keycloak-uncached
Changes
services/src/main/java/org/keycloak/services/resources/admin/UserFederationProvidersResource.java 2(+1 -1)
Details
diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UserFederationProvidersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UserFederationProvidersResource.java
index 8a70463..8854a7b 100755
--- a/services/src/main/java/org/keycloak/services/resources/admin/UserFederationProvidersResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/UserFederationProvidersResource.java
@@ -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);
}
/**
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/PermissionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/PermissionsTest.java
index e1fe92c..29252d9 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/PermissionsTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/PermissionsTest.java
@@ -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
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/federated-generic.html b/themes/src/main/resources/theme/base/admin/resources/partials/federated-generic.html
index 06c64d6..b680b65 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/federated-generic.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/federated-generic.html
@@ -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>
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/federated-kerberos.html b/themes/src/main/resources/theme/base/admin/resources/partials/federated-kerberos.html
index 74ac52f..6e4305d 100644
--- a/themes/src/main/resources/theme/base/admin/resources/partials/federated-kerberos.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/federated-kerberos.html
@@ -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>
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html b/themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html
index d2a75c2..1208c3b 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html
@@ -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>
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/realm-keys-providers.html b/themes/src/main/resources/theme/base/admin/resources/partials/realm-keys-providers.html
index af25c11..810569a 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/realm-keys-providers.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/realm-keys-providers.html
@@ -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>
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/user-federation.html b/themes/src/main/resources/theme/base/admin/resources/partials/user-federation.html
index 92ec018..e4d2e4f 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/user-federation.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/user-federation.html
@@ -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>
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/user-storage.html b/themes/src/main/resources/theme/base/admin/resources/partials/user-storage.html
index 156a1ff..aaf2158 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/user-storage.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/user-storage.html
@@ -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>
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/user-storage-generic.html b/themes/src/main/resources/theme/base/admin/resources/partials/user-storage-generic.html
index 0108cde..7d0f5e9 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/user-storage-generic.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/user-storage-generic.html
@@ -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>
diff --git a/themes/src/main/resources/theme/base/admin/resources/templates/kc-menu.html b/themes/src/main/resources/theme/base/admin/resources/templates/kc-menu.html
index daa0b34..e38cf3c 100755
--- a/themes/src/main/resources/theme/base/admin/resources/templates/kc-menu.html
+++ b/themes/src/main/resources/theme/base/admin/resources/templates/kc-menu.html
@@ -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>