Skip to content

[WPB-28094] Do not include apps in GET /teams/:tid/members. #5453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
fisx wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

[WPB-28094] Do not include apps in GET /teams/:tid/members. #5453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
496500b
Changelog.
fisx Aug 17, 2026
c4bf96d
Integration tests (the one about apps failing).
fisx Aug 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/1-api-changes/WPB-28094-do-not-include-apps-in-_get-_teams__tid_members_
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Do not include apps in `GET /teams/:tid/members`.
18 changes: 5 additions & 13 deletions integration/test/Test/Apps.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,14 +284,6 @@ testRetrieveUsersIncludingApps = do
("team", SString),
("type", SString)
]
memberShape =
SObject
[ ("created_at", SString),
("created_by", SString),
("legalhold_status", SString),
("permissions", SObject [("copy", SNumber), ("self", SNumber)]),
("user", SString)
]
appShape =
SObject
[ ("category", SString),
Expand Down Expand Up @@ -344,23 +336,23 @@ testRetrieveUsersIncludingApps = do
appId <- appCreated %. "user.id" & asString

-- [`GET /teams/:tid/members`](https://staging-nginz-https.zinfra.io/v15/api/swagger-ui/#/default/get-team-members) (route id: "get-team-members")
-- Apps are not team members, so they are not listed here.
getTeamMembers owner tid `bindResponse` \resp -> do
resp.status `shouldMatchInt` 200
resp.json %. "hasMore" `shouldMatch` False
mems <- resp.json %. "members" >>= asList
memIds <- (asString . (%. "user")) `mapM` mems
memIds
`shouldMatchSet` sequence
[ pure appId,
asString $ regular %. "qualified_id.id",
[ asString $ regular %. "qualified_id.id",
asString $ owner %. "qualified_id.id"
]

-- [`GET /teams/:tid/members/:uid`](https://staging-nginz-https.zinfra.io/v15/api/swagger-ui/#/default/get-team-member) (route id: "get-team-member")
-- Same here: apps cannot be retrieved as team members.
getTeamMember owner tid appId `bindResponse` \resp -> do
resp.status `shouldMatchInt` 200
resp.json %. "user" `shouldMatch` appId
resp.json `shouldMatchShapeLenient` memberShape
resp.status `shouldMatchInt` 404
resp.json %. "label" `shouldMatch` "no-team-member"

-- [`GET /teams/:tid/apps`](https://staging-nginz-https.zinfra.io/v15/api/swagger-ui/#/default/get-apps) (route id: "get-apps")
getApps owner tid `bindResponse` \resp -> do
Expand Down
16 changes: 16 additions & 0 deletions integration/test/Test/TeamCollaborators.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,22 @@ testCreateTeamCollaborator = do
res %. "team" `shouldMatch` team
res %. "permissions" `shouldMatch` ["create_team_conversation", "implicit_connection"]

-- Collaborators are not team members, so they don't show up in the team
-- member end-points.
bindResponse (getTeamMembers owner team) $ \resp -> do
resp.status `shouldMatchInt` 200
mems <- resp.json %. "members" >>= asList
memIds <- (asString . (%. "user")) `mapM` mems
memIds
`shouldMatchSet` sequence
[ asString $ owner %. "qualified_id.id",
asString $ alice %. "qualified_id.id"
]

bindResponse (getTeamMember owner team userId) $ \resp -> do
resp.status `shouldMatchInt` 404
resp.json %. "label" `shouldMatch` "no-team-member"

testTeamCollaboratorEndpointsForbiddenForOtherTeams :: (HasCallStack) => App ()
testTeamCollaboratorEndpointsForbiddenForOtherTeams = do
(owner, _team, _members) <- createTeam OwnDomain 2
Expand Down