Repair user key inconsistency on invitation (#5031)

Author: pcapriotti

changelog.d/3-bug-fixes/repair-user-key-inconsistency

@@ -0,0 +1 @@
+Repair user key inconsistency when inviting user

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

@@ -78,7 +78,8 @@ runTeamInvitationSubsystem ::
     Member Now r,
     Member EmailSubsystem r,
     Member EnterpriseLoginSubsystem r,
-    Member TeamSubsystem r
+    Member TeamSubsystem r,
+    Member UserKeyStore r
   ) =>
   TeamInvitationSubsystemConfig ->
   InterpreterFor TeamInvitationSubsystem r
@@ -98,7 +99,8 @@ inviteUserImpl ::
     Member Now r,
     Member EmailSubsystem r,
     Member EnterpriseLoginSubsystem r,
-    Member TeamSubsystem r
+    Member TeamSubsystem r,
+    Member UserKeyStore r
   ) =>
   Local UserId ->
   TeamId ->
@@ -139,7 +141,8 @@ createInvitation' ::
     Member (Input TeamInvitationSubsystemConfig) r,
     Member Now r,
     Member EmailSubsystem r,
-    Member EnterpriseLoginSubsystem r
+    Member EnterpriseLoginSubsystem r,
+    Member UserKeyStore r
   ) =>
   TeamId ->
   Maybe InvitationId ->
@@ -165,6 +168,11 @@ createInvitation' tid mExpectedInvId inviteeRole mbInviterUid inviterEmail invRe
           && user.userStatus == Active
           && isNothing user.userTeam ->
           pure InviteExistingUser
+      | user.userStatus == Deleted -> do
+          -- user key is present but the user is deleted
+          -- repair inconsistency here, and allow invitation to proceed
+          deleteKeyForUser (qUnqualified user.userQualifiedId) (tUnqualified uke)
+          pure InviteNewUser
       | otherwise -> throw TeamInvitationEmailTaken
   guardEmailDomainRegistration invitationFlow tid email
 

libs/wire-subsystems/test/unit/Wire/TeamInvitationSubsystem/InterpreterSpec.hs

@@ -55,6 +55,7 @@ import Wire.TeamInvitationSubsystem.Error
 import Wire.TeamInvitationSubsystem.Interpreter
 import Wire.TeamSubsystem
 import Wire.TeamSubsystem.GalleyAPI
+import Wire.UserKeyStore
 import Wire.UserSubsystem
 import Wire.Util
 
@@ -67,6 +68,7 @@ type AllEffects =
     Random,
     State StdGen,
     InvitationStore,
+    UserKeyStore,
     State (Map (TeamId, InvitationId) StoredInvitation),
     State (Map (InvitationCode) StoredInvitation),
     Now,
@@ -93,6 +95,7 @@ runAllEffects args =
     . interpretNowAsState
     . evalState mempty
     . evalState mempty
+    . (evalState mempty . inMemoryUserKeyStoreInterpreter . raiseUnder)
     . inMemoryInvitationStoreInterpreter
     . evalState (mkStdGen 3)
     . randomToStatefulStdGen