diff --git a/libs/wire-api/src/Wire/API/Team/Invitation.hs b/libs/wire-api/src/Wire/API/Team/Invitation.hs index 12c64b8a214..4b744ad356a 100644 --- a/libs/wire-api/src/Wire/API/Team/Invitation.hs +++ b/libs/wire-api/src/Wire/API/Team/Invitation.hs @@ -140,6 +140,8 @@ newtype InvitationLocation = InvitationLocation } deriving stock (Eq, Show, Generic) +-- TODO: is there an invitation list EP that we should also change? + instance S.ToParamSchema InvitationLocation where toParamSchema _ = mempty diff --git a/libs/wire-subsystems/src/Wire/TeamInvitationSubsystem/Interpreter.hs b/libs/wire-subsystems/src/Wire/TeamInvitationSubsystem/Interpreter.hs index 9d97929cfab..bb720916cdc 100644 --- a/libs/wire-subsystems/src/Wire/TeamInvitationSubsystem/Interpreter.hs +++ b/libs/wire-subsystems/src/Wire/TeamInvitationSubsystem/Interpreter.hs @@ -128,6 +128,8 @@ createInvitation' tid mExpectedInvId inviteeRole mbInviterUid inviterEmail invRe when blacklistedEm $ throw TeamInvitationBlacklistedEmail + -- TODO: explain change in confluence. + mEmailOwner <- getLocalUserAccountByUserKey uke isPersonalUserMigration <- case mEmailOwner of Nothing -> pure False @@ -163,6 +165,8 @@ createInvitation' tid mExpectedInvId inviteeRole mbInviterUid inviterEmail invRe } in Store.insertInvitation insertInv timeout + -- TODO: write tests (in wire-subsystem? in /integration?) + let sendOp = if isPersonalUserMigration then sendTeamInvitationMailPersonalUser diff --git a/services/brig/src/Brig/Team/API.hs b/services/brig/src/Brig/Team/API.hs index 2d2310345fd..920b7e84ff9 100644 --- a/services/brig/src/Brig/Team/API.hs +++ b/services/brig/src/Brig/Team/API.hs @@ -283,6 +283,7 @@ mkInviteUrl ShowInvitationUrl team (InvitationCode c) = do template <- invitationEmail <$> input getInviteUrl template team c +-- TODO: is this also code already available from wire-subsystems? getInvitation :: ( Member GalleyAPIAccess r, Member InvitationStore r,