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

Merge pull request #3444 from stianst/KEYCLOAK-3225

Browse source 
KEYCLOAK-3225
This commit is contained in:
Stian Thorgersen 2016-10-28 11:51:35 +02:00 committed by GitHub
commit f4a77c3d06
10 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/src/main/java/org/keycloak/services/resources/admin/UserFederationProvidersResource.java
View file

@ -90,7 +90,7 @@ public class UserFederationProvidersResource {
this.realm = realm;
this.adminEvent = adminEvent.resource(ResourceType.USER_FEDERATION_PROVIDER);
auth.init(RealmAuth.Resource.USER);
auth.init(RealmAuth.Resource.REALM);
}
/**

26
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/PermissionsTest.java
View file

@ -1512,69 +1512,69 @@ public class PermissionsTest extends AbstractKeycloakTest {
public void invoke(RealmResource realm) {
realm.userFederation().getProviderInstances();
}
}, Resource.USER, false);
}, Resource.REALM, false);
invoke(new Invocation() {
public void invoke(RealmResource realm) {
realm.userFederation().getProviderFactories();
}
}, Resource.USER, false);
}, Resource.REALM, false);
invoke(new Invocation() {
public void invoke(RealmResource realm) {
realm.userFederation().getProviderFactory("nosuch");
}
}, Resource.USER, false);
}, Resource.REALM, false);
invoke(new InvocationWithResponse() {
public void invoke(RealmResource realm, AtomicReference<Response> response) {
UserFederationProviderRepresentation rep = new UserFederationProviderRepresentation();
rep.setProviderName("ldap");
response.set(realm.userFederation().create(rep));
}
}, Resource.USER, true);
}, Resource.REALM, true);
invoke(new Invocation() {
public void invoke(RealmResource realm) {
realm.userFederation().get("nosuch").toRepresentation();
}
}, Resource.USER, false);
}, Resource.REALM, false);
invoke(new Invocation() {
public void invoke(RealmResource realm) {
realm.userFederation().get("nosuch").update(new UserFederationProviderRepresentation());
}
}, Resource.USER, true);
}, Resource.REALM, true);
invoke(new Invocation() {
public void invoke(RealmResource realm) {
realm.userFederation().get("nosuch").remove();
}
}, Resource.USER, true);
}, Resource.REALM, true);
invoke(new Invocation() {
public void invoke(RealmResource realm) {
realm.userFederation().get("nosuch").syncUsers("nosuch");
}
}, Resource.USER, true);
}, Resource.REALM, true);
invoke(new Invocation() {
public void invoke(RealmResource realm) {
realm.userFederation().get("nosuch").getMapperTypes();
}
}, Resource.USER, false);
}, Resource.REALM, false);
invoke(new Invocation() {
public void invoke(RealmResource realm) {
realm.userFederation().get("nosuch").getMappers();
}
}, Resource.USER, false);
}, Resource.REALM, false);
invoke(new InvocationWithResponse() {
public void invoke(RealmResource realm, AtomicReference<Response> response) {
response.set(realm.userFederation().get("nosuch").addMapper(new UserFederationMapperRepresentation()));
}
}, Resource.USER, true);
}, Resource.REALM, true);
invoke(new Invocation() {
public void invoke(RealmResource realm) {
realm.userFederation().get("nosuch").getMapperById("nosuch");
}
}, Resource.USER, false);
}, Resource.REALM, false);
invoke(new Invocation() {
public void invoke(RealmResource realm) {
realm.userFederation().get("nosuch").syncMapperData("nosuch", "nosuch");
}
}, Resource.USER, true);
}, Resource.REALM, true);
}
@Test

4
themes/src/main/resources/theme/base/admin/resources/partials/federated-generic.html
View file

@ -75,14 +75,14 @@
</fieldset>
<div class="form-group">
<div class="col-md-10 col-md-offset-2" data-ng-show="create && access.manageUsers">
<div class="col-md-10 col-md-offset-2" data-ng-show="create && access.manageRealm">
<button kc-save>{{:: 'save' | translate}}</button>
<button kc-cancel data-ng-click="cancel()">{{:: 'cancel' | translate}}</button>
</div>
</div>
<div class="form-group">
<div class="col-md-10 col-md-offset-2" data-ng-show="!create && access.manageUsers">
<div class="col-md-10 col-md-offset-2" data-ng-show="!create && access.manageRealm">
<button kc-save data-ng-disabled="!changed">{{:: 'save' | translate}}</button>
<button kc-reset data-ng-disabled="!changed">{{:: 'cancel' | translate}}</button>
<button class="btn btn-primary" data-ng-click="triggerChangedUsersSync()" data-ng-hide="changed">{{:: 'synchronize-changed-users' | translate}}</button>

4
themes/src/main/resources/theme/base/admin/resources/partials/federated-kerberos.html
View file

@ -91,14 +91,14 @@
</fieldset>
<div class="form-group">
<div class="col-md-10 col-md-offset-2" data-ng-show="create && access.manageUsers">
<div class="col-md-10 col-md-offset-2" data-ng-show="create && access.manageRealm">
<button kc-save>{{:: 'save' | translate}}</button>
<button kc-cancel data-ng-click="cancel()">{{:: 'cancel' | translate}}</button>
</div>
</div>
<div class="form-group">
<div class="col-md-10 col-md-offset-2" data-ng-show="!create && access.manageUsers">
<div class="col-md-10 col-md-offset-2" data-ng-show="!create && access.manageRealm">
<button kc-save data-ng-disabled="!changed">{{:: 'save' | translate}}</button>
<button kc-reset data-ng-disabled="!changed">{{:: 'cancel' | translate}}</button>
</div>

4
themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html
View file

@ -280,14 +280,14 @@
</fieldset>
<div class="form-group">
<div class="col-md-10 col-md-offset-2" data-ng-show="create && access.manageUsers">
<div class="col-md-10 col-md-offset-2" data-ng-show="create && access.manageRealm">
<button kc-save>{{:: 'save' | translate}}</button>
<button kc-cancel data-ng-click="cancel()">{{:: 'cancel' | translate}}</button>
</div>
</div>
<div class="form-group">
<div class="col-md-10 col-md-offset-2" data-ng-show="!create && access.manageUsers">
<div class="col-md-10 col-md-offset-2" data-ng-show="!create && access.manageRealm">
<button kc-save data-ng-disabled="!changed">{{:: 'save' | translate}}</button>
<button kc-reset data-ng-disabled="!changed">{{:: 'cancel' | translate}}</button>
<button class="btn btn-primary" data-ng-click="triggerChangedUsersSync()" data-ng-hide="changed">{{:: 'synchronize-changed-users' | translate}}</button>

2
themes/src/main/resources/theme/base/admin/resources/partials/realm-keys-providers.html
View file

@ -26,7 +26,7 @@
<table class="table table-striped table-bordered">
<thead>
<tr ng-show="providers.length > 0 && access.manageUsers">
<tr ng-show="providers.length > 0 && access.manageRealm">
<th colspan="6" class="kc-table-actions">
<div class="pull-right">
<div>

4
themes/src/main/resources/theme/base/admin/resources/partials/user-federation.html
View file

@ -13,7 +13,7 @@
<p>Keycloak can federate external user databases. Out of the box we have support for LDAP and Active Directory.</p>
<p>To get started select a provider from the dropdown below:</p>
<div class="blank-slate-pf-main-action">
<div class="row" data-ng-show="access.manageUsers">
<div class="row" data-ng-show="access.manageRealm">
<div class="col-sm-4 col-sm-offset-4">
<div class="form-group">
<select class="form-control" ng-model="selectedProvider"
@ -29,7 +29,7 @@
<table class="table table-striped table-bordered" data-ng-show="instances && instances.length > 0">
<thead>
<tr ng-show="providers.length > 0 && access.manageUsers">
<tr ng-show="providers.length > 0 && access.manageRealm">
<th colspan="5" class="kc-table-actions">
<div class="pull-right">
<div>

4
themes/src/main/resources/theme/base/admin/resources/partials/user-storage-generic.html
View file

@ -217,14 +217,14 @@
<div class="form-group">
<div class="col-md-10 col-md-offset-2" data-ng-show="create && access.manageUsers">
<div class="col-md-10 col-md-offset-2" data-ng-show="create && access.manageRealm">
<button kc-save>{{:: 'save' | translate}}</button>
<button kc-cancel data-ng-click="cancel()">{{:: 'cancel' | translate}}</button>
</div>
</div>
<div class="form-group">
<div class="col-md-10 col-md-offset-2" data-ng-show="!create && access.manageUsers">
<div class="col-md-10 col-md-offset-2" data-ng-show="!create && access.manageRealm">
<button kc-save data-ng-disabled="!changed">{{:: 'save' | translate}}</button>
<button kc-reset data-ng-disabled="!changed">{{:: 'cancel' | translate}}</button>
<button class="btn btn-primary" data-ng-click="triggerChangedUsersSync()" data-ng-hide="changed || !showSync">{{:: 'synchronize-changed-users' | translate}}</button>

2
themes/src/main/resources/theme/base/admin/resources/partials/user-storage.html
View file

@ -5,7 +5,7 @@
<table class="table table-striped table-bordered">
<thead>
<tr ng-show="providers.length > 0 && access.manageUsers">
<tr ng-show="providers.length > 0 && access.manageRealm">
<th colspan="5" class="kc-table-actions">
<div class="pull-right">
<div>

2
themes/src/main/resources/theme/base/admin/resources/templates/kc-menu.html
View file

@ -39,7 +39,7 @@
|| path[2] == 'identity-provider-mappers'
|| path[1] == 'identity-provider-mappers'
|| path[1] == 'identity-provider') && 'active'"><a href="#/realms/{{realm.realm}}/identity-provider-settings"><i class="fa fa-exchange"></i> {{:: 'identity-providers' | translate}}</a></li>
<li data-ng-show="access.viewUsers" data-ng-class="(path[1] == 'user-federation'
<li data-ng-show="access.viewRealm" data-ng-class="(path[1] == 'user-federation'
|| path[2] == 'user-federation'
|| path[1] == 'user-federation-mappers') && 'active'"><a href="#/realms/{{realm.realm}}/user-federation"><i class="fa fa-database"></i> {{:: 'user-federation' | translate}}</a></li>
<li data-ng-show="access.viewRealm" data-ng-class="(path[1] == 'authentication' || path[2] == 'authentication') && 'active'"><a href="#/realms/{{realm.realm}}/authentication/flows"><i class="fa fa-lock"></i> {{:: 'authentication' | translate}}</a></li>