Merge pull request #490 from BillFarber/task/changeScaffoldRoles

DEVEXP-546: Scaffold new roles using privileges instead of OOTB roles

Author: BillFarber

src/main/java/com/marklogic/appdeployer/scaffold/ScaffoldGenerator.java

@@ -139,8 +139,9 @@ protected ObjectNode buildReaderRole(String appName) {
 		node.put("role-name", appName + "-reader");
 		node.put("description", "Can view documents, but not edit");
 		ArrayNode array = node.putArray("role");
-		array.add("rest-reader");
 		array.add(appName + "-nobody");
+		array = node.putArray("privilege");
+		array.add(buildPrivilege("rest-reader", "http://marklogic.com/xdmp/privileges/rest-reader", "execute"));
 		return node;
 	}
 
@@ -149,9 +150,9 @@ protected ObjectNode buildWriterRole(String appName) {
 		node.put("role-name", appName + "-writer");
 		node.put("description", "Can read and write documents");
 		ArrayNode array = node.putArray("role");
-		array.add("rest-writer");
 		array.add(appName + "-reader");
 		array = node.putArray("privilege");
+		array.add(buildPrivilege("rest-writer", "http://marklogic.com/xdmp/privileges/rest-writer", "execute"));
 		array.add(buildPrivilege("any-uri", "http://marklogic.com/xdmp/privileges/any-uri", "execute"));
 		array.add(buildPrivilege("unprotected-collections", "http://marklogic.com/xdmp/privileges/unprotected-collections", "execute"));
 		return node;

src/test/java/com/marklogic/appdeployer/scaffold/GenerateScaffoldTest.java

@@ -136,5 +136,9 @@ private void assertSecurity(Boolean shouldExist) {
 		assertEquals(shouldExist, new RoleManager(manageClient).exists("sample-app-writer"));
 		assertEquals(shouldExist, new RoleManager(manageClient).exists("sample-app-internal"));
 		assertEquals(shouldExist, new RoleManager(manageClient).exists("sample-app-admin"));
+		if (shouldExist) {
+			assertTrue(new RoleManager(manageClient).getPropertiesAsXmlString("sample-app-reader").contains("http://marklogic.com/xdmp/privileges/rest-reader"));
+			assertTrue(new RoleManager(manageClient).getPropertiesAsXmlString("sample-app-writer").contains("http://marklogic.com/xdmp/privileges/rest-writer"));
+		}
 	}
 }