fix(oidc): add name claim extraction (#3384)

datahub-project · Oct 14, 2021 · a25434c · a25434c
1 parent 037c897
commit a25434c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/datahub-frontend/app/auth/sso/oidc/OidcCallbackLogic.java b/datahub-frontend/app/auth/sso/oidc/OidcCallbackLogic.java
@@ -185,14 +185,18 @@ private CorpUserSnapshot extractUser(CorpuserUrn urn, CommonProfile profile) {
     String email = profile.getEmail();
     URI picture = profile.getPictureUrl();
     String displayName = profile.getDisplayName();
+    String fullName = (String) profile.getAttribute("name"); // Name claim is sometimes provided, including by Google.
+    if (fullName == null && firstName != null && lastName != null) {
+      fullName = String.format("%s %s", firstName, lastName);
+    }
 
     // TODO: Support custom claims mapping. (e.g. department, title, etc)
 
     final CorpUserInfo userInfo = new CorpUserInfo();
     userInfo.setActive(true);
     userInfo.setFirstName(firstName, SetMode.IGNORE_NULL);
     userInfo.setLastName(lastName, SetMode.IGNORE_NULL);
-    userInfo.setFullName(String.format("%s %s", firstName, lastName), SetMode.IGNORE_NULL);
+    userInfo.setFullName(fullName, SetMode.IGNORE_NULL);
     userInfo.setEmail(email, SetMode.IGNORE_NULL);
     // If there is a display name, use it. Otherwise fall back to full name.
     userInfo.setDisplayName(displayName == null ? userInfo.getFullName() : displayName, SetMode.IGNORE_NULL);