From e1b9dfe65df5ba3d59b23076d4563e3b8ab7629d Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Fri, 29 Aug 2014 15:49:17 +0200
Subject: [PATCH] KEYCLOAK-649 Invalidate realm if app name or client clientId
 is changed

---
 .../theme/admin/base/resources/js/controllers/applications.js    | 1 +
 .../theme/admin/base/resources/js/controllers/oauth-clients.js   | 1 +
 .../main/java/org/keycloak/models/cache/ApplicationAdapter.java  | 1 +
 .../main/java/org/keycloak/models/cache/OAuthClientAdapter.java  | 1 +
 4 files changed, 4 insertions(+)

diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js
index 5cc6390881..0f468614c0 100755
--- a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js
+++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js
@@ -317,6 +317,7 @@ module.controller('ApplicationDetailCtrl', function($scope, realm, application,
                 }, $scope.application, function() {
                     $scope.changed = false;
                     application = angular.copy($scope.application);
+                    $location.url("/realms/" + realm.realm + "/applications/" + application.name);
                     Notifications.success("Your changes have been saved to the application.");
                 });
             }
diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/oauth-clients.js b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/oauth-clients.js
index b37d228e64..7c66f89a41 100755
--- a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/oauth-clients.js
+++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/oauth-clients.js
@@ -152,6 +152,7 @@ module.controller('OAuthClientDetailCtrl', function($scope, realm, oauth, OAuthC
                 }, $scope.oauth, function() {
                     $scope.changed = false;
                     oauth = angular.copy($scope.oauth);
+                    $location.url("/realms/" + realm.realm + "/oauth-clients/" + oauth.name);
                     Notifications.success("Your changes have been saved to the oauth client.");
                 });
             }
diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/ApplicationAdapter.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/ApplicationAdapter.java
index 58fecaf633..50e3ccc97e 100755
--- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/ApplicationAdapter.java
+++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/ApplicationAdapter.java
@@ -53,6 +53,7 @@ public class ApplicationAdapter extends ClientAdapter implements ApplicationMode
     public void setName(String name) {
         getDelegateForUpdate();
         updated.setName(name);
+        cacheSession.registerRealmInvalidation(cachedRealm.getId());
     }
 
     @Override
diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/OAuthClientAdapter.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/OAuthClientAdapter.java
index 50708b917e..1fe5b25e5d 100755
--- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/OAuthClientAdapter.java
+++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/OAuthClientAdapter.java
@@ -36,6 +36,7 @@ public class OAuthClientAdapter extends ClientAdapter implements OAuthClientMode
     public void setClientId(String id) {
         getDelegateForUpdate();
         updated.setClientId(id);
+        cacheSession.registerRealmInvalidation(cachedRealm.getId());
     }
 
     @Override