diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/applications.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/applications.js index 2338abe7f1..fc08bac447 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/applications.js +++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/applications.js @@ -54,7 +54,7 @@ module.controller('ApplicationCredentialsCtrl', function($scope, $location, real } ]; - ApplicationCredentials.update({ realm : realm.id, application : application.id }, creds, + ApplicationCredentials.update({ realm : realm.realm, application : application.id }, creds, function() { Notifications.success('The password has been changed.'); $scope.password = null; @@ -76,7 +76,7 @@ module.controller('ApplicationCredentialsCtrl', function($scope, $location, real } ]; - ApplicationCredentials.update({ realm : realm.id, application : application.id }, creds, + ApplicationCredentials.update({ realm : realm.realm, application : application.id }, creds, function() { Notifications.success('The totp was changed.'); $scope.totp = null; @@ -122,7 +122,7 @@ module.controller('ApplicationRoleDetailCtrl', function($scope, realm, applicati $scope.save = function() { if ($scope.create) { ApplicationRole.save({ - realm: realm.id, + realm: realm.realm, application : application.id }, $scope.role, function (data, headers) { $scope.changed = false; @@ -130,12 +130,12 @@ module.controller('ApplicationRoleDetailCtrl', function($scope, realm, applicati var l = headers().location; var id = l.substring(l.lastIndexOf("/") + 1); - $location.url("/realms/" + realm.id + "/applications/" + application.id + "/roles/" + id); + $location.url("/realms/" + realm.realm + "/applications/" + application.id + "/roles/" + id); Notifications.success("The role has been created."); }); } else { ApplicationRole.update({ - realm : realm.id, + realm : realm.realm, application : application.id, roleId : role.id }, $scope.role, function() { @@ -152,17 +152,17 @@ module.controller('ApplicationRoleDetailCtrl', function($scope, realm, applicati }; $scope.cancel = function() { - $location.url("/realms/" + realm.id + "/applications/" + application.id + "/roles"); + $location.url("/realms/" + realm.realm + "/applications/" + application.id + "/roles"); }; $scope.remove = function() { Dialog.confirmDelete($scope.role.name, 'role', function() { $scope.role.$remove({ - realm : realm.id, + realm : realm.realm, application : application.id, roleId : $scope.role.id }, function() { - $location.url("/realms/" + realm.id + "/applications/" + application.id + "/roles"); + $location.url("/realms/" + realm.realm + "/applications/" + application.id + "/roles"); Notifications.success("The role has been deleted."); }); }); @@ -233,17 +233,17 @@ module.controller('ApplicationDetailCtrl', function($scope, realm, application, $scope.save = function() { if ($scope.create) { Application.save({ - realm: realm.id + realm: realm.realm }, $scope.application, function (data, headers) { $scope.changed = false; var l = headers().location; var id = l.substring(l.lastIndexOf("/") + 1); - $location.url("/realms/" + realm.id + "/applications/" + id); + $location.url("/realms/" + realm.realm + "/applications/" + id); Notifications.success("The application has been created."); }); } else { Application.update({ - realm : realm.id, + realm : realm.realm, id : application.id }, $scope.application, function() { $scope.changed = false; @@ -259,16 +259,16 @@ module.controller('ApplicationDetailCtrl', function($scope, realm, application, }; $scope.cancel = function() { - $location.url("/realms/" + realm.id + "/applications"); + $location.url("/realms/" + realm.realm + "/applications"); }; $scope.remove = function() { Dialog.confirmDelete($scope.application.name, 'application', function() { $scope.application.$remove({ - realm : realm.id, + realm : realm.realm, id : $scope.application.id }, function() { - $location.url("/realms/" + realm.id + "/applications"); + $location.url("/realms/" + realm.realm + "/applications"); Notifications.success("The application has been deleted."); }); }); @@ -292,7 +292,7 @@ module.controller('ApplicationScopeMappingCtrl', function($scope, $http, realm, - $scope.realmMappings = ApplicationRealmScopeMapping.query({realm : realm.id, application : application.id}, function(){ + $scope.realmMappings = ApplicationRealmScopeMapping.query({realm : realm.realm, application : application.id}, function(){ for (var i = 0; i < $scope.realmMappings.length; i++) { var role = $scope.realmMappings[i]; for (var j = 0; j < $scope.realmRoles.length; j++) { @@ -309,7 +309,7 @@ module.controller('ApplicationScopeMappingCtrl', function($scope, $http, realm, }); $scope.addRealmRole = function() { - $http.post('/auth/rest/admin/realms/' + realm.id + '/applications/' + application.id + '/scope-mappings/realm', + $http.post('/auth/rest/admin/realms/' + realm.realm + '/applications/' + application.id + '/scope-mappings/realm', $scope.selectedRealmRoles).success(function() { for (var i = 0; i < $scope.selectedRealmRoles.length; i++) { var role = $scope.selectedRealmRoles[i]; @@ -324,7 +324,7 @@ module.controller('ApplicationScopeMappingCtrl', function($scope, $http, realm, }; $scope.deleteRealmRole = function() { - $http.delete('/auth/rest/admin/realms/' + realm.id + '/applications/' + application.id + '/scope-mappings/realm', + $http.delete('/auth/rest/admin/realms/' + realm.realm + '/applications/' + application.id + '/scope-mappings/realm', {data : $scope.selectedRealmMappings, headers : {"content-type" : "application/json"}}).success(function() { for (var i = 0; i < $scope.selectedRealmMappings.length; i++) { var role = $scope.selectedRealmMappings[i]; @@ -339,7 +339,7 @@ module.controller('ApplicationScopeMappingCtrl', function($scope, $http, realm, }; $scope.addApplicationRole = function() { - $http.post('/auth/rest/admin/realms/' + realm.id + '/applications/' + application.id + '/scope-mappings/applications/' + $scope.targetApp.id, + $http.post('/auth/rest/admin/realms/' + realm.realm + '/applications/' + application.id + '/scope-mappings/applications/' + $scope.targetApp.id, $scope.selectedApplicationRoles).success(function() { for (var i = 0; i < $scope.selectedApplicationRoles.length; i++) { var role = $scope.selectedApplicationRoles[i]; @@ -354,7 +354,7 @@ module.controller('ApplicationScopeMappingCtrl', function($scope, $http, realm, }; $scope.deleteApplicationRole = function() { - $http.delete('/auth/rest/admin/realms/' + realm.id + '/applications/' + application.id + '/scope-mappings/applications/' + $scope.targetApp.id, + $http.delete('/auth/rest/admin/realms/' + realm.realm + '/applications/' + application.id + '/scope-mappings/applications/' + $scope.targetApp.id, {data : $scope.selectedApplicationMappings, headers : {"content-type" : "application/json"}}).success(function() { for (var i = 0; i < $scope.selectedApplicationMappings.length; i++) { var role = $scope.selectedApplicationMappings[i]; @@ -370,8 +370,8 @@ module.controller('ApplicationScopeMappingCtrl', function($scope, $http, realm, $scope.changeApplication = function() { - $scope.applicationRoles = ApplicationRole.query({realm : realm.id, application : $scope.targetApp.id}, function() { - $scope.applicationMappings = ApplicationApplicationScopeMapping.query({realm : realm.id, application : application.id, targetApp : $scope.targetApp.id}, function(){ + $scope.applicationRoles = ApplicationRole.query({realm : realm.realm, application : $scope.targetApp.id}, function() { + $scope.applicationMappings = ApplicationApplicationScopeMapping.query({realm : realm.realm, application : application.id, targetApp : $scope.targetApp.id}, function(){ for (var i = 0; i < $scope.applicationMappings.length; i++) { var role = $scope.applicationMappings[i]; for (var j = 0; j < $scope.applicationRoles.length; j++) { diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/oauth-clients.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/oauth-clients.js index 4c43c66dd8..7443130c0e 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/oauth-clients.js +++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/oauth-clients.js @@ -42,7 +42,7 @@ module.controller('OAuthClientCredentialsCtrl', function($scope, $location, real } ]; - OAuthClientCredentials.update({ realm : realm.id, oauth : oauth.id }, creds, + OAuthClientCredentials.update({ realm : realm.realm, oauth : oauth.id }, creds, function() { Notifications.success('The password has been changed.'); $scope.password = null; @@ -64,7 +64,7 @@ module.controller('OAuthClientCredentialsCtrl', function($scope, $location, real } ]; - OAuthClientCredentials.update({ realm : realm.id, oauth : oauth.id }, creds, + OAuthClientCredentials.update({ realm : realm.realm, oauth : oauth.id }, creds, function() { Notifications.success('The totp was changed.'); $scope.totp = null; @@ -133,17 +133,17 @@ module.controller('OAuthClientDetailCtrl', function($scope, realm, oauth, OAuthC $scope.save = function() { if ($scope.create) { OAuthClient.save({ - realm: realm.id + realm: realm.realm }, $scope.oauth, function (data, headers) { $scope.changed = false; var l = headers().location; var id = l.substring(l.lastIndexOf("/") + 1); - $location.url("/realms/" + realm.id + "/oauth-clients/" + id); + $location.url("/realms/" + realm.realm + "/oauth-clients/" + id); Notifications.success("The oauth client has been created."); }); } else { OAuthClient.update({ - realm : realm.id, + realm : realm.realm, id : oauth.id }, $scope.oauth, function() { $scope.changed = false; @@ -159,16 +159,16 @@ module.controller('OAuthClientDetailCtrl', function($scope, realm, oauth, OAuthC }; $scope.cancel = function() { - $location.url("/realms/" + realm.id + "/oauth-clients"); + $location.url("/realms/" + realm.realm + "/oauth-clients"); }; $scope.remove = function() { Dialog.confirmDelete($scope.oauth.name, 'oauth', function() { $scope.oauth.$remove({ - realm : realm.id, + realm : realm.realm, id : $scope.oauth.id }, function() { - $location.url("/realms/" + realm.id + "/oauth-clients"); + $location.url("/realms/" + realm.realm + "/oauth-clients"); Notifications.success("The oauth client has been deleted."); }); }); @@ -192,7 +192,7 @@ module.controller('OAuthClientScopeMappingCtrl', function($scope, $http, realm, - $scope.realmMappings = OAuthClientRealmScopeMapping.query({realm : realm.id, oauth : oauth.id}, function(){ + $scope.realmMappings = OAuthClientRealmScopeMapping.query({realm : realm.realm, oauth : oauth.id}, function(){ for (var i = 0; i < $scope.realmMappings.length; i++) { var role = $scope.realmMappings[i]; for (var j = 0; j < $scope.realmRoles.length; j++) { @@ -209,7 +209,7 @@ module.controller('OAuthClientScopeMappingCtrl', function($scope, $http, realm, }); $scope.addRealmRole = function() { - $http.post('/auth/rest/admin/realms/' + realm.id + '/oauth-clients/' + oauth.id + '/scope-mappings/realm', + $http.post('/auth/rest/admin/realms/' + realm.realm + '/oauth-clients/' + oauth.id + '/scope-mappings/realm', $scope.selectedRealmRoles).success(function() { for (var i = 0; i < $scope.selectedRealmRoles.length; i++) { var role = $scope.selectedRealmRoles[i]; @@ -224,7 +224,7 @@ module.controller('OAuthClientScopeMappingCtrl', function($scope, $http, realm, }; $scope.deleteRealmRole = function() { - $http.delete('/auth/rest/admin/realms/' + realm.id + '/oauth-clients/' + oauth.id + '/scope-mappings/realm', + $http.delete('/auth/rest/admin/realms/' + realm.realm + '/oauth-clients/' + oauth.id + '/scope-mappings/realm', {data : $scope.selectedRealmMappings, headers : {"content-type" : "application/json"}}).success(function() { for (var i = 0; i < $scope.selectedRealmMappings.length; i++) { var role = $scope.selectedRealmMappings[i]; @@ -239,7 +239,7 @@ module.controller('OAuthClientScopeMappingCtrl', function($scope, $http, realm, }; $scope.addApplicationRole = function() { - $http.post('/auth/rest/admin/realms/' + realm.id + '/oauth-clients/' + oauth.id + '/scope-mappings/applications/' + $scope.targetApp.id, + $http.post('/auth/rest/admin/realms/' + realm.realm + '/oauth-clients/' + oauth.id + '/scope-mappings/applications/' + $scope.targetApp.id, $scope.selectedApplicationRoles).success(function() { for (var i = 0; i < $scope.selectedApplicationRoles.length; i++) { var role = $scope.selectedApplicationRoles[i]; @@ -254,7 +254,7 @@ module.controller('OAuthClientScopeMappingCtrl', function($scope, $http, realm, }; $scope.deleteApplicationRole = function() { - $http.delete('/auth/rest/admin/realms/' + realm.id + '/oauth-clients/' + oauth.id + '/scope-mappings/applications/' + $scope.targetApp.id, + $http.delete('/auth/rest/admin/realms/' + realm.realm + '/oauth-clients/' + oauth.id + '/scope-mappings/applications/' + $scope.targetApp.id, {data : $scope.selectedApplicationMappings, headers : {"content-type" : "application/json"}}).success(function() { for (var i = 0; i < $scope.selectedApplicationMappings.length; i++) { var role = $scope.selectedApplicationMappings[i]; @@ -270,8 +270,8 @@ module.controller('OAuthClientScopeMappingCtrl', function($scope, $http, realm, $scope.changeApplication = function() { - $scope.applicationRoles = ApplicationRole.query({realm : realm.id, application : $scope.targetApp.id}, function() { - $scope.applicationMappings = OAuthClientApplicationScopeMapping.query({realm : realm.id, oauth : oauth.id, targetApp : $scope.targetApp.id}, function(){ + $scope.applicationRoles = ApplicationRole.query({realm : realm.realm, application : $scope.targetApp.id}, function() { + $scope.applicationMappings = OAuthClientApplicationScopeMapping.query({realm : realm.realm, oauth : oauth.id, targetApp : $scope.targetApp.id}, function(){ for (var i = 0; i < $scope.applicationMappings.length; i++) { var role = $scope.applicationMappings[i]; for (var j = 0; j < $scope.applicationRoles.length; j++) { diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js index 72bd806adc..d006c718cc 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js +++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js @@ -24,15 +24,15 @@ module.controller('HomeCtrl', function(Realm, $location) { Realm.query(null, function(realms) { var realm; if (realms.length == 1) { - realm = realms[0].id; + realm = realms[0].realm; } else if (realms.length == 2) { if (realms[0].realm == 'Keycloak Administration') { - realm = realms[1].id; + realm = realms[1].realm; } else if (realms[1].realm == 'Keycloak Administration') { - realm = realms[0].id; + realm = realms[0].realm; } } - + console.log("****** HomeCtrl ******"); if (realm) { $location.url('/realms/' + realm); } else { @@ -50,7 +50,7 @@ module.controller('RealmDropdownCtrl', function($scope, Realm, Current, Auth, $l // Current.realms = Realm.get(); $scope.current = Current; $scope.changeRealm = function() { - $location.url("/realms/" + $scope.current.realm.id); + $location.url("/realms/" + $scope.current.realm.realm); }; $scope.showNav = function() { var show = Current.realms.length > 0; @@ -118,18 +118,16 @@ module.controller('RealmCreateCtrl', function($scope, Current, Realm, $upload, $ $scope.save = function() { var realmCopy = angular.copy($scope.realm); - Realm.save(realmCopy, function(data, headers) { - console.log('creating new realm'); - var l = headers().location; - var id = l.substring(l.lastIndexOf("/") + 1); + console.log('creating new realm **'); + Realm.create(realmCopy, function(data, headers) { var data = Realm.query(function() { Current.realms = data; for (var i = 0; i < Current.realms.length; i++) { - if (Current.realms[i].id == id) { + if (Current.realms[i].realm == realmCopy.realm) { Current.realm = Current.realms[i]; } } - $location.url("/realms/" + id); + $location.url("/realms/" + realmCopy.realm); Notifications.success("The realm has been created."); }); }); @@ -143,7 +141,7 @@ module.controller('RealmCreateCtrl', function($scope, Current, Realm, $upload, $ module.controller('RealmDetailCtrl', function($scope, Current, Realm, realm, $http, $location, Dialog, Notifications) { - $scope.createRealm = !realm.id; + $scope.createRealm = !realm.realm; console.log('RealmDetailCtrl'); @@ -154,19 +152,28 @@ module.controller('RealmDetailCtrl', function($scope, Current, Realm, realm, $ht cookieLoginAllowed: true }; } else { - if (Current.realm == null || Current.realm.id != realm.id) { + if (Current.realm == null || Current.realm.realm != realm.realm) { for (var i = 0; i < Current.realms.length; i++) { - if (realm.id == Current.realms[i].id) { + if (realm.realm == Current.realms[i].realm) { Current.realm = Current.realms[i]; break; } } } - if (Current.realm == null || Current.realm.id != realm.id) { + console.log('realm name: ' + realm.realm); + for (var i = 0; i < Current.realms.length; i++) { + console.log('checking Current.realm:' + Current.realms[i].realm); + if (Current.realms[i].realm == realm.realm) { + Current.realm = Current.realms[i]; + } + } + /* + if (Current.realm == null || Current.realm.realm != realm.realm) { console.log('should be unreachable'); console.log('Why? ' + Current.realms.length + ' ' + Current.realm); return; } + */ $scope.realm = angular.copy(realm); $scope.realm.requireSsl = !realm.sslNotRequired; } @@ -193,16 +200,14 @@ module.controller('RealmDetailCtrl', function($scope, Current, Realm, realm, $ht if ($scope.createRealm) { Realm.save(realmCopy, function(data, headers) { console.log('creating new realm'); - var l = headers().location; - var id = l.substring(l.lastIndexOf("/") + 1); var data = Realm.query(function() { Current.realms = data; for (var i = 0; i < Current.realms.length; i++) { - if (Current.realms[i].id == id) { + if (Current.realms[i].realm == realmCopy.realm) { Current.realm = Current.realms[i]; } } - $location.url("/realms/" + id); + $location.url("/realms/" + realmCopy.realm); Notifications.success("The realm has been created."); $scope.social = $scope.realm.social; $scope.registrationAllowed = $scope.realm.registrationAllowed; @@ -211,18 +216,18 @@ module.controller('RealmDetailCtrl', function($scope, Current, Realm, realm, $ht } else { console.log('updating realm...'); $scope.changed = false; - Realm.update(realmCopy, function () { - var id = realmCopy.id; + console.log('oldCopy.realm - ' + oldCopy.realm); + Realm.update({ id : oldCopy.realm}, realmCopy, function () { var data = Realm.query(function () { Current.realms = data; for (var i = 0; i < Current.realms.length; i++) { - if (Current.realms[i].id == id) { + if (Current.realms[i].realm == realmCopy.realm) { Current.realm = Current.realms[i]; oldCopy = angular.copy($scope.realm); } } }); - $location.url("/realms/" + id); + $location.url("/realms/" + realmCopy.realm); Notifications.success("Your changes have been saved to the realm."); $scope.social = $scope.realm.social; $scope.registrationAllowed = $scope.realm.registrationAllowed; @@ -242,7 +247,7 @@ module.controller('RealmDetailCtrl', function($scope, Current, Realm, realm, $ht $scope.remove = function() { Dialog.confirmDelete($scope.realm.realm, 'realm', function() { - Realm.remove({ id : $scope.realm.id }, function() { + Realm.remove({ id : $scope.realm.realm }, function() { Current.realms = Realm.query(); Notifications.success("The realm has been deleted."); $location.url("/"); @@ -255,7 +260,7 @@ module.controller('RealmRequiredCredentialsCtrl', function($scope, Realm, realm, console.log('RealmRequiredCredentialsCtrl'); $scope.realm = { - id : realm.id, realm : realm.realm, social : realm.social, + id : realm.realm, realm : realm.realm, social : realm.social, requiredCredentials : realm.requiredCredentials, requiredApplicationCredentials : realm.requiredApplicationCredentials, requiredOAuthClientCredentials : realm.requiredOAuthClientCredentials, @@ -406,7 +411,7 @@ module.controller('RealmRequiredCredentialsCtrl', function($scope, Realm, realm, $scope.changed = false; Realm.update($scope.realm, function () { - $location.url("/realms/" + realm.id + "/required-credentials"); + $location.url("/realms/" + realm.realm + "/required-credentials"); Notifications.success("Your changes have been saved to the realm."); oldCopy = angular.copy($scope.realm); }); @@ -498,7 +503,7 @@ module.controller('RealmRegistrationCtrl', function ($scope, Realm, realm, appli $scope.selectedAppDefRoles = []; // Populate available roles for selected application - var appDefaultRoles = ApplicationRole.query({realm: $scope.realm.id, application: $scope.application.id}, function () { + var appDefaultRoles = ApplicationRole.query({realm: $scope.realm.realm, application: $scope.application.id}, function () { if (!$scope.application.hasOwnProperty('defaultRoles') || $scope.application.defaultRoles === null) { $scope.application.defaultRoles = []; @@ -535,7 +540,7 @@ module.controller('RealmRegistrationCtrl', function ($scope, Realm, realm, appli // Update/save the selected application with new default roles. Application.update({ - realm: $scope.realm.id, + realm: $scope.realm.realm, id: $scope.application.id }, $scope.application, function () { Notifications.success("Your changes have been saved to the application."); @@ -559,7 +564,7 @@ module.controller('RealmRegistrationCtrl', function ($scope, Realm, realm, appli // Update/save the selected application with new default roles. Application.update({ - realm: $scope.realm.id, + realm: $scope.realm.realm, id: $scope.application.id }, $scope.application, function () { Notifications.success("Your changes have been saved to the application."); @@ -672,7 +677,7 @@ module.controller('RealmSocialCtrl', function($scope, realm, Realm, $location, N realmCopy.social = true; $scope.changed = false; Realm.update(realmCopy, function () { - $location.url("/realms/" + realm.id + "/social-settings"); + $location.url("/realms/" + realm.realm + "/social-settings"); Notifications.success("Saved changes to realm"); oldCopy = realmCopy; }); @@ -741,7 +746,7 @@ module.controller('RealmTokenDetailCtrl', function($scope, Realm, realm, $http, $scope.changed = false; Realm.update(realmCopy, function () { - $location.url("/realms/" + realm.id + "/token-settings"); + $location.url("/realms/" + realm.realm + "/token-settings"); Notifications.success("Your changes have been saved to the realm."); }); }; @@ -757,9 +762,9 @@ module.controller('RealmKeysDetailCtrl', function($scope, Realm, realm, $http, $ $scope.generate = function() { Dialog.confirmGenerateKeys($scope.realm.realm, 'realm', function() { - Realm.update({ id: realm.id, publicKey : 'GENERATE' }, function () { + Realm.update({ id: realm.realm, publicKey : 'GENERATE' }, function () { Notifications.success('New keys generated for realm.'); - Realm.get({ id : realm.id }, function(updated) { + Realm.get({ id : realm.realm }, function(updated) { $scope.realm = updated; }) }); @@ -801,19 +806,19 @@ module.controller('RoleDetailCtrl', function($scope, realm, role, Role, $locatio $scope.save = function() { if ($scope.create) { Role.save({ - realm: realm.id + realm: realm.realm }, $scope.role, function (data, headers) { $scope.changed = false; role = angular.copy($scope.role); var l = headers().location; var id = l.substring(l.lastIndexOf("/") + 1); - $location.url("/realms/" + realm.id + "/roles/" + id); + $location.url("/realms/" + realm.realm + "/roles/" + id); Notifications.success("The role has been created."); }); } else { Role.update({ - realm : realm.id, + realm : realm.realm, roleId : role.id }, $scope.role, function() { $scope.changed = false; @@ -829,16 +834,16 @@ module.controller('RoleDetailCtrl', function($scope, realm, role, Role, $locatio }; $scope.cancel = function() { - $location.url("/realms/" + realm.id + "/roles"); + $location.url("/realms/" + realm.realm + "/roles"); }; $scope.remove = function() { Dialog.confirmDelete($scope.role.name, 'role', function() { $scope.role.$remove({ - realm : realm.id, + realm : realm.realm, roleId : $scope.role.id }, function() { - $location.url("/realms/" + realm.id + "/roles"); + $location.url("/realms/" + realm.realm + "/roles"); Notifications.success("The role has been deleted."); }); }); @@ -869,7 +874,7 @@ module.controller('RealmSMTPSettingsCtrl', function($scope, Current, Realm, real realmCopy['smtpServer'] = detypeObject(realmCopy.smtpServer); $scope.changed = false; Realm.update(realmCopy, function () { - $location.url("/realms/" + realm.id + "/smtp-settings"); + $location.url("/realms/" + realm.realm + "/smtp-settings"); Notifications.success("Your changes have been saved to the realm."); }); }; diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/users.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/users.js index 6eb69860bb..cf73bf9473 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/users.js +++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/users.js @@ -13,7 +13,7 @@ module.controller('UserRoleMappingCtrl', function($scope, $http, realm, user, ro - $scope.realmMappings = RealmRoleMapping.query({realm : realm.id, userId : user.username}, function(){ + $scope.realmMappings = RealmRoleMapping.query({realm : realm.realm, userId : user.username}, function(){ for (var i = 0; i < $scope.realmMappings.length; i++) { var role = $scope.realmMappings[i]; for (var j = 0; j < $scope.realmRoles.length; j++) { @@ -30,7 +30,7 @@ module.controller('UserRoleMappingCtrl', function($scope, $http, realm, user, ro }); $scope.addRealmRole = function() { - $http.post('/auth/rest/admin/realms/' + realm.id + '/users/' + user.username + '/role-mappings/realm', + $http.post('/auth/rest/admin/realms/' + realm.realm + '/users/' + user.username + '/role-mappings/realm', $scope.selectedRealmRoles).success(function() { for (var i = 0; i < $scope.selectedRealmRoles.length; i++) { var role = $scope.selectedRealmRoles[i]; @@ -45,7 +45,7 @@ module.controller('UserRoleMappingCtrl', function($scope, $http, realm, user, ro }; $scope.deleteRealmRole = function() { - $http.delete('/auth/rest/admin/realms/' + realm.id + '/users/' + user.username + '/role-mappings/realm', + $http.delete('/auth/rest/admin/realms/' + realm.realm + '/users/' + user.username + '/role-mappings/realm', {data : $scope.selectedRealmMappings, headers : {"content-type" : "application/json"}}).success(function() { for (var i = 0; i < $scope.selectedRealmMappings.length; i++) { var role = $scope.selectedRealmMappings[i]; @@ -60,7 +60,7 @@ module.controller('UserRoleMappingCtrl', function($scope, $http, realm, user, ro }; $scope.addApplicationRole = function() { - $http.post('/auth/rest/admin/realms/' + realm.id + '/users/' + user.username + '/role-mappings/applications/' + $scope.application.id, + $http.post('/auth/rest/admin/realms/' + realm.realm + '/users/' + user.username + '/role-mappings/applications/' + $scope.application.id, $scope.selectedApplicationRoles).success(function() { for (var i = 0; i < $scope.selectedApplicationRoles.length; i++) { var role = $scope.selectedApplicationRoles[i]; @@ -75,7 +75,7 @@ module.controller('UserRoleMappingCtrl', function($scope, $http, realm, user, ro }; $scope.deleteApplicationRole = function() { - $http.delete('/auth/rest/admin/realms/' + realm.id + '/users/' + user.username + '/role-mappings/applications/' + $scope.application.id, + $http.delete('/auth/rest/admin/realms/' + realm.realm + '/users/' + user.username + '/role-mappings/applications/' + $scope.application.id, {data : $scope.selectedApplicationMappings, headers : {"content-type" : "application/json"}}).success(function() { for (var i = 0; i < $scope.selectedApplicationMappings.length; i++) { var role = $scope.selectedApplicationMappings[i]; @@ -91,8 +91,8 @@ module.controller('UserRoleMappingCtrl', function($scope, $http, realm, user, ro $scope.changeApplication = function() { - $scope.applicationRoles = ApplicationRole.query({realm : realm.id, userId : user.username, application : $scope.application.id}, function() { - $scope.applicationMappings = ApplicationRoleMapping.query({realm : realm.id, userId : user.username, application : $scope.application.id}, function(){ + $scope.applicationRoles = ApplicationRole.query({realm : realm.realm, userId : user.username, application : $scope.application.id}, function() { + $scope.applicationMappings = ApplicationRoleMapping.query({realm : realm.realm, userId : user.username, application : $scope.application.id}, function(){ for (var i = 0; i < $scope.applicationMappings.length; i++) { var role = $scope.applicationMappings[i]; for (var j = 0; j < $scope.applicationRoles.length; j++) { @@ -122,7 +122,7 @@ module.controller('UserListCtrl', function($scope, realm, User) { $scope.searchLoaded = false; $scope.currentSearch = $scope.search; - var params = { realm: realm.id }; + var params = { realm: realm.realm }; if ($scope.search) { params.search = $scope.search; } @@ -185,17 +185,17 @@ module.controller('UserDetailCtrl', function($scope, realm, user, User, $locatio $scope.save = function() { if ($scope.create) { User.save({ - realm: realm.id + realm: realm.realm }, $scope.user, function () { $scope.changed = false; user = angular.copy($scope.user); - $location.url("/realms/" + realm.id + "/users/" + $scope.user.username); + $location.url("/realms/" + realm.realm + "/users/" + $scope.user.username); Notifications.success("The user has been created."); }); } else { User.update({ - realm: realm.id, + realm: realm.realm, userId: $scope.user.username }, $scope.user, function () { $scope.changed = false; @@ -211,16 +211,16 @@ module.controller('UserDetailCtrl', function($scope, realm, user, User, $locatio }; $scope.cancel = function() { - $location.url("/realms/" + realm.id + "/users"); + $location.url("/realms/" + realm.realm + "/users"); }; $scope.remove = function() { Dialog.confirmDelete($scope.user.username, 'user', function() { $scope.user.$remove({ - realm : realm.id, + realm : realm.realm, userId : $scope.user.username }, function() { - $location.url("/realms/" + realm.id + "/users"); + $location.url("/realms/" + realm.realm + "/users"); Notifications.success("The user has been deleted."); }); }); @@ -259,7 +259,7 @@ module.controller('UserCredentialsCtrl', function($scope, realm, user, User, Use var credentials = [ { type : "password", value : $scope.password } ]; User.update({ - realm: realm.id, + realm: realm.realm, userId: $scope.user.username }, $scope.user, function () { @@ -267,7 +267,7 @@ module.controller('UserCredentialsCtrl', function($scope, realm, user, User, Use if ($scope.pwdChange){ UserCredentials.update({ - realm: realm.id, + realm: realm.realm, userId: $scope.user.username }, credentials, function () { Notifications.success("The password has been reset. The user is required to change his password on" + @@ -326,7 +326,7 @@ module.controller('UserCredentialsCtrl', function($scope, realm, user, User, Use module.controller('RoleMappingCtrl', function($scope, realm, User, users, role, RoleMapping, Notifications) { $scope.realm = realm; - $scope.realmId = realm.realm || realm.id; + $scope.realmId = realm.realm || realm.realm; $scope.allUsers = User.query({ realm : $scope.realmId }); $scope.users = users; $scope.role = role; diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js index 5f1b3d88e6..1b661f8d88 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js +++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js @@ -107,12 +107,17 @@ module.factory('Notifications', function($rootScope, $timeout) { module.factory('Realm', function($resource) { return $resource('/auth/rest/admin/realms/:id', { - id : '@id' + id : '@realm' }, { update : { method : 'PUT' - } - }); + }, + create : { + method : 'POST', + params : { id : ''} + } + + }); }); module.factory('User', function($resource) { @@ -120,9 +125,9 @@ module.factory('User', function($resource) { realm : '@realm', userId : '@userId' }, { - update : { - method : 'PUT' - } + update : { + method : 'PUT' + } }); }); @@ -321,7 +326,7 @@ module.factory('Current', function(Realm, $route) { current.realms = Realm.query(null, function(realms) { if ($route.current.params.realm) { for (var i = 0; i < realms.length; i++) { - if (realms[i].id == $route.current.params.realm) { + if (realms[i].realm == $route.current.params.realm) { current.realm = realms[i]; } } diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-credentials.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-credentials.html index b39ece6cae..94e5145e16 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-credentials.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-credentials.html @@ -4,19 +4,19 @@
    -
  1. {{realm.realm}}
    2. -
  2. Applications
    3. -
  3. {{application.name}}
    4. +
  4. {{realm.realm}}
    5. +
  5. Applications
    6. +
  6. {{application.name}}
  7. Credentials

{{application.name}} Credentials

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-detail.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-detail.html index f966317317..9c83a6deb2 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-detail.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-detail.html @@ -4,12 +4,12 @@
@@ -19,16 +19,16 @@
    -
  1. {{realm.realm}}
    2. -
  2. Applications
    3. +
  3. {{realm.realm}}
    4. +
  4. Applications
  5. Add Application

{{realm.realm}} Add Application

* Required fields

    -
  1. {{realm.realm}}
    2. -
  2. Applications
    3. -
  3. {{application.name}}
    4. +
  4. {{realm.realm}}
    5. +
  5. Applications
    6. +
  6. {{application.name}}
  7. Settings

{{application.name}} Settings

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-installation.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-installation.html index 89c1e75b6b..773d034748 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-installation.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-installation.html @@ -4,12 +4,12 @@
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-list.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-list.html index a3b193671a..b68312190c 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-list.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-list.html @@ -9,12 +9,12 @@
    -
  1. {{realm.realm}}
    2. +
  2. {{realm.realm}}
  3. Applications

{{realm.realm}} Applications

@@ -29,7 +29,7 @@
- Add Application + Add Application
@@ -53,7 +53,7 @@ - + diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-detail.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-detail.html index fe77951ae8..c5ddb25a20 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-detail.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-detail.html @@ -4,30 +4,30 @@
    -
  1. {{realm.realm}}
    2. -
  2. Applications
    3. -
  3. {{application.name}}
    4. -
  4. Roles
    5. +
  5. {{realm.realm}}
    6. +
  6. Applications
    7. +
  7. {{application.name}}
    8. +
  8. Roles
  9. Add role

{{application.name}} Add Role

* Required fields

    -
  1. {{realm.realm}}
    2. -
  2. Applications
    3. -
  3. {{application.name}}
    4. -
  4. Roles
    5. +
  5. {{realm.realm}}
    6. +
  6. Applications
    7. +
  7. {{application.name}}
    8. +
  8. Roles
  9. {{role.name}}
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-list.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-list.html index f747dbdfed..b497e24182 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-list.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-list.html @@ -4,24 +4,24 @@
    -
  1. {{realm.realm}}
    2. -
  2. Applications
    3. -
  3. {{application.name}}
    4. +
  4. {{realm.realm}}
    5. +
  5. Applications
    6. +
  6. {{application.name}}
  7. Roles

{{application.name}} Roles

{{app.name}}{{app.name}} {{app.enabled}} {{app.baseUrl || "Not defined"}}
@@ -29,7 +29,7 @@ @@ -64,7 +64,7 @@ - + diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-scope-mappings.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-scope-mappings.html index cade20d363..2e9b94a3cd 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-scope-mappings.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-scope-mappings.html @@ -4,19 +4,19 @@
    -
  1. {{realm.realm}}
    2. -
  2. Applications
    3. -
  3. {{application.name}}
    4. +
  4. {{realm.realm}}
    5. +
  5. Applications
    6. +
  6. {{application.name}}
  7. Scope

{{application.name}} Scope Mappings

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-sessions.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-sessions.html index d39a60b132..1c5aa76f10 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-sessions.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-sessions.html @@ -4,19 +4,19 @@
    -
  1. {{realm.realm}}
    2. -
  2. Applications
    3. -
  3. {{application.name}}
    4. +
  4. {{realm.realm}}
    5. +
  5. Applications
    6. +
  6. {{application.name}}
  7. Sessions

{{application.name}} Sessions (Placeholder Page)

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-credentials.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-credentials.html index 2605f53bca..8ce6073082 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-credentials.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-credentials.html @@ -4,17 +4,17 @@
    -
  1. {{realm.realm}}
    2. -
  2. OAuth Clients
    3. -
  3. {{oauth.name}}
    4. +
  4. {{realm.realm}}
    5. +
  5. OAuth Clients
    6. +
  6. {{oauth.name}}
  7. Credentials

{{oauth.name}} Credentials

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-detail.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-detail.html index 5f3ac726b2..528bf6e962 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-detail.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-detail.html @@ -4,10 +4,10 @@
@@ -17,16 +17,16 @@
    -
  1. {{realm.realm}}
    2. -
  2. OAuth Clients
    3. +
  3. {{realm.realm}}
    4. +
  4. OAuth Clients
  5. Add OAuth Client

{{realm.realm}} Add OAuth Client

* Required fields

    -
  1. {{realm.realm}}
    2. -
  2. OAuth Clients
    3. -
  3. {{oauth.name}}
    4. +
  4. {{realm.realm}}
    5. +
  5. OAuth Clients
    6. +
  6. {{oauth.name}}
  7. Settings

{{oauth.name}} Settings

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-installation.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-installation.html index 94708a9196..07a0c80509 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-installation.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-installation.html @@ -4,10 +4,10 @@
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-list.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-list.html index edd2ce51ba..6613d1bb24 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-list.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-list.html @@ -9,12 +9,12 @@
    -
  1. {{realm.realm}}
    2. +
  2. {{realm.realm}}
  3. OAuth Clients

{{realm.realm}} OAuth Clients

- Add Role + Add Role
{{role.name}}{{role.name}} {{role.description}}
@@ -29,7 +29,7 @@
- Add OAuth Client + Add OAuth Client
@@ -52,7 +52,7 @@ - + diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-scope-mappings.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-scope-mappings.html index 0d8e856e4f..38606b5308 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-scope-mappings.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-scope-mappings.html @@ -4,17 +4,17 @@
    -
  1. {{realm.realm}}
    2. -
  2. OAuth Clients
    3. -
  3. {{oauth.name}}
    4. +
  4. {{realm.realm}}
    5. +
  5. OAuth Clients
    6. +
  6. {{oauth.name}}
  7. Scope

{{oauth.name}} Scope Mappings

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-credentials.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-credentials.html index 9ddead0e93..9d0e0f68cf 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-credentials.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-credentials.html @@ -4,20 +4,20 @@
    -
  1. {{realm.realm}}
    2. -
  2. Settings
    3. +
  3. {{realm.realm}}
    4. +
  4. Settings
  5. Required Credentials

{{realm.realm}} Credentials

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-detail.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-detail.html index db6c93d875..a3ef383b1f 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-detail.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-detail.html @@ -4,20 +4,20 @@
    -
  1. {{realm.realm}}
    2. -
  2. Settings
    3. +
  3. {{realm.realm}}
    4. +
  4. Settings
  5. General

Add Realm

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-keys.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-keys.html index b783bfa1b6..f60f38b993 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-keys.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-keys.html @@ -4,20 +4,20 @@
    -
  1. {{realm.realm}}
    2. -
  2. Settings
    3. +
  3. {{realm.realm}}
    4. +
  4. Settings
  5. Keys

{{realm.realm}} Keys

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-list.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-list.html index decb41892e..969046206b 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-list.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-list.html @@ -24,7 +24,7 @@
- +
{{client.name}}{{client.name}} {{client.enabled}}
{{r.realm}}{{r.realm}}
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-menu.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-menu.html index ca77bd6a74..679e2b9c9e 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-menu.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-menu.html @@ -1,10 +1,10 @@ diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-registration.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-registration.html index a84658a031..867305f2b4 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-registration.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-registration.html @@ -4,20 +4,20 @@
    -
  1. {{realm.realm}}
    2. -
  2. Settings
    3. +
  3. {{realm.realm}}
    4. +
  4. Settings
  5. Registration

{{realm.realm}} Registration Settings

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-smtp.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-smtp.html index f43386f608..f731d19c06 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-smtp.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-smtp.html @@ -4,20 +4,20 @@
    -
  1. {{realm.realm}}
    2. -
  2. Settings
    3. +
  3. {{realm.realm}}
    4. +
  4. Settings
  5. SMTP Configuration

{{realm.realm}} SMTP Settings

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-social.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-social.html index dbdeb24e75..723d5fc18a 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-social.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-social.html @@ -4,20 +4,20 @@
    -
  1. {{realm.realm}}
    2. -
  2. Settings
    3. +
  3. {{realm.realm}}
    4. +
  4. Settings
  5. Social

{{realm.realm}} Social Providers Settings

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-tokens.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-tokens.html index 57a15d0212..7c77f6adb3 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-tokens.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-tokens.html @@ -4,20 +4,20 @@
    -
  1. {{realm.realm}}
    2. -
  2. Settings
    3. +
  3. {{realm.realm}}
    4. +
  4. Settings
  5. Token

{{realm.realm}} Token Settings

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-detail.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-detail.html index 76e602bf0f..6fd412b257 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-detail.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-detail.html @@ -4,28 +4,28 @@
    -
  1. {{realm.realm}}
    2. -
  2. Settings
    3. -
  3. Roles
    4. +
  4. {{realm.realm}}
    5. +
  5. Settings
    6. +
  6. Roles
  7. {{role.name}}

{{realm.realm}} {{role.name}}

    -
  1. {{realm.realm}}
    2. -
  2. Settings
    3. -
  3. Roles
    4. +
  4. {{realm.realm}}
    5. +
  5. Settings
    6. +
  6. Roles
  7. Add Role

{{realm.realm}} Add Role

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-list.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-list.html index 507084d67e..ae3092d890 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-list.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-list.html @@ -4,32 +4,32 @@
    -
  1. {{realm.realm}}
    2. -
  2. Settings
    3. +
  3. {{realm.realm}}
    4. +
  4. Settings
  5. Roles

{{realm.realm}} Roles

@@ -64,7 +64,7 @@ - + diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-mappings.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-mappings.html index 78e055dee9..ea2b9506dc 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-mappings.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-mappings.html @@ -4,16 +4,16 @@
    -
  1. {{realm.realm}}
    2. -
  2. Users
    3. -
  3. {{user.username}}
    4. +
  4. {{realm.realm}}
    5. +
  5. Users
    6. +
  6. {{user.username}}
  7. Role Mappings

{{user.username}}'s Role Mappings

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-credentials.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-credentials.html index 8f3de02d44..5f67c0ea89 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-credentials.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-credentials.html @@ -4,14 +4,14 @@
    -
  1. {{realm.realm}}
    2. +
  2. {{realm.realm}}
  3. Users

{{user.username}}'s Credentials

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-detail.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-detail.html index fa1683b6d6..95b099ea68 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-detail.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-detail.html @@ -9,24 +9,24 @@
    -
  1. {{realm.realm}}
    2. -
  2. Users
    3. +
  3. {{realm.realm}}
    4. +
  4. Users
  5. Add

Add User

* Required fields

    -
  1. {{realm.realm}}
    2. -
  2. Users
    3. -
  3. {{user.username}}
    4. +
  4. {{realm.realm}}
    5. +
  5. Users
    6. +
  6. {{user.username}}
  7. Attributes

{{user.username}}'s Attributes

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-list.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-list.html index 5bf71efc15..ac727d8217 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-list.html +++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-list.html @@ -9,7 +9,7 @@
    -
  1. {{realm.realm}}
    2. +
  2. {{realm.realm}}
  3. Users

{{realm.realm}} Users

@@ -29,7 +29,7 @@
or
- Add User + Add User
@@ -57,7 +57,7 @@ -->
- + diff --git a/core/src/main/java/org/keycloak/adapters/AdapterAdminResourceConstants.java b/core/src/main/java/org/keycloak/adapters/AdapterAdminResourceConstants.java deleted file mode 100755 index 7c0bb8774b..0000000000 --- a/core/src/main/java/org/keycloak/adapters/AdapterAdminResourceConstants.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.keycloak.adapters; - -/** - * @author Bill Burke - * @version $Revision: 1 $ - */ -public interface AdapterAdminResourceConstants { - public static final String LOGOUT = "k_logout"; -} diff --git a/core/src/main/java/org/keycloak/adapters/AdapterConstants.java b/core/src/main/java/org/keycloak/adapters/AdapterConstants.java new file mode 100755 index 0000000000..7ad2d85631 --- /dev/null +++ b/core/src/main/java/org/keycloak/adapters/AdapterConstants.java @@ -0,0 +1,12 @@ +package org.keycloak.adapters; + +/** + * @author Bill Burke + * @version $Revision: 1 $ + */ +public interface AdapterConstants { + + // URL endpoints + public static final String K_LOGOUT = "k_logout"; + public static final String K_QUERY_BEARER_TOKEN = "k_query_bearer_token"; +} diff --git a/docbook/reference/en/en-US/modules/adapter-config.xml b/docbook/reference/en/en-US/modules/adapter-config.xml index 8f4ed9c28c..32ae3894d3 100755 --- a/docbook/reference/en/en-US/modules/adapter-config.xml +++ b/docbook/reference/en/en-US/modules/adapter-config.xml @@ -174,7 +174,7 @@ Iftrue, an authenticated browser client (via a Javascript HTTP invocation) - can obtain the signed access token via the URLroot/K_QUERY_BEARER_TOKEN. + can obtain the signed access token via the URLroot/k_query_bearer_token. This isOPTIONAL. The default value isfalse. diff --git a/examples/as7-eap-demo/customer-app/src/main/webapp/customers/cors-test.html b/examples/as7-eap-demo/customer-app/src/main/webapp/customers/cors-test.html index 254b2aeec5..bc5456cceb 100755 --- a/examples/as7-eap-demo/customer-app/src/main/webapp/customers/cors-test.html +++ b/examples/as7-eap-demo/customer-app/src/main/webapp/customers/cors-test.html @@ -6,7 +6,7 @@
- Add Role + Add Role
{{role.name}}{{role.name}} {{role.description}}
{{user.username}}{{user.username}} {{user.lastName}} {{user.firstName}} {{user.email}}