[WPB-22549] connect users to apps. #4970
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fisx
changed the title
zebot
added
the
ok-to-test
fisx
changed the title
fisx
added
not-ok-to-test
fisx
force-pushed
the
WPB-22549-connect-user-to-app
branch
6 times, most recently
from
14b7ab8 to
9d436c0
Compare
battermann
force-pushed
the
WPB-22549-connect-user-to-app
branch
from
e1925d0 to
89c8d44
Compare
battermann
removed
the
not-ok-to-test
fisx
commented
Feb 5, 2026
services/brig/src/Brig/API/User.hs
Outdated
| Nothing -> case userTeam u of | ||
| Nothing -> pure Nothing | ||
| Just tid -> do | ||
| mApp <- AppStore.getApp (userId u) tid |
Contributor
Author
There was a problem hiding this comment.
Shouldn't this happen in UserStore?
zebot
added
the
ok-to-test
fisx
commented
Feb 10, 2026
| Store.createApp app | ||
| Store.createUser u Nothing | ||
| now <- toUTCTimeMillis <$> get | ||
| void $ addTeamMember u.id tid (Just (tUnqualified lusr, now)) R.RoleMember |
Contributor
Author
There was a problem hiding this comment.
This is an essential fix. Before this, apps had a user record, but no team member record. (Excercise to the reader: why was that bad?)
fisx
force-pushed
the
WPB-22549-connect-user-to-app
branch
from
4f892ce to
a06642e
Compare
fisx
commented
Feb 10, 2026
integration/test/Test/Connection.hs
Outdated
|
|
||
| -- the same goes for apps from the same team | ||
| postConnection mem1 app `bindResponse` \resp -> do | ||
| resp.status `shouldMatchInt` 403 |
Contributor
Author
There was a problem hiding this comment.
this still fails, because the response status is 404. shouldn't be too hard to fix.
fisx
force-pushed
the
WPB-22549-connect-user-to-app
branch
2 times, most recently
from
bfbd6fa to
1186a9c
Compare
battermann
reviewed
Feb 11, 2026
Contributor
battermann
left a comment
battermann
left a comment
There was a problem hiding this comment.
I think the new column user_type is not needed for the solution taken in this PR.
integration/test/Test/Apps.hs
Outdated
| -- make sure that matches from previous test runs don't get in the way. | ||
| catMaybes | ||
| <$> forM foundDocs (\doc -> do | ||
| tidActual :: String <- doc %. "team" & asString |
Contributor
There was a problem hiding this comment.
nitpick: type annotation is redundant
|
|
||
| -- the same goes for apps from the same team | ||
| postConnection mem1 app `bindResponse` \resp -> do | ||
| resp.status `shouldMatchInt` 404 |
Contributor
There was a problem hiding this comment.
Should be 403, but not high prio issue.
Comment on lines
86
to
89
| data UserType = UserTypeRegular | UserTypeApp | UserTypeBot | ||
| deriving (Eq, Show, Ord, Generic) | ||
| deriving (Arbitrary) via (GenericUniform UserType) | ||
| deriving (A.FromJSON, A.ToJSON, S.ToSchema) via (Schema UserType) |
Contributor
There was a problem hiding this comment.
nitpick: maybe this can go back into the User module?
battermann
approved these changes
Feb 11, 2026
fisx
force-pushed
the
WPB-22549-connect-user-to-app
branch
from
d90af36 to
d344fec
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://wearezeta.atlassian.net/browse/WPB-22549
Checklist
changelog.d