Renamed registration to default roles, add default roles to all users when they are created

admin-ui/src/main/resources/META-INF/resources/admin/js/app.js

@@ -82,8 +82,8 @@ module.config([ '$routeProvider', function($routeProvider) {
             },
             controller : 'RealmSocialCtrl'
         })
-        .when('/realms/:realm/registration-settings', {
+        .when('/realms/:realm/default-roles', {
-            templateUrl : 'partials/realm-registration.html',
+            templateUrl : 'partials/realm-default-roles.html',
             resolve : {
                 realm : function(RealmLoader) {
                     return RealmLoader();
@@ -95,7 +95,7 @@ module.config([ '$routeProvider', function($routeProvider) {
                     return RoleListLoader();
                 }
             },
-            controller : 'RealmRegistrationCtrl'
+            controller : 'RealmDefaultRolesCtrl'
         })
         .when('/realms/:realm/required-credentials', {
             templateUrl : 'partials/realm-credentials.html',

admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js

@@ -427,9 +427,9 @@ module.controller('RealmRequiredCredentialsCtrl', function($scope, Realm, realm,
     };
 });
 
-module.controller('RealmRegistrationCtrl', function ($scope, Realm, realm, applications, roles, Notifications, ApplicationRole, Application) {
+module.controller('RealmDefaultRolesCtrl', function ($scope, Realm, realm, applications, roles, Notifications, ApplicationRole, Application) {
 
-    console.log('RealmRegistrationCtrl');
+    console.log('RealmDefaultRolesCtrl');
 
     $scope.realm = realm;
 

admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-credentials.html

@@ -6,8 +6,8 @@
                 <ul class="rcue-tabs">
                     <li><a href="#/realms/{{realm.realm}}">General</a></li>
                     <li data-ng-show="realm.social"><a href="#/realms/{{realm.realm}}/social-settings">Social</a></li>
-                    <li data-ng-show="realm.registrationAllowed"><a href="#/realms/{{realm.realm}}/registration-settings">Registration</a></li>
                     <li><a href="#/realms/{{realm.realm}}/roles">Roles</a></li>
+                    <li><a href="#/realms/{{realm.realm}}/default-roles">Default Roles</a></li>
                     <li class="active"><a href="#/realms/{{realm.realm}}/required-credentials">Credentials</a></li>
                     <li><a href="#/realms/{{realm.realm}}/token-settings">Token</a></li>
                     <li><a href="#/realms/{{realm.realm}}/keys-settings">Keys</a></li>

admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-default-roles.html

@@ -6,8 +6,8 @@
                 <ul class="rcue-tabs">
                     <li><a href="#/realms/{{realm.realm}}">General</a></li>
                     <li data-ng-show="realm.social"><a href="#/realms/{{realm.realm}}/social-settings">Social</a></li>
-                    <li class="active"><a href="#/realms/{{realm.realm}}/registration-settings">Registration</a></li>
                     <li><a href="#/realms/{{realm.realm}}/roles">Roles</a></li>
+                    <li class="active"><a href="#/realms/{{realm.realm}}/default-roles">Default Roles</a></li>
                     <li><a href="#/realms/{{realm.realm}}/required-credentials">Credentials</a></li>
                     <li><a href="#/realms/{{realm.realm}}/token-settings">Token</a></li>
                     <li><a href="#/realms/{{realm.realm}}/keys-settings">Keys</a></li>

admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-detail.html

@@ -6,8 +6,8 @@
                 <ul class="rcue-tabs">
                     <li class="active"><a href="#/realms/{{realm.realm}}">General</a></li>
                     <li data-ng-show="social"><a href="#/realms/{{realm.realm}}/social-settings">Social</a></li>
-                    <li data-ng-show="registrationAllowed"><a href="#/realms/{{realm.realm}}/registration-settings">Registration</a></li>
                     <li><a href="#/realms/{{realm.realm}}/roles">Roles</a></li>
+                    <li><a href="#/realms/{{realm.realm}}/default-roles">Default Roles</a></li>
                     <li><a href="#/realms/{{realm.realm}}/required-credentials">Credentials</a></li>
                     <li><a href="#/realms/{{realm.realm}}/token-settings">Token</a></li>
                     <li><a href="#/realms/{{realm.realm}}/keys-settings">Keys</a></li>

admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-keys.html

@@ -6,8 +6,8 @@
                 <ul class="rcue-tabs">
                     <li><a href="#/realms/{{realm.realm}}">General</a></li>
                     <li data-ng-show="realm.social"><a href="#/realms/{{realm.realm}}/social-settings">Social</a></li>
-                    <li data-ng-show="realm.registrationAllowed"><a href="#/realms/{{realm.realm}}/registration-settings">Registration</a></li>
                     <li><a href="#/realms/{{realm.realm}}/roles">Roles</a></li>
+                    <li><a href="#/realms/{{realm.realm}}/default-roles">Default Roles</a></li>
                     <li><a href="#/realms/{{realm.realm}}/required-credentials">Credentials</a></li>
                     <li><a href="#/realms/{{realm.realm}}/token-settings">Token</a></li>
                     <li class="active"><a href="#/realms/{{realm.realm}}/keys-settings">Keys</a></li>

admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-smtp.html

@@ -6,8 +6,8 @@
                 <ul class="rcue-tabs">
                     <li><a href="#/realms/{{realm.realm}}">General</a></li>
                     <li data-ng-show="realm.social"><a href="#/realms/{{realm.realm}}/social-settings">Social</a></li>
-                    <li data-ng-show="realm.registrationAllowed"><a href="#/realms/{{realm.realm}}/registration-settings">Registration</a></li>
                     <li><a href="#/realms/{{realm.realm}}/roles">Roles</a></li>
+                    <li><a href="#/realms/{{realm.realm}}/default-roles">Default Roles</a></li>
                     <li><a href="#/realms/{{realm.realm}}/required-credentials">Credentials</a></li>
                     <li><a href="#/realms/{{realm.realm}}/token-settings">Token</a></li>
                     <li><a href="#/realms/{{realm.realm}}/keys-settings">Keys</a></li>

admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-social.html

@@ -6,8 +6,8 @@
                 <ul class="rcue-tabs">
                     <li><a href="#/realms/{{realm.realm}}">General</a></li>
                     <li class="active" data-ng-show="realm.social"><a href="#/realms/{{realm.realm}}/social-settings">Social</a></li>
-                    <li data-ng-show="realm.registrationAllowed"><a href="#/realms/{{realm.realm}}/registration-settings">Registration</a></li>
                     <li><a href="#/realms/{{realm.realm}}/roles">Roles</a></li>
+                    <li><a href="#/realms/{{realm.realm}}/default-roles">Default Roles</a></li>
                     <li><a href="#/realms/{{realm.realm}}/required-credentials">Credentials</a></li>
                     <li><a href="#/realms/{{realm.realm}}/token-settings">Token</a></li>
                     <li><a href="#/realms/{{realm.realm}}/keys-settings">Keys</a></li>

admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-tokens.html

@@ -6,8 +6,8 @@
                 <ul class="rcue-tabs">
                     <li><a href="#/realms/{{realm.realm}}">General</a></li>
                     <li data-ng-show="realm.social"><a href="#/realms/{{realm.realm}}/social-settings">Social</a></li>
-                    <li data-ng-show="realm.registrationAllowed"><a href="#/realms/{{realm.realm}}/registration-settings">Registration</a></li>
                     <li><a href="#/realms/{{realm.realm}}/roles">Roles</a></li>
+                    <li><a href="#/realms/{{realm.realm}}/default-roles">Default Roles</a></li>
                     <li><a href="#/realms/{{realm.realm}}/required-credentials">Credentials</a></li>
                     <li class="active"><a href="#/realms/{{realm.realm}}/token-settings">Token</a></li>
                     <li><a href="#/realms/{{realm.realm}}/keys-settings">Keys</a></li>

admin-ui/src/main/resources/META-INF/resources/admin/partials/role-detail.html

@@ -6,8 +6,8 @@
                 <ul class="rcue-tabs">
                     <li><a href="#/realms/{{realm.realm}}">General</a></li>
                     <li data-ng-show="realm.social"><a href="#/realms/{{realm.realm}}/social-settings">Social</a></li>
-                    <li><a href="#/realms/{{realm.realm}}/registration-settings">Registration</a></li>
                     <li class="active"><a href="#/realms/{{realm.realm}}/roles">Roles</a></li>
+                    <li><a href="#/realms/{{realm.realm}}/default-roles">Default Roles</a></li>
                     <li><a href="#/realms/{{realm.realm}}/required-credentials">Credentials</a></li>
                     <li><a href="#/realms/{{realm.realm}}/token-settings">Token</a></li>
                     <li><a href="#/realms/{{realm.realm}}/keys-settings">Keys</a></li>

admin-ui/src/main/resources/META-INF/resources/admin/partials/role-list.html

@@ -6,8 +6,8 @@
                 <ul class="rcue-tabs">
                     <li><a href="#/realms/{{realm.realm}}">General</a></li>
                     <li data-ng-show="realm.social"><a href="#/realms/{{realm.realm}}/social-settings">Social</a></li>
-                    <li data-ng-show="realm.registrationAllowed"><a href="#/realms/{{realm.realm}}/registration-settings">Registration</a></li>
                     <li class="active"><a href="#/realms/{{realm.realm}}/roles">Roles</a></li>
+                    <li><a href="#/realms/{{realm.realm}}/default-roles">Default Roles</a></li>
                     <li><a href="#/realms/{{realm.realm}}/required-credentials">Credentials</a></li>
                     <li><a href="#/realms/{{realm.realm}}/token-settings">Token</a></li>
                     <li><a href="#/realms/{{realm.realm}}/keys-settings">Keys</a></li>

model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java

@@ -444,7 +444,19 @@ public class RealmAdapter implements RealmModel {
         entity.setRealm(realm);
         em.persist(entity);
         em.flush();
-        return new UserAdapter(entity);
+        UserModel userModel = new UserAdapter(entity);
+
+        for (String r : getDefaultRoles()) {
+            grantRole(userModel, getRole(r));
+        }
+
+        for (ApplicationModel application : getApplications()) {
+            for (String r : application.getDefaultRoles()) {
+                application.grantRole(userModel, application.getRole(r));
+            }
+        }
+
+        return userModel;
     }
 
     @Override

model/picketlink/src/main/java/org/keycloak/models/picketlink/RealmAdapter.java

@@ -516,7 +516,19 @@ public class RealmAdapter implements RealmModel {
         if (user != null) throw new IllegalStateException("User already exists");
         user = new User(username);
         getIdm().add(user);
-        return new UserAdapter(user, getIdm());
+        UserAdapter userModel = new UserAdapter(user, getIdm());
+
+        for (String r : getDefaultRoles()) {
+            grantRole(userModel, getRole(r));
+        }
+
+        for (ApplicationModel application : getApplications()) {
+            for (String r : application.getDefaultRoles()) {
+                application.grantRole(userModel, application.getRole(r));
+            }
+        }
+
+        return userModel;
     }
 
     @Override
@@ -885,7 +897,7 @@ public class RealmAdapter implements RealmModel {
     @Override
     public Set<SocialLinkModel> getSocialLinks(UserModel user) {
         RelationshipQuery<SocialLinkRelationship> query = getRelationshipManager().createRelationshipQuery(SocialLinkRelationship.class);
-        query.setParameter(SocialLinkRelationship.USER, ((UserAdapter)user).getUser());
+        query.setParameter(SocialLinkRelationship.USER, ((UserAdapter) user).getUser());
         List<SocialLinkRelationship> plSocialLinks = query.getResultList();
 
         Set<SocialLinkModel> results = new HashSet<SocialLinkModel>();

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

@@ -339,16 +339,6 @@ public class TokenService {
             realm.updateCredential(user, credentials);
         }
 
-        for (String r : realm.getDefaultRoles()) {
-            realm.grantRole(user, realm.getRole(r));
-        }
-
-        for (ApplicationModel application : realm.getApplications()) {
-            for (String r : application.getDefaultRoles()) {
-                application.grantRole(user, application.getRole(r));
-            }
-        }
-
         return processLogin(clientId, scopeParam, state, redirect, formData);
     }
 

testsuite/integration/src/test/java/org/keycloak/testsuite/account/ProfileTest.java

@@ -54,12 +54,12 @@ public class ProfileTest {
             user.setAttribute("key2", "value2");
 
             ApplicationModel accountApp = appRealm.getApplicationNameMap().get(org.keycloak.models.Constants.ACCOUNT_APPLICATION);
-            for (String r : accountApp.getDefaultRoles()) {
-                accountApp.grantRole(user, accountApp.getRole(r));
-            }
 
             UserModel user2 = appRealm.addUser("test-user-no-access@localhost");
             user2.setEnabled(true);
+            for (String r : accountApp.getDefaultRoles()) {
+                accountApp.deleteRoleMapping(user2, accountApp.getRole(r));
+            }
             UserCredentialModel creds = new UserCredentialModel();
             creds.setType(CredentialRepresentation.PASSWORD);
             creds.setValue("password");

testsuite/integration/src/test/java/org/keycloak/testsuite/forms/AccountTest.java

@@ -52,13 +52,14 @@ public class AccountTest {
         @Override
         public void config(RealmManager manager, RealmModel adminstrationRealm, RealmModel appRealm) {
             UserModel user = appRealm.getUser("test-user@localhost");
+
             ApplicationModel accountApp = appRealm.getApplicationNameMap().get(org.keycloak.models.Constants.ACCOUNT_APPLICATION);
-            for (String r : accountApp.getDefaultRoles()) {
-                accountApp.grantRole(user, accountApp.getRole(r));
-            }
 
             UserModel user2 = appRealm.addUser("test-user-no-access@localhost");
             user2.setEnabled(true);
+            for (String r : accountApp.getDefaultRoles()) {
+                accountApp.deleteRoleMapping(user2, accountApp.getRole(r));
+            }
             UserCredentialModel creds = new UserCredentialModel();
             creds.setType(CredentialRepresentation.PASSWORD);
             creds.setValue("password");