github/reitti
1
1
Fork 0
mirror of https://github.com/dedicatedcode/reitti.git synced 2026-01-10 09:57:57 -05:00
Code Issues 6 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Hosted Weblate
2026-01-03 14:30:33 +01:00
parent ff3742ad1d 6b5b6648a6
commit d05e16e036
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/dedicatedcode/reitti/config/CustomOidcUserService.java
View File

@@ -52,8 +52,17 @@ public class CustomOidcUserService extends OidcUserService {
OidcUser oidcUser = getDefaultUser(userRequest);
String preferredUsername = userRequest.getIdToken().getPreferredUsername();
if (preferredUsername == null) {
preferredUsername = oidcUser.getPreferredUsername();
}
if (preferredUsername == null && oidcUser.getUserInfo() != null) {
preferredUsername = oidcUser.getUserInfo().getPreferredUsername();
}
if (preferredUsername == null) {
preferredUsername = oidcUser.getEmail();
}
if (preferredUsername == null) {
preferredUsername = oidcUser.getGivenName().toLowerCase() + "." + oidcUser.getFamilyName().toLowerCase();
}
String oidcUserId = userRequest.getIdToken().getIssuer().toString() + ":" + userRequest.getIdToken().getSubject();
String displayName = getDisplayName(oidcUser, preferredUsername);