Skip to content

Commit

Permalink
Merge branch 'refactor' of github.com:HiWay-Media/keycloak-identity-p…
Browse files Browse the repository at this point in the history
…rovider-druid into refactor
  • Loading branch information
sergi committed Dec 18, 2024
2 parents 35c0f59 + f8ea45f commit bf6df0f
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/main/java/media/hiway/provider/DruidIdentityProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,10 @@ public BrokeredIdentityContext getFederatedIdentity(String response) {

@Override
protected BrokeredIdentityContext doGetFederatedIdentity(String accessToken) {
logger.infof("doGetFederatedIdentity before accessToken: %s", accessToken);
try {
JsonNode profile = SimpleHttp.doGet(PROFILE_URL, session).auth(accessToken).asJson();
logger.infof("doGetFederatedIdentity response: %s", profile);
if (profile.has("error") && !profile.get("error").isNull()) {
throw new IdentityBrokerException("Error in Druid Graph API response. Payload: " + profile.toString());
}
Expand All @@ -96,16 +98,16 @@ protected BrokeredIdentityContext doGetFederatedIdentity(String accessToken) {
@Override
protected BrokeredIdentityContext extractIdentityFromProfile(EventBuilder event, JsonNode profile) {
String id = getJsonProperty(profile, "sub");
logger.infof("extractIdentityFromProfile before id: %s", id);
BrokeredIdentityContext user = new BrokeredIdentityContext(id, getConfig());

logger.infof("extractIdentityFromProfile user: %s", user);
String email = getJsonProperty(profile, "email");
if (email == null && profile.has("userPrincipalName")) {
String username = getJsonProperty(profile, "userPrincipalName");
if (Validation.isEmailValid(username)) {
email = username;
}
}

user.setUsername(email != null ? email : id);
user.setFirstName(getJsonProperty(profile, "name"));
user.setLastName(getJsonProperty(profile, "family_name"));
Expand Down

0 comments on commit bf6df0f

Please sign in to comment.