Remove user from groups on user deletion

Author: pcapriotti

libs/wire-subsystems/src/Wire/UserGroupSubsystem/Interpreter.hs

@@ -353,7 +353,7 @@ removeUserFromAllGroups uid tid = do
     go [] = pure ()
 
     nextPage mug =
-      Store.getUserGroups $
+      fmap (.page) . Store.getUserGroups $
         UserGroupPageRequest
           { pageSize = def,
             sortOrder = Desc,

services/brig/src/Brig/API/Internal.hs

@@ -127,6 +127,7 @@ import Wire.Sem.Random (Random)
 import Wire.SparAPIAccess (SparAPIAccess)
 import Wire.TeamInvitationSubsystem
 import Wire.TeamSubsystem (TeamSubsystem)
+import Wire.UserGroupSubsystem
 import Wire.UserKeyStore
 import Wire.UserStore as UserStore
 import Wire.UserSubsystem
@@ -148,6 +149,7 @@ servantSitemap ::
     Member GalleyAPIAccess r,
     Member NotificationSubsystem r,
     Member UserSubsystem r,
+    Member UserGroupSubsystem r,
     Member TeamSubsystem r,
     Member TeamInvitationSubsystem r,
     Member UserStore r,
@@ -222,6 +224,7 @@ accountAPI ::
     Member (Embed HttpClientIO) r,
     Member NotificationSubsystem r,
     Member UserSubsystem r,
+    Member UserGroupSubsystem r,
     Member UserKeyStore r,
     Member (Input (Local ())) r,
     Member UserStore r,
@@ -626,7 +629,8 @@ deleteUserNoAuthH ::
     Member Events r,
     Member UserSubsystem r,
     Member PropertySubsystem r,
-    Member AuthenticationSubsystem r
+    Member AuthenticationSubsystem r,
+    Member UserGroupSubsystem r
   ) =>
   UserId ->
   (Handler r) DeleteUserResponse

services/brig/src/Brig/API/Public.hs

@@ -1418,7 +1418,8 @@ deleteSelfUser ::
     Member Events r,
     Member HashPassword r,
     Member RateLimit r,
-    Member AuthenticationSubsystem r
+    Member AuthenticationSubsystem r,
+    Member UserGroupSubsystem r
   ) =>
   Local UserId ->
   Public.DeleteUser ->
@@ -1436,7 +1437,8 @@ verifyDeleteUser ::
     Member PropertySubsystem r,
     Member UserSubsystem r,
     Member Events r,
-    Member AuthenticationSubsystem r
+    Member AuthenticationSubsystem r,
+    Member UserGroupSubsystem r
   ) =>
   Public.VerifyDeleteUser ->
   Handler r ()

services/brig/src/Brig/API/User.hs

@@ -150,6 +150,7 @@ import Wire.Sem.Paging.Cassandra
 import Wire.StoredUser
 import Wire.TeamSubsystem (TeamSubsystem)
 import Wire.TeamSubsystem qualified as TeamSubsystem
+import Wire.UserGroupSubsystem
 import Wire.UserKeyStore
 import Wire.UserStore (UserStore)
 import Wire.UserStore qualified as UserStore
@@ -903,7 +904,8 @@ deleteSelfUser ::
     Member PropertySubsystem r,
     Member HashPassword r,
     Member RateLimit r,
-    Member AuthenticationSubsystem r
+    Member AuthenticationSubsystem r,
+    Member UserGroupSubsystem r
   ) =>
   Local UserId ->
   Maybe PlainTextPassword6 ->
@@ -975,7 +977,8 @@ verifyDeleteUser ::
     Member Events r,
     Member UserSubsystem r,
     Member PropertySubsystem r,
-    Member AuthenticationSubsystem r
+    Member AuthenticationSubsystem r,
+    Member UserGroupSubsystem r
   ) =>
   VerifyDeleteUser ->
   ExceptT DeleteUserError (AppT r) ()
@@ -1003,7 +1006,8 @@ ensureAccountDeleted ::
     Member Events r,
     Member UserSubsystem r,
     Member PropertySubsystem r,
-    Member AuthenticationSubsystem r
+    Member AuthenticationSubsystem r,
+    Member UserGroupSubsystem r
   ) =>
   Local UserId ->
   AppT r DeleteUserResult
@@ -1052,7 +1056,8 @@ deleteAccount ::
     Member PropertySubsystem r,
     Member UserSubsystem r,
     Member Events r,
-    Member AuthenticationSubsystem r
+    Member AuthenticationSubsystem r,
+    Member UserGroupSubsystem r
   ) =>
   User ->
   Sem r ()
@@ -1064,9 +1069,10 @@ deleteAccount user = do
     for_ (userEmail user) $ deleteKeyForUser uid . mkEmailKey
 
     PropertySubsystem.onUserDeleted uid
-
     UserStore.deleteUser user
 
+  traverse_ (removeUserFromAllGroups uid) user.userTeam
+
   Intra.rmUser uid (userAssets user)
   embed $ Data.lookupClients uid >>= mapM_ (Data.rmClient uid . (.clientId))
   luid <- embed $ qualifyLocal uid

services/brig/src/Brig/InternalEvent/Process.hs

@@ -40,6 +40,7 @@ import Wire.Events (Events)
 import Wire.NotificationSubsystem
 import Wire.PropertySubsystem
 import Wire.Sem.Delay
+import Wire.UserGroupSubsystem
 import Wire.UserKeyStore
 import Wire.UserStore (UserStore)
 import Wire.UserSubsystem
@@ -59,7 +60,8 @@ onEvent ::
     Member PropertySubsystem r,
     Member UserSubsystem r,
     Member Events r,
-    Member AuthenticationSubsystem r
+    Member AuthenticationSubsystem r,
+    Member UserGroupSubsystem r
   ) =>
   InternalNotification ->
   Sem r ()