Release 1.0-beta-1-20150521

2014-05-21 19:04:14 +01:00
106 changed files with 460 additions and 346 deletions
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-audit-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-audit-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-audit-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-audit-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-audit-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -5,7 +5,7 @@
    <parent>
        <artifactId>keycloak-audit-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-authentication</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-authentication</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-authentication</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -30,7 +30,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <name>Distribution</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <name>Examples</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -48,12 +48,12 @@
            "name": "js-console",
            "enabled": true,
            "publicClient": true,
-            "baseUrl": "http://localhost:8080/js-console",
+            "baseUrl": "http://localhost/js-console",
            "redirectUris": [
-                "http://localhost:8080/js-console/*"
+                "http://localhost/js-console/*"
            ],
            "webOrigins": [
-                "http://localhost:8080"
+                "http://localhost"
            ]
        }
    ],
@@ -1,13 +1,13 @@
 <html>
 <head>
-    <script src="//localhost:8080/auth/js/keycloak.js"></script>
+    <script src="//localhost:8081/auth/js/keycloak.js"></script>
 </head>
 <body>

 <div>
    <button onclick="keycloak.login()">Login</button>
    <button onclick="keycloak.logout()">Logout</button>
-    <button onclick="refreshToken(9999)">Refresh Token</button>
+    <button onclick="refreshToken()">Refresh Token</button>
    <button onclick="refreshToken(30)">Refresh Token (if <30s validity)</button>
    <button onclick="loadProfile()">Get Profile</button>
    <button onclick="output(keycloak.tokenParsed)">Show Token</button>
@@ -1,8 +1,8 @@
 {
  "realm" : "example",
  "realm-public-key" : "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQAB",
-  "auth-server-url" : "http://localhost:8080/auth",
+  "auth-server-url" : "http://localhost:8081/auth",
  "ssl-not-required" : true,
  "resource" : "js-console",
  "public-client" : true
-}
+}
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <name>Examples</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-export-import</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-export-import</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -151,7 +151,7 @@ public class ModelImporter {
            }
        }

-        logger.infof("%d roles imported: ", roles.size());
+        logger.infof("%d roles imported: ", roles);
        if (logger.isDebugEnabled()) {
            logger.debug("Imported roles: " + roles);
        }
@@ -225,7 +225,7 @@ public class ModelImporter {
            addScopes(realm, client, clientEntity);
        }

-        logger.info("OAuth clients imported: " + clients);
+        logger.infof("OAuth clients imported: " + clients);
    }

    protected ApplicationModel findApplicationById(KeycloakSession keycloakSession, String applicationId) {
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-forms</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.0-beta-1-20150523</version>
+		<version>1.0-beta-1-20150521</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-forms</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.0-beta-1-20150523</version>
+		<version>1.0-beta-1-20150521</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-forms</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.0-beta-1-20150523</version>
+		<version>1.0-beta-1-20150521</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-forms</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.0-beta-1-20150523</version>
+		<version>1.0-beta-1-20150521</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -38,7 +38,7 @@
    </style>
 </head>

-<body class="admin-console" data-ng-controller="GlobalCtrl" data-ng-cloak data-ng-show="auth.user">
+<body class="admin-console" data-ng-controller="GlobalCtrl" data-ng-cloak>

 <div id="idletimeout">
    You will be logged off in <strong><span></span> seconds</strong> due to inactivity.
@@ -1,5 +1,6 @@
 'use strict';

+var indexUrl = window.location.href;
 var consoleBaseUrl = window.location.href;
 consoleBaseUrl = consoleBaseUrl.substring(0, consoleBaseUrl.indexOf("/console"));
 consoleBaseUrl = consoleBaseUrl + "/console";
@@ -22,12 +23,14 @@ var loadingTimer = -1;

 angular.element(document).ready(function ($http) {
    var keycloakAuth = new Keycloak(configUrl);
+    auth.loggedIn = false;

    keycloakAuth.onAuthLogout = function() {
        location.reload();
    }

    keycloakAuth.init({ onLoad: 'login-required' }).success(function () {
+        auth.loggedIn = true;
        auth.authz = keycloakAuth;
        module.factory('Auth', function() {
            return auth;
@@ -263,10 +263,10 @@ module.controller('ApplicationDetailCtrl', function($scope, realm, application,
    }

    $scope.save = function() {
-        if (!$scope.application.bearerOnly && (!$scope.application.redirectUris || $scope.application.redirectUris.length == 0)) {
-            Notifications.error("You must specify at least one redirect uri");
-        } else {
-            if ($scope.create) {
+        if ($scope.create) {
+            if (!$scope.application.bearerOnly && (!$scope.application.redirectUris || $scope.application.redirectUris.length == 0)) {
+                Notifications.error("You must specify at least one redirect uri");
+            } else {
                Application.save({
                    realm: realm.realm,
                    application: ''
@@ -277,16 +277,16 @@ module.controller('ApplicationDetailCtrl', function($scope, realm, application,
                    $location.url("/realms/" + realm.realm + "/applications/" + id);
                    Notifications.success("The application has been created.");
                });
-            } else {
-                Application.update({
-                    realm : realm.realm,
-                    application : application.name
-                }, $scope.application, function() {
-                    $scope.changed = false;
-                    application = angular.copy($scope.application);
-                    Notifications.success("Your changes have been saved to the application.");
-                });
            }
+        } else {
+            Application.update({
+                realm : realm.realm,
+                application : application.name
+            }, $scope.application, function() {
+                $scope.changed = false;
+                application = angular.copy($scope.application);
+                Notifications.success("Your changes have been saved to the application.");
+            });
        }
    };

@@ -331,71 +331,195 @@ module.controller('ApplicationScopeMappingCtrl', function($scope, $http, realm,
    $scope.applicationMappings = [];
    $scope.dummymodel = [];

-    function updateRealmRoles() {
-        $scope.realmRoles = ApplicationAvailableRealmScopeMapping.query({realm : realm.realm, application : application.name});
-        $scope.realmMappings = ApplicationRealmScopeMapping.query({realm : realm.realm, application : application.name});
-        $scope.realmComposite = ApplicationCompositeRealmScopeMapping.query({realm : realm.realm, application : application.name});
-    }

-    function updateAppRoles() {
+
+    $scope.realmMappings = ApplicationRealmScopeMapping.query({realm : realm.realm, application : application.name}, function(){
+        for (var i = 0; i < $scope.realmMappings.length; i++) {
+            var role = $scope.realmMappings[i];
+            for (var j = 0; j < $scope.realmRoles.length; j++) {
+                var realmRole = $scope.realmRoles[j];
+                if (realmRole.id == role.id) {
+                    var idx = $scope.realmRoles.indexOf(realmRole);
+                    if (idx != -1) {
+                        $scope.realmRoles.splice(idx, 1);
+                        break;
+                    }
+                }
+            }
+        }
+    });
+
+    $scope.addRealmRole = function() {
+        $http.post(authUrl + '/admin/realms/' + realm.realm + '/applications/' + application.name + '/scope-mappings/realm',
+                $scope.selectedRealmRoles).success(function() {
+                for (var i = 0; i < $scope.selectedRealmRoles.length; i++) {
+                    var role = $scope.selectedRealmRoles[i];
+                    var idx = $scope.realmRoles.indexOf($scope.selectedRealmRoles[i]);
+                    if (idx != -1) {
+                        $scope.realmRoles.splice(idx, 1);
+                        $scope.realmMappings.push(role);
+                    }
+                }
+                $scope.selectRealmRoles = [];
+            });
+    };
+
+    $scope.deleteRealmRole = function() {
+        $http.delete(authUrl + '/admin/realms/' + realm.realm + '/applications/' + application.name +  '/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];
+                    var idx = $scope.realmMappings.indexOf($scope.selectedRealmMappings[i]);
+                    if (idx != -1) {
+                        $scope.realmMappings.splice(idx, 1);
+                        $scope.realmRoles.push(role);
+                    }
+                }
+                $scope.selectedRealmMappings = [];
+            });
+    };
+
+    $scope.addApplicationRole = function() {
+        $http.post(authUrl + '/admin/realms/' + realm.realm + '/applications/' + application.name +  '/scope-mappings/applications/' + $scope.targetApp.name,
+                $scope.selectedApplicationRoles).success(function() {
+                for (var i = 0; i < $scope.selectedApplicationRoles.length; i++) {
+                    var role = $scope.selectedApplicationRoles[i];
+                    var idx = $scope.applicationRoles.indexOf($scope.selectedApplicationRoles[i]);
+                    if (idx != -1) {
+                        $scope.applicationRoles.splice(idx, 1);
+                        $scope.applicationMappings.push(role);
+                    }
+                }
+                $scope.selectedApplicationRoles = [];
+            });
+    };
+
+    $scope.deleteApplicationRole = function() {
+        $http.delete(authUrl + '/admin/realms/' + realm.realm + '/applications/' + application.name +  '/scope-mappings/applications/' + $scope.targetApp.name,
+            {data : $scope.selectedApplicationMappings, headers : {"content-type" : "application/json"}}).success(function() {
+                for (var i = 0; i < $scope.selectedApplicationMappings.length; i++) {
+                    var role = $scope.selectedApplicationMappings[i];
+                    var idx = $scope.applicationMappings.indexOf($scope.selectedApplicationMappings[i]);
+                    if (idx != -1) {
+                        $scope.applicationMappings.splice(idx, 1);
+                        $scope.applicationRoles.push(role);
+                    }
+                }
+                $scope.selectedApplicationMappings = [];
+            });
+    };
+
+
+    $scope.changeApplication = function() {
        if ($scope.targetApp) {
-            console.debug($scope.targetApp.name);
-            $scope.applicationRoles = ApplicationAvailableApplicationScopeMapping.query({realm : realm.realm, application : application.name, targetApp : $scope.targetApp.name});
+            $scope.applicationRoles = ApplicationRole.query({realm : realm.realm, application : $scope.targetApp.name}, function() {
+                    $scope.applicationMappings = ApplicationApplicationScopeMapping.query({realm : realm.realm, application : application.name, targetApp : $scope.targetApp.name}, function(){
+                        for (var i = 0; i < $scope.applicationMappings.length; i++) {
+                            var role = $scope.applicationMappings[i];
+                            for (var j = 0; j < $scope.applicationRoles.length; j++) {
+                                var realmRole = $scope.applicationRoles[j];
+                                if (realmRole.id == role.id) {
+                                    var idx = $scope.applicationRoles.indexOf(realmRole);
+                                    if (idx != -1) {
+                                        $scope.applicationRoles.splice(idx, 1);
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    });
+
+                }
+            );
+        } else {
+            $scope.applicationRoles = null;
+        }
+    };
+
+    $scope.realmMappings = ApplicationRealmScopeMapping.query({realm : realm.realm, application : application.name});
+    $scope.realmRoles = ApplicationAvailableRealmScopeMapping.query({realm : realm.realm, application : application.name});
+    $scope.realmComposite = ApplicationCompositeRealmScopeMapping.query({realm : realm.realm, application : application.name});
+
+    $scope.addRealmRole = function() {
+        $http.post(authUrl + '/admin/realms/' + realm.realm + '/applications/' + application.name + '/scope-mappings/realm',
+                $scope.selectedRealmRoles).success(function() {
+                $scope.realmMappings = ApplicationRealmScopeMapping.query({realm : realm.realm, application : application.name});
+                $scope.realmRoles = ApplicationAvailableRealmScopeMapping.query({realm : realm.realm, application : application.name});
+                $scope.realmComposite = ApplicationCompositeRealmScopeMapping.query({realm : realm.realm, application : application.name});
+                $scope.selectedRealmMappings = [];
+                $scope.selectRealmRoles = [];
+                if ($scope.targetApp) {
+                    console.log('load available');
+                    $scope.applicationMappings = ApplicationApplicationScopeMapping.query({realm : realm.realm, application : application.name, targetApp : $scope.targetApp.name});
+                    $scope.applicationRoles = ApplicationAvailableApplicationScopeMapping.query({realm : realm.realm, application : application.name, targetApp : $scope.targetApp.name});
+                    $scope.applicationComposite = ApplicationCompositeApplicationScopeMapping.query({realm : realm.realm, application : application.name, targetApp : $scope.targetApp.name});
+                    $scope.selectedApplicationRoles = [];
+                    $scope.selectedApplicationMappings = [];
+                }
+            });
+    };
+
+    $scope.deleteRealmRole = function() {
+        $http.delete(authUrl + '/admin/realms/' + realm.realm + '/applications/' + application.name +  '/scope-mappings/realm',
+            {data : $scope.selectedRealmMappings, headers : {"content-type" : "application/json"}}).success(function() {
+                $scope.realmMappings = ApplicationRealmScopeMapping.query({realm : realm.realm, application : application.name});
+                $scope.realmRoles = ApplicationAvailableRealmScopeMapping.query({realm : realm.realm, application : application.name});
+                $scope.realmComposite = ApplicationCompositeRealmScopeMapping.query({realm : realm.realm, application : application.name});
+                $scope.selectedRealmMappings = [];
+                $scope.selectRealmRoles = [];
+                if ($scope.targetApp) {
+                    console.log('load available');
+                    $scope.applicationMappings = ApplicationApplicationScopeMapping.query({realm : realm.realm, application : application.name, targetApp : $scope.targetApp.name});
+                    $scope.applicationRoles = ApplicationAvailableApplicationScopeMapping.query({realm : realm.realm, application : application.name, targetApp : $scope.targetApp.name});
+                    $scope.applicationComposite = ApplicationCompositeApplicationScopeMapping.query({realm : realm.realm, application : application.name, targetApp : $scope.targetApp.name});
+                    $scope.selectedApplicationRoles = [];
+                    $scope.selectedApplicationMappings = [];
+                }
+            });
+    };
+
+    $scope.addApplicationRole = function() {
+        $http.post(authUrl + '/admin/realms/' + realm.realm + '/applications/' + application.name +  '/scope-mappings/applications/' + $scope.targetApp.name,
+                $scope.selectedApplicationRoles).success(function() {
+                $scope.applicationMappings = ApplicationRoleMapping.query({realm : realm.realm, userId : user.username, application : $scope.application.name});
+                $scope.applicationRoles = AvailableApplicationRoleMapping.query({realm : realm.realm, userId : user.username, application : $scope.application.name});
+                $scope.applicationComposite = CompositeApplicationRoleMapping.query({realm : realm.realm, userId : user.username, application : $scope.application.name});
+                $scope.selectedApplicationRoles = [];
+                $scope.selectedApplicationMappings = [];
+            });
+    };
+
+    $scope.deleteApplicationRole = function() {
+        $http.delete(authUrl + '/admin/realms/' + realm.realm + '/applications/' + application.name +  '/scope-mappings/applications/' + $scope.targetApp.name,
+            {data : $scope.selectedApplicationMappings, headers : {"content-type" : "application/json"}}).success(function() {
+                $scope.applicationMappings = ApplicationRoleMapping.query({realm : realm.realm, userId : user.username, application : $scope.application.name});
+                $scope.applicationRoles = AvailableApplicationRoleMapping.query({realm : realm.realm, userId : user.username, application : $scope.application.name});
+                $scope.applicationComposite = CompositeApplicationRoleMapping.query({realm : realm.realm, userId : user.username, application : $scope.application.name});
+                $scope.selectedApplicationRoles = [];
+                $scope.selectedApplicationMappings = [];
+            });
+    };
+
+
+    $scope.changeApplication = function() {
+        console.log('changeApplication');
+        if ($scope.targetApp) {
+            console.log('load available');
            $scope.applicationMappings = ApplicationApplicationScopeMapping.query({realm : realm.realm, application : application.name, targetApp : $scope.targetApp.name});
+            $scope.applicationRoles = ApplicationAvailableApplicationScopeMapping.query({realm : realm.realm, application : application.name, targetApp : $scope.targetApp.name});
            $scope.applicationComposite = ApplicationCompositeApplicationScopeMapping.query({realm : realm.realm, application : application.name, targetApp : $scope.targetApp.name});
        } else {
            $scope.applicationRoles = null;
            $scope.applicationMappings = null;
            $scope.applicationComposite = null;
        }
-    }
-
-    $scope.addRealmRole = function() {
-        $http.post(authUrl + '/admin/realms/' + realm.realm + '/applications/' + application.name + '/scope-mappings/realm', $scope.selectedRealmRoles)
-            .success(updateRealmRoles);
+        $scope.selectedApplicationRoles = [];
+        $scope.selectedApplicationMappings = [];
    };

-    $scope.deleteRealmRole = function() {
-        $http.delete(authUrl + '/admin/realms/' + realm.realm + '/applications/' + application.name +  '/scope-mappings/realm',
-            {data : $scope.selectedRealmMappings, headers : {"content-type" : "application/json"}})
-            .success(updateRealmRoles);
-    };

-    $scope.addApplicationRole = function() {
-        $http.post(authUrl + '/admin/realms/' + realm.realm + '/applications/' + application.name +  '/scope-mappings/applications/' + $scope.targetApp.name,
-                $scope.selectedApplicationRoles).success(updateAppRoles);
-    };

-    $scope.deleteApplicationRole = function() {
-        $http.delete(authUrl + '/admin/realms/' + realm.realm + '/applications/' + application.name +  '/scope-mappings/applications/' + $scope.targetApp.name,
-            {data : $scope.selectedApplicationMappings, headers : {"content-type" : "application/json"}}).success(updateAppRoles);
-    };

-    $scope.changeApplication = function() {
-        updateAppRoles();
-    };
-
-    $scope.addRealmRole = function() {
-        $http.post(authUrl + '/admin/realms/' + realm.realm + '/applications/' + application.name + '/scope-mappings/realm',
-                $scope.selectedRealmRoles).success(updateRealmRoles);
-    };
-
-    $scope.deleteRealmRole = function() {
-        $http.delete(authUrl + '/admin/realms/' + realm.realm + '/applications/' + application.name +  '/scope-mappings/realm',
-            {data : $scope.selectedRealmMappings, headers : {"content-type" : "application/json"}}).success(updateRealmRoles);
-    };
-
-    $scope.addApplicationRole = function() {
-        $http.post(authUrl + '/admin/realms/' + realm.realm + '/applications/' + application.name +  '/scope-mappings/applications/' + $scope.targetApp.name,
-                $scope.selectedApplicationRoles).success(updateAppRoles);
-    };
-
-    $scope.deleteApplicationRole = function() {
-        $http.delete(authUrl + '/admin/realms/' + realm.realm + '/applications/' + application.name +  '/scope-mappings/applications/' + $scope.targetApp.name,
-            {data : $scope.selectedApplicationMappings, headers : {"content-type" : "application/json"}}).success(updateAppRoles);
-    };
-
-    updateRealmRoles();
 });

 module.controller('ApplicationRevocationCtrl', function($scope, realm, application, Application, ApplicationPushRevocation, $location, Dialog, Notifications) {
@@ -133,29 +133,25 @@ module.controller('OAuthClientDetailCtrl', function($scope, realm, oauth, OAuthC
    }

    $scope.save = function() {
-        if (!$scope.oauth.redirectUris || $scope.oauth.redirectUris.length == 0) {
-            Notifications.error("You must specify at least one redirect uri");
+        if ($scope.create) {
+            OAuthClient.save({
+                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.realm + "/oauth-clients/" + id);
+                Notifications.success("The oauth client has been created.");
+            });
        } else {
-            if ($scope.create) {
-                OAuthClient.save({
-                    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.realm + "/oauth-clients/" + id);
-                    Notifications.success("The oauth client has been created.");
-                });
-            } else {
-                OAuthClient.update({
-                    realm : realm.realm,
-                    id : oauth.id
-                }, $scope.oauth, function() {
-                    $scope.changed = false;
-                    oauth = angular.copy($scope.oauth);
-                    Notifications.success("Your changes have been saved to the oauth client.");
-                });
-            }
+            OAuthClient.update({
+                realm : realm.realm,
+                id : oauth.id
+            }, $scope.oauth, function() {
+                $scope.changed = false;
+                oauth = angular.copy($scope.oauth);
+                Notifications.success("Your changes have been saved to the oauth client.");
+            });
        }
    };

@@ -7,69 +7,69 @@ module.controller('GlobalCtrl', function($scope, $http, Auth, WhoAmI, Current, $
    $scope.logout = logout;

    $scope.auth = Auth;
+    WhoAmI.get(function(data) {
+        Auth.user = data;
+        Auth.loggedIn = true;

-    WhoAmI.get(function(user) {
-        Auth.user = user;
-    });
+        function getAccess(role) {
+            if (!Current.realm) {
+                return false;
+            }

-    function getAccess(role) {
-        if (!Current.realm) {
+            var realmAccess = Auth.user['realm_access'];
+            if (realmAccess) {
+                realmAccess = realmAccess[Current.realm.realm];
+                if (realmAccess) {
+                    return realmAccess.indexOf(role) >= 0;
+                }
+            }
            return false;
        }

-        var realmAccess = Auth.user && Auth.user['realm_access'];
-        if (realmAccess) {
-            realmAccess = realmAccess[Current.realm.realm];
-            if (realmAccess) {
-                return realmAccess.indexOf(role) >= 0;
+        $scope.access = {
+            createRealm: data.createRealm,
+
+            get viewRealm() {
+                return getAccess('view-realm') || this.manageRealm;
+            },
+
+            get viewApplications() {
+                return getAccess('view-applications') || this.manageApplications;
+            },
+
+            get viewClients() {
+                return getAccess('view-clients') || this.manageClients;
+            },
+
+            get viewUsers() {
+                return getAccess('view-users') || this.manageClients;
+            },
+
+            get viewAudit() {
+                return getAccess('view-audit') || this.manageClients;
+            },
+
+            get manageRealm() {
+                return getAccess('manage-realm');
+            },
+
+            get manageApplications() {
+                return getAccess('manage-applications');
+            },
+
+            get manageClients() {
+                return getAccess('manage-clients');
+            },
+
+            get manageUsers() {
+                return getAccess('manage-users');
+            },
+
+            get manageAudit() {
+                return getAccess('manage-audit');
            }
        }
-        return false;
-    }
-
-    $scope.access = {
-        createRealm: Auth.user && Auth.user.createRealm,
-
-        get viewRealm() {
-            return getAccess('view-realm') || this.manageRealm;
-        },
-
-        get viewApplications() {
-            return getAccess('view-applications') || this.manageApplications;
-        },
-
-        get viewClients() {
-            return getAccess('view-clients') || this.manageClients;
-        },
-
-        get viewUsers() {
-            return getAccess('view-users') || this.manageClients;
-        },
-
-        get viewAudit() {
-            return getAccess('view-audit') || this.manageClients;
-        },
-
-        get manageRealm() {
-            return getAccess('manage-realm');
-        },
-
-        get manageApplications() {
-            return getAccess('manage-applications');
-        },
-
-        get manageClients() {
-            return getAccess('manage-clients');
-        },
-
-        get manageUsers() {
-            return getAccess('manage-users');
-        },
-
-        get manageAudit() {
-            return getAccess('manage-audit');
-        }
-    }
+    });

    $scope.$watch(function() {
        return $location.path();
@@ -114,7 +114,7 @@ module.controller('RealmDropdownCtrl', function($scope, Realm, Current, Auth, $l

    $scope.showNav = function() {
        var show = Current.realms.length > 0;
-        return Auth.user && show;
+        return Auth.loggedIn && show;
    }
    $scope.refresh = function() {
         Current.refresh();
@@ -107,7 +107,7 @@ module.controller('UserSessionsCtrl', function($scope, realm, user, sessions, Us
    $scope.logoutAll = function() {
        UserLogout.save({realm : realm.realm, user: user.username}, function () {
            Notifications.success('Logged out user in all applications');
-            UserSessions.query({realm: realm.realm, user: user.username}, function(updated) {
+            UserSessions.get({realm: realm.realm, user: user.username}, function(updated) {
                $scope.sessions = updated;
            })
        });
@@ -116,9 +116,9 @@ module.controller('UserSessionsCtrl', function($scope, realm, user, sessions, Us
    $scope.logoutSession = function(sessionId) {
        console.log('here in logoutSession');
        UserSessionLogout.delete({realm : realm.realm, session: sessionId}, function() {
-            UserSessions.query({realm: realm.realm, user: user.username}, function(updated) {
+            Notifications.success('Logged out session');
+            UserSessions.get({realm: realm.realm, user: user.username}, function(updated) {
                $scope.sessions = updated;
-                Notifications.success('Logged out session');
            })
        });
    }
@@ -77,6 +77,8 @@ module.service('Dialog', function($modal) {
    }

    dialog.confirm = function(title, message, success, cancel) {
+        var title = title;
+        var msg = '<span class="primary">' + message + '"</span>';
        var btns = {
            ok: {
                label: title,
@@ -88,7 +90,7 @@ module.service('Dialog', function($modal) {
            }
        }

-        openDialog(title, message, btns).then(success, cancel);
+        openDialog(title, msg, btns).then(success).reject(cancel);
    }

 	return dialog
@@ -92,24 +92,30 @@
                </div>
                <div class="form-group" data-ng-show="!application.bearerOnly">
                    <label class="col-sm-2 control-label" for="newWebOrigin">Web Origin</label>
-                    <div class="col-sm-4 multiple" ng-repeat="webOrigin in application.webOrigins">
-                        <div class="input-group kc-item-deletable">
-                            <input class="form-control" type="text" data-ng-class="{'input-below':!$first}"
-                                   name="webOrigin" id="webOrigin" data-ng-model="webOrigin" readonly />
-                            <span class="input-group-btn">
-                                <button class="btn btn-default" type="button" data-ng-click="deleteWebOrigin($index)">
-                                    Delete</button>
-                            </span>
+                    <div class="col-sm-6">
+                        <div ng-repeat="webOrigin in application.webOrigins" class="row kc-item-deletable">
+                                <div class="col-sm-8">
+                                    <input class="form-control kc-button-control"
+                                           type="text" data-ng-class="{'input-below':!$first}"
+                                           name="webOrigin" id="webOrigin"
+                                           data-ng-model="webOrigin" readonly/>
+                                </div>
+                                <div class="col-sm-2">
+                                    <button class="btn btn-danger"
+                                            type="button" data-ng-click="deleteWebOrigin($index)">Delete</button>
+                                </div>
                        </div>
-                    </div>
-                    <div class="col-sm-4 multiple">
-                        <div class="input-group">
-                            <input class="form-control" type="text" name="newWebOrigin" id="newWebOrigin"
-                                   placeholder="New Web Origin..." data-ng-model="newWebOrigin"
-                                   data-ng-class="{'input-below':application.webOrigins.length}" />
-                            <span class="input-group-btn">
-                                <button class="btn btn-default" data-ng-click="addWebOrigin()" ng-show="newWebOrigin.length > 0">Add</button>
-                            </span>
+                        <div class="row">
+                            <div class="col-sm-8">
+                                <input class="form-control kc-button-control"
+                                       type="text" name="newWebOrigin" id="newWebOrigin"
+                                       placeholder="New Web Origin..." data-ng-model="newWebOrigin"
+                                       data-ng-class="{'input-below':application.webOrigins.length}"/>
+                            </div>
+                            <div class="col-sm-2">
+                                <button class="btn btn-primary"
+                                        data-ng-click="addWebOrigin()" ng-show="newWebOrigin.length > 0">Add</button>
+                            </div>
                        </div>
                    </div>
                </div>
@@ -12,7 +12,7 @@
    </div>
    <div class="collapse navbar-collapse navbar-collapse-1">
    		<div class="container">
-		        <ul class="nav navbar-nav navbar-utility" data-ng-show="auth.user">
+		        <ul class="nav navbar-nav navbar-utility" data-ng-show="auth.loggedIn">
 		            <li class="dropdown">
 		                <a data-toggle="dropdown" class="dropdown-toggle" href="#">
 		                    <span class="pficon pficon-user"></span>
@@ -36,9 +36,9 @@
 		                    </li>
 		                </ul>
 		            </li>
-		            <li class="active pull-right" data-ng-show="auth.user && access.createRealm">
+		            <li class="active pull-right" data-ng-show="auth.loggedIn && access.createRealm">
 		                <a class="button primary" href="#/create/realm" data-ng-class="path[0] == 'create' && path[1] == 'realm' && 'active'"
-		                   data-ng-show="auth.user">Add Realm</a>
+		                   data-ng-show="auth.loggedIn">Add Realm</a>
 		            </li>
 		        </ul>
    		</div>
@@ -77,24 +77,26 @@
                </div>
                <div class="form-group">
                    <label class="col-sm-2 control-label" for="newWebOrigin">Web Origin</label>
-                    <div class="col-sm-4 multiple" ng-repeat="webOrigin in oauth.webOrigins">
-                        <div class="input-group kc-item-deletable">
-                            <input class="form-control" type="text" data-ng-class="{'input-below':!$first}"
-                                   name="webOrigin" id="webOrigin" data-ng-model="webOrigin" readonly />
-                            <span class="input-group-btn">
-                                <button class="btn btn-default" type="button" data-ng-click="deleteWebOrigin($index)">
+                    <div class="col-sm-6">
+                        <div ng-repeat="webOrigin in oauth.webOrigins" class="kc-item-deletable row">
+                            <div class="col-sm-8">
+                                <input  class="form-control" type="text" data-ng-class="{'input-below':!$first}"
+                                        name="webOrigin" id="webOrigin" data-ng-model="webOrigin" readonly />
+                            </div>
+                            <div class="col-sm-2">
+                                <button class="btn btn-danger" type="button" data-ng-click="deleteWebOrigin($index)">
                                    Delete</button>
-                            </span>
+                            </div>
                        </div>
-                    </div>
-                    <div class="col-sm-4 multiple">
-                        <div class="input-group">
-                            <input class="form-control" type="text" name="newWebOrigin" id="newWebOrigin"
-                                   placeholder="New Web Origin..." data-ng-model="newWebOrigin"
-                                   data-ng-class="{'input-below':oauth.webOrigins.length}" />
-                            <span class="input-group-btn">
-                                <button class="btn btn-default" data-ng-click="addWebOrigin()" ng-show="newWebOrigin.length > 0">Add</button>
-                            </span>
+                        <div class="row">
+                            <div class="col-sm-8">
+                                <input  class="form-control" type="text" name="newWebOrigin" id="newWebOrigin"
+                                        placeholder="New Web Origin..." data-ng-model="newWebOrigin"
+                                        data-ng-class="{'input-below':oauth.webOrigins.length}" />
+                            </div>
+                            <div class="col-sm-2">
+                                <button  class="btn btn-primary" data-ng-click="addWebOrigin()" ng-show="newWebOrigin.length > 0">Add</button>
+                            </div>
                        </div>
                    </div>
                </div>
@@ -1,5 +1,5 @@
 <ul data-ng-hide="createRealm">
-    <li data-ng-show="access.viewRealm" data-ng-class="((!path[2] || path[1] == 'role' || path[2] == 'roles' ||
+    <li data-ng-show="access.viewRealm" data-ng-class="((!path[2] || path[1] == 'role' || path[2] == 'roles' || path[2] == 'token-settings' ||
    path[2] == 'social-settings' || path[2] == 'required-credentials' || path[2] == 'default-roles' || path[2] == 'registration-settings' ||
    path[2] == 'keys-settings' || path[2] == 'smtp-settings' || path[2] == 'ldap-settings' || path[2] == 'auth-settings') && path[3] != 'applications') && 'active'">
        <a href="#/realms/{{realm.realm}}">Settings</a>
@@ -8,6 +8,6 @@
    </li>
    <li data-ng-show="access.viewApplications" data-ng-class="(path[2] == 'applications' || path[1] == 'application' || path[3] == 'applications') && 'active'"><a href="#/realms/{{realm.realm}}/applications">Applications</a></li>
    <li data-ng-show="access.viewClients" data-ng-class="(path[2] == 'oauth-clients' || path[1] == 'oauth-client') && 'active'"><a href="#/realms/{{realm.realm}}/oauth-clients">OAuth Clients</a></li>
-    <li data-ng-show="access.viewRealm" data-ng-class="(path[2] == 'sessions' || path[2] == 'token-settings') && 'active'"><a href="#/realms/{{realm.realm}}/sessions/realm">Sessions and Tokens</a></li>
+    <li data-ng-show="access.viewRealm" data-ng-class="(path[2] == 'sessions') && 'active'"><a href="#/realms/{{realm.realm}}/sessions/realm">Sessions and Tokens</a></li>
    <li data-ng-show="access.viewAudit" data-ng-class="(path[2] == 'audit' || path[2] == 'audit-settings') && 'active'"><a href="#/realms/{{realm.realm}}/audit">Audit</a></li>
 </ul>
@@ -38,18 +38,19 @@
                <td>{{session.ipAddress}}</td>
                <td>{{session.start | date:'medium'}}</td>
                <td>{{session.lastAccess | date:'medium'}}</td>
-                <td>
-                    <div data-ng-repeat="app in session.applications">
+                <td><ul style="list-style: none; ">
+                    <li data-ng-repeat="app in session.applications">
                        <a href="#/realms/{{realm.realm}}/applications/{{app}}/sessions">{{app}}</a>
-                    </div>
+                    </li>
                </ul>
                </td>
-                <td>
-                    <div data-ng-repeat="(clientId, clientName) in session.clients">
+                <td><ul style="list-style: none; ">
+                    <li data-ng-repeat="(clientId, clientName) in session.clients">
                        <a href="#/realms/{{realm.realm}}/oauth-clients/{{clientId}}">{{clientName}}</a>
-                    </div>
+                    </li>
+                </ul>
                </td>
-                <td><a href="" ng-click="logoutSession(session.id)">logout</a> </td>
+                <td><a ng-click="logoutSession(session.id)">logout</a> </td>
            </tr>
            </tbody>
        </table>
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-forms</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.0-beta-1-20150523</version>
+		<version>1.0-beta-1-20150521</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-forms</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-forms</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.0-beta-1-20150523</version>
+		<version>1.0-beta-1-20150521</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-forms</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.0-beta-1-20150523</version>
+		<version>1.0-beta-1-20150521</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.0-beta-1-20150523</version>
+		<version>1.0-beta-1-20150521</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-parent</artifactId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.0-beta-1-20150523</version>
+		<version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -29,10 +29,6 @@ var Keycloak = function (config) {
            if (initOptions.checkLoginIframeInterval) {
                loginIframe.interval = initOptions.checkLoginIframeInterval;
            }
-
-            if (initOptions.onLoad === 'login-required') {
-                kc.loginRequired = true;
-            }
        }

        var promise = createPromise();
@@ -378,9 +374,6 @@ var Keycloak = function (config) {
        if (kc.token) {
            setToken(null, null);
            kc.onAuthLogout && kc.onAuthLogout();
-            if (kc.loginRequired) {
-                kc.login();
-            }
        }
    }

@@ -538,7 +531,7 @@ var Keycloak = function (config) {
            loginIframe.iframe = iframe;
        }

-        var src = getRealmUrl() + '/login-status-iframe.html?client_id=' + encodeURIComponent(kc.clientId) + '&origin=' + window.location.origin;
+        var src = getRealmUrl() + '/login-status-iframe.html?client_id=' + encodeURIComponent(kc.clientId);
        iframe.setAttribute('src', src );
        iframe.style.display = 'none';
        document.body.appendChild(iframe);
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <name>Keycloak Integration</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.0-beta-1-20150523</version>
+		<version>1.0-beta-1-20150521</version>
 		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-parent</artifactId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <name>Model Parent</name>
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>keycloak-picketlink</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>keycloak-picketlink</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -8,12 +8,10 @@
    </description>
    <groupId>org.keycloak</groupId>
    <artifactId>keycloak-parent</artifactId>
-    <version>1.0-beta-1-20150523</version>
+    <version>1.0-beta-1-20150521</version>
    <packaging>pom</packaging>

    <properties>
-        <bouncycastle.version>1.46</bouncycastle.version>
-        <jackson.version>1.9.12</jackson.version>
        <keycloak.apache.httpcomponents.version>4.1.2</keycloak.apache.httpcomponents.version>
        <resteasy.version>2.3.7.Final</resteasy.version>
        <resteasy.version.eap.6.3>2.3.7.Final</resteasy.version.eap.6.3>
@@ -35,13 +33,6 @@
        <slf4j.version>1.5.10</slf4j.version>
        <jboss.version>7.1.1.Final</jboss.version>
        <wildfly.version>8.0.0.Final</wildfly.version>
-        <servlet.api.30.version>1.0.1.Final</servlet.api.30.version>
-        <google.zxing.version>2.2</google.zxing.version>
-        <google.client.version>1.14.1-beta</google.client.version>
-        <winzipaes.version>1.0.1</winzipaes.version>
-        <freemarker.version>2.3.19</freemarker.version>
-        <twitter4j.version>3.0.5</twitter4j.version>
-        <selenium.version>2.35.0</selenium.version>

        <!-- maven-compiler-plugin -->
        <maven.compiler.target>1.6</maven.compiler.target>
@@ -118,12 +109,12 @@
            <dependency>
                <groupId>org.bouncycastle</groupId>
                <artifactId>bcprov-jdk16</artifactId>
-                <version>${bouncycastle.version}</version>
+                <version>1.46</version>
            </dependency>
            <dependency>
                <groupId>org.bouncycastle</groupId>
                <artifactId>bcmail-jdk16</artifactId>
-                <version>${bouncycastle.version}</version>
+                <version>1.46</version>
            </dependency>
            <dependency>
                <groupId>net.iharder</groupId>
@@ -188,27 +179,27 @@
            <dependency>
                <groupId>org.codehaus.jackson</groupId>
                <artifactId>jackson-core-asl</artifactId>
-                <version>${jackson.version}</version>
+                <version>1.9.12</version>
            </dependency>
            <dependency>
                <groupId>org.codehaus.jackson</groupId>
                <artifactId>jackson-mapper-asl</artifactId>
-                <version>${jackson.version}</version>
+                <version>1.9.12</version>
            </dependency>
            <dependency>
                <groupId>org.codehaus.jackson</groupId>
                <artifactId>jackson-xc</artifactId>
-                <version>${jackson.version}</version>
+                <version>1.9.12</version>
            </dependency>
            <dependency>
                <groupId>org.codehaus.jackson</groupId>
                <artifactId>jackson-jaxrs</artifactId>
-                <version>${jackson.version}</version>
+                <version>1.9.12</version>
            </dependency>
            <dependency>
                <groupId>org.jboss.spec.javax.servlet</groupId>
                <artifactId>jboss-servlet-api_3.0_spec</artifactId>
-                <version>${servlet.api.30.version}</version>
+                <version>1.0.1.Final</version>
            </dependency>
            <dependency>
                <groupId>org.jboss.spec.javax.servlet</groupId>
@@ -291,19 +282,19 @@
            <dependency>
                <groupId>com.google.api-client</groupId>
                <artifactId>google-api-client</artifactId>
-                <version>${google.client.version}</version>
+                <version>1.14.1-beta</version>
            </dependency>
            <dependency>
                <groupId>org.freemarker</groupId>
                <artifactId>freemarker</artifactId>
-                <version>${freemarker.version}</version>
+                <version>2.3.19</version>
            </dependency>

            <!-- Google+ -->
            <dependency>
                <groupId>com.google.http-client</groupId>
                <artifactId>google-http-client-jackson</artifactId>
-                <version>${google.client.version}</version>
+                <version>1.14.1-beta</version>
            </dependency>
            <dependency>
                <groupId>com.google.apis</groupId>
@@ -315,19 +306,19 @@
            <dependency>
                <groupId>org.twitter4j</groupId>
                <artifactId>twitter4j-core</artifactId>
-                <version>${twitter4j.version}</version>
+                <version>3.0.5</version>
            </dependency>

 			<!-- QR Code Generator -->
            <dependency>
      			<groupId>com.google.zxing</groupId>
      			<artifactId>core</artifactId>
-      			<version>${google.zxing.version}</version>
+      			<version>2.2</version>
 			</dependency>
            <dependency>
      			<groupId>com.google.zxing</groupId>
      			<artifactId>javase</artifactId>
-      			<version>${google.zxing.version}</version>
+      			<version>2.2</version>
 			</dependency>

 			<!-- Email Test Servers -->
@@ -341,19 +332,19 @@
            <dependency>
                <groupId>de.idyl</groupId>
                <artifactId>winzipaes</artifactId>
-                <version>${winzipaes.version}</version>
+                <version>1.0.1</version>
            </dependency>

 			<!-- Selenium -->
 			<dependency>
 				<groupId>org.seleniumhq.selenium</groupId>
 				<artifactId>selenium-java</artifactId>
-				<version>${selenium.version}</version>
+				<version>2.35.0</version>
  			</dependency>
 			<dependency>
 				<groupId>org.seleniumhq.selenium</groupId>
 				<artifactId>selenium-chrome-driver</artifactId>
-				<version>${selenium.version}</version>
+				<version>2.35.0</version>
                <scope>test</scope>
 			</dependency>
            <dependency>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <name>Aerogear UPS Parent</name>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <name>Third-party Integration Parent</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -20,9 +20,7 @@

    "theme": {
        "default": "keycloak",
-        "folder": {
-          "dir": "${jboss.server.config.dir}/themes"
-        }
+        "dir": "${jboss.server.config.dir}/themes"
    },

    "login-forms": {
@@ -25,6 +25,7 @@

        <properties>
            <property name="hibernate.hbm2ddl.auto" value="update" />
+            <property name="jboss.as.jpa.managed" value="false" />
        </properties>
    </persistence-unit>
 	
@@ -36,6 +37,7 @@

        <properties>
            <property name="hibernate.hbm2ddl.auto" value="update" />
+            <property name="jboss.as.jpa.managed" value="false" />
        </properties>
    </persistence-unit>
 	
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -2,7 +2,6 @@ package org.keycloak.services.resources;

 import org.jboss.logging.Logger;
 import org.jboss.resteasy.annotations.cache.NoCache;
-import org.jboss.resteasy.spi.BadRequestException;
 import org.jboss.resteasy.spi.NotFoundException;
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
 import org.jboss.resteasy.spi.UnauthorizedException;
@@ -99,8 +98,7 @@ public class RealmsResource {
    @Produces(MediaType.TEXT_HTML)
    @NoCache
    public String getLoginStatusIframe(final @PathParam("realm") String name,
-                                       @QueryParam("client_id") String client_id,
-                                       @QueryParam("origin") String origin) {
+                                       @QueryParam("client_id") String client_id) {
        logger.info("getLoginStatusIframe");
        AuthenticationManager auth = new AuthenticationManager(providers);

@@ -118,33 +116,31 @@ public class RealmsResource {

        InputStream is = getClass().getClassLoader().getResourceAsStream("login-status-iframe.html");
        if (is == null) throw new NotFoundException("Could not find login-status-iframe.html ");
+        Set<String> redirectUris = TokenService.resolveValidRedirects(uriInfo, client.getRedirectUris());
+        String origin = null;
+        for (String redirect : redirectUris) {

-        boolean valid = false;
-        for (String o : client.getWebOrigins()) {
-            if (o.equals("*") || o.equals(origin)) {
-                valid = true;
-                break;
+            int index = redirect.indexOf("://");
+            if (index == -1) continue;
+            index = redirect.indexOf('/', index + 3);
+            if (index == -1) {
+                origin = redirect;
+            } else {
+                origin = redirect.substring(0, index);
            }
-        }
+            break;

-        for (String r : TokenService.resolveValidRedirects(uriInfo, client.getRedirectUris())) {
-            r = r.substring(0, r.indexOf('/', 8));
-            if (r.equals(origin)) {
-                valid = true;
-                break;
-            }
        }
-
-        if (!valid) {
-            throw new BadRequestException("Invalid origin");
-        }
-
+        String file = null;
        try {
-            String file = StreamUtil.readString(is);
-            return file.replace("ORIGIN", origin);
+            file = StreamUtil.readString(is);
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
+        file = file.replace("ORIGIN", origin);
+        //System.out.println(file);
+        return file;
+
    }

    @Path("{realm}/tokens")
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-social-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-social-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-social-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-social-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-social-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-beta-1-20150523</version>
+        <version>1.0-beta-1-20150521</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>