Merge pull request #11362 from IQSS/11191-assign-role-api-error-message

Change to duplicate role assignment error message

Author: ofahimIQSS

doc/release-notes/11191-assign-role-api-error-message.md

@@ -0,0 +1,6 @@
+### Modify Assign Role API error message
+
+Change error message from specifying 'User' and 'Dataverse' since it is used for groups and Datasets as well
+Generic message: datasets.api.grant.role.assignee.has.role.error=Role has already been granted.
+
+Note: Re-Translation needed.

src/main/java/propertyFiles/Bundle.properties

@@ -2801,7 +2801,7 @@ datasets.api.datasize.ioerror=Fatal IO error while trying to determine the total
 datasets.api.grant.role.not.found.error=Cannot find role named ''{0}'' in dataverse {1}
 datasets.api.grant.role.cant.create.assignment.error=Cannot create assignment: {0}
 datasets.api.grant.role.assignee.not.found.error=Assignee not found
-datasets.api.grant.role.assignee.has.role.error=User already has this role for this dataset
+datasets.api.grant.role.assignee.has.role.error=Role has already been granted.
 datasets.api.revoke.role.not.found.error="Role assignment {0} not found"
 datasets.api.revoke.role.success=Role {0} revoked for assignee {1} in {2}
 datasets.api.privateurl.error.datasetnotfound=Could not find dataset. 

src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java

@@ -301,7 +301,13 @@ public void testCreateDataset() {
         Response grantRole = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.DS_CONTRIBUTOR, AuthenticatedUsers.get().getIdentifier(), apiToken);
         grantRole.prettyPrint();
         assertEquals(OK.getStatusCode(), grantRole.getStatusCode());
-        
+        // Test duplicate grant
+        grantRole = UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.DS_CONTRIBUTOR, AuthenticatedUsers.get().getIdentifier(), apiToken);
+        grantRole.prettyPrint();
+        grantRole.then().assertThat()
+                .body("message", containsString(BundleUtil.getStringFromBundle("datasets.api.grant.role.assignee.has.role.error")))
+                .statusCode(FORBIDDEN.getStatusCode());
+
         // Create another random user: 
 
         Response createRandomUser = UtilIT.createRandomUser();
@@ -2243,7 +2249,7 @@ private static void validateAssignExistingRole(String datasetPersistentId, Strin
         final Response failedGrantPermission = UtilIT.grantRoleOnDataset(datasetPersistentId, role, "@" + randomUsername, apiToken);
         failedGrantPermission.prettyPrint();
         failedGrantPermission.then().assertThat()
-                .body("message", containsString("User already has this role for this dataset"))
+                .body("message", containsString(BundleUtil.getStringFromBundle("datasets.api.grant.role.assignee.has.role.error")))
                 .statusCode(FORBIDDEN.getStatusCode());
     }