libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Merge pull request #1094 from velias/KEYCLOAK-1141

Browse source 
KEYCLOAK-1141 - name of federated identity provider added back to acount management
This commit is contained in:
Stian Thorgersen 2015-03-27 11:32:38 +01:00
commit ff11a377da
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/AccountFederatedIdentityBean.java
View file

@ -49,7 +49,7 @@ public class AccountFederatedIdentityBean {
.queryParam("stateChecker", stateChecker) .queryParam("stateChecker", stateChecker)
.build().toString(); .build().toString();
FederatedIdentityEntry entry = new FederatedIdentityEntry(identity, provider.getAlias(), actionUrl); FederatedIdentityEntry entry = new FederatedIdentityEntry(identity, provider.getAlias(), provider.getAlias(), actionUrl);
this.identities.add(entry); this.identities.add(entry);
} }
} }
@ -79,11 +79,14 @@ public class AccountFederatedIdentityBean {
private FederatedIdentityModel federatedIdentityModel; private FederatedIdentityModel federatedIdentityModel;
private final String providerId; private final String providerId;
private final String providerName;
private final String actionUrl; private final String actionUrl;
public FederatedIdentityEntry(FederatedIdentityModel federatedIdentityModel, String providerId, String actionUrl) { public FederatedIdentityEntry(FederatedIdentityModel federatedIdentityModel, String providerId, String providerName, String actionUrl
) {
this.federatedIdentityModel = federatedIdentityModel; this.federatedIdentityModel = federatedIdentityModel;
this.providerId = providerId; this.providerId = providerId;
this.providerName = providerName;
this.actionUrl = actionUrl; this.actionUrl = actionUrl;
} }
@ -91,6 +94,10 @@ public class AccountFederatedIdentityBean {
return providerId; return providerId;
} }
public String getProviderName() {
return providerName;
}
public String getUserId() { public String getUserId() {
return federatedIdentityModel != null ? federatedIdentityModel.getUserId() : null; return federatedIdentityModel != null ? federatedIdentityModel.getUserId() : null;
} }