Support for suppressInvitation in dry-run

Author: oharsta

server/src/main/java/invite/crm/CRMController.java

@@ -121,12 +121,9 @@ public ResponseEntity<String> contact(@RequestBody CRMContact crmContact) {
 
         boolean created;
 
-        if (crmContact.isSuppressInvitation()) {
-            if (!StringUtils.hasText(crmContact.getSchacHomeOrganisation()) || !StringUtils.hasText(crmContact.getUid())) {
-                throw new InvalidInputException(
-                        "Missing schacHomeOrganisation or uid in crmContact with isSuppressInvitation true: " + crmContact);
-            }
-            created = provisionUser(crmContact);
+        if (crmContact.isSuppressInvitation() &&
+                StringUtils.hasText(crmContact.getSchacHomeOrganisation()) && StringUtils.hasText(crmContact.getUid())) {
+                created = provisionUser(crmContact);
         } else {
             created = sendInvitation(crmContact);
         }
@@ -251,11 +248,14 @@ private boolean sendInvitation(CRMContact crmContact) {
             Invitation invitation = createInvitation(crmContact, invitationRoles);
 
             Optional<String> idpName = identityProviderName(manage, invitation);
-
-            LOG.debug(String.format("Sending invitation to user %s for roles %s",
-                    invitation.getEmail(), roles.stream().map(Role::getName).collect(Collectors.joining(","))));
-
-            mailBox.sendInviteMail(this.provisionable, invitation, groupedProviders, Language.en, idpName);
+            if (crmContact.isSuppressInvitation()) {
+                LOG.debug(String.format("Not actualy sending invitation to user %s for roles %s, because suppressInvitation is set to true",
+                        invitation.getEmail(), roles.stream().map(Role::getName).collect(Collectors.joining(","))));
+            } else {
+                LOG.debug(String.format("Sending invitation to user %s for roles %s",
+                        invitation.getEmail(), roles.stream().map(Role::getName).collect(Collectors.joining(","))));
+                mailBox.sendInviteMail(this.provisionable, invitation, groupedProviders, Language.en, idpName);
+            }
         }
         return optionalUser.isEmpty();
     }

server/src/test/java/invite/crm/CRMControllerTest.java

@@ -114,23 +114,6 @@ void contactProvisioningExistingUser() throws JsonProcessingException {
         assertEquals(Authority.GUEST, userRole.getAuthority());
     }
 
-    @Test
-    void contactProvisioningMissingUID() {
-        CRMRole crmRole = new CRMRole("roleId", "BVW", "Super");
-        //Empty uid will force the InvalidInputException
-        CRMContact crmContact = createCrmContact(CRM_CONTACT_ID, CRM_ORGANIZATION_ID, crmRole, "", "hardewijk.org", true);
-
-        given()
-                .when()
-                .accept(ContentType.JSON)
-                .header(API_KEY_HEADER, "secret")
-                .contentType(ContentType.JSON)
-                .body(crmContact)
-                .post("/api/internal/v1/crm")
-                .then()
-                .statusCode(HttpStatus.BAD_REQUEST.value());
-    }
-
     @Test
     void contactInviteNewUser() throws Exception {
         CRMRole crmRole = new CRMRole("roleId", "BVW", "Super");
@@ -187,6 +170,35 @@ void contactInviteNewUser() throws Exception {
     }
 
     @Test
+    void contactInviteNewUserSuppressEmail() throws Exception {
+        CRMRole crmRole = new CRMRole("roleId", "BVW", "Super");
+        String crmContactID = UUID.randomUUID().toString();
+        String crmOrganisationID = UUID.randomUUID().toString();
+        CRMContact crmContact = createCrmContact(crmContactID, crmOrganisationID, crmRole, null, null, true);
+        //These two applications are linked to the 'BVW' CRM role
+        super.stubForManageProviderByEntityID(EntityType.OIDC10_RP, "https://calendar");
+        super.stubForManageProviderByEntityID(EntityType.SAML20_SP, "https://storage");
+
+        String response = given()
+                .when()
+                .accept(ContentType.JSON)
+                .header(API_KEY_HEADER, "secret")
+                .contentType(ContentType.JSON)
+                .body(crmContact)
+                .post("/api/internal/v1/crm")
+                .then()
+                .extract()
+                .asString();
+        assertEquals("created", response);
+
+        Optional<User> optionalUser = userRepository.findByCrmContactIdAndCrmOrganisationId(crmContactID,
+                crmOrganisationID);
+        assertTrue(optionalUser.isEmpty());
+
+        List<MimeMessageParser> allMailMessages = allMailMessages(0);
+        assertEquals(0, allMailMessages.size());
+    }
+        @Test
     void contactProvisioningRemoveScimRole() throws JsonProcessingException {
         CRMRole crmRoleResearch = new CRMRole("5e17b508-08e4-e811-8100-005056956c1a", "CONBEH", "SURFconextbeheerder");
         CRMRole crmRoleCloud = new CRMRole("cf652619-08e4-e811-8100-005056956c1a", "CONVER", "SURFconextverantwoordelijke");