WIP for #538

Author: oharsta

server/src/main/java/invite/api/InvitationController.java

@@ -109,7 +109,6 @@ public ResponseEntity<InvitationResponse> newInvitation(@Validated @RequestBody
         return this.invitationOperations.sendInvitation(invitationRequest, user, null);
     }
 
-
     @DeleteMapping("/{id}")
     public ResponseEntity<Void> deleteInvitation(@PathVariable("id") Long id,
                                                  @Parameter(hidden = true) User user) {
@@ -252,6 +251,7 @@ public ResponseEntity<Map<String, Object>> accept(@Validated @RequestBody Accept
                 saveOAuth2AuthenticationToken(authentication, user, servletRequest, servletResponse);
             }
         }
+        user.setInternalPlaceholderIdentifier(invitation.getInternalPlaceholderIdentifier());
         userRepository.save(user);
         AccessLogger.user(LOG, Event.Created, user);
         newUserRoles.forEach(userRole -> userRoleAuditService.logAction(userRole, UserRoleAudit.ActionType.ADD));

server/src/main/java/invite/api/InvitationOperations.java

@@ -40,6 +40,7 @@ public InvitationOperations(InvitationResource invitationResource) {
     public ResponseEntity<InvitationResponse> sendInvitation(InvitationRequest invitationRequest,
                                                              User user,
                                                              RemoteUser remoteUser) {
+        invitationRequest.verify();
         Authority intendedAuthority = invitationRequest.getIntendedAuthority();
         if (!List.of(Authority.INSTITUTION_ADMIN, Authority.SUPER_USER).contains(intendedAuthority)
                 && CollectionUtils.isEmpty(invitationRequest.getRoleIdentifiers())) {
@@ -65,19 +66,26 @@ public ResponseEntity<InvitationResponse> sendInvitation(InvitationRequest invit
                 invitationRequest.setRoleExpiryDate(Instant.now().plus(defaultExpiryDays, ChronoUnit.DAYS));
             }
         }
-
-        List<Invitation> invitations = invitationRequest.getInvites().stream()
-                .filter(email -> {
-                    boolean valid = emailFormatValidator.isValid(email);
+        List<Invite> invites = invitationRequest.getInvitations();
+        if (invites == null) {
+            invites = new ArrayList<>();
+        }
+        List<String> requestInvites = invitationRequest.getInvites();
+        if (requestInvites != null) {
+            invites.addAll(requestInvites.stream().map(invite -> new Invite(invite, null)).toList());
+        }
+        List<Invitation> invitations = invites.stream()
+                .filter(invite -> {
+                    boolean valid = emailFormatValidator.isValid(invite.getEmail());
                     if (!valid) {
-                        LOG.debug("Not sending invalid email for invitation: " + email);
+                        LOG.debug("Not sending invalid email for invitation: " + invite.getEmail());
                     }
                     return valid;
                 })
-                .map(invitee -> new Invitation(
+                .map(invite -> new Invitation(
                         intendedAuthority,
                         HashGenerator.generateRandomHash(),
-                        invitee,
+                        invite.getEmail(),
                         invitationRequest.isEnforceEmailEquality(),
                         invitationRequest.isEduIDOnly(),
                         invitationRequest.isGuestRoleIncluded(),
@@ -88,8 +96,9 @@ public ResponseEntity<InvitationResponse> sendInvitation(InvitationRequest invit
                         invitationRequest.getRoleExpiryDate(),
                         requestedRoles.stream()
                                 .map(InvitationRole::new)
-                                .collect(toSet())))
-                .toList();
+                                .collect(toSet()),
+                        invite.getInternalPlaceholderIdentifier())
+                ).toList();
         if (user == null) {
             invitations.forEach(invitation -> invitation.setRemoteApiUser(remoteUser.getName()));
         }

server/src/main/java/invite/exception/InvalidInputException.java

@@ -5,6 +5,7 @@
 
 @ResponseStatus(HttpStatus.BAD_REQUEST)
 public class InvalidInputException extends BaseException {
+
     public InvalidInputException(String message) {
         super(message);
     }

server/src/main/java/invite/model/Invitation.java

@@ -73,6 +73,9 @@ public class Invitation implements Serializable {
     @Column(name = "organization_guid")
     private String organizationGUID;
 
+    @Column(name = "internal_placeholder_identifier")
+    private String internalPlaceholderIdentifier;
+
     @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "inviter_id")
     @JsonIgnore
@@ -98,7 +101,8 @@ public Invitation(Authority intendedAuthority,
                       User inviter,
                       Instant expiryDate,
                       Instant roleExpiryDate,
-                      @NotEmpty Set<InvitationRole> roles) {
+                      @NotEmpty Set<InvitationRole> roles,
+                      String internalPlaceholderIdentifier) {
         this.intendedAuthority = intendedAuthority;
         this.hash = hash;
         this.enforceEmailEquality = enforceEmailEquality;

server/src/main/java/invite/model/InvitationRequest.java

@@ -1,11 +1,12 @@
 package invite.model;
 
-import jakarta.validation.constraints.NotEmpty;
+import invite.exception.InvalidInputException;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
 import java.time.Instant;
@@ -32,9 +33,10 @@ public class InvitationRequest implements Serializable {
 
     private boolean suppressSendingEmails;
 
-    @NotEmpty
     private List<String> invites;
 
+    private List<Invite> invitations;
+
     private List<Long> roleIdentifiers;
 
     private String organizationGUID;
@@ -43,4 +45,10 @@ public class InvitationRequest implements Serializable {
 
     @NotNull
     private Instant expiryDate;
+
+    public void verify() {
+        if (CollectionUtils.isEmpty(invitations) && CollectionUtils.isEmpty(invites)) {
+            throw new InvalidInputException("Either at least one invitation or invite is required");
+        }
+    }
 }

server/src/main/java/invite/model/Invite.java

@@ -0,0 +1,19 @@
+package invite.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class Invite implements Serializable {
+
+    private String email;
+    private String internalPlaceholderIdentifier;
+
+}

server/src/main/java/invite/model/User.java

@@ -75,6 +75,9 @@ public class User implements Serializable, Provisionable {
     @Column
     private String email;
 
+    @Column(name = "internal_placeholder_identifier")
+    private String internalPlaceholderIdentifier;
+
     @Column(name = "created_at")
     private Instant createdAt;
 

server/src/main/java/invite/provision/scim/UserRequest.java

@@ -36,6 +36,9 @@ public UserRequest(User user, Provisioning provisioning) {
         this.emails = List.of(new Email("other",user.getEmail()));
         //Add a default phonenumber, for remote systems that require that
         this.phoneNumbers = Collections.singletonList(new PhoneNumber("+31600000000"));
+        if (StringUtils.hasText(user.getInternalPlaceholderIdentifier())) {
+            this.id = user.getInternalPlaceholderIdentifier();
+        }
     }
 
     public UserRequest(User user, Provisioning provisioning, String remoteScimIdentifier) {

server/src/main/java/invite/repository/RemoteProvisionedUserRepository.java

@@ -12,4 +12,5 @@ public interface RemoteProvisionedUserRepository extends JpaRepository<RemotePro
 
     Optional<RemoteProvisionedUser> findByManageProvisioningIdAndUser(String manageId, User user);
 
+    Optional<RemoteProvisionedUser> findByRemoteScimIdentifier(String remoteScimIdentifier);
 }

server/src/main/java/invite/seed/PerformanceSeed.java

@@ -140,7 +140,8 @@ private Invitation createInvitation(User inviter, Role role) {
                 inviter,
                 Instant.now().plus(30, ChronoUnit.DAYS),
                 Instant.now().plus(365 * 5, ChronoUnit.DAYS),
-                roles);
+                roles,
+                null);
     }
 
     private Role createRole(List<Map<String, Object>> providers, String institutionGuid) {