CORE-107: save user profile for already-registered users #1466
Conversation
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
davidangb
commented
Oct 24, 2024
| var mockKeyValues: Map[String, Set[FireCloudKeyValue]] = | ||
| Map( | ||
| NORMAL_USER -> baseProfile, | ||
| "foo" -> baseProfile, // to match registeredUser, enabledUserInfo, unknownUserInfo from MockSamDao |
There was a problem hiding this comment.
the fix to save registered user's profiles under userInfo.userSubjectId requires this tweak to the testing mock
davidangb
commented
Oct 24, 2024
| val googleLegacyUserInfo = UserInfo("google-legacy@example.com", OAuth2BearerToken("token"), 1, "111111111111", None) | ||
| val azureB2CUserInfo: UserInfo = UserInfo("azure-b2c@example.com", OAuth2BearerToken("token"), 1, "0f3cd8e4-59c2-4bce-9c24-98c5a0c308c1", None) | ||
| val googleB2CUserInfo: UserInfo = UserInfo("google-b2c@example.com", OAuth2BearerToken("token"), 1, "0617047d-a81f-4724-b783-b5af51af9a70", Some(OAuth2BearerToken("some-google-token"))) | ||
| val googleLegacyUserInfo: UserInfo = UserInfo("google-legacy@example.com", OAuth2BearerToken("token"), 1, "111111111111", None) |
There was a problem hiding this comment.
adding the type definitions to eliminate some IntelliJ warnings
davidangb
commented
Oct 24, 2024
| Because the original profile was created during registration using `userInfo.userSubjectId` (see | ||
| `registrationResultUserInfo` above), we use that same id here. | ||
| */ | ||
| thurloeDao.saveProfile(userInfo.copy(id = isRegistered.userInfo.userSubjectId), basicProfile) map (_ => isRegistered) |
There was a problem hiding this comment.
#1405 changed the logic from (pseudocode):
saveProfile()
if (user is not registered) {
registerUser()
}
to:
if (user is not registered) {
saveProfileAndRegisterUser()
}
This PR changes it to:
if (user is not registered) {
saveProfileAndRegisterUser()
} else {
saveProfile()
}
davidangb
changed the title
davidangb
requested review from
a team,
samanehsan and
trholdridge
and removed request for
a team
trholdridge
approved these changes
Oct 25, 2024
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://broadworkbench.atlassian.net/browse/CORE-107
When users who are already registered attempt to update their user profile, we were not actually updating that profile. This PR fixes a regression from #1405.