diff options
| author | jakefeasel <jfeasel@gmail.com> | 2014-05-29 22:42:35 -0700 |
|---|---|---|
| committer | jakefeasel <jfeasel@gmail.com> | 2014-05-29 22:42:35 -0700 |
| commit | 6e8799234bd60575b9ca94c3d68400381b6da5f6 (patch) | |
| tree | 57daec68988cdb81fb5f6ca489f7cefeb7b371f0 | |
| parent | dd9fbdbb497384bfb38e0b914aefa16096634d53 (diff) | |
| download | sqlfiddle2-6e8799234bd60575b9ca94c3d68400381b6da5f6.zip sqlfiddle2-6e8799234bd60575b9ca94c3d68400381b6da5f6.tar.gz sqlfiddle2-6e8799234bd60575b9ca94c3d68400381b6da5f6.tar.bz2 | |
Aligning with upstream IDM changes
| -rwxr-xr-x | src/main/resources/conf/authentication.json | 8 | ||||
| -rw-r--r-- | src/main/resources/script/createSchema.groovy | 2 | ||||
| -rw-r--r-- | src/main/resources/script/executeQuery.groovy | 4 | ||||
| -rw-r--r-- | src/main/resources/script/loadContent.groovy | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/main/resources/conf/authentication.json b/src/main/resources/conf/authentication.json index 9e5f92f..e99081c 100755 --- a/src/main/resources/conf/authentication.json +++ b/src/main/resources/conf/authentication.json @@ -8,6 +8,7 @@ }, "defaultUserRoles" : [ ], "serverAuthContext" : { + "sessionModule" : { "name" : "JWT_SESSION", "properties" : { @@ -25,13 +26,16 @@ { "name" : "INTERNAL_USER", "properties" : { + "queryId" : "credential-internaluser-query", + "queryOnResource" : "repo/internal/user", "propertyMapping" : { - "authenticationId" : "_id", + "authenticationId" : "username", "userCredential" : "password", "userRoles" : "roles" }, "defaultUserRoles" : [ ] - } + }, + "enabled" : true } ] } diff --git a/src/main/resources/script/createSchema.groovy b/src/main/resources/script/createSchema.groovy index 079c1ca..d91189c 100644 --- a/src/main/resources/script/createSchema.groovy +++ b/src/main/resources/script/createSchema.groovy @@ -33,7 +33,7 @@ if (schema_def.context == "host") { if (hostLink == null) { def recon = openidm.action("recon", - "reconById", + "reconById", [:], [ "mapping" : "fiddles_hosts", "ids" : schema_def._id, diff --git a/src/main/resources/script/executeQuery.groovy b/src/main/resources/script/executeQuery.groovy index 3c1121b..be6d32b 100644 --- a/src/main/resources/script/executeQuery.groovy +++ b/src/main/resources/script/executeQuery.groovy @@ -45,8 +45,8 @@ if (schema_def.context == "host") { ]).result[0] if (hostLink == null) { - openidm.action("recon", - "reconById", + openidm.action("recon", + "reconById", [:], [ "mapping" : "fiddles_hosts", "ids" : schema_def._id, diff --git a/src/main/resources/script/loadContent.groovy b/src/main/resources/script/loadContent.groovy index a671b1a..091d9f5 100644 --- a/src/main/resources/script/loadContent.groovy +++ b/src/main/resources/script/loadContent.groovy @@ -21,7 +21,7 @@ if (fragment_parts.size() > 2) { response["sql"] = query.sql response["id"] = query.id - response["sets"] = openidm.action("endpoint/executeQuery", "query", [:], [ + response["sets"] = openidm.action("endpoint/executeQuery", "query", [ "db_type_id": fragment_parts[0], "schema_short_code": fragment_parts[1], "sql": query.sql, |