fix subject Id not populated

Author: blabadi

docker-compose.yml

@@ -19,7 +19,7 @@ services:
       - "8080:8080"
     environment:
       REACT_APP_API: http://localhost:8081
-      REACT_APP_EGO_CLIENT_ID: ego-local
+      REACT_APP_EGO_CLIENT_ID: ego-ui
       REACT_APP_KEYCLOAK_ENABLED: "true"
   postgres:
     image: postgres:12.6

src/main/java/bio/overture/ego/controller/AuthController.java

@@ -140,23 +140,8 @@ public ResponseEntity<String> user(
     if (Objects.isNull(authentication.getPrincipal())) {
       throw new RuntimeException("no user");
     }
-    CustomOAuth2User user;
-    if (authentication.getPrincipal() instanceof OidcUser) {
-      val p = (OidcUser) authentication.getPrincipal();
-      user =
-          CustomOAuth2User.builder()
-              .subjectId(p.getUserInfo().getSubject())
-              .givenName(p.getUserInfo().getGivenName())
-              .familyName(p.getUserInfo().getFamilyName())
-              .email(p.getUserInfo().getEmail())
-              .oauth2User(p)
-              .build();
-    } else if (authentication.getPrincipal() instanceof CustomOAuth2User) {
-      user = (CustomOAuth2User) authentication.getPrincipal();
-    } else {
-      throw new RuntimeException();
-    }
 
+    val user = (CustomOAuth2User) authentication.getPrincipal();
     String token =
         tokenService.generateUserToken(
             IDToken.builder()

src/main/java/bio/overture/ego/security/CustomOAuth2UserInfoService.java

@@ -53,9 +53,7 @@ public CustomOAuth2User loadUser(OAuth2UserRequest oAuth2UserRequest)
             .familyName(info.getOrDefault(FAMILY_NAME, "").toString())
             .givenName(info.getOrDefault(GIVEN_NAME, "").toString())
             .build();
-      }
-
-      if (provider.equalsIgnoreCase(ProviderType.LINKEDIN.toString())) {
+      } else if (provider.equalsIgnoreCase(ProviderType.LINKEDIN.toString())) {
         val info = getLinkedInUserInfo(oAuth2User, oAuth2UserRequest);
         return CustomOAuth2User.builder()
             .oauth2User(new DefaultOAuth2User(oAuth2User.getAuthorities(), info, idName))
@@ -64,9 +62,10 @@ public CustomOAuth2User loadUser(OAuth2UserRequest oAuth2UserRequest)
             .familyName(info.getOrDefault(FAMILY_NAME, "").toString())
             .givenName(info.getOrDefault(GIVEN_NAME, "").toString())
             .build();
+      } else {
+        throw new RuntimeException("unhandled provider type " + provider);
       }
 
-      return CustomOAuth2User.builder().oauth2User(oAuth2User).build();
     } catch (AuthenticationException ex) {
       throw ex;
     } catch (Exception ex) {

src/main/java/bio/overture/ego/security/CustomOidc2UserInfoService.java

@@ -48,7 +48,13 @@ public OidcUser loadUser(OidcUserRequest oAuth2UserRequest) throws OAuth2Authent
             .givenName(info.getOrDefault(GIVEN_NAME, "").toString())
             .build();
       }
-      return CustomOAuth2User.builder().oauth2User(oidcUser).build();
+      return CustomOAuth2User.builder()
+          .oauth2User(oidcUser)
+          .subjectId(oidcUser.getSubject())
+          .email(oidcUser.getEmail())
+          .familyName(oidcUser.getFamilyName())
+          .givenName(oidcUser.getGivenName())
+          .build();
     } catch (AuthenticationException ex) {
       throw ex;
     } catch (Exception ex) {