From e98d3f8dcdbe0de8606e0475f7b30f1d6705d122 Mon Sep 17 00:00:00 2001 From: Richard Millet Date: Tue, 9 Nov 2010 15:54:39 +0000 Subject: [PATCH] CSPACE-3158: Adding change that qualified role names with tentant ID now that App layer got a chance to update their tests. --- .../services/authorization/client/test/RoleServiceTest.java | 2 +- .../services/authorization/storage/RoleDocumentHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/RoleServiceTest.java b/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/RoleServiceTest.java index f28a30451..36022c059 100644 --- a/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/RoleServiceTest.java +++ b/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/RoleServiceTest.java @@ -353,7 +353,7 @@ public class RoleServiceTest extends AbstractServiceTestImpl { //FIXME: Tenant ID of "1" should not be hard coded String roleNameToVerify = "ROLE_" + - //"1_" + FIXME: Need to qualify role name with tenant ID + "1_" + verifyRoleName.toUpperCase(); Assert.assertEquals(output.getRoleName(), roleNameToVerify, "RoleName fix did not work!"); diff --git a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/RoleDocumentHandler.java b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/RoleDocumentHandler.java index 8c3eec3a6..837fbf513 100644 --- a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/RoleDocumentHandler.java +++ b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/RoleDocumentHandler.java @@ -189,7 +189,7 @@ public class RoleDocumentHandler private String fixRoleName(String role, String tenantId) { String roleName = role.toUpperCase(); - String rolePrefix = "ROLE_";//FIXME: Need to qualify role names with tenant ID. // + tenantId + "_"; + String rolePrefix = "ROLE_" + tenantId + "_"; if (!roleName.startsWith(rolePrefix)) { roleName = rolePrefix + roleName; } -- 2.47.3