Skip to content

WPB-21744: invalidate pending email update when a user is put under SCIM control#5333

Open
blackheaven wants to merge 1 commit into
developfrom
gdifolco/WPB-21744-scim-verification-email-resend
Open

WPB-21744: invalidate pending email update when a user is put under SCIM control#5333
blackheaven wants to merge 1 commit into
developfrom
gdifolco/WPB-21744-scim-verification-email-resend

Conversation

@blackheaven

Copy link
Copy Markdown
Contributor

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

Checklist

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

…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 blackheaven requested review from a team as code owners July 10, 2026 17:28
@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label Jul 10, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants