Merge pull request keycloak#699 from mposolda/master

Admin console fixes, KEYCLOAK_REMEMBER_ME life changed to 1 year
cvasilak · Sep 18, 2014 · 825c475 · 825c475
2 parents 16ea183 89471b7
commit 825c475
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/...ommon-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js b/...ommon-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js
@@ -246,7  246,6 @@ module.controller('ApplicationDetailCtrl', function($scope, realm, application,
         }
     } else {
         $scope.application = { enabled: true };
-        $scope.application.webOrigins = [];
         $scope.application.redirectUris = [];
         $scope.accessType = $scope.accessTypes[0];
     }
@@ -296,10  295,6 @@ module.controller('ApplicationDetailCtrl', function($scope, realm, application,
             Notifications.error("You must specify at least one redirect uri");
         } else {
             if ($scope.create) {
-                if ($scope.application.webOrigins.length == 0) {
-                    // let rest api put in default webOrigins
-                    $scope.application.webOrigins = null;
-                }
                 Application.save({
                     realm: realm.realm,
                     application: ''

diff --git a/...s/src/main/resources/theme/admin/base/resources/templates/kc-navigation-oauth-client.html b/...s/src/main/resources/theme/admin/base/resources/templates/kc-navigation-oauth-client.html
@@ -1,4  1,4 @@
-<ul class="nav nav-tabs nav-tabs-pf">
 <ul class="nav nav-tabs nav-tabs-pf" data-ng-show="!create">
     <li ng-class="{active: !path[4]}"><a href="#/realms/{{realm.realm}}/oauth-clients/{{oauth.name}}">Settings</a></li>
     <li ng-class="{active: path[4] == 'credentials'}" data-ng-show="!oauth.publicClient"><a href="#/realms/{{realm.realm}}/oauth-clients/{{oauth.name}}/credentials">Credentials</a></li>
     <li ng-class="{active: path[4] == 'claims'}"><a href="#/realms/{{realm.realm}}/oauth-clients/{{oauth.name}}/claims">Claims</a></li>

diff --git a/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java b/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java
@@ -119,9  119,9 @@ public void createLoginCookie(RealmModel realm, UserModel user, UserSessionModel
     public void createRememberMeCookie(RealmModel realm, String username, UriInfo uriInfo, ClientConnection connection) {
         String path = getIdentityCookiePath(realm, uriInfo);
         boolean secureOnly = realm.getSslRequired().isRequired(connection);
-        // remember me cookie should be persistent (hardcoded to 1 month for now)
         // remember me cookie should be persistent (hardcoded to 365 days for now)
         //NewCookie cookie = new NewCookie(KEYCLOAK_REMEMBER_ME, "true", path, null, null, realm.getCentralLoginLifespan(), secureOnly);// todo httponly , true);
-        CookieHelper.addCookie(KEYCLOAK_REMEMBER_ME, username, path, null, null, 2592000, secureOnly, true);
         CookieHelper.addCookie(KEYCLOAK_REMEMBER_ME, username, path, null, null, 31536000, secureOnly, true);
     }
 
     protected String encodeToken(RealmModel realm, Object token) {