CSPACE-3158: Adding change that qualified role names with tentant ID now that App...

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 f28a30451d392d234419d02e679cc160b3582a39..36022c059d5a791c3487a8772c494cf6aeabce64 100644 (file)
--- 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 8c3eec3a6187bc41a95e58bd87249bb46b7aeafd..837fbf51373aaa612c31cb2a4c990ff40a96415d 100644 (file)
--- 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;
         }