KEYCLOAK-1070 Migration for adding names to builtin clients

services/src/main/java/org/keycloak/services/managers/RealmManager.java

@@ -113,11 +113,11 @@ public class RealmManager {
     }
 
     public String getRealmAdminClientId(RealmModel realm) {
-        return "realm-management";
+        return Constants.REALM_MANAGEMENT_CLIENT_ID;
     }
 
     public String getRealmAdminClientId(RealmRepresentation realm) {
-        return "realm-management";
+        return Constants.REALM_MANAGEMENT_CLIENT_ID;
     }
 
 
@@ -223,10 +223,11 @@ public class RealmManager {
         if (client == null) {
             client = new ClientManager(this).createClient(realm, Constants.BROKER_SERVICE_CLIENT_ID);
             client.setEnabled(true);
+            client.setName("${client_" + Constants.BROKER_SERVICE_CLIENT_ID + "}");
             client.setFullScopeAllowed(false);
 
             for (String role : Constants.BROKER_SERVICE_ROLES) {
-                client.addRole(role).setDescription("${role_"+role+"}");
+                client.addRole(role).setDescription("${role_"+ role.toLowerCase().replaceAll("_", "-") +"}");
             }
         }
     }

services/src/main/java/org/keycloak/services/resources/AccountService.java

@@ -531,7 +531,14 @@ public class AccountService {
         event.event(EventType.REVOKE_GRANT).client(auth.getClient()).user(auth.getUser()).detail(Details.REVOKED_CLIENT, client.getClientId()).success();
         setReferrerOnPage();
 
-        return account.setSuccess(Messages.SUCCESS_GRANT_REVOKED).createResponse(AccountPages.APPLICATIONS);
+        UriBuilder builder = Urls.accountBase(uriInfo.getBaseUri()).path(AccountService.class, "applicationsPage");
+        String referrer = uriInfo.getQueryParameters().getFirst("referrer");
+        if (referrer != null) {
+            builder.queryParam("referrer", referrer);
+
+        }
+        URI location = builder.build(realm.getName());
+        return Response.seeOther(location).build();
     }
 
     /**