Skip to content

Commit

Permalink
broker fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@patriot1burke
patriot1burke committed Mar 19, 2015
1 parent 3912c60 commit b26277a
Show file tree
Hide file tree
Showing 46 changed files with 336 additions and 469 deletions.
6 changes: 3 additions & 3 deletions broker/saml/src/main/java/org/keycloak/broker/saml/SAMLIdentityProvider.java
View file
Expand Up @@ -117,11 +117,11 @@ public AuthenticationResponse handleRequest(AuthenticationRequest request) {
PublicKey publicKey = realm.getPublicKey();

if (privateKey == null) {
throw new IdentityBrokerException("Identity Provider [" + getConfig().getName() + "] wants a signed authentication request. But the Realm [" + realm.getName() + "] does not have a private key.");
throw new IdentityBrokerException("Identity Provider [" + getConfig().getAlias() + "] wants a signed authentication request. But the Realm [" + realm.getName() + "] does not have a private key.");
}

if (publicKey == null) {
throw new IdentityBrokerException("Identity Provider [" + getConfig().getName() + "] wants a signed authentication request. But the Realm [" + realm.getName() + "] does not have a public key.");
throw new IdentityBrokerException("Identity Provider [" + getConfig().getAlias() + "] wants a signed authentication request. But the Realm [" + realm.getName() + "] does not have a public key.");
}

KeyPair keypair = new KeyPair(publicKey, privateKey);
Expand Down Expand Up @@ -301,7 +301,7 @@ public Response export(UriInfo uriInfo, RealmModel realm, String format) {
authnBinding = JBossSAMLURIConstants.SAML_HTTP_POST_BINDING.get();
}

String assertionConsumerService = uriInfo.getBaseUriBuilder().path("realms").path(realm.getName()).path("broker").path(getConfig().getId()).build().toString();
String assertionConsumerService = uriInfo.getBaseUriBuilder().path("realms").path(realm.getName()).path("broker").path(getConfig().getAlias()).build().toString();



Expand Down
5 changes: 2 additions & 3 deletions connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml
View file
Expand Up @@ -47,8 +47,7 @@
<constraints nullable="false"/>
</column>
<column name="ENABLED" type="BOOLEAN" defaultValueBoolean="false"/>
<column name="PROVIDER_NONIMAL_ID" type="VARCHAR(255)"/>
<column name="PROVIDER_NAME" type="VARCHAR(255)"/>
<column name="PROVIDER_ALIAS" type="VARCHAR(255)"/>
<column name="PROVIDER_ID" type="VARCHAR(255)"/>
<column name="UPDATE_PROFILE_FIRST_LOGIN" type="BOOLEAN" defaultValueBoolean="false"/>
<column name="STORE_TOKEN" type="BOOLEAN" defaultValueBoolean="false"/>
Expand Down Expand Up @@ -95,7 +94,7 @@
<addForeignKeyConstraint baseColumnNames="IDENTITY_PROVIDER_ID" baseTableName="CLIENT_IDENTITY_PROVIDER_MAPPING" constraintName="FK_7CELWNIBJI49AVXSRTUF6XJ12" referencedColumnNames="INTERNAL_ID" referencedTableName="IDENTITY_PROVIDER"/>
<addForeignKeyConstraint baseColumnNames="CLIENT_ID" baseTableName="CLIENT_IDENTITY_PROVIDER_MAPPING" constraintName="FK_56ELWNIBJI49AVXSRTUF6XJ23" referencedColumnNames="ID" referencedTableName="CLIENT"/>
<addForeignKeyConstraint baseColumnNames="REALM_ID" baseTableName="REALM_SUPPORTED_LOCALES" constraintName="FK_SUPPORTED_LOCALES_REALM" referencedColumnNames="ID" referencedTableName="REALM"/>
<addUniqueConstraint columnNames="PROVIDER_NONIMAL_ID" constraintName="UK_2DAELWNIBJI49AVXSRTUF6XJ33" tableName="IDENTITY_PROVIDER"/>
<addUniqueConstraint columnNames="PROVIDER_ALIAS, REALM_ID" constraintName="UK_2DAELWNIBJI49AVXSRTUF6XJ33" tableName="IDENTITY_PROVIDER"/>
<addUniqueConstraint columnNames="IDENTITY_PROVIDER_ID,CLIENT_ID" constraintName="UK_7CAELWNIBJI49AVXSRTUF6XJ12" tableName="CLIENT_IDENTITY_PROVIDER_MAPPING"/>

<addColumn tableName="REALM">
Expand Down
28 changes: 5 additions & 23 deletions core/src/main/java/org/keycloak/representations/idm/IdentityProviderRepresentation.java 100644 → 100755
View file
Expand Up @@ -25,15 +25,13 @@
*/
public class IdentityProviderRepresentation {

protected String id;
protected String alias;
protected String internalId;
protected String providerId;
protected String name;
protected boolean enabled = true;
protected boolean updateProfileFirstLogin = true;
protected boolean storeToken;
protected boolean authenticateByDefault;
protected String groupName;
protected Map<String, String> config = new HashMap<String, String>();

public String getInternalId() {
Expand All @@ -44,12 +42,12 @@ public void setInternalId(String internalId) {
this.internalId = internalId;
}

public String getId() {
return this.id;
public String getAlias() {
return this.alias;
}

public void setId(String id) {
this.id = id;
public void setAlias(String alias) {
this.alias = alias;
}

public String getProviderId() {
Expand All @@ -60,14 +58,6 @@ public void setProviderId(String providerId) {
this.providerId = providerId;
}

public String getName() {
return this.name;
}

public void setName(String name) {
this.name = name;
}

public Map<String, String> getConfig() {
return this.config;
}
Expand Down Expand Up @@ -107,12 +97,4 @@ public boolean isStoreToken() {
public void setStoreToken(boolean storeToken) {
this.storeToken = storeToken;
}

public String getGroupName() {
return this.groupName;
}

public void setGroupName(String groupName) {
this.groupName = groupName;
}
}
12 changes: 3 additions & 9 deletions ...ker/src/main/java/org/keycloak/account/freemarker/model/AccountFederatedIdentityBean.java
View file
Expand Up @@ -34,7 +34,7 @@ public AccountFederatedIdentityBean(KeycloakSession session, RealmModel realm, U
int availableIdentities = 0;
if (identityProviders != null && !identityProviders.isEmpty()) {
for (IdentityProviderModel provider : identityProviders) {
String providerId = provider.getId();
String providerId = provider.getAlias();

FederatedIdentityModel identity = getIdentity(identities, providerId);

Expand All @@ -49,7 +49,7 @@ public AccountFederatedIdentityBean(KeycloakSession session, RealmModel realm, U
.queryParam("stateChecker", stateChecker)
.build().toString();

FederatedIdentityEntry entry = new FederatedIdentityEntry(identity, provider.getId(), provider.getName(), actionUrl);
FederatedIdentityEntry entry = new FederatedIdentityEntry(identity, provider.getAlias(), actionUrl);
this.identities.add(entry);
}
}
Expand Down Expand Up @@ -79,24 +79,18 @@ public class FederatedIdentityEntry {

private FederatedIdentityModel federatedIdentityModel;
private final String providerId;
private final String providerName;
private final String actionUrl;

public FederatedIdentityEntry(FederatedIdentityModel federatedIdentityModel, String providerId, String providerName, String actionUrl) {
public FederatedIdentityEntry(FederatedIdentityModel federatedIdentityModel, String providerId, String actionUrl) {
this.federatedIdentityModel = federatedIdentityModel;
this.providerId = providerId;
this.providerName = providerName;
this.actionUrl = actionUrl;
}

public String getProviderId() {
return providerId;
}

public String getProviderName() {
return providerName;
}

public String getUserId() {
return federatedIdentityModel != null ? federatedIdentityModel.getUserId() : null;
}
Expand Down
4 changes: 2 additions & 2 deletions forms/common-themes/src/main/resources/theme/admin/base/resources/js/app.js
View file
Expand Up @@ -170,7 +170,7 @@ module.config([ '$routeProvider', function($routeProvider) {
},
controller : 'RealmIdentityProviderCtrl'
})
.when('/realms/:realm/identity-provider-settings/provider/:provider_id/:id', {
.when('/realms/:realm/identity-provider-settings/provider/:provider_id/:alias', {
templateUrl : function(params){ return resourceUrl + '/partials/realm-identity-provider-' + params.provider_id + '.html'; },
resolve : {
realm : function(RealmLoader) {
Expand All @@ -188,7 +188,7 @@ module.config([ '$routeProvider', function($routeProvider) {
},
controller : 'RealmIdentityProviderCtrl'
})
.when('/realms/:realm/identity-provider-settings/provider/:provider_id/:id/export', {
.when('/realms/:realm/identity-provider-settings/provider/:provider_id/:alias/export', {
templateUrl : resourceUrl + '/partials/realm-identity-provider-export.html',
resolve : {
realm : function(RealmLoader) {
Expand Down
4 changes: 1 addition & 3 deletions ...ommon-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js
View file
Expand Up @@ -1183,11 +1183,9 @@ module.controller('ApplicationProtocolMapperCtrl', function($scope, realm, serve
$scope.mapper = angular.copy(mapper);
var oldCopy = angular.copy($scope.realm);
$scope.changed = false;
$scope.boolval = true;
$scope.boolvalId = 'boolval';

console.log('protocol: ' + protocol);
var protocolMappers = serverInfo.protocolMapperTypes[protocol];
var protocolMappers = serverInfo.protocolMapperTypes[$scope.protocol];
for (var i = 0; i < protocolMappers.length; i++) {
if (protocolMappers[i].id == mapper.protocolMapper) {
$scope.mapperType = protocolMappers[i];
Expand Down

0 comments on commit b26277a

Please sign in to comment.