Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public static void setUpBeforeClass() throws Exception {
};
addRangePathIndex(dbName, rangePaths);

createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:eval-in", "any-uri", "xdbc:invoke", "xdmp-login");
createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:eval-in", "any-uri", "xdbc:invoke");
createRESTUser("eval-user", "x", "test-eval", "rest-admin", "rest-writer", "rest-reader", "rest-extension-user", "manage-user");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public static void tearDownAfterClass() throws Exception {
@BeforeEach
public void setUp() throws Exception {
// create new connection for each test below
createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:eval-in", "any-uri", "xdbc:invoke", "xdmp-login");
createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:eval-in", "any-uri", "xdbc:invoke");
createRESTUser("eval-user", "x", "test-eval", "rest-admin", "rest-writer", "rest-reader");
client = newClientAsUser("eval-user", "x");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public String deleteJSON(String docUri) {

@BeforeAll
public static void setUpBeforeClass() throws Exception {
createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:value", "xdmp:eval", "xdmp:eval-in", "any-uri", "xdbc:invoke", "xdmp-login");
createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:value", "xdmp:eval", "xdmp:eval-in", "any-uri", "xdbc:invoke");
createRESTUser("eval-user", "x", "test-eval", "rest-admin", "rest-writer", "rest-reader", "rest-extension-user");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public static void tearDownAfterClass() throws Exception {
@BeforeEach
public void setUp() throws Exception {
createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:eval-in", "any-uri",
"xdbc:invoke", "temporal:statement-set-system-time", "xdmp-login");
"xdbc:invoke", "temporal:statement-set-system-time");
createRESTUser("eval-user", "x", "test-eval", "rest-admin", "rest-writer", "rest-reader", "temporal-admin");

adminClient = getDatabaseClient("rest-admin", "x", getConnType());
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@
"action": "http://marklogic.com/xdmp/privileges/rest-tracer",
"kind": "execute"
},
{
"privilege-name": "xdmp-login",
"action": "http://marklogic.com/xdmp/privileges/xdmp-login",
"kind": "execute"
},
{
"privilege-name": "xdmp:invoke",
"action": "http://marklogic.com/xdmp/privileges/xdmp-invoke",
Expand Down
11 changes: 7 additions & 4 deletions test-app/src/main/ml-config/security/users/rest-admin.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"user-name": "rest-admin",
"description": "rest-admin user",
"role": ["rest-admin", "java-test-delete-temporal", "java-test-xdmp-login"],
"password": "x"
"user-name": "rest-admin",
"description": "rest-admin user",
"role": [
"rest-admin",
Comment on lines 1 to +5
"java-test-delete-temporal"
],
"password": "x"
}
10 changes: 6 additions & 4 deletions test-app/src/main/ml-config/security/users/rest-evaluator.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"user-name": "rest-evaluator",
"description": "Test user for the java-client-api-project",
"role": ["java-test-evaluator", "java-test-xdmp-login"],
"password": "x"
"user-name": "rest-evaluator",
"description": "Test user for the java-client-api-project",
"role": [
"java-test-evaluator"
Comment on lines 1 to +5
],
"password": "x"
}

This file was deleted.

11 changes: 7 additions & 4 deletions test-app/src/main/ml-config/security/users/rest-writer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"user-name": "rest-writer",
"description": "rest-writer user",
"role": ["rest-writer", "java-test-delete-graph", "java-test-xdmp-login"],
"password": "x"
"user-name": "rest-writer",
"description": "rest-writer user",
"role": [
"rest-writer",
Comment on lines 1 to +5
"java-test-delete-graph"
],
"password": "x"
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"user-name": "writer-no-default-permissions",
"description": "test user that does not have the rest-writer role so as to avoid having default permissions",
"role": [
"test-rest-writer",
"java-test-delete-graph",
"rest-extension-user",
"rest-reader",
"java-test-xdmp-login"
],
"password": "x"
"user-name": "writer-no-default-permissions",
"description": "test user that does not have the rest-writer role so as to avoid having default permissions",
"role": [
"test-rest-writer",
Comment on lines 1 to +5
"java-test-delete-graph",
"rest-extension-user",
"rest-reader"
],
"password": "x"
}
Loading