fix: user deletion

sovity · Dec 9, 2024 · 5987976 · 5987976
1 parent 4f432a2
commit 5987976
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/...ity-portal-db/src/main/resources/db/migration/V12__Fix_Service_Provider_User_Deletion.sql b/...ity-portal-db/src/main/resources/db/migration/V12__Fix_Service_Provider_User_Deletion.sql
@@ -0,0 +1 @@
+alter table connector alter column created_by drop not null;
diff --git a/.../main/kotlin/de/sovity/authorityportal/web/pages/usermanagement/UserDeletionApiService.kt b/.../main/kotlin/de/sovity/authorityportal/web/pages/usermanagement/UserDeletionApiService.kt
@@ -102,11 +102,12 @@ class UserDeletionApiService(
         userService.deleteInvitationReferencesToOrgMembers(orgMemberIds)
         userService.deleteOrganizationIds(orgMemberIds)
 
-        keycloakService.deleteOrganization(organizationId)
         organizationService.deleteOrganization(organizationId)
-        keycloakService.deleteUsers(orgMemberIds)
         userService.deleteUsers(orgMemberIds)
 
+        keycloakService.deleteUsers(orgMemberIds)
+        keycloakService.deleteOrganization(organizationId)
+
         Log.info(
             "Organization and related users, connectors and central components deleted. " +
                 "organization=${organizationId}, adminUserId=$adminUserId."

diff --git a/...portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/services/ConnectorService.kt b/...portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/services/ConnectorService.kt
@@ -106,6 +106,7 @@ class ConnectorService(
         val c = Tables.CONNECTOR
         dsl.update(c)
             .setNull(c.PROVIDER_ORGANIZATION_ID)
+            .setNull(c.CREATED_BY)
             .where(c.PROVIDER_ORGANIZATION_ID.eq(organizationId))
             .execute()
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		alter table connector alter column created_by drop not null;