Return members from Brig

Author: eyeinsky

libs/wire-api/src/Wire/API/UserGroup/Pagination.hs

@@ -29,6 +29,9 @@ import Wire.Arbitrary as Arbitrary
 -- | User group without members
 type UserGroupPage = UserGroupPage_ UserGroupMeta
 
+-- | User group with members
+type UserGroupPageWithMembers = UserGroupPage_ UserGroup
+
 -- * User group pages
 --
 -- | User group pages with different types of user groups.

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

@@ -161,7 +161,7 @@ data BrigAPIAccess m a where
   GetAccountsBy :: GetBy -> BrigAPIAccess m [User]
   CreateGroupInternal :: ManagedBy -> TeamId -> Maybe UserId -> NewUserGroup -> BrigAPIAccess m (Either Wai.Error UserGroup)
   GetGroupInternal :: TeamId -> UserGroupId -> Bool -> BrigAPIAccess m (Maybe UserGroup)
-  GetGroupsInternal :: TeamId -> Maybe Scim.Filter -> BrigAPIAccess m UserGroupPage
+  GetGroupsInternal :: TeamId -> Maybe Scim.Filter -> BrigAPIAccess m UserGroupPageWithMembers
   UpdateGroup :: UpdateGroupInternalRequest -> BrigAPIAccess m ()
   DeleteGroupInternal :: ManagedBy -> TeamId -> UserGroupId -> BrigAPIAccess m (Either DeleteGroupManagedError ())
 

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

@@ -601,7 +601,7 @@ getGroupsInternal ::
   (Member Rpc r, Member (Input Endpoint) r, Member (Error ParseException) r) =>
   TeamId ->
   Maybe Scim.Filter ->
-  Sem r UserGroupPage
+  Sem r UserGroupPageWithMembers
 getGroupsInternal tid mbFilter = do
   maybeDisplayName :: Maybe Text <- case mbFilter of
     Just filter' -> case filter' of

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

@@ -142,12 +142,9 @@ scimGetUserGroupsImpl ::
   Maybe Scim.Filter ->
   Sem r (Scim.ListResponse (SCG.StoredGroup SparTag))
 scimGetUserGroupsImpl tid mbFilter = do
-  UserGroupPage {page} :: UserGroupPage <- BrigAPI.getGroupsInternal tid mbFilter
+  UserGroupPage {page} :: UserGroupPageWithMembers <- BrigAPI.getGroupsInternal tid mbFilter
   ScimSubsystemConfig scimBaseUri <- input
-  pure . Scim.fromList $ toStoredGroup scimBaseUri . userGroupFromMeta <$> page
-  where
-    userGroupFromMeta :: UserGroupMeta -> UserGroup
-    userGroupFromMeta UserGroup_ {..} = UserGroup_ {members = pure mempty, ..}
+  pure . Scim.fromList $ toStoredGroup scimBaseUri <$> page
 
 scimUpdateUserGroupImpl ::
   forall r.