fix(leif): split moved actions

Author: blackheaven

libs/wire-subsystems/src/Wire/BrigAPIAccess.hs

@@ -71,6 +71,9 @@ module Wire.BrigAPIAccess
     deleteGroupInternal,
     deleteApp,
     DeleteGroupManagedError (..),
+
+    -- * Assertions
+    ensureConnectedToLocals,
   )
 where
 
@@ -88,6 +91,7 @@ import Polysemy
 import Polysemy.Error
 import Web.Scim.Filter qualified as Scim
 import Wire.API.Connection
+import Wire.API.Error
 import Wire.API.Error.Galley
 import Wire.API.MLS.CipherSuite
 import Wire.API.Routes.Internal.Brig
@@ -192,3 +196,17 @@ getConnectionsUnqualifiedBidi uids1 uids2 mrel1 mrel2 = do
   res1 <- getConnectionsUnqualified uids1 (Just uids2) mrel1
   res2 <- getConnectionsUnqualified uids2 (Just uids1) mrel2
   pure (res1, res2)
+
+ensureConnectedToLocals ::
+  ( Member (ErrorS 'NotConnected) r,
+    Member BrigAPIAccess r
+  ) =>
+  UserId ->
+  [UserId] ->
+  Sem r ()
+ensureConnectedToLocals _ [] = pure ()
+ensureConnectedToLocals u uids = do
+  (connsFrom, connsTo) <-
+    getConnectionsUnqualifiedBidi [u] uids (Just Accepted) (Just Accepted)
+  unless (length connsFrom == length uids && length connsTo == length uids) $
+    throwS @'NotConnected

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

@@ -1,14 +1,18 @@
+{-# OPTIONS_GHC -Wno-ambiguous-fields #-}
+
 module Wire.ClientSubsystem.Interpreter (runClientSubsystem) where
 
 import Data.Id
-import Data.Time.Clock
+import Data.Time.Clock (UTCTime)
 import Imports
 import Polysemy
 import Wire.ClientStore (ClientStore)
 import Wire.ClientStore qualified as ClientStore
 import Wire.ClientSubsystem
 
-runClientSubsystem :: (Member ClientStore r) => InterpreterFor ClientSubsystem r
+runClientSubsystem ::
+  (Member ClientStore r) =>
+  InterpreterFor ClientSubsystem r
 runClientSubsystem = interpret $ \case
   InternalGetActivityTimestamps uid -> internalGetActivityTimestampsImpl uid
 

libs/wire-subsystems/src/Wire/ConversationSubsystem.hs

@@ -20,12 +20,9 @@
 module Wire.ConversationSubsystem
   ( module Wire.ConversationSubsystem,
     Util.BotsAndMembers (..),
-    Util.ConsentGiven (..),
     Util.canDeleteMember,
-    Util.consentGiven,
     Util.isMember,
     Util.userLHEnabled,
-    Features.toTeamStatus,
     MLSRemoval.RemoveUserIncludeMain (..),
     LegalholdConflicts.guardLegalholdPolicyConflicts,
   )
@@ -35,13 +32,10 @@ import Data.Code qualified as Code
 import Data.CommaSeparatedList (CommaSeparatedList)
 import Data.Domain
 import Data.Id
-import Data.LegalHold (UserLegalHoldStatus)
-import Data.Misc (IpAddr, PlainTextPassword6)
-import Data.Proxy (Proxy (..))
+import Data.Misc (IpAddr)
 import Data.Qualified
 import Data.Range
-import Data.Singletons (Demote, Sing, SingKind)
-import Galley.Types.Clients (Clients)
+import Data.Singletons (Sing)
 import Imports
 import Polysemy
 import Wire.API.Bot (AddBot, RemoveBot)
@@ -75,23 +69,15 @@ import Wire.API.Routes.Public.Galley.Messaging (MessageNotSent, PostOtrResponse)
 import Wire.API.Routes.Public.Util (UpdateResult)
 import Wire.API.Routes.Version
 import Wire.API.ServantProto (RawProto (..))
-import Wire.API.Team.Feature (AllTeamFeatures, GuestLinksConfig, LockableFeature)
-import Wire.API.Team.LegalHold (UserLegalHoldStatusResponse)
-import Wire.API.Team.Member (IsPerm, TeamMemberList)
-import Wire.API.User (VerificationAction)
+import Wire.API.Team.Feature (GuestLinksConfig, LockableFeature)
 import Wire.ConversationStore.MLS.Types (ListGlobalSelfConvs)
-import Wire.ConversationSubsystem.Features qualified as Features
 import Wire.ConversationSubsystem.LegalholdConflicts qualified as LegalholdConflicts
 import Wire.ConversationSubsystem.MLS.IncomingMessage (IncomingBundle, IncomingMessage)
 import Wire.ConversationSubsystem.MLS.Removal qualified as MLSRemoval
 import Wire.ConversationSubsystem.Util qualified as Util
-import Wire.FeaturesConfigSubsystem.Types (GetFeatureConfig)
 import Wire.NotificationSubsystem (LocalConversationUpdate)
 import Wire.StoredConversation (BotMember, LocalMember, StoredConversation)
 
-data PermissionCheckArgs teamAssociation where
-  PermissionCheckArgs :: forall k (p :: k) teamAssociation. (SingKind k, IsPerm teamAssociation (Demote k)) => Sing p -> Maybe teamAssociation -> PermissionCheckArgs teamAssociation
-
 data ConversationSubsystem m a where
   NotifyConversationAction ::
     Sing tag ->
@@ -146,7 +132,6 @@ data ConversationSubsystem m a where
     Range 1 1000 Int32 ->
     Maybe ConversationPagingState ->
     ConversationSubsystem r ConvIdsPage
-  InternalGetClientIds :: [UserId] -> ConversationSubsystem m Clients
   InternalGetLocalMember ::
     ConvId ->
     UserId ->
@@ -169,13 +154,11 @@ data ConversationSubsystem m a where
   GetLocalConversationInternal ::
     ConvId ->
     ConversationSubsystem m Conversation
-  RmClient ::
-    UserId ->
+  RemoveClient ::
+    Local StoredConversation ->
+    Qualified UserId ->
     ClientId ->
     ConversationSubsystem m ()
-  GetClients ::
-    UserId ->
-    ConversationSubsystem m [ClientId]
   AddBot ::
     Local UserId ->
     ConnId ->
@@ -186,10 +169,6 @@ data ConversationSubsystem m a where
     Maybe ConnId ->
     RemoveBot ->
     ConversationSubsystem m (UpdateResult Event)
-  GetFeatureInternal ::
-    (GetFeatureConfig cfg) =>
-    TeamId ->
-    ConversationSubsystem m (LockableFeature cfg)
   UpdateCellsState ::
     ConvId ->
     CellsState ->
@@ -371,20 +350,6 @@ data ConversationSubsystem m a where
   GetMLSPublicKeys ::
     Maybe MLSPublicKeyFormat ->
     ConversationSubsystem m (MLSKeysByPurpose (MLSKeys SomeKey))
-  FeatureEnabledForTeam ::
-    forall cfg m.
-    (GetFeatureConfig cfg) =>
-    Proxy cfg ->
-    TeamId ->
-    ConversationSubsystem m Bool
-  GetAllTeamFeaturesForUser ::
-    UserId ->
-    ConversationSubsystem m AllTeamFeatures
-  GetSingleFeatureForUser ::
-    forall cfg m.
-    (GetFeatureConfig cfg) =>
-    UserId ->
-    ConversationSubsystem m (LockableFeature cfg)
   ResetMLSConversation ::
     Local UserId ->
     MLSReset ->
@@ -394,15 +359,6 @@ data ConversationSubsystem m a where
     Qualified ConvId ->
     SubConvId ->
     ConversationSubsystem m PublicSubConversation
-  GetUserStatus ::
-    Local UserId ->
-    TeamId ->
-    UserId ->
-    ConversationSubsystem m UserLegalHoldStatusResponse
-  GuardSecondFactorDisabled ::
-    UserId ->
-    ConvId ->
-    ConversationSubsystem m ()
   GetBotConversation ::
     BotId ->
     ConvId ->
@@ -426,6 +382,9 @@ data ConversationSubsystem m a where
     Local UserId ->
     Qualified ConvId ->
     ConversationSubsystem m Public.Conversation
+  InternalGetConversation ::
+    ConvId ->
+    ConversationSubsystem m (Maybe StoredConversation)
   GetConversationRoles ::
     Local UserId ->
     ConvId ->
@@ -710,42 +669,9 @@ data ConversationSubsystem m a where
     ConversationAction (tag :: ConversationActionTag) ->
     ExtraConversationData ->
     ConversationSubsystem m LocalConversationUpdate
-  PermissionCheck ::
-    (IsPerm teamAssociation perm) =>
-    perm -> Maybe teamAssociation -> ConversationSubsystem m teamAssociation
-  PermissionCheckSAbs ::
-    PermissionCheckArgs teamAssociation ->
-    ConversationSubsystem m teamAssociation
-  EnsureReAuthorised ::
-    UserId ->
-    Maybe PlainTextPassword6 ->
-    Maybe Code.Value ->
-    Maybe VerificationAction ->
-    ConversationSubsystem m ()
   QualifyLocal ::
     a ->
     ConversationSubsystem m (Local a)
-  AssertOnTeam ::
-    UserId ->
-    TeamId ->
-    ConversationSubsystem m ()
-  CheckConsent ::
-    Map UserId TeamId ->
-    UserId ->
-    ConversationSubsystem m Util.ConsentGiven
-  GetLHStatusForUsers ::
-    [UserId] ->
-    ConversationSubsystem m [(UserId, UserLegalHoldStatus)]
-  EnsureConnectedToLocals ::
-    UserId ->
-    [UserId] ->
-    ConversationSubsystem m ()
-  GetTeamMembersForFanout ::
-    TeamId ->
-    ConversationSubsystem m TeamMemberList
-  AssertTeamExists ::
-    TeamId ->
-    ConversationSubsystem m ()
   InternalUpsertOne2OneConversation ::
     UpsertOne2OneConversationRequest ->
     ConversationSubsystem m ()
@@ -765,6 +691,3 @@ data ConversationSubsystem m a where
     ConversationSubsystem m ()
 
 makeSem ''ConversationSubsystem
-
-permissionCheckS :: forall k (p :: k) teamAssociation r. (Member ConversationSubsystem r, SingKind k, IsPerm teamAssociation (Demote k)) => Sing p -> Maybe teamAssociation -> Sem r teamAssociation
-permissionCheckS p mTeam = send (PermissionCheckSAbs (PermissionCheckArgs p mTeam))

libs/wire-subsystems/src/Wire/ConversationSubsystem/Action.hs

@@ -118,7 +118,6 @@ import Wire.ConversationSubsystem.Action.Kick
 import Wire.ConversationSubsystem.Action.Leave
 import Wire.ConversationSubsystem.Action.Notify
 import Wire.ConversationSubsystem.Action.Reset
-import Wire.ConversationSubsystem.Features
 import Wire.ConversationSubsystem.MLS.Conversation
 import Wire.ConversationSubsystem.MLS.Migration
 import Wire.ConversationSubsystem.MLS.Removal
@@ -139,7 +138,7 @@ import Wire.StoredConversation
 import Wire.StoredConversation qualified as Data
 import Wire.TeamCollaboratorsSubsystem
 import Wire.TeamStore
-import Wire.TeamSubsystem (TeamSubsystem)
+import Wire.TeamSubsystem (ConsentGiven (..), TeamSubsystem, consentGiven)
 import Wire.TeamSubsystem qualified as TeamSubsystem
 import Wire.UserList
 
@@ -838,7 +837,7 @@ performConversationJoin qusr lconv (ConversationJoin invited role joinType) = do
           throwS @'MissingLegalholdConsent
 
         convUsersLHStatus <- do
-          uidsStatus <- getLHStatusForUsers ((.id_) <$> convUsers)
+          uidsStatus <- TeamSubsystem.getLHStatusForUsers ((.id_) <$> convUsers)
           pure $ zipWith (\mem (_, status) -> (mem, status)) convUsers uidsStatus
 
         if any

libs/wire-subsystems/src/Wire/ConversationSubsystem/CreateInternal.hs

@@ -80,7 +80,7 @@ import Wire.StoredConversation qualified as Data
 import Wire.TeamCollaboratorsSubsystem
 import Wire.TeamStore (TeamStore)
 import Wire.TeamStore qualified as TeamStore
-import Wire.TeamSubsystem (TeamSubsystem)
+import Wire.TeamSubsystem (TeamSubsystem, permissionCheck)
 import Wire.TeamSubsystem qualified as TeamSubsystem
 import Wire.UserList (UserList (UserList), toUserList, ulAddLocal, ulAll, ulFromLocals, ulLocals, ulRemotes)