Skip to content

[WPB-27227] Include collaborating apps (aka external apps) in "GET /teams/:tid/apps". - #5343

Merged
fisx merged 4 commits into
developfrom
WPB-27227-include-collaborating-apps-_aka-external-apps_-in-_get-_teams__tid_apps_
Jul 17, 2026
Merged

[WPB-27227] Include collaborating apps (aka external apps) in "GET /teams/:tid/apps".#5343
fisx merged 4 commits into
developfrom
WPB-27227-include-collaborating-apps-_aka-external-apps_-in-_get-_teams__tid_apps_

Conversation

@fisx

@fisx fisx commented Jul 17, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

before:

  test/unit/Wire/UserSubsystem/InterpreterSpec.hs:1148:5:
  1) Wire.UserSubsystem.Interpreter.UserSubsystem.Interpreter.getLocalAppProfiles includes apps that are collaborators from other teams
         [...]
         ([],[499980fd-b369-528b-ebc8-a175fa2ebbb6]) /= ([499980fd-b369-528b-ebc8-a175fa2ebbb6],[499980fd-b369-528b-ebc8-a175fa2ebbb6])

after:

Wire.UserSubsystem.Interpreter
  UserSubsystem.Interpreter
    getLocalAppProfiles
      includes apps that are collaborators from other teams [✔]
        +++ OK, passed 100 tests.

https://wearezeta.atlassian.net/browse/WPB-27227

Checklist

  • Add a new entry in an appropriate subdirectory of changelog.d
  • Read and follow the PR guidelines

@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label Jul 17, 2026
@fisx
fisx force-pushed the WPB-27227-include-collaborating-apps-_aka-external-apps_-in-_get-_teams__tid_apps_ branch from 7591d9b to e68de6e Compare July 17, 2026 10:41
@fisx
fisx force-pushed the WPB-27227-include-collaborating-apps-_aka-external-apps_-in-_get-_teams__tid_apps_ branch from e68de6e to a27e8f7 Compare July 17, 2026 11:30
@fisx
fisx marked this pull request as ready for review July 17, 2026 11:31
@fisx
fisx requested review from a team as code owners July 17, 2026 11:31
supersven
supersven approved these changes Jul 17, 2026
View reviewed changes

@supersven supersven left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found nothing that would block merging. However, might be good to give the comments I've left some attention 😸

Comment thread ...bug-fixes/WPB-27227-include-collaborating-apps-_aka-external-apps_-in-_get-_teams__tid_apps_
Comment thread libs/wire-subsystems/src/Wire/UserSubsystem/Interpreter.hs
Comment thread libs/wire-subsystems/test/unit/Wire/UserSubsystem/InterpreterSpec.hs
Comment thread libs/wire-subsystems/test/unit/Wire/UserSubsystem/InterpreterSpec.hs
Comment thread libs/wire-subsystems/src/Wire/UserSubsystem/Interpreter.hs
Comment on lines +390 to +392
UserStore.getUserTeam (tUnqualified self) >>= \requestingUserTeam ->
unless (requestingUserTeam == Just tid) $
throw UserSubsystemProfileNotFound

@supersven supersven Jul 17, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have a test exercising this moved guard? Probably, quickly done as unit test...

@fisx fisx Jul 17, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, fine, I'll merge this and make an errata PR. :)

@fisx fisx Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#5354

@fisx
fisx merged commit 632be41 into develop Jul 17, 2026
9 checks passed
@fisx
fisx deleted the WPB-27227-include-collaborating-apps-_aka-external-apps_-in-_get-_teams__tid_apps_ branch July 17, 2026 13:35
@fisx fisx mentioned this pull request Jul 21, 2026
Merged
2 tasks
fisx added a commit that referenced this pull request Jul 31, 2026
@fisx
Revert "[WPB-27227] Include collaborating apps (aka external apps) in…
319642a 
… "GET /teams/:tid/apps". (#5343)"

This partially reverts commits
3cb74c4,
632be41, but leaves in some drive-by
changes.
fisx added a commit that referenced this pull request Jul 31, 2026
@fisx
[WPB-27705] Roll back: do *not* include collaborator apps in get-apps…
f07b903 
… end-point. (#5402)

* Revert "[WPB-27227] Include collaborating apps (aka external apps) in "GET /teams/:tid/apps". (#5343)"

This partially reverts commits
3cb74c4,
632be41, but leaves in some drive-by
changes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@supersven supersven supersven approved these changes

Assignees

No one assigned

Labels

ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@fisx @supersven @zebot