keycloak-aplcache

KEYCLOAK-177

11/23/2013 8:20:31 AM

Stian Thorgersen

Commit: 7698e40

Tree: 3840b29

Parents: 4c3f995

Changes

admin-ui/src/main/resources/META-INF/resources/admin/index.html 3(+1 -2)

admin-ui/src/main/resources/META-INF/resources/admin/js/app.js 2(+1 -1)

admin-ui/src/main/resources/META-INF/resources/admin/js/controllers.js 22(+0 -22)

admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/applications.js 10(+10 -0)

Details

admin-ui/src/main/resources/META-INF/resources/admin/index.html 3(+1 -2)

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/index.html b/admin-ui/src/main/resources/META-INF/resources/admin/index.html
index 4be31ec..f0c8996 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/index.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/index.html
@@ -41,7 +41,6 @@
     <script src="/auth-server/admin-ui/js/bootstrap-tokenfield.js"></script>
     -->
     <script src="js/app.js"></script>
-    <script src="js/controllers.js"></script>
     <script src="js/controllers/realm.js"></script>
     <script src="js/controllers/applications.js"></script>
     <script src="js/controllers/users.js"></script>
@@ -51,7 +50,7 @@
 
 </head>
 
-<body class="admin-console" data-ng-controller="GlobalCtrl">
+<body class="admin-console" data-ng-controller="GlobalCtrl" ng-cloak>
 <div id="idletimeout">
     You will be logged off in <strong><span></span> seconds</strong> due to inactivity.
     <a id="idletimeout-resume" href="#">Click here to continue using this web page</a>.

admin-ui/src/main/resources/META-INF/resources/admin/js/app.js 2(+1 -1)

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 85ec565..f021923 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
@@ -1,6 +1,6 @@
 'use strict';
 
-var module = angular.module('keycloak', [ 'keycloak.services', 'keycloak.loaders', 'keycloak.controllers', 'ui.bootstrap', 'ui.select2' ]);
+var module = angular.module('keycloak', [ 'keycloak.services', 'keycloak.loaders', 'ui.bootstrap', 'ui.select2' ]);
 var resourceRequests = 0;
 var loadingTimer = -1;

admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/applications.js 10(+10 -0)

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 c14231d..b4d9ee6 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
@@ -26,6 +26,16 @@ module.controller('ApplicationCredentialsCtrl', function($scope, $location, real
         }
     }
 
+    function randomString(len) {
+        var charSet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+        var randomString = '';
+        for (var i = 0; i < len; i++) {
+            var randomPoz = Math.floor(Math.random() * charSet.length);
+            randomString += charSet.substring(randomPoz,randomPoz+1);
+        }
+        return randomString;
+    }
+
     $scope.generateTotp = function() {
         $scope.totp = randomString(5) + '-' + randomString(5) + '-' + randomString(5);
     }