WPB-21744: invalidate pending email update when a user is put under SCIM control - #5333
Merged
blackheaven merged 4 commits intoJul 15, 2026
Merged
Conversation
zebot
added
the
ok-to-test
…CIM control When a user's managed_by transitioned from Wire to SCIM, a pending email-address update was left dangling: team settings kept offering a "resend verification" action that failed with 403 managed-by-scim, and a stale activation link could still change a SCIM-managed user's email outside of SCIM. - Add internal brig endpoint DELETE /i/users/:uid/pending-email-update that removes the user's unvalidated email and its activation token. - Call it from spar's two Wire->SCIM transition sites (lazy SCIM adoption via GET /Users/:id and getUserById). - Add defense-in-depth: brig's email-activation path now rejects SCIM-managed users (InvalidActivationManagedByScim -> 403 managed-by-scim). - Add ActivationCodeStore.deleteActivationCode (effect + Cassandra + in-memory impls).
blackheaven
force-pushed
the
gdifolco/WPB-21744-scim-verification-email-resend
branch
from
July 12, 2026 09:54
da772d7 to
8bff71c
Compare
supersven
requested changes
Jul 13, 2026
supersven
left a comment
supersven
left a comment
Contributor
There was a problem hiding this comment.
Looking good so far, however I would expect new tests to show that the changes really solve the issue.
Contributor
Author
added |
blackheaven
force-pushed
the
gdifolco/WPB-21744-scim-verification-email-resend
branch
from
July 13, 2026 21:43
b54a527 to
40b2b80
Compare
supersven
approved these changes
Jul 14, 2026
blackheaven
deleted the
gdifolco/WPB-21744-scim-verification-email-resend
branch
July 15, 2026 07:00
This was referenced Aug 21, 2026
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
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-21744
Checklist
changelog.d