Fix: Changed profile.username to profile.displayName for header username display #1388
Conversation
| @@ -22,7 +22,7 @@ export const selectCurrentUserName = createSelector( | |||
| selectCurrentUser, | |||
| (profile, user) => { | |||
| if (profile) { | |||
| return profile.username.replace("ms-ad.", ""); | |||
| return profile.displayName.replace("ms-ad.", ""); | |||
There was a problem hiding this comment.
the replace is probably not needed here then. The backend prepends a marker for the auth source to the username, but should not do that for the displayName.
There was a problem hiding this comment.
I checked and all user types do implement the user profile (local, oidc, ldap) . jwt auth relies on the other strategies for initial login/account creation, so we proably can rely on the profile being there (or adopt the BE to ensure that),
There was a problem hiding this comment.
@bpedersen2 hopefully I understood your comment above correctly.
To clarify further: user profile is created for all accounts, no matter which auth strategy they use. It is safe to assume that profile is always present.
I agree with you that the displayName should not be stored in the db with a prefix.
We should display it as it is saved in the database.
| @@ -22,7 +22,7 @@ export const selectCurrentUserName = createSelector( | |||
| selectCurrentUser, | |||
| (profile, user) => { | |||
| if (profile) { | |||
| return profile.username.replace("ms-ad.", ""); | |||
| return profile.displayName.replace("ms-ad.", ""); | |||
There was a problem hiding this comment.
@bpedersen2 hopefully I understood your comment above correctly.
To clarify further: user profile is created for all accounts, no matter which auth strategy they use. It is safe to assume that profile is always present.
I agree with you that the displayName should not be stored in the db with a prefix.
We should display it as it is saved in the database.
…ion-process-confi
…ion-process-confi
updated e2e docker compose file to use latest scichat-loopback image from github image repo
…ion-process-confi
removed replace instruction in case username has a prefix in it. We assume that the prefix is an error to be fixed in data with an additional script.The suffix needs to be removed in data.
Restored docker compose
…ion-process-confi
…ion-process-confi
Junjiequan
deleted the
SWAP-3745-scicat-be-make-oidc-user-validation-process-confi
branch
Description
This PR adapts to the SciCatProject/scicat-backend-next#1041
In the above backend PR we have changed
profile.usernameto storeoidc.subby default, which in some cases might return string of numbers instead of user's name. So the change of displayingprofile.usernametoprofile.displayNameon the header section is required.Tests included/Docs Updated?