Fixes #747

Author: oharsta

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.1.14
+
+- Only delete User in CRM Delete endpoint, if there are no native Invite roles anymore for this user
+
 ## 1.1.13
 
 - Added SuperUser endpoint to fix the missing landing pages in Application Usages

client/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>invite</artifactId>
-        <version>1.1.14-SNAPSHOT</version>
+        <version>1.1.15-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>invite-client</artifactId>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openconext</groupId>
     <artifactId>invite</artifactId>
-    <version>1.1.14-SNAPSHOT</version>
+    <version>1.1.15-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>invite</name>
     <description>SURFconext Invite</description>

provisioning-mock/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>invite</artifactId>
-        <version>1.1.14-SNAPSHOT</version>
+        <version>1.1.15-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>provisioning-mock</artifactId>

server/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>invite</artifactId>
-        <version>1.1.14-SNAPSHOT</version>
+        <version>1.1.15-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>invite-server</artifactId>

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

@@ -182,9 +182,27 @@ public ResponseEntity<String> delete(@RequestBody CRMContact crmContact) {
         optionalOrganisation
                 .flatMap(organisation -> userRepository.findByCrmContactIdAndOrganisation(crmContact.getContactId(), organisation))
                 .ifPresent(user -> {
-                    LOG.debug("Deleting CRM user: " + user.getEmail());
-                    this.provisioningService.deleteUserRequest(user);
-                    this.userRepository.delete(user);
+                    long inviteNativeUserRolesCount = user.getUserRoles().stream()
+                            .filter(userRole -> !StringUtils.hasText(userRole.getRole().getCrmRoleId()))
+                            .count();
+                    if (inviteNativeUserRolesCount == 0L) {
+                        LOG.debug("Deleting CRM user: " + user.getEmail());
+                        this.provisioningService.deleteUserRequest(user);
+                        this.userRepository.delete(user);
+                    } else {
+                        List<UserRole> crmUserRoles = user.getUserRoles().stream()
+                                .filter(userRole -> StringUtils.hasText(userRole.getRole().getCrmRoleId()))
+                                .toList();
+
+                        LOG.debug("Deleting all CRM roles (but not deleting the user) for user: " + user.getEmail());
+                        crmUserRoles.forEach(crmUserRole -> {
+                            this.userRoleAuditService.logAction(crmUserRole, UserRoleAudit.ActionType.DELETE);
+                            this.provisioningService.deleteUserRoleRequest(crmUserRole);
+                        });
+                        user.getUserRoles().removeIf(userRole -> StringUtils.hasText(userRole.getRole().getCrmRoleId()));
+                        this.userRepository.save(user);
+                    }
+
                 });
         return ResponseEntity.ok().body("deleted");
     }

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

@@ -445,6 +445,9 @@ void deleteUser() throws JsonProcessingException {
         super.remoteProvisionedGroupRepository.save(remoteProvisionedGroup);
 
         User user = userRepository.findBySubIgnoreCase(KB_USER_SUB).get();
+        user.getUserRoles().removeIf(userRole -> !StringUtils.hasText(userRole.getRole().getCrmRoleId()));
+        userRepository.save(user);
+
         RemoteProvisionedUser remoteProvisionedUser = new RemoteProvisionedUser(user, UUID.randomUUID().toString(), "7");
         super.remoteProvisionedUserRepository.save(remoteProvisionedUser);
         //Because of the PUT request of the change in the group, all users are fetched and checked if they exists in the remote SCIM
@@ -473,6 +476,47 @@ void deleteUser() throws JsonProcessingException {
         assertTrue(optionalUser.isEmpty());
     }
 
+    @Test
+    void deleteUserWithNativeInviteRoles() throws JsonProcessingException {
+        CRMContact crmContact = new CRMContact();
+        crmContact.setContactId(CRM_CONTACT_ID);
+        crmContact.setOrganisation(new CRMOrganisation(CRM_ORGANIZATION_ID, "abbr", "name"));
+
+        stubForManageProvisioning(List.of("5"));
+        Role role = roleRepository.findByName("Research").get();
+        RemoteProvisionedGroup remoteProvisionedGroup = new RemoteProvisionedGroup(role, UUID.randomUUID().toString(), "7");
+        super.remoteProvisionedGroupRepository.save(remoteProvisionedGroup);
+
+        User user = userRepository.findBySubIgnoreCase(KB_USER_SUB).get();
+        RemoteProvisionedUser remoteProvisionedUser = new RemoteProvisionedUser(user, UUID.randomUUID().toString(), "7");
+        super.remoteProvisionedUserRepository.save(remoteProvisionedUser);
+        //Because of the PUT request of the change in the group, all users are fetched and checked if they exists in the remote SCIM
+        User guestUser = userRepository.findBySubIgnoreCase(GUEST_SUB).get();
+        RemoteProvisionedUser remoteProvisionedUserGuest = new RemoteProvisionedUser(guestUser, UUID.randomUUID().toString(), "7");
+        super.remoteProvisionedUserRepository.save(remoteProvisionedUserGuest);
+
+        stubForUpdateScimRole();
+        stubForDeleteScimUser();
+
+        String response = given()
+                .when()
+                .accept(ContentType.JSON)
+                .header(API_KEY_HEADER, "secret")
+                .contentType(ContentType.JSON)
+                .body(crmContact)
+                .delete("/crm/profile")
+                .then()
+                .extract()
+                .asString();
+        assertEquals("deleted", response);
+
+        Organisation organisation = organisationRepository.findByCrmOrganisationId(CRM_ORGANIZATION_ID)
+                .orElseThrow(() -> new NotFoundException("Organisation not found: " + CRM_ORGANIZATION_ID));
+        Optional<User> optionalUser = userRepository.findByCrmContactIdAndOrganisation(CRM_CONTACT_ID, organisation);
+        assertFalse(optionalUser.isEmpty());
+        assertEquals(1, optionalUser.get().getUserRoles().size());
+    }
+
     @Test
     void scopeInviteRoleToUniqueCRMRoleIdAndOrganizationId() throws JsonProcessingException {
         String converRoleId = "92b2b379-07e4-e811-8100-005056956c1a";

welcome/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>invite</artifactId>
-        <version>1.1.14-SNAPSHOT</version>
+        <version>1.1.15-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>invite-welcome</artifactId>