Repository navigation
Allow user unlock for externals - #4153
Merged
Merged
Conversation
fix for #issue #3963
cf-foundation-community-automation
Bot
moved this to Inbox
in Foundational Infrastructure Working Group
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
The changes address external-user SCIM unlock behavior while preserving existing validation constraints, with corresponding coverage and documentation updates and no active issues identified.
No open issues 🎉
What changed in this PR
This PR enables SCIM account unlocks for users from external identity providers while preserving restrictions on password-change management for non-UAA users.
Changes:
- Allow
locked: falseupdates for users of any origin. - Retain validation for password-change requirements and account locking.
- Add unit and integration coverage and update API documentation.
| File | Description |
|---|---|
| uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpointsMockMvcTests.java | Adds MockMvc coverage for unlocking external users and rejecting invalid status updates. |
| uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpointDocs.java | Updates generated endpoint documentation for external-user unlocking. |
| server/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpointsStatusTests.java | Adds unit coverage for status validation and unlocking across user origins. |
| server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpoints.java | Allows unlock requests for external users while retaining password-change validation. |
| docs/UAA-APIs.rst | Documents account-status endpoint behavior, constraints, and external-provider limitations. |
Review effort: Lite
duanemay
approved these changes
Nov 12, 2026
github-project-automation
Bot
moved this from Inbox
to Pending Merge | Prioritized
in Foundational Infrastructure Working Group
github-project-automation
Bot
moved this from Pending Merge | Prioritized
to Done
in Foundational Infrastructure Working Group
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
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.
fix for #issue #3963