scim: Fix random suffix added to every user on resync #63122
Merged
Conversation
This file contains 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
github-actions
bot
added
team/product-platform
team/source
|
This stack of pull requests is managed by Graphite. Learn more about stacking. |
eseliger
force-pushed
the
es/06-06-scimfixrandomsuffixaddedtoeveryuseronresync
branch
from
4cd0d8a
to
11ffd1a
Compare
In the current implementation, we check if there's a user in the database already, and if so we add a random suffix to increase the chances of the insert/update to succeed. However, we didn't check if the user that already exists is _the same user_. So for a first sync, usernames would look nice and tidy, but then on a second sync from the SCIM provider, every user would get a suffix. This PR fixes that by adding a check for the user ID. Test plan: Added tests, verified SCIM sync doesn't modify usernames anymore locally.
eseliger
force-pushed
the
es/06-06-scimfixrandomsuffixaddedtoeveryuseronresync
branch
from
11ffd1a
to
322de58
Compare
pjlast
approved these changes
Jun 6, 2024
DaedalusG
added
the
backport 5.4.5099
sourcegraph-release-bot
pushed a commit
that referenced
this pull request
Jun 6, 2024
In the current implementation, we check if there's a user in the database already, and if so we add a random suffix to increase the chances of the insert/update to succeed. However, we didn't check if the user that already exists is _the same user_. So for a first sync, usernames would look nice and tidy, but then on a second sync from the SCIM provider, every user would get a suffix. This PR fixes that by adding a check for the user ID. Test plan: Added tests, verified SCIM sync doesn't modify usernames anymore locally. (cherry picked from commit 614375e)
DaedalusG
pushed a commit
that referenced
this pull request
Jun 6, 2024
…sync (#63131) In the current implementation, we check if there's a user in the database already, and if so we add a random suffix to increase the chances of the insert/update to succeed. However, we didn't check if the user that already exists is _the same user_. So for a first sync, usernames would look nice and tidy, but then on a second sync from the SCIM provider, every user would get a suffix. This PR fixes that by adding a check for the user ID. Test plan: Added tests, verified SCIM sync doesn't modify usernames anymore locally. <br> Backport 614375e from #63122 Co-authored-by: Erik Seliger <erikseliger@me.com>
|
Oh, good catch, thanks, @eseliger! |
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.
In the current implementation, we check if there's a user in the database already, and if so we add a random suffix to increase the chances of the insert/update to succeed.
However, we didn't check if the user that already exists is the same user. So for a first sync, usernames would look nice and tidy, but then on a second sync from the SCIM provider, every user would get a suffix.
This PR fixes that by adding a check for the user ID.
Test plan:
Added tests, verified SCIM sync doesn't modify usernames anymore locally.