From 93ce8a7e599cea9ed686b4406a0f4f64d3486a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Lesaint?= Date: Mon, 24 Apr 2017 17:58:44 +0200 Subject: [PATCH] SONAR-9136 remove permission to AnyOne in perm template of new orgs --- .../sonar/server/organization/OrganizationCreationImpl.java | 2 -- .../server/organization/OrganizationCreationImplTest.java | 1 - .../org/sonar/server/organization/ws/CreateActionTest.java | 3 +-- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java b/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java index cc835cbb44c2..8b51febb2f45 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java +++ b/server/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/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java index ca95df2bbb46..62896239c366 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java +++ b/server/sonar-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 index 7a354eac0bfd..48ac414b7702 100644 --- 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)); }