From 07f9fd3de3b75d0619cfaa586b9f492c1c9a738b Mon Sep 17 00:00:00 2001
From: vrockai
Date: Mon, 9 Dec 2013 11:52:41 +0100
Subject: [PATCH 1/3] KEYCLOAK-212 placeholder page for app sessions
---
.../META-INF/resources/admin/js/app.js | 12 +++++++++
.../admin/js/controllers/applications.js | 7 ++---
.../partials/application-credentials.html | 2 +-
.../admin/partials/application-detail.html | 2 +-
.../partials/application-installation.html | 2 +-
.../partials/application-role-detail.html | 2 +-
.../admin/partials/application-role-list.html | 2 +-
.../partials/application-scope-mappings.html | 2 +-
.../admin/partials/application-sessions.html | 27 +++++++++++++++++++
9 files changed, 49 insertions(+), 9 deletions(-)
create mode 100755 admin-ui/src/main/resources/META-INF/resources/admin/partials/application-sessions.html
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/app.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/app.js
index a1c967d121ee..ae18772105ab 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/js/app.js
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/app.js
@@ -306,6 +306,18 @@ module.config([ '$routeProvider', function($routeProvider) {
},
controller : 'ApplicationInstallationCtrl'
})
+ .when('/realms/:realm/applications/:application/sessions', {
+ templateUrl : 'partials/application-sessions.html',
+ resolve : {
+ realm : function(RealmLoader) {
+ return RealmLoader();
+ },
+ application : function(ApplicationLoader) {
+ return ApplicationLoader();
+ }
+ },
+ controller : 'ApplicationSessionsCtrl'
+ })
.when('/create/application/:realm', {
templateUrl : 'partials/application-detail.html',
resolve : {
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 30dde4d62993..90c51d425ab8 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
@@ -94,9 +94,10 @@ module.controller('ApplicationCredentialsCtrl', function($scope, $location, real
});
});
-
-
-
+module.controller('ApplicationSessionsCtrl', function($scope, $location, realm, application) {
+ $scope.realm = realm;
+ $scope.application = application;
+});
module.controller('ApplicationRoleDetailCtrl', function($scope, realm, application, role, ApplicationRole, $location, Dialog, Notifications) {
$scope.realm = realm;
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 fd7bb6d1996f..b39ece6cae1e 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
@@ -9,7 +9,7 @@
Installation
Roles
Scope
- Sessions
+ Sessions
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 6d1ffa170d53..f96631731744 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
@@ -9,7 +9,7 @@
Installation
Roles
Scope
-
Sessions
+
Sessions
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 a63d5528b500..89c1e75b6b16 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
@@ -9,7 +9,7 @@
Installation
Roles
Scope
-
Sessions
+
Sessions
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 5101392461fb..fe77951ae8aa 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
@@ -9,7 +9,7 @@
Installation
Roles
Scope
-
Sessions
+
Sessions
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 1093a3f7fd8d..f747dbdfed7e 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
@@ -9,7 +9,7 @@
Installation
Roles
Scope
-
Sessions
+
Sessions
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 ebabbd95b566..cade20d3638e 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
@@ -9,7 +9,7 @@
Installation
Roles
Scope
-
Sessions
+
Sessions
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
new file mode 100755
index 000000000000..d39a60b1321e
--- /dev/null
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-sessions.html
@@ -0,0 +1,27 @@
+
From 331f3212749aefcc160e568d4906c682a882d6df Mon Sep 17 00:00:00 2001
From: vrockai
Date: Mon, 9 Dec 2013 14:27:32 +0100
Subject: [PATCH 2/3] KEYCLOAK-203 KEYCLOAK-210 fixed role menu conditions
---
.../META-INF/resources/admin/partials/realm-menu.html | 6 +++---
.../META-INF/resources/admin/partials/role-detail.html | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
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 158a787eb619..ca77bd6a741e 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/role-detail.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-detail.html
index 8e1837c8434c..76e602bf0f40 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
@@ -6,9 +6,11 @@
From 809c4b3673b0736ce9f8ad082c694a20240af662 Mon Sep 17 00:00:00 2001
From: vrockai
Date: Mon, 9 Dec 2013 15:17:28 +0100
Subject: [PATCH 3/3] KEYCLOAK-206 KEYCLOAK-207 SMTP config page fix
---
.../resources/admin/js/controllers/realm.js | 41 ++++++++++++++++++-
.../resources/admin/partials/realm-smtp.html | 4 +-
2 files changed, 42 insertions(+), 3 deletions(-)
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 134eae607304..999c6b4c924b 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
@@ -843,9 +843,13 @@ module.controller('RoleDetailCtrl', function($scope, realm, role, Role, $locatio
});
module.controller('RealmSMTPSettingsCtrl', function($scope, Current, Realm, realm, $http, $location, Dialog, Notifications) {
+ console.log('RealmSMTPSettingsCtrl');
+
+ var booleanSmtpAtts = ["auth","ssl","starttls"];
+
$scope.realm = {
id : realm.id, realm : realm.realm, social : realm.social, registrationAllowed : realm.registrationAllowed,
- smtpServer: realm.smtpServer
+ smtpServer: typeObject(realm.smtpServer)
};
var oldCopy = angular.copy($scope.realm);
@@ -859,6 +863,7 @@ module.controller('RealmSMTPSettingsCtrl', function($scope, Current, Realm, real
$scope.save = function() {
var realmCopy = angular.copy($scope.realm);
+ realmCopy['smtpServer'] = detypeObject(realmCopy.smtpServer);
$scope.changed = false;
Realm.update(realmCopy, function () {
$location.url("/realms/" + realm.id + "/smtp-settings");
@@ -870,4 +875,38 @@ module.controller('RealmSMTPSettingsCtrl', function($scope, Current, Realm, real
$scope.realm = angular.copy(oldCopy);
$scope.changed = false;
};
+
+ /* Convert string attributes containing a boolean to actual boolean type + convert an integer string (port) to integer. */
+ function typeObject(obj){
+ for (var att in obj){
+ if (booleanSmtpAtts.indexOf(att) < 0)
+ continue;
+ if (obj[att] === "true"){
+ obj[att] = true;
+ } else if (obj[att] === "false"){
+ obj[att] = false;
+ }
+ }
+
+ obj['port'] = parseInt(obj['port']);
+
+ return obj;
+ }
+
+ /* Convert all non-string values to strings to invert changes caused by the typeObject function. */
+ function detypeObject(obj){
+ for (var att in obj){
+ if (booleanSmtpAtts.indexOf(att) < 0)
+ continue;
+ if (obj[att] === true){
+ obj[att] = "true";
+ } else if (obj[att] === false){
+ obj[att] = "false"
+ }
+ }
+
+ obj['port'] = obj['port'].toString();
+
+ return obj;
+ }
});
\ No newline at end of file
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 2ba7ad8c6620..f43386f608fd 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
@@ -34,13 +34,13 @@ {{realm.realm}} SMTP Settings