diff --git a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesRealmAdminProvider.java b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesRealmAdminProvider.java index 5cd1058388a..2399d764f63 100644 --- a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesRealmAdminProvider.java +++ b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesRealmAdminProvider.java @@ -23,7 +23,7 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; import org.keycloak.services.resources.admin.ext.AdminRealmResourceProvider; import org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; public class LdapServerCapabilitiesRealmAdminProvider implements AdminRealmResourceProviderFactory, AdminRealmResourceProvider { diff --git a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesResource.java b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesResource.java index caadac66e1c..9e6be154553 100644 --- a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesResource.java +++ b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesResource.java @@ -24,7 +24,7 @@ import org.keycloak.representations.idm.LDAPCapabilityRepresentation; import org.keycloak.representations.idm.TestLdapConnectionRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.managers.LDAPServerCapabilitiesManager; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; diff --git a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionRealmAdminProvider.java b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionRealmAdminProvider.java index e330cd4a212..6654df2b45d 100644 --- a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionRealmAdminProvider.java +++ b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionRealmAdminProvider.java @@ -23,7 +23,7 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; import org.keycloak.services.resources.admin.ext.AdminRealmResourceProvider; import org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; public class TestLdapConnectionRealmAdminProvider implements AdminRealmResourceProviderFactory, AdminRealmResourceProvider { diff --git a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java index d0e52dd0bb0..ef521fed163 100644 --- a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java +++ b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java @@ -23,7 +23,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.TestLdapConnectionRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.managers.LDAPServerCapabilitiesManager; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.FormParam; diff --git a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearCrlCacheRealmAdminProvider.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearCrlCacheRealmAdminProvider.java index ac49b375171..6f52ac508ed 100644 --- a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearCrlCacheRealmAdminProvider.java +++ b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearCrlCacheRealmAdminProvider.java @@ -23,7 +23,7 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; import org.keycloak.services.resources.admin.ext.AdminRealmResourceProvider; import org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; public class ClearCrlCacheRealmAdminProvider implements AdminRealmResourceProviderFactory, AdminRealmResourceProvider { diff --git a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearCrlCacheResource.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearCrlCacheResource.java index fcb9f4754b9..3757d54876e 100644 --- a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearCrlCacheResource.java +++ b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearCrlCacheResource.java @@ -21,7 +21,7 @@ import org.keycloak.events.admin.OperationType; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.cache.CacheCrlProvider; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.POST; diff --git a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheRealmAdminProvider.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheRealmAdminProvider.java index f4962d5f37e..5a6b2b69251 100644 --- a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheRealmAdminProvider.java +++ b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheRealmAdminProvider.java @@ -23,7 +23,7 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; import org.keycloak.services.resources.admin.ext.AdminRealmResourceProvider; import org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; public class ClearKeysCacheRealmAdminProvider implements AdminRealmResourceProviderFactory, AdminRealmResourceProvider { diff --git a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheResource.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheResource.java index d72c3e82f7d..8e64be70242 100644 --- a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheResource.java +++ b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheResource.java @@ -21,7 +21,7 @@ import org.keycloak.events.admin.OperationType; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.cache.CachePublicKeyProvider; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.POST; import jakarta.ws.rs.core.Context; diff --git a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheRealmAdminProvider.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheRealmAdminProvider.java index 0b3c06e238d..944025a46d9 100644 --- a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheRealmAdminProvider.java +++ b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheRealmAdminProvider.java @@ -23,7 +23,7 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; import org.keycloak.services.resources.admin.ext.AdminRealmResourceProvider; import org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; public class ClearRealmCacheRealmAdminProvider implements AdminRealmResourceProviderFactory, AdminRealmResourceProvider { diff --git a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java index bd1d2bfd119..8538bc7dc5e 100644 --- a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java +++ b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java @@ -20,7 +20,7 @@ import org.keycloak.events.admin.OperationType; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.cache.CacheRealmProvider; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.POST; diff --git a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheRealmAdminProvider.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheRealmAdminProvider.java index a078594a379..15625c6c0f1 100644 --- a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheRealmAdminProvider.java +++ b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheRealmAdminProvider.java @@ -23,7 +23,7 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; import org.keycloak.services.resources.admin.ext.AdminRealmResourceProvider; import org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; public class ClearUserCacheRealmAdminProvider implements AdminRealmResourceProviderFactory, AdminRealmResourceProvider { diff --git a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java index ec4925497d4..2dff198231b 100644 --- a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java +++ b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java @@ -20,7 +20,7 @@ import org.keycloak.events.admin.OperationType; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.cache.UserCache; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.POST; diff --git a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderRealmAdminProvider.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderRealmAdminProvider.java index f0750c15f66..70af9b41e41 100644 --- a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderRealmAdminProvider.java +++ b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderRealmAdminProvider.java @@ -23,7 +23,7 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; import org.keycloak.services.resources.admin.ext.AdminRealmResourceProvider; import org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; public class UserStorageProviderRealmAdminProvider implements AdminRealmResourceProviderFactory, AdminRealmResourceProvider { diff --git a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java index 3b6f9a91652..5418ee8e211 100644 --- a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java +++ b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java @@ -28,7 +28,7 @@ import org.keycloak.services.ServicesLogger; import org.keycloak.storage.managers.UserStorageSyncManager; import org.keycloak.services.ErrorResponse; import org.keycloak.services.managers.LDAPServerCapabilitiesManager; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.storage.ldap.LDAPStorageProvider; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusKeycloakSessionFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusKeycloakSessionFactory.java index 13ae7cdb536..01f8cd3256d 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusKeycloakSessionFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusKeycloakSessionFactory.java @@ -29,7 +29,7 @@ import org.keycloak.provider.ProviderManagerRegistry; import org.keycloak.provider.Spi; import org.keycloak.quarkus.runtime.themes.QuarkusJarThemeProviderFactory; import org.keycloak.services.DefaultKeycloakSessionFactory; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.theme.ClasspathThemeProviderFactory; public final class QuarkusKeycloakSessionFactory extends DefaultKeycloakSessionFactory { diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AdminExtProvider.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AdminExtProvider.java index 225de090616..aa4a92cccad 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AdminExtProvider.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AdminExtProvider.java @@ -9,7 +9,7 @@ import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.services.resources.admin.AdminEventBuilder; import org.keycloak.services.resources.admin.ext.AdminRealmResourceProvider; import org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; public final class AdminExtProvider implements AdminRealmResourceProviderFactory, AdminRealmResourceProvider, EnvironmentDependentProviderFactory { public AdminRealmResourceProvider create(KeycloakSession session) { diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AdminExtResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AdminExtResource.java index e517bfc7288..00875db0b55 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AdminExtResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AdminExtResource.java @@ -3,7 +3,7 @@ package org.keycloak.admin.ui.rest; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.services.resources.admin.AdminEventBuilder; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.Path; diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AuthenticationManagementResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AuthenticationManagementResource.java index 8c457d7ac0d..dcd88e510cf 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AuthenticationManagementResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AuthenticationManagementResource.java @@ -34,7 +34,7 @@ import org.keycloak.models.RequiredActionProviderModel; import org.keycloak.models.utils.DefaultAuthenticationFlows; import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; public class AuthenticationManagementResource extends RoleMappingResource { diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AvailableEventListenersResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AvailableEventListenersResource.java index 5e2fe0a50d1..5dbdda3efd6 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AvailableEventListenersResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AvailableEventListenersResource.java @@ -33,7 +33,7 @@ import org.keycloak.admin.ui.rest.model.ProviderMapper; import org.keycloak.events.EventListenerProvider; import org.keycloak.events.EventListenerProviderFactory; import org.keycloak.models.KeycloakSession; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; public class AvailableEventListenersResource { diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AvailableRoleMappingResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AvailableRoleMappingResource.java index fc126c69725..0155866a50f 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AvailableRoleMappingResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AvailableRoleMappingResource.java @@ -33,7 +33,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserProvider; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLE; import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLE_CLIENT_SCOPE; diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/BruteForceUsersResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/BruteForceUsersResource.java index 65ee93ebb9b..cf630d10815 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/BruteForceUsersResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/BruteForceUsersResource.java @@ -26,8 +26,8 @@ import org.keycloak.models.UserLoginFailureModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import org.keycloak.services.resources.admin.permissions.UserPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.UserPermissionEvaluator; import org.keycloak.userprofile.UserProfile; import org.keycloak.userprofile.UserProfileContext; import org.keycloak.userprofile.UserProfileProvider; diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/EffectiveRoleMappingResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/EffectiveRoleMappingResource.java index 421f8413be6..5a551993127 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/EffectiveRoleMappingResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/EffectiveRoleMappingResource.java @@ -25,7 +25,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import static org.keycloak.admin.ui.rest.model.RoleMapper.convertToModel; diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/RoleMappingResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/RoleMappingResource.java index 138a051efb8..e6c7924dd22 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/RoleMappingResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/RoleMappingResource.java @@ -2,7 +2,7 @@ package org.keycloak.admin.ui.rest; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; public abstract class RoleMappingResource { protected final KeycloakSession session; diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/SessionsResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/SessionsResource.java index 8ba3f6ee9bd..c16dc75702b 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/SessionsResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/SessionsResource.java @@ -16,7 +16,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserSessionModel; import org.keycloak.models.light.LightweightUserAdapter; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DefaultValue; diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmResource.java index 43f70a314a9..3e13f6bee9a 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmResource.java @@ -33,7 +33,7 @@ import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.services.resources.admin.AdminEventBuilder; import org.keycloak.services.resources.admin.RealmAdminResource; import org.keycloak.services.resources.admin.UserProfileResource; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.storage.UserStorageProviderModel; import jakarta.ws.rs.Consumes; diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmsResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmsResource.java index 01c03c28f0f..5b23783b10d 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmsResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmsResource.java @@ -17,9 +17,9 @@ import org.jboss.resteasy.reactive.NoCache; import org.keycloak.admin.ui.rest.model.RealmNameRepresentation; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import org.keycloak.services.resources.admin.permissions.RealmsPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.RealmsPermissionEvaluator; public class UIRealmsResource { diff --git a/services/src/main/java/org/keycloak/authorization/admin/AuthorizationService.java b/services/src/main/java/org/keycloak/authorization/admin/AuthorizationService.java index c8dc0acc540..2872be385aa 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/AuthorizationService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/AuthorizationService.java @@ -28,7 +28,7 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.AdminEventBuilder; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; /** * @author Pedro Igor diff --git a/services/src/main/java/org/keycloak/authorization/admin/PermissionService.java b/services/src/main/java/org/keycloak/authorization/admin/PermissionService.java index 0ae1a82b07f..8458ad91028 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PermissionService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PermissionService.java @@ -27,7 +27,7 @@ import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.authorization.AbstractPolicyRepresentation; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.AdminEventBuilder; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; /** * @author Pedro Igor diff --git a/services/src/main/java/org/keycloak/authorization/admin/PolicyEvaluationService.java b/services/src/main/java/org/keycloak/authorization/admin/PolicyEvaluationService.java index 9c4390d2b01..148432477b8 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PolicyEvaluationService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PolicyEvaluationService.java @@ -84,7 +84,7 @@ import org.keycloak.services.Urls; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.managers.UserSessionManager; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.sessions.AuthenticationSessionModel; /** diff --git a/services/src/main/java/org/keycloak/authorization/admin/PolicyResourceService.java b/services/src/main/java/org/keycloak/authorization/admin/PolicyResourceService.java index 7cff8c6beb5..36c440f700d 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PolicyResourceService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PolicyResourceService.java @@ -47,7 +47,7 @@ import org.keycloak.representations.idm.authorization.AbstractPolicyRepresentati import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.services.resources.admin.AdminEventBuilder; import org.keycloak.util.JsonSerialization; diff --git a/services/src/main/java/org/keycloak/authorization/admin/PolicyService.java b/services/src/main/java/org/keycloak/authorization/admin/PolicyService.java index 1be1cc3abe5..091dcacd842 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PolicyService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PolicyService.java @@ -67,7 +67,7 @@ import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.services.ErrorResponseException; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.AdminEventBuilder; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.StringUtil; diff --git a/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeResourceService.java b/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeResourceService.java index d440547d831..5b5bcfb6f0d 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeResourceService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeResourceService.java @@ -23,7 +23,7 @@ import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.authorization.AbstractPolicyRepresentation; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.services.resources.admin.AdminEventBuilder; import org.keycloak.util.JsonSerialization; diff --git a/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeService.java b/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeService.java index b0bd7b5fa1e..1306df8aed2 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeService.java @@ -29,7 +29,7 @@ import org.keycloak.authorization.policy.provider.PolicyProviderAdminService; import org.keycloak.authorization.policy.provider.PolicyProviderFactory; import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.authorization.AbstractPolicyRepresentation; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.services.resources.admin.AdminEventBuilder; import org.keycloak.util.JsonSerialization; diff --git a/services/src/main/java/org/keycloak/authorization/admin/ResourceServerService.java b/services/src/main/java/org/keycloak/authorization/admin/ResourceServerService.java index d921752e6ec..73ff44fd993 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/ResourceServerService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/ResourceServerService.java @@ -52,7 +52,7 @@ import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.AdminEventBuilder; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; /** * @author Pedro Igor diff --git a/services/src/main/java/org/keycloak/authorization/admin/ResourceSetService.java b/services/src/main/java/org/keycloak/authorization/admin/ResourceSetService.java index c6f9115c887..94c350c6e40 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/ResourceSetService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/ResourceSetService.java @@ -77,7 +77,7 @@ import org.keycloak.representations.idm.authorization.ScopeRepresentation; import org.keycloak.services.ErrorResponseException; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.AdminEventBuilder; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; /** * @author Pedro Igor diff --git a/services/src/main/java/org/keycloak/authorization/admin/ScopeService.java b/services/src/main/java/org/keycloak/authorization/admin/ScopeService.java index 07523d231ce..c83226fb05c 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/ScopeService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/ScopeService.java @@ -41,7 +41,7 @@ import org.keycloak.representations.idm.authorization.ScopeRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.AdminEventBuilder; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; diff --git a/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationsResource.java b/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationsResource.java index 96ec57afed8..777986507bd 100644 --- a/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationsResource.java +++ b/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationsResource.java @@ -59,7 +59,7 @@ import org.keycloak.representations.idm.OrganizationRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.AdminEventBuilder; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.utils.ReservedCharValidator; import org.keycloak.utils.SearchQueryUtils; import org.keycloak.utils.StringUtil; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/AbstractTokenExchangeProvider.java b/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/AbstractTokenExchangeProvider.java index bf7b4e70781..7e3223f98a2 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/AbstractTokenExchangeProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/AbstractTokenExchangeProvider.java @@ -72,7 +72,7 @@ import org.keycloak.services.managers.AuthenticationSessionManager; import org.keycloak.services.managers.BruteForceProtector; import org.keycloak.services.managers.UserSessionManager; import org.keycloak.services.resources.IdentityBrokerService; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.services.validation.Validation; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/V1TokenExchangeProvider.java b/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/V1TokenExchangeProvider.java index 8d44e124b14..0ad178f67f7 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/V1TokenExchangeProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/V1TokenExchangeProvider.java @@ -38,7 +38,7 @@ import org.keycloak.services.cors.Cors; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.managers.UserSessionManager; import org.keycloak.services.resources.admin.AdminAuth; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_ID; import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_USERNAME; diff --git a/services/src/main/java/org/keycloak/services/DefaultKeycloakSessionFactory.java b/services/src/main/java/org/keycloak/services/DefaultKeycloakSessionFactory.java index efa6c80735a..530c245080e 100755 --- a/services/src/main/java/org/keycloak/services/DefaultKeycloakSessionFactory.java +++ b/services/src/main/java/org/keycloak/services/DefaultKeycloakSessionFactory.java @@ -54,7 +54,7 @@ import org.keycloak.provider.ProviderManager; import org.keycloak.provider.ProviderManagerDeployer; import org.keycloak.provider.ProviderManagerRegistry; import org.keycloak.provider.Spi; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.theme.ThemeManagerFactory; public abstract class DefaultKeycloakSessionFactory implements KeycloakSessionFactory, ProviderManagerDeployer { diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java index c91710ed274..4921b0fe2a2 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java @@ -36,7 +36,7 @@ import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.managers.RealmManager; import org.keycloak.services.resources.WelcomeResource; import org.keycloak.services.resources.admin.info.ServerInfoAdminResource; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.theme.Theme; import org.keycloak.urls.UrlType; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AttackDetectionResource.java b/services/src/main/java/org/keycloak/services/resources/admin/AttackDetectionResource.java index aeb735e76dd..59d494e4fbe 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/AttackDetectionResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AttackDetectionResource.java @@ -31,7 +31,7 @@ import org.keycloak.models.UserLoginFailureModel; import org.keycloak.models.UserModel; import org.keycloak.services.managers.BruteForceProtector; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java b/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java index 9415592c853..a7256913365 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java @@ -64,7 +64,7 @@ import org.keycloak.representations.idm.RequiredActionConfigRepresentation; import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.userprofile.ValidationException; import org.keycloak.utils.CredentialHelper; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientAttributeCertificateResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientAttributeCertificateResource.java index 3930284f616..6c0f1595d50 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientAttributeCertificateResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientAttributeCertificateResource.java @@ -44,7 +44,7 @@ import org.keycloak.representations.KeyStoreConfig; import org.keycloak.representations.idm.CertificateRepresentation; import org.keycloak.services.ErrorResponseException; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.services.util.CertificateInfoHelper; import jakarta.ws.rs.BadRequestException; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientInitialAccessResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientInitialAccessResource.java index 7a267e31f1e..80e62451161 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientInitialAccessResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientInitialAccessResource.java @@ -34,7 +34,7 @@ import org.keycloak.representations.idm.ClientInitialAccessPresentation; import org.keycloak.representations.idm.OAuth2ErrorRepresentation; import org.keycloak.services.clientregistration.ClientRegistrationTokenUtils; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientPoliciesResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientPoliciesResource.java index 2d14666ac90..265ca5ba076 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientPoliciesResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientPoliciesResource.java @@ -38,7 +38,7 @@ import org.keycloak.representations.idm.ClientPoliciesRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; @Extension(name = KeycloakOpenAPI.Profiles.ADMIN, value = "") public class ClientPoliciesResource { diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientProfilesResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientProfilesResource.java index 58f2ccb4dfc..9c39787e17c 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientProfilesResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientProfilesResource.java @@ -39,7 +39,7 @@ import org.keycloak.representations.idm.ClientProfilesRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; @Extension(name = KeycloakOpenAPI.Profiles.ADMIN, value = "") public class ClientProfilesResource { diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientRegistrationPolicyResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientRegistrationPolicyResource.java index fc1f15ee5c3..6a097a4bc99 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientRegistrationPolicyResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientRegistrationPolicyResource.java @@ -31,7 +31,7 @@ import org.keycloak.representations.idm.ComponentTypeRepresentation; import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy; import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicyFactory; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientResource.java index bcead7c690e..44e1e182ac1 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientResource.java @@ -71,9 +71,9 @@ import org.keycloak.services.managers.ClientManager; import org.keycloak.services.managers.RealmManager; import org.keycloak.services.managers.ResourceAdminManager; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import org.keycloak.services.resources.admin.permissions.AdminPermissionManagement; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionManagement; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.utils.ProfileHelper; import org.keycloak.utils.ReservedCharValidator; import org.keycloak.validation.ValidationUtil; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java index 5e4b24d2b58..0c09a67102c 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java @@ -26,7 +26,7 @@ import org.jboss.resteasy.reactive.NoCache; import jakarta.ws.rs.NotFoundException; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.ClientModel; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateResource.java index 9aae60aeba1..52768129ba3 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateResource.java @@ -71,7 +71,7 @@ import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.managers.AuthenticationSessionManager; import org.keycloak.services.managers.UserSessionManager; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateScopeMappingsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateScopeMappingsResource.java index d8bdbb644d7..4a53366ac0c 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateScopeMappingsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateScopeMappingsResource.java @@ -45,7 +45,7 @@ import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.protocol.oidc.TokenManager; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java index a82d7aca996..da6357c48eb 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java @@ -42,7 +42,7 @@ import org.keycloak.saml.common.util.StringUtil; import org.keycloak.services.ErrorResponse; import org.keycloak.services.ErrorResponseException; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java index 88d58763160..804a4cb2aa6 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java @@ -37,7 +37,7 @@ import org.keycloak.models.utils.RepresentationToModel; import org.keycloak.representations.idm.ClientScopeRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientTypesResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientTypesResource.java index 3b5b6fc92fe..474fb9c8127 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientTypesResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientTypesResource.java @@ -38,7 +38,7 @@ import org.keycloak.services.ErrorResponse; import org.keycloak.client.clienttype.ClientTypeException; import org.keycloak.client.clienttype.ClientTypeManager; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java index 72fa324d3ec..de4b22dc9dd 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java @@ -46,7 +46,7 @@ import org.keycloak.services.clientpolicy.context.AdminClientRegisteredContext; import org.keycloak.services.managers.ClientManager; import org.keycloak.services.managers.RealmManager; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.utils.SearchQueryUtils; import org.keycloak.validation.ValidationUtil; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ComponentResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ComponentResource.java index 2b5c3db6130..f0a60e589a1 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ComponentResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ComponentResource.java @@ -42,7 +42,7 @@ import org.keycloak.representations.idm.ComponentTypeRepresentation; import org.keycloak.representations.idm.ConfigPropertyRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.Consumes; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java b/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java index ade1a522ff9..5407df2ed83 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java @@ -39,9 +39,9 @@ import org.keycloak.representations.idm.ManagementPermissionReference; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import org.keycloak.services.resources.admin.permissions.AdminPermissionManagement; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionManagement; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.utils.GroupUtils; import org.keycloak.utils.ProfileHelper; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java index e9262bb989e..843ccc2d0cd 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java @@ -52,8 +52,8 @@ import org.keycloak.organization.utils.Organizations; import org.keycloak.representations.idm.GroupRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import org.keycloak.services.resources.admin.permissions.GroupPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.GroupPermissionEvaluator; import org.keycloak.utils.GroupUtils; import org.keycloak.utils.SearchQueryUtils; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/IdentityProviderResource.java b/services/src/main/java/org/keycloak/services/resources/admin/IdentityProviderResource.java index 1333a69c179..ebeb64221fc 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/IdentityProviderResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/IdentityProviderResource.java @@ -50,9 +50,9 @@ import org.keycloak.representations.idm.ManagementPermissionReference; import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.IdentityBrokerService; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import org.keycloak.services.resources.admin.permissions.AdminPermissionManagement; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionManagement; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.utils.ProfileHelper; import jakarta.ws.rs.Consumes; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java index 943db7d2384..6628540c743 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java @@ -41,7 +41,7 @@ import org.keycloak.provider.ProviderFactory; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.utils.ReservedCharValidator; import jakarta.ws.rs.BadRequestException; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/KeyResource.java b/services/src/main/java/org/keycloak/services/resources/admin/KeyResource.java index 112188b09ba..a43b3368989 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/KeyResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/KeyResource.java @@ -28,7 +28,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.KeysMetadataRepresentation; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.GET; import jakarta.ws.rs.Produces; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java index 1f01a303aee..6867486dbe7 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java @@ -41,7 +41,7 @@ import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.ErrorResponseException; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java index 6719a8bbc51..b045168dc03 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java @@ -101,9 +101,9 @@ import org.keycloak.services.managers.RealmManager; import org.keycloak.services.managers.ResourceAdminManager; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.ext.AdminRealmResourceProvider; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import org.keycloak.services.resources.admin.permissions.AdminPermissionManagement; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionManagement; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.services.util.DateUtil; import org.keycloak.storage.DatastoreProvider; import org.keycloak.storage.ExportImportManager; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmLocalizationResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmLocalizationResource.java index 8894144f527..26b1c3b49d6 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/RealmLocalizationResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmLocalizationResource.java @@ -32,7 +32,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.RealmModel; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import java.io.IOException; import java.io.InputStream; @@ -54,7 +54,7 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MultivaluedMap; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.StringUtil; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java index 7ddca708ee9..81e2957260e 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java @@ -44,8 +44,8 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.managers.RealmManager; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.storage.DatastoreProvider; import org.keycloak.storage.ExportImportManager; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java index 53f8d2b775c..5df25ffad29 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java @@ -39,9 +39,9 @@ import org.keycloak.representations.idm.ManagementPermissionReference; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import org.keycloak.services.resources.admin.permissions.AdminPermissionManagement; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionManagement; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.utils.ProfileHelper; import jakarta.ws.rs.Consumes; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RoleContainerResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RoleContainerResource.java index 0a81c477f18..6568a65f147 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RoleContainerResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RoleContainerResource.java @@ -46,9 +46,9 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import org.keycloak.services.resources.admin.permissions.AdminPermissionManagement; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionManagement; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.utils.ProfileHelper; import jakarta.ws.rs.BadRequestException; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RoleMapperResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RoleMapperResource.java index 74da775b26e..e115e414240 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/RoleMapperResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RoleMapperResource.java @@ -47,7 +47,7 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.ErrorResponseException; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.storage.ReadOnlyException; import jakarta.ws.rs.Consumes; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RoleResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RoleResource.java index fba5835f4e4..e6c5fea35d3 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RoleResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RoleResource.java @@ -25,7 +25,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.RoleRepresentation; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.UriInfo; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedClientResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedClientResource.java index 7c01b71b221..896282c41d4 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedClientResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedClientResource.java @@ -35,7 +35,7 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedResource.java index b319a5fd73d..2bdf06bfa39 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedResource.java @@ -36,7 +36,7 @@ import org.keycloak.representations.idm.ClientMappingsRepresentation; import org.keycloak.representations.idm.MappingsRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.services.util.ScopeMappedUtil; import jakarta.ws.rs.Consumes; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UserProfileResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UserProfileResource.java index 7e43ca588b2..80ef5a6db6d 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/UserProfileResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/UserProfileResource.java @@ -44,7 +44,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.UserProfileMetadata; import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.userprofile.UserProfile; import org.keycloak.userprofile.UserProfileContext; import org.keycloak.userprofile.UserProfileProvider; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UserResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UserResource.java index 45475bdeb2b..fdae368897e 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/UserResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/UserResource.java @@ -86,7 +86,7 @@ import org.keycloak.services.managers.UserSessionManager; import org.keycloak.services.messages.Messages; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.LoginActionsService; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.services.validation.Validation; import org.keycloak.storage.ReadOnlyException; import org.keycloak.userprofile.UserProfile; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java index e6af6b34c03..d9b79ed3017 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java @@ -51,8 +51,8 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.ErrorResponseException; import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import org.keycloak.services.resources.admin.permissions.UserPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.UserPermissionEvaluator; import org.keycloak.userprofile.UserProfile; import org.keycloak.userprofile.UserProfileContext; import org.keycloak.userprofile.UserProfileProvider; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ext/AdminRealmResourceProvider.java b/services/src/main/java/org/keycloak/services/resources/admin/ext/AdminRealmResourceProvider.java index 8ca009acec3..440a91d4921 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ext/AdminRealmResourceProvider.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ext/AdminRealmResourceProvider.java @@ -22,7 +22,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.provider.Provider; import org.keycloak.services.resources.admin.AdminEventBuilder; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; /** *

A {@link AdminRealmResourceProvider} creates JAX-RS sub-resource instances for paths relative diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/AdminPermissionEvaluator.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/AdminPermissionEvaluator.java similarity index 97% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/AdminPermissionEvaluator.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/AdminPermissionEvaluator.java index d42ad2e8091..83bf1985143 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/AdminPermissionEvaluator.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/AdminPermissionEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.services.resources.admin.AdminAuth; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/AdminPermissionManagement.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/AdminPermissionManagement.java similarity index 96% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/AdminPermissionManagement.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/AdminPermissionManagement.java index e9ed4bc6b8a..343b7a295af 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/AdminPermissionManagement.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/AdminPermissionManagement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.ResourceServer; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/AdminPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/AdminPermissions.java similarity index 98% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/AdminPermissions.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/AdminPermissions.java index c3695b20415..1e859893764 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/AdminPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/AdminPermissions.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.common.Profile; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/ClientPermissionEvaluator.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionEvaluator.java similarity index 99% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/ClientPermissionEvaluator.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionEvaluator.java index 8fcf6a1406b..017c148e013 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/ClientPermissionEvaluator.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.models.AdminRoles; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/ClientPermissionManagement.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionManagement.java similarity index 97% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/ClientPermissionManagement.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionManagement.java index 75dd57ab485..337c8a990dd 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/ClientPermissionManagement.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionManagement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/ClientPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissions.java similarity index 99% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/ClientPermissions.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissions.java index 2822b18a79e..47043edb551 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/ClientPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissions.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.jboss.logging.Logger; import org.keycloak.authorization.fgap.AdminPermissionsSchema; @@ -50,7 +50,7 @@ import java.util.Set; import jakarta.ws.rs.ForbiddenException; import static org.keycloak.authorization.fgap.AdminPermissionsSchema.CLIENTS_RESOURCE_TYPE; -import static org.keycloak.services.resources.admin.permissions.AdminPermissionManagement.TOKEN_EXCHANGE; +import static org.keycloak.services.resources.admin.fgap.AdminPermissionManagement.TOKEN_EXCHANGE; /** * Manages default policies for all users. diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/ClientPermissionsV2.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionsV2.java similarity index 97% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/ClientPermissionsV2.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionsV2.java index 326691206be..8e57521908d 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/ClientPermissionsV2.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionsV2.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import static org.keycloak.authorization.fgap.AdminPermissionsSchema.CLIENTS_RESOURCE_TYPE; @@ -28,7 +28,7 @@ import org.keycloak.models.ClientScopeModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.representations.AccessToken; -import org.keycloak.services.resources.admin.permissions.ModelRecord.ClientModelRecord; +import org.keycloak.services.resources.admin.fgap.ModelRecord.ClientModelRecord; import java.util.Map; import java.util.Set; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/FineGrainedAdminPermissionEvaluator.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/FineGrainedAdminPermissionEvaluator.java similarity index 98% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/FineGrainedAdminPermissionEvaluator.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/FineGrainedAdminPermissionEvaluator.java index 547dc19f87f..51ee4def4e2 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/FineGrainedAdminPermissionEvaluator.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/FineGrainedAdminPermissionEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import java.util.Collection; import java.util.Collections; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissionEvaluator.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionEvaluator.java similarity index 98% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissionEvaluator.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionEvaluator.java index 7daa520f61f..433c17546da 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissionEvaluator.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.models.AdminRoles; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissionManagement.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionManagement.java similarity index 96% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissionManagement.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionManagement.java index 2ec602c54bf..bad7de3648c 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissionManagement.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionManagement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissions.java similarity index 99% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissions.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissions.java index 7b8f670d6da..2f4e0822244 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissions.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissionsV2.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionsV2.java similarity index 97% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissionsV2.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionsV2.java index c659f726236..1b88aa9a556 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissionsV2.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionsV2.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import java.util.Map; import java.util.Set; @@ -26,7 +26,7 @@ import org.keycloak.authorization.model.Resource; import org.keycloak.models.AdminRoles; import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSession; -import org.keycloak.services.resources.admin.permissions.ModelRecord.GroupModelRecord; +import org.keycloak.services.resources.admin.fgap.ModelRecord.GroupModelRecord; class GroupPermissionsV2 extends GroupPermissions { diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/Helper.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/Helper.java similarity index 98% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/Helper.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/Helper.java index 84b5a632fc8..9bf12fdf0a8 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/Helper.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/Helper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/IdentityProviderPermissionManagement.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/IdentityProviderPermissionManagement.java similarity index 96% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/IdentityProviderPermissionManagement.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/IdentityProviderPermissionManagement.java index a5b595dfea2..9afb2dba371 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/IdentityProviderPermissionManagement.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/IdentityProviderPermissionManagement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/IdentityProviderPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/IdentityProviderPermissions.java similarity index 97% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/IdentityProviderPermissions.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/IdentityProviderPermissions.java index b56559b09e8..ae2e25b2168 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/IdentityProviderPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/IdentityProviderPermissions.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.jboss.logging.Logger; import org.keycloak.authorization.AuthorizationProvider; @@ -37,7 +37,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import static org.keycloak.services.resources.admin.permissions.AdminPermissionManagement.TOKEN_EXCHANGE; +import static org.keycloak.services.resources.admin.fgap.AdminPermissionManagement.TOKEN_EXCHANGE; /** * Manages default policies for identity providers. diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/MgmtPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/MgmtPermissions.java similarity index 99% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/MgmtPermissions.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/MgmtPermissions.java index b4c58b858f6..5a6cd59310e 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/MgmtPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/MgmtPermissions.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.Config; import org.keycloak.authorization.AuthorizationProvider; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/MgmtPermissionsV2.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/MgmtPermissionsV2.java similarity index 98% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/MgmtPermissionsV2.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/MgmtPermissionsV2.java index 74589a1b810..4e9fe051c28 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/MgmtPermissionsV2.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/MgmtPermissionsV2.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/ModelRecord.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ModelRecord.java similarity index 97% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/ModelRecord.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/ModelRecord.java index 820408fd65c..43e5c1f520a 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/ModelRecord.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ModelRecord.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.models.ClientModel; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RealmAuth.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmAuth.java similarity index 98% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/RealmAuth.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmAuth.java index fc9a726a3f4..4e84afb2500 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RealmAuth.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmAuth.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.models.AdminRoles; import org.keycloak.models.ClientModel; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RealmPermissionEvaluator.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmPermissionEvaluator.java similarity index 96% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/RealmPermissionEvaluator.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmPermissionEvaluator.java index 909b71cb8bc..2a2ca11ee79 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RealmPermissionEvaluator.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmPermissionEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.authorization.model.ResourceServer; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RealmPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmPermissions.java similarity index 98% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/RealmPermissions.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmPermissions.java index 1c4732a7974..77413f6cf37 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RealmPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmPermissions.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.models.AdminRoles; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RealmPermissionsV2.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmPermissionsV2.java similarity index 96% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/RealmPermissionsV2.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmPermissionsV2.java index 1ebe5e81f21..b3e331df457 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RealmPermissionsV2.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmPermissionsV2.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.models.ClientModel; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RealmsPermissionEvaluator.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmsPermissionEvaluator.java similarity index 94% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/RealmsPermissionEvaluator.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmsPermissionEvaluator.java index 5286d103d1f..8932bbb858e 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RealmsPermissionEvaluator.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmsPermissionEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.models.RealmModel; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RolePermissionEvaluator.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionEvaluator.java similarity index 99% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/RolePermissionEvaluator.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionEvaluator.java index 7730dfb7a74..b110dec6bc8 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RolePermissionEvaluator.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.models.ClientModel; import org.keycloak.models.RoleContainerModel; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RolePermissionManagement.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionManagement.java similarity index 96% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/RolePermissionManagement.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionManagement.java index 977e109d3e4..3ed65655de8 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RolePermissionManagement.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionManagement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RolePermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissions.java similarity index 99% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/RolePermissions.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissions.java index 9d3e1a97688..003be46cd16 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RolePermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissions.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.jboss.logging.Logger; import org.keycloak.Config; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RolePermissionsV2.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionsV2.java similarity index 98% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/RolePermissionsV2.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionsV2.java index 29032ea824a..37181feea2b 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RolePermissionsV2.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionsV2.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import static org.keycloak.authorization.fgap.AdminPermissionsSchema.ROLES_RESOURCE_TYPE; import static org.keycloak.models.utils.KeycloakModelUtils.getMasterRealmAdminManagementClientId; @@ -36,7 +36,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleContainerModel; import org.keycloak.models.RoleModel; -import org.keycloak.services.resources.admin.permissions.ModelRecord.RoleModelRecord; +import org.keycloak.services.resources.admin.fgap.ModelRecord.RoleModelRecord; class RolePermissionsV2 extends RolePermissions { diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissionEvaluator.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionEvaluator.java similarity index 98% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissionEvaluator.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionEvaluator.java index c4b543b8962..dfa6a49fddc 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissionEvaluator.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.models.AdminRoles; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissionManagement.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionManagement.java similarity index 96% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissionManagement.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionManagement.java index 50bbaed2315..49454801d3f 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissionManagement.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionManagement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissions.java similarity index 99% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissions.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissions.java index 610365408ff..23cb734b3cf 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissions.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.common.ClientModelIdentity; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissionsV2.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionsV2.java similarity index 97% rename from services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissionsV2.java rename to services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionsV2.java index 33cd40a6567..549fc4def43 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissionsV2.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionsV2.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.services.resources.admin.permissions; +package org.keycloak.services.resources.admin.fgap; import java.util.List; import java.util.Map; @@ -30,7 +30,7 @@ import org.keycloak.models.AdminRoles; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserModel; -import org.keycloak.services.resources.admin.permissions.ModelRecord.UserModelRecord; +import org.keycloak.services.resources.admin.fgap.ModelRecord.UserModelRecord; class UserPermissionsV2 extends UserPermissions { diff --git a/services/src/main/java/org/keycloak/utils/GroupUtils.java b/services/src/main/java/org/keycloak/utils/GroupUtils.java index eb47d96e48f..0d099679862 100644 --- a/services/src/main/java/org/keycloak/utils/GroupUtils.java +++ b/services/src/main/java/org/keycloak/utils/GroupUtils.java @@ -11,7 +11,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.GroupRepresentation; -import org.keycloak.services.resources.admin.permissions.GroupPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.GroupPermissionEvaluator; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java index 16b7aad3491..cbffcbdbf87 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java @@ -47,11 +47,11 @@ import org.keycloak.representations.idm.authorization.ClientPolicyRepresentation import org.keycloak.representations.idm.authorization.DecisionStrategy; import org.keycloak.representations.idm.authorization.Logic; import org.keycloak.representations.idm.authorization.UserPolicyRepresentation; -import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import org.keycloak.services.resources.admin.permissions.AdminPermissionManagement; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; -import org.keycloak.services.resources.admin.permissions.ClientPermissionManagement; -import org.keycloak.services.resources.admin.permissions.GroupPermissionManagement; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissionManagement; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.ClientPermissionManagement; +import org.keycloak.services.resources.admin.fgap.GroupPermissionManagement; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTokenExchangeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTokenExchangeTest.java index 9665fdaeb1f..978dbbc8817 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTokenExchangeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTokenExchangeTest.java @@ -67,8 +67,8 @@ import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.authorization.ClientPolicyRepresentation; -import org.keycloak.services.resources.admin.permissions.AdminPermissionManagement; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissionManagement; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/SocialLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/SocialLoginTest.java index eaa490cf343..1dc8fb95fab 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/SocialLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/SocialLoginTest.java @@ -27,8 +27,8 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.authorization.ClientPolicyRepresentation; import org.keycloak.representations.idm.authorization.DecisionStrategy; -import org.keycloak.services.resources.admin.permissions.AdminPermissionManagement; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissionManagement; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/ClientTokenExchangeSAML2Test.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/ClientTokenExchangeSAML2Test.java index 1c140659587..2a2130102f6 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/ClientTokenExchangeSAML2Test.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/ClientTokenExchangeSAML2Test.java @@ -52,8 +52,8 @@ import org.keycloak.saml.common.util.DocumentUtil; import org.keycloak.saml.processing.core.parsers.saml.SAMLParser; import org.keycloak.saml.processing.core.saml.v2.util.AssertionUtil; import org.keycloak.saml.processing.core.util.XMLEncryptionUtil; -import org.keycloak.services.resources.admin.permissions.AdminPermissionManagement; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissionManagement; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/TokenExchangeTestUtils.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/TokenExchangeTestUtils.java index 6fda1cd8132..1d2d6bee603 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/TokenExchangeTestUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/TokenExchangeTestUtils.java @@ -37,8 +37,8 @@ import org.keycloak.representations.idm.authorization.ClientPolicyRepresentation import org.keycloak.representations.idm.authorization.DecisionStrategy; import org.keycloak.services.managers.ClientManager; import org.keycloak.services.managers.RealmManager; -import org.keycloak.services.resources.admin.permissions.AdminPermissionManagement; -import org.keycloak.services.resources.admin.permissions.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.AdminPermissionManagement; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.testsuite.util.oauth.OAuthClient; import static org.junit.Assert.assertNotNull;