From 4952849526df5a42aaf4cef436f3485cfe5a72ef Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Thu, 25 Jul 2013 12:40:26 +0100 Subject: [PATCH] Updatd realm and application forms --- .../java/org/keycloak/ui/example/Admin.java | 56 +- .../org/keycloak/ui/example/Application.java | 80 ++- .../java/org/keycloak/ui/example/Realm.java | 81 ++- .../META-INF/resources/ui/index.html | 4 +- .../resources/META-INF/resources/ui/js/app.js | 81 ++- .../META-INF/resources/ui/js/controllers.js | 549 ++++++++++-------- .../META-INF/resources/ui/js/services.js | 74 ++- .../ui/partials/application-detail.html | 138 ++--- .../ui/partials/application-list.html | 4 +- .../ui/partials/application-menu.html | 4 +- .../resources/ui/partials/realm-detail.html | 78 ++- .../resources/ui/partials/realm-list.html | 4 +- .../resources/ui/partials/realm-menu.html | 10 +- 13 files changed, 665 insertions(+), 498 deletions(-) diff --git a/ui/src/main/java/org/keycloak/ui/example/Admin.java b/ui/src/main/java/org/keycloak/ui/example/Admin.java index ce064bb078..2a70f7807e 100644 --- a/ui/src/main/java/org/keycloak/ui/example/Admin.java +++ b/ui/src/main/java/org/keycloak/ui/example/Admin.java @@ -24,27 +24,27 @@ import javax.ws.rs.core.Response; @Path("") public class Admin extends javax.ws.rs.core.Application { - private static Map realms = new HashMap(); - private static Map applications = new HashMap(); + private static Map realms = new HashMap(); + @DELETE - @Path("/applications/{key}") - public void delete(@PathParam("key") String applicationKey) { - applications.remove(applicationKey); + @Path("/applications/{id}") + public void delete(@PathParam("id") String id) { + applications.remove(id); } @DELETE - @Path("/realms/{key}") - public void deleteRealm(@PathParam("key") String key) { - realms.remove(key); + @Path("/realms/{id}") + public void deleteRealm(@PathParam("id") String id) { + realms.remove(id); } @GET - @Path("/applications/{key}") + @Path("/applications/{id}") @Produces(MediaType.APPLICATION_JSON) - public Application getApplication(@PathParam("key") String applicationKey) { - return applications.get(applicationKey); + public Application getApplication(@PathParam("id") String id) { + return applications.get(id); } @GET @@ -55,10 +55,10 @@ public class Admin extends javax.ws.rs.core.Application { } @GET - @Path("/realms/{key}") + @Path("/realms/{id}") @Produces(MediaType.APPLICATION_JSON) - public Realm getRealm(@PathParam("key") String key) { - return realms.get(key); + public Realm getRealm(@PathParam("id") String id) { + return realms.get(id); } @@ -73,33 +73,33 @@ public class Admin extends javax.ws.rs.core.Application { @Path("/applications") @Consumes(MediaType.APPLICATION_JSON) public Response save(Application application) { - String key = UUID.randomUUID().toString(); - application.setKey(key); - applications.put(key, application); - return Response.created(URI.create("/applications/" + application.getKey())).build(); + String id = UUID.randomUUID().toString(); + application.setId(id); + applications.put(id, application); + return Response.created(URI.create("/applications/" + id)).build(); } @POST @Path("/realms") @Consumes(MediaType.APPLICATION_JSON) public Response save(Realm realm) { - String key = UUID.randomUUID().toString(); - realm.setKey(key); - realms.put(key, realm); - return Response.created(URI.create("/realms/" + realm.getKey())).build(); + String id = UUID.randomUUID().toString(); + realm.setId(id); + realms.put(id, realm); + return Response.created(URI.create("/realms/" + id)).build(); } @PUT - @Path("/applications/{key}") + @Path("/applications/{id}") @Consumes(MediaType.APPLICATION_JSON) - public void save(@PathParam("key") String applicationKey, Application application) { - applications.put(applicationKey, application); + public void save(@PathParam("id") String id, Application application) { + applications.put(id, application); } @PUT - @Path("/realms/{key}") + @Path("/realms/{id}") @Consumes(MediaType.APPLICATION_JSON) - public void save(@PathParam("key") String key, Realm realm) { - realms.put(key, realm); + public void save(@PathParam("id") String id, Realm realm) { + realms.put(id, realm); } } \ No newline at end of file diff --git a/ui/src/main/java/org/keycloak/ui/example/Application.java b/ui/src/main/java/org/keycloak/ui/example/Application.java index c110036a0c..c977223f54 100644 --- a/ui/src/main/java/org/keycloak/ui/example/Application.java +++ b/ui/src/main/java/org/keycloak/ui/example/Application.java @@ -21,8 +21,6 @@ */ package org.keycloak.ui.example; -import java.util.List; - import javax.xml.bind.annotation.XmlRootElement; /** @@ -31,84 +29,74 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement public class Application { - private String callbackUrl; + private String[] callbackUrl; - private String key; + private boolean enabled; + + private String id; + + private String[] initialRoles; private String name; - private String owner; - - private String javaScriptOrigin; - - private List providers; - - private String secret; - private String realm; - public String getCallbackUrl() { + private String[] roles; + + public String[] getCallbackUrl() { return callbackUrl; } - public String getJavaScriptOrigin() { - return javaScriptOrigin; + public String getId() { + return id; } - public String getKey() { - return key; + public String[] getInitialRoles() { + return initialRoles; } public String getName() { return name; } - public String getOwner() { - return owner; - } - - public List getProviders() { - return providers; - } - - public String getSecret() { - return secret; - } - public String getRealm() { return realm; } - public void setCallbackUrl(String callbackUrl) { + public String[] getRoles() { + return roles; + } + + public boolean isEnabled() { + return enabled; + } + + public void setCallbackUrl(String[] callbackUrl) { this.callbackUrl = callbackUrl; } - public void setJavaScriptOrigin(String javaScriptOrigin) { - this.javaScriptOrigin = javaScriptOrigin; + public void setEnabled(boolean enabled) { + this.enabled = enabled; } - public void setKey(String key) { - this.key = key; + public void setId(String id) { + this.id = id; + } + + public void setInitialRoles(String[] initialRoles) { + this.initialRoles = initialRoles; } public void setName(String name) { this.name = name; } - public void setOwner(String owner) { - this.owner = owner; - } - - public void setProviders(List providers) { - this.providers = providers; - } - - public void setSecret(String secret) { - this.secret = secret; - } - public void setRealm(String realm) { this.realm = realm; } + public void setRoles(String[] roles) { + this.roles = roles; + } + } diff --git a/ui/src/main/java/org/keycloak/ui/example/Realm.java b/ui/src/main/java/org/keycloak/ui/example/Realm.java index 0153521df6..2c2a758077 100644 --- a/ui/src/main/java/org/keycloak/ui/example/Realm.java +++ b/ui/src/main/java/org/keycloak/ui/example/Realm.java @@ -21,40 +21,101 @@ */ package org.keycloak.ui.example; +import java.util.concurrent.TimeUnit; /** * @author Stian Thorgersen */ public class Realm { - private String key; + private boolean enabled; + + private String[] initialRoles; + + private String id; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } private String name; - private String owner; + private String[] roles; - public String getKey() { - return key; + private boolean social; + + private long tokenExpiration; + + private TimeUnit tokenExpirationUnit; + + private boolean userRegistration; + + public String[] getInitialRoles() { + return initialRoles; } public String getName() { return name; } - public String getOwner() { - return owner; + public String[] getRoles() { + return roles; } - public void setKey(String key) { - this.key = key; + public long getTokenExpiration() { + return tokenExpiration; + } + + public TimeUnit getTokenExpirationUnit() { + return tokenExpirationUnit; + } + + public boolean isEnabled() { + return enabled; + } + + public boolean isSocial() { + return social; + } + + public boolean isUserRegistration() { + return userRegistration; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public void setInitialRoles(String[] initialRoles) { + this.initialRoles = initialRoles; } public void setName(String name) { this.name = name; } - public void setOwner(String owner) { - this.owner = owner; + public void setRoles(String[] roles) { + this.roles = roles; + } + + public void setSocial(boolean social) { + this.social = social; + } + + public void setTokenExpiration(long tokenExpiration) { + this.tokenExpiration = tokenExpiration; + } + + public void setTokenExpirationUnit(TimeUnit tokenExpirationUnit) { + this.tokenExpirationUnit = tokenExpirationUnit; + } + + public void setUserRegistration(boolean userRegistration) { + this.userRegistration = userRegistration; } } diff --git a/ui/src/main/resources/META-INF/resources/ui/index.html b/ui/src/main/resources/META-INF/resources/ui/index.html index df90d48ab2..49a3ce9581 100644 --- a/ui/src/main/resources/META-INF/resources/ui/index.html +++ b/ui/src/main/resources/META-INF/resources/ui/index.html @@ -12,12 +12,12 @@ + + - - diff --git a/ui/src/main/resources/META-INF/resources/ui/js/app.js b/ui/src/main/resources/META-INF/resources/ui/js/app.js index 24f6d828d8..bc4bc53b73 100644 --- a/ui/src/main/resources/META-INF/resources/ui/js/app.js +++ b/ui/src/main/resources/META-INF/resources/ui/js/app.js @@ -4,7 +4,24 @@ var module = angular.module('keycloak', [ 'keycloak.services', 'keycloak.control var resourceRequests = 0; module.config([ '$routeProvider', function($routeProvider) { - $routeProvider.when('/applications/:key', { + $routeProvider.when('/create/application', { + templateUrl : 'partials/application-detail.html', + resolve : { + applications : function(ApplicationListLoader) { + return ApplicationListLoader(); + }, + application : function(ApplicationLoader) { + return {}; + }, + realms : function(RealmListLoader) { + return RealmListLoader(); + }, + providers : function(ProviderListLoader) { + return ProviderListLoader(); + } + }, + controller : 'ApplicationDetailCtrl' + }).when('/applications/:application', { templateUrl : 'partials/application-detail.html', resolve : { applications : function(ApplicationListLoader) { @@ -29,7 +46,7 @@ module.config([ '$routeProvider', function($routeProvider) { } }, controller : 'ApplicationListCtrl' - }).when('/realms/:realmKey/users/:userId', { + }).when('/realms/:realm/users/:user', { templateUrl : 'partials/user-detail.html', resolve : { realms : function(RealmListLoader) { @@ -43,7 +60,7 @@ module.config([ '$routeProvider', function($routeProvider) { } }, controller : 'UserDetailCtrl' - }).when('/realms/:realmKey/users', { + }).when('/realms/:realm/users', { templateUrl : 'partials/user-list.html', resolve : { realms : function(RealmListLoader) { @@ -57,7 +74,18 @@ module.config([ '$routeProvider', function($routeProvider) { } }, controller : 'UserListCtrl' - }).when('/realms/:realmKey', { + }).when('/create/realm', { + templateUrl : 'partials/realm-detail.html', + resolve : { + realms : function(RealmListLoader) { + return RealmListLoader(); + }, + realm : function(RealmLoader) { + return {}; + } + }, + controller : 'RealmDetailCtrl' + }).when('/realms/:realm', { templateUrl : 'partials/realm-detail.html', resolve : { realms : function(RealmListLoader) { @@ -126,4 +154,49 @@ module.factory('spinnerInterceptor', function($q, $window, $rootScope, $location return $q.reject(response); }); }; +}); + +module.directive('kcInput', function() { + var d = { + scope : true, + replace: false, + link : function(scope, element, attrs) { + var form = element.closest('form'); + var label = element.children('label'); + var input = element.children('input'); + + var id = form.attr('name') + '.' + input.attr('name'); + + element.attr('class', 'control-group'); + + label.attr('class', 'control-label'); + label.attr('for', id); + + input.wrap('
'); + input.attr('id', id); + + if (!input.attr('placeHolder')) { + input.attr('placeHolder', label.text()); + } + + if (input.attr('required')) { + label.append(' *'); + } + } + }; + return d; +}); + +module.directive('kcEnter', function() { + return function(scope, element, attrs) { + element.bind("keydown keypress", function(event) { + if(event.which === 13) { + scope.$apply(function(){ + scope.$eval(attrs.kcEnter); + }); + + event.preventDefault(); + } + }); + }; }); \ No newline at end of file diff --git a/ui/src/main/resources/META-INF/resources/ui/js/controllers.js b/ui/src/main/resources/META-INF/resources/ui/js/controllers.js index 041af40fbd..f15a05fd16 100644 --- a/ui/src/main/resources/META-INF/resources/ui/js/controllers.js +++ b/ui/src/main/resources/META-INF/resources/ui/js/controllers.js @@ -1,308 +1,361 @@ 'use strict'; -var module = angular.module('keycloak.controllers', [ 'keycloak.services' ]); +var module = angular.module('keycloak.controllers', [ 'keycloak.services' ]); module.controller('GlobalCtrl', function($scope, Auth, $location, Notifications) { - $scope.addMessage = function() { - Notifications.success("test"); - }; - - $scope.auth = Auth; + $scope.addMessage = function() { + Notifications.success("test"); + }; - $scope.$watch(function() { - return $location.path(); - }, function() { - $scope.path = $location.path().substring(1).split("/"); - }); + $scope.auth = Auth; + + $scope.$watch(function() { + return $location.path(); + }, function() { + $scope.path = $location.path().substring(1).split("/"); + }); }); - module.controller('ApplicationListCtrl', function($scope, applications) { - $scope.applications = applications; + $scope.applications = applications; }); -module.controller('ApplicationDetailCtrl', function($scope, applications, application, Application, realms, providers, $location, $window, $dialog, Notifications) { - $scope.application = angular.copy(application); - $scope.applications = applications; - $scope.realms = realms; - $scope.providers = providers; +module.controller('ApplicationDetailCtrl', function($scope, applications, application, Application, realms, providers, $location, $window, $dialog, + Notifications) { + $scope.application = angular.copy(application); + $scope.applications = applications; + $scope.realms = realms; + $scope.providers = providers; - $scope.callbackUrl = $window.location.origin + "/ejs-identity/api/callback/" + application.key; + $scope.callbackUrl = $window.location.origin + "/ejs-identity/api/callback/" + application.id; - $scope.create = !application.key; + $scope.create = !application.id; - $scope.changed = $scope.create; + $scope.changed = $scope.create; - $scope.$watch('application', function() { - if (!angular.equals($scope.application, application)) { - $scope.changed = true; - } - }, true); + $scope.$watch('application', function() { + if (!angular.equals($scope.application, application)) { + $scope.changed = true; + } + }, true); - $scope.save = function() { - if ($scope.applicationForm.$valid) { - if (!$scope.application.key) { - Application.save($scope.application, function(data, headers) { - var l = headers().location; - var key = l.substring(l.lastIndexOf("/") + 1); - $location.url("/applications/" + key); - Notifications.success("Created application"); - }); - } else { - Application.update($scope.application, function() { - $scope.changed = false; - application = angular.copy($scope.application); - if ($scope.create) { - $location.url("/applications/" + $scope.application.key); - } - Notifications.success("Saved changes to the application"); - }); - } - } else { - $scope.applicationForm.showErrors = true; - } - }; - $scope.reset = function() { - $scope.application = angular.copy(application); - $scope.changed = false; - $scope.applicationForm.showErrors = false; - }; + $scope.addRole = function() { + if ($scope.newRole) { + if (!$scope.application.roles) { + $scope.application.roles = []; + } - $scope.cancel = function() { - $location.url("/applications"); - }; + $scope.application.roles.push($scope.newRole); + $scope.newRole = null; + } + } - $scope.remove = function() { - var title = 'Delete ' + $scope.application.name; - var msg = 'Are you sure you want to permanently delete this application?'; - var btns = [ { - result : 'cancel', - label : 'Cancel' - }, { - result : 'ok', - label : 'Delete this application', - cssClass : 'btn-primary' - } ]; + $scope.removeRole = function(i) { + $scope.application.roles.splice(i, 1); + }; - $dialog.messageBox(title, msg, btns).open().then(function(result) { - if (result == "ok") { - $scope.application.$remove(function() { - $location.url("/applications"); - Notifications.success("Deleted application"); - }); - } - }); - }; + $scope.addInitialRole = function() { + if ($scope.newInitialRole) { + if (!$scope.application.initialRoles) { + $scope.application.initialRoles = []; + } - $scope.availableProviders = []; + $scope.application.initialRoles.push($scope.newInitialRole); + $scope.newInitialRole = null; + } + } - $scope.addProvider = function() { - if (!$scope.application.providers) { - $scope.application.providers = []; - } + $scope.removeInitialRole = function(i) { + $scope.application.initialRoles.splice(i, 1); + }; + + $scope.save = function() { + if ($scope.applicationForm.$valid) { + if ($scope.create) { + Application.save($scope.application, function(data, headers) { + var l = headers().location; + var id = l.substring(l.lastIndexOf("/") + 1); + $location.url("/applications/" + id); + Notifications.success("Created application"); + }); + } else { + Application.update($scope.application, function() { + $scope.changed = false; + application = angular.copy($scope.application); + Notifications.success("Saved changes to the application"); + }); + } + } else { + $scope.applicationForm.showErrors = true; + } + }; - $scope.application.providers.push({ - "providerId" : $scope.newProviderId - }); + $scope.reset = function() { + $scope.application = angular.copy(application); + $scope.changed = false; + $scope.applicationForm.showErrors = false; + }; - $scope.newProviderId = null; - }; + $scope.cancel = function() { + $location.url("/applications"); + }; - $scope.getProviderDescription = function(providerId) { - for ( var i = 0; i < $scope.providers.length; i++) { - if ($scope.providers[i].id == providerId) { - return $scope.providers[i]; - } - } - }; + $scope.remove = function() { + var title = 'Delete ' + $scope.application.name; + var msg = 'Are you sure you want to permanently delete this application?'; + var btns = [ { + result : 'cancel', + label : 'Cancel' + }, { + result : 'ok', + label : 'Delete this application', + cssClass : 'btn-primary' + } ]; - $scope.removeProvider = function(i) { - $scope.application.providers.splice(i, 1); - }; + $dialog.messageBox(title, msg, btns).open().then(function(result) { + if (result == "ok") { + $scope.application.$remove(function() { + $location.url("/applications"); + Notifications.success("Deleted application"); + }); + } + }); + }; - var updateAvailableProviders = function() { - $scope.availableProviders.splice(0, $scope.availableProviders.length); + $scope.availableProviders = []; - for ( var i in $scope.providers) { - var add = true; + $scope.addProvider = function() { + if (!$scope.application.providers) { + $scope.application.providers = []; + } - for ( var j in $scope.application.providers) { - if ($scope.application.providers[j].providerId == $scope.providers[i].id) { - add = false; - break; - } - } + $scope.application.providers.push({ + "providerId" : $scope.newProviderId + }); - if (add) { - $scope.availableProviders.push($scope.providers[i]); - } - } - }; + $scope.newProviderId = null; + }; - $scope.openHelp = function(i) { - $scope.providerHelpModal = true; - $scope.providerHelp = {}; - $scope.providerHelp.index = i; - $scope.providerHelp.description = $scope.getProviderDescription($scope.application.providers[i].providerId); - }; + $scope.getProviderDescription = function(providerId) { + for ( var i = 0; i < $scope.providers.length; i++) { + if ($scope.providers[i].id == providerId) { + return $scope.providers[i]; + } + } + }; - $scope.closeHelp = function() { - $scope.providerHelpModal = false; - $scope.providerHelp = null; - }; + $scope.removeProvider = function(i) { + $scope.application.providers.splice(i, 1); + }; - $scope.$watch("providers.length + application.providers.length", updateAvailableProviders); + var updateAvailableProviders = function() { + $scope.availableProviders.splice(0, $scope.availableProviders.length); + + for ( var i in $scope.providers) { + var add = true; + + for ( var j in $scope.application.providers) { + if ($scope.application.providers[j].providerId == $scope.providers[i].id) { + add = false; + break; + } + } + + if (add) { + $scope.availableProviders.push($scope.providers[i]); + } + } + }; + + $scope.openHelp = function(i) { + $scope.providerHelpModal = true; + $scope.providerHelp = {}; + $scope.providerHelp.index = i; + $scope.providerHelp.description = $scope.getProviderDescription($scope.application.providers[i].providerId); + }; + + $scope.closeHelp = function() { + $scope.providerHelpModal = false; + $scope.providerHelp = null; + }; + + $scope.$watch("providers.length + application.providers.length", updateAvailableProviders); }); module.controller('RealmListCtrl', function($scope, realms) { - $scope.realms = realms; + $scope.realms = realms; }); module.controller('UserListCtrl', function($scope, realms, realm, users) { - $scope.realms = realms; - $scope.realm = realm; - $scope.users = users; + $scope.realms = realms; + $scope.realm = realm; + $scope.users = users; }); module.controller('UserDetailCtrl', function($scope, realms, realm, user, User, $location, $dialog, Notifications) { - $scope.realms = realms; - $scope.realm = realm; - $scope.user = angular.copy(user); - $scope.create = !user.userId; + $scope.realms = realms; + $scope.realm = realm; + $scope.user = angular.copy(user); + $scope.create = !user.userId; - $scope.changed = $scope.create; + $scope.changed = $scope.create; - $scope.$watch('user', function() { - if (!angular.equals($scope.user, user)) { - $scope.changed = true; - } - }, true); + $scope.$watch('user', function() { + if (!angular.equals($scope.user, user)) { + $scope.changed = true; + } + }, true); - $scope.save = function() { - if ($scope.userForm.$valid) { - User.save({ - realmKey : realm.key - }, $scope.user, function() { - $scope.changed = false; - user = angular.copy($scope.user); + $scope.save = function() { + if ($scope.userForm.$valid) { + User.save({ + realmKey : realm.key + }, $scope.user, function() { + $scope.changed = false; + user = angular.copy($scope.user); - if ($scope.create) { - $location.url("/realms/" + realm.key + "/users/" + user.userId); - Notifications.success("Created user"); - } else { - Notifications.success("Saved changes to user"); - } - }); - } else { - $scope.userForm.showErrors = true; - } - }; + if ($scope.create) { + $location.url("/realms/" + realm.key + "/users/" + user.userId); + Notifications.success("Created user"); + } else { + Notifications.success("Saved changes to user"); + } + }); + } else { + $scope.userForm.showErrors = true; + } + }; - $scope.reset = function() { - $scope.user = angular.copy(user); - $scope.changed = false; - $scope.userForm.showErrors = false; - }; + $scope.reset = function() { + $scope.user = angular.copy(user); + $scope.changed = false; + $scope.userForm.showErrors = false; + }; - $scope.cancel = function() { - $location.url("/realms/" + realm.key + "/users"); - }; + $scope.cancel = function() { + $location.url("/realms/" + realm.key + "/users"); + }; - $scope.remove = function() { - var title = 'Delete ' + $scope.user.userId; - var msg = 'Are you sure you want to permanently delete this user?'; - var btns = [ { - result : 'cancel', - label : 'Cancel' - }, { - result : 'ok', - label : 'Delete this user', - cssClass : 'btn-primary' - } ]; + $scope.remove = function() { + var title = 'Delete ' + $scope.user.userId; + var msg = 'Are you sure you want to permanently delete this user?'; + var btns = [ { + result : 'cancel', + label : 'Cancel' + }, { + result : 'ok', + label : 'Delete this user', + cssClass : 'btn-primary' + } ]; - $dialog.messageBox(title, msg, btns).open().then(function(result) { - if (result == "ok") { - $scope.user.$remove({ - realmKey : realm.key, - userId : $scope.user.userId - }, function() { - $location.url("/realms/" + realm.key + "/users"); - Notifications.success("Deleted user"); - }); - } - }); - }; + $dialog.messageBox(title, msg, btns).open().then(function(result) { + if (result == "ok") { + $scope.user.$remove({ + realmKey : realm.key, + userId : $scope.user.userId + }, function() { + $location.url("/realms/" + realm.key + "/users"); + Notifications.success("Deleted user"); + }); + } + }); + }; }); module.controller('RealmDetailCtrl', function($scope, Realm, realms, realm, $location, $dialog, Notifications) { - $scope.realms = realms; - $scope.realm = angular.copy(realm); - $scope.create = !realm.name; + $scope.realms = realms; + $scope.realm = angular.copy(realm); + $scope.create = !realm.name; - $scope.changed = $scope.create; + $scope.changed = $scope.create; - $scope.$watch('realm', function() { - if (!angular.equals($scope.realm, realm)) { - $scope.changed = true; - } - }, true); + $scope.$watch('realm', function() { + if (!angular.equals($scope.realm, realm)) { + $scope.changed = true; + } + }, true); - $scope.save = function() { - if ($scope.realmForm.$valid) { - if (!$scope.realm.key) { - Realm.save($scope.realm, function(data, headers) { - var l = headers().location; - var key = l.substring(l.lastIndexOf("/") + 1); - $location.url("/realms/" + key); - Notifications.success("Created realm"); - }); - } else { - Realm.update($scope.realm, function() { - $scope.changed = false; - realm = angular.copy($scope.realm); - if ($scope.create) { - $location.url("/realms/" + $scope.realm.key); - Notifications.success("Created realm"); - } else { - Notifications.success("Saved changes to realm"); - } - }); - } - } else { - $scope.realmForm.showErrors = true; - } - }; + $scope.addRole = function() { + if ($scope.newRole) { + if (!$scope.realm.roles) { + $scope.realm.roles = []; + } - $scope.reset = function() { - $scope.realm = angular.copy(realm); - $scope.changed = false; - $scope.realmForm.showErrors = false; - }; + $scope.realm.roles.push($scope.newRole); + $scope.newRole = null; + } + } - $scope.cancel = function() { - $location.url("/realms"); - }; + $scope.removeRole = function(i) { + $scope.realm.roles.splice(i, 1); + }; - $scope.remove = function() { - var title = 'Delete ' + $scope.realm.name; - var msg = 'Are you sure you want to permanently delete this realm?'; - var btns = [ { - result : 'cancel', - label : 'Cancel' - }, { - result : 'ok', - label : 'Delete this realm', - cssClass : 'btn-primary' - } ]; + $scope.addInitialRole = function() { + if ($scope.newInitialRole) { + if (!$scope.realm.initialRoles) { + $scope.realm.initialRoles = []; + } - $dialog.messageBox(title, msg, btns).open().then(function(result) { - if (result == "ok") { - Realm.remove($scope.realm, function() { - $location.url("/realms"); - Notifications.success("Deleted realm"); - }); - } - }); - }; + $scope.realm.initialRoles.push($scope.newInitialRole); + $scope.newInitialRole = null; + } + } + + $scope.removeInitialRole = function(i) { + $scope.realm.initialRoles.splice(i, 1); + }; + + $scope.save = function() { + if ($scope.realmForm.$valid) { + if ($scope.create) { + Realm.save($scope.realm, function(data, headers) { + var l = headers().location; + var id = l.substring(l.lastIndexOf("/") + 1); + $location.url("/realms/" + id); + Notifications.success("Created realm"); + }); + } else { + Realm.update($scope.realm, function() { + $scope.changed = false; + realm = angular.copy($scope.realm); + Notifications.success("Saved changes to realm"); + }); + } + } else { + $scope.realmForm.showErrors = true; + } + }; + + $scope.reset = function() { + $scope.realm = angular.copy(realm); + $scope.changed = false; + $scope.realmForm.showErrors = false; + }; + + $scope.cancel = function() { + $location.url("/realms"); + }; + + $scope.remove = function() { + var title = 'Delete ' + $scope.realm.name; + var msg = 'Are you sure you want to permanently delete this realm?'; + var btns = [ { + result : 'cancel', + label : 'Cancel' + }, { + result : 'ok', + label : 'Delete this realm', + cssClass : 'btn-primary' + } ]; + + $dialog.messageBox(title, msg, btns).open().then(function(result) { + if (result == "ok") { + Realm.remove($scope.realm, function() { + $location.url("/realms"); + Notifications.success("Deleted realm"); + }); + } + }); + }; }); \ No newline at end of file diff --git a/ui/src/main/resources/META-INF/resources/ui/js/services.js b/ui/src/main/resources/META-INF/resources/ui/js/services.js index 6e58fa7dc9..6f7064346d 100644 --- a/ui/src/main/resources/META-INF/resources/ui/js/services.js +++ b/ui/src/main/resources/META-INF/resources/ui/js/services.js @@ -34,8 +34,8 @@ module.factory('Notifications', function($rootScope, $timeout) { }); module.factory('Application', function($resource) { - return $resource('/keycloak-server/ui/api/applications/:key', { - key : '@key' + return $resource('/keycloak-server/ui/api/applications/:id', { + id : '@id' }, { update : { method : 'PUT' @@ -57,20 +57,16 @@ module.factory('ApplicationListLoader', function(Application, $q) { module.factory('ApplicationLoader', function(Application, $route, $q) { return function() { - var key = $route.current.params.key; - if (key == 'new') { - return {}; - } else { - var delay = $q.defer(); - Application.get({ - key : key - }, function(application) { - delay.resolve(application); - }, function() { - delay.reject('Unable to fetch application ' + key); - }); - return delay.promise; - } + var id = $route.current.params.application; + var delay = $q.defer(); + Application.get({ + id : id + }, function(application) { + delay.resolve(application); + }, function() { + delay.reject('Unable to fetch application ' + id); + }); + return delay.promise; }; }); @@ -91,8 +87,8 @@ module.factory('ProviderListLoader', function(Provider, $q) { }); module.factory('Realm', function($resource) { - return $resource('/keycloak-server/ui/api/realms/:key', { - key : '@key' + return $resource('/keycloak-server/ui/api/realms/:id', { + id : '@id' }, { update : { method : 'PUT' @@ -114,27 +110,23 @@ module.factory('RealmListLoader', function(Realm, $q) { module.factory('RealmLoader', function(Realm, $route, $q) { return function() { - var key = $route.current.params.realmKey; - if (key == 'new') { - return {}; - } else { - var delay = $q.defer(); - Realm.get({ - key : key - }, function(realm) { - delay.resolve(realm); - }, function() { - delay.reject('Unable to fetch key ' + key); - }); - return delay.promise; - } + var id = $route.current.params.realm; + var delay = $q.defer(); + Realm.get({ + id : id + }, function(realm) { + delay.resolve(realm); + }, function() { + delay.reject('Unable to fetch realm ' + name); + }); + return delay.promise; }; }); module.factory('User', function($resource) { - return $resource('/ejs-identity/api/im/:realmKey/users/:userId', { - realmKey : '@realmKey', - userId : '@userId' + return $resource('/ejs-identity/api/im/:realm/users/:id', { + realm : '@realm', + id : '@id' }, { save : { method : 'PUT' @@ -158,18 +150,18 @@ module.factory('UserListLoader', function(User, $route, $q) { module.factory('UserLoader', function(User, $route, $q) { return function() { - var userId = $route.current.params.userId; - if (userId == 'new') { + var name = $route.current.params.user; + if (name == 'new') { return {}; } else { var delay = $q.defer(); User.get({ - realmKey : $route.current.params.realmKey, - userId : userId + realm : $route.current.params.realm, + name : name }, function(user) { delay.resolve(user); }, function() { - delay.reject('Unable to fetch user ' + $route.current.params.userId); + delay.reject('Unable to fetch user ' + name); }); return delay.promise; } @@ -182,7 +174,7 @@ module.service('Auth', function($resource, $http, $location, $routeParams) { }; auth.user = { userId : 'test', - displayName: 'Test User' + displayName : 'Test User' }; return auth; }); \ No newline at end of file diff --git a/ui/src/main/resources/META-INF/resources/ui/partials/application-detail.html b/ui/src/main/resources/META-INF/resources/ui/partials/application-detail.html index 924ba07bbe..f274cc2061 100644 --- a/ui/src/main/resources/META-INF/resources/ui/partials/application-detail.html +++ b/ui/src/main/resources/META-INF/resources/ui/partials/application-detail.html @@ -2,7 +2,7 @@
- +

New Application {{application.name}} @@ -15,88 +15,56 @@
Settings -
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
-
- Identity Providers -
-
- - -
- - - - - - - - - - - - - - - - -
ProviderKey *Secret * 
- - - -
+
+ + +
+ +
+ + +
+ +
+ +
+ +
+
+ Roles + +
+ +
+ {{r}} + +
+ + +
+
+
+ +
+ +
+ {{r}} + +
+ +
+
+
+
+
@@ -113,16 +81,4 @@
-

- -
-
-

Configure {{providerHelp.description.name}}

-
-
-
-
-
- -
\ No newline at end of file diff --git a/ui/src/main/resources/META-INF/resources/ui/partials/application-list.html b/ui/src/main/resources/META-INF/resources/ui/partials/application-list.html index 1b8c68e12e..fa5fe4ea82 100644 --- a/ui/src/main/resources/META-INF/resources/ui/partials/application-list.html +++ b/ui/src/main/resources/META-INF/resources/ui/partials/application-list.html @@ -4,7 +4,7 @@
diff --git a/ui/src/main/resources/META-INF/resources/ui/partials/application-menu.html b/ui/src/main/resources/META-INF/resources/ui/partials/application-menu.html index 7eec7a1109..519708285c 100644 --- a/ui/src/main/resources/META-INF/resources/ui/partials/application-menu.html +++ b/ui/src/main/resources/META-INF/resources/ui/partials/application-menu.html @@ -5,8 +5,8 @@ Applications
diff --git a/ui/src/main/resources/META-INF/resources/ui/partials/realm-detail.html b/ui/src/main/resources/META-INF/resources/ui/partials/realm-detail.html index db2e374f8a..473e60b8f3 100644 --- a/ui/src/main/resources/META-INF/resources/ui/partials/realm-detail.html +++ b/ui/src/main/resources/META-INF/resources/ui/partials/realm-detail.html @@ -14,25 +14,69 @@
- Details + Settings + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
- +
- -
-
-
- -
- -
-
-
- -
- -
-
+ + +
+ + + +
+ Roles + +
+ +
+ {{r}} + +
+ + +
+
+
+ +
+ +
+ {{r}} + +
+ +
+
+
diff --git a/ui/src/main/resources/META-INF/resources/ui/partials/realm-list.html b/ui/src/main/resources/META-INF/resources/ui/partials/realm-list.html index 2618643801..344838e6e4 100644 --- a/ui/src/main/resources/META-INF/resources/ui/partials/realm-list.html +++ b/ui/src/main/resources/META-INF/resources/ui/partials/realm-list.html @@ -4,7 +4,7 @@
- Add Realm + Add Realm

Realms @@ -17,7 +17,7 @@ - {{r.name}} + {{r.name}}

diff --git a/ui/src/main/resources/META-INF/resources/ui/partials/realm-menu.html b/ui/src/main/resources/META-INF/resources/ui/partials/realm-menu.html index 646a79affc..f568909bfd 100644 --- a/ui/src/main/resources/META-INF/resources/ui/partials/realm-menu.html +++ b/ui/src/main/resources/META-INF/resources/ui/partials/realm-menu.html @@ -5,11 +5,11 @@ Realms