Skip to content
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.

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

Allow admins to create/delete/list SCIM tokens #1280

Merged
merged 4 commits into from
Dec 18, 2020

Conversation

smatting
Copy link
Contributor

@smatting smatting commented Dec 8, 2020

No description provided.

@smatting smatting requested a review from fisx December 8, 2020 16:52
libs/galley-types/src/Galley/Types/Teams.hs Outdated Show resolved Hide resolved
@@ -49,6 +49,7 @@ module Spar.Intra.Brig
createBrigUserNoSAML,
updateEmail,
getZUsrOwnedTeam,
authorizeScimTokenManagement,
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not Spar.Intra.Galley.assertHasPermission?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

authorizeScimTokenManagement uses Spar.Intra.Galley.assertHasPermission
Can't use Spar.Intra.Galley.assertHasPermission directly because the team of the user has to be fetched first.

services/spar/test-integration/Test/Spar/Scim/AuthSpec.hs Outdated Show resolved Hide resolved
@smatting smatting requested a review from fisx December 16, 2020 17:40
@fisx
Copy link
Contributor

fisx commented Dec 18, 2020

If you have run all tests locally: :shipit:

@smatting smatting force-pushed the smatting/admin-scim-tokens branch from 6ecbd1f to 7e33c2d Compare December 18, 2020 16:44
@smatting smatting merged commit b6ac361 into develop Dec 18, 2020
@smatting smatting deleted the smatting/admin-scim-tokens branch December 18, 2020 16:46
@fisx fisx mentioned this pull request Dec 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants