SONAR-9136 remove permission to AnyOne in perm template of new orgs

SonarSource · Apr 27, 2017 · 93ce8a7 · 93ce8a7
1 parent d7ce42f
commit 93ce8a7
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/...er/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java b/...er/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java
@@ -217,8 +217,6 @@ private void insertDefaultTemplateOnGroups(DbSession dbSession, OrganizationDto
     insertGroupPermission(dbSession, permissionTemplateDto, SCAN.getKey(), ownerGroup);
     insertGroupPermission(dbSession, permissionTemplateDto, USER, defaultGroup);
     insertGroupPermission(dbSession, permissionTemplateDto, CODEVIEWER, defaultGroup);
-    insertGroupPermission(dbSession, permissionTemplateDto, USER, null);
-    insertGroupPermission(dbSession, permissionTemplateDto, CODEVIEWER, null);
 
     dbClient.organizationDao().setDefaultTemplates(
       dbSession,

diff --git a/...onar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java b/...onar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java
@@ -272,7 +272,6 @@ public void create_creates_default_template_for_new_organization() throws Organi
       .extracting(PermissionTemplateGroupDto::getGroupId, PermissionTemplateGroupDto::getPermission)
       .containsOnly(
         tuple(ownersGroup.getId(), UserRole.ADMIN), tuple(ownersGroup.getId(), UserRole.ISSUE_ADMIN), tuple(ownersGroup.getId(), GlobalPermissions.SCAN_EXECUTION),
-        tuple(ANYONE_GROUP_ID, UserRole.USER), tuple(ANYONE_GROUP_ID, UserRole.CODEVIEWER),
         tuple(defaultGroupId, UserRole.USER), tuple(defaultGroupId, UserRole.CODEVIEWER));
   }
 

diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java
@@ -524,7 +524,7 @@ public void request_creates_members_group_and_add_current_user_to_it() {
   }
 
   @Test
-  public void request_creates_default_template_for_owner_group_and_anyone() {
+  public void request_creates_default_template_for_owner_group() {
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
     UserDto user = dbTester.users().insertUser();
     userSession.logIn(user).setSystemAdministrator();
@@ -544,7 +544,6 @@ public void request_creates_default_template_for_owner_group_and_anyone() {
       .extracting(PermissionTemplateGroupDto::getGroupId, PermissionTemplateGroupDto::getPermission)
       .containsOnly(
         tuple(ownersGroup.getId(), UserRole.ADMIN), tuple(ownersGroup.getId(), UserRole.ISSUE_ADMIN), tuple(ownersGroup.getId(), GlobalPermissions.SCAN_EXECUTION),
-        tuple(0, UserRole.USER), tuple(0, UserRole.CODEVIEWER),
         tuple(defaultGroup.getId(), UserRole.USER), tuple(defaultGroup.getId(), UserRole.CODEVIEWER));
   }