Aligning with upstream IDM changes

zzzprojects · May 30, 2014 · 6e87992 · 6e87992
1 parent dd9fbdb
commit 6e87992
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,