Changeset 499 for Dev

Timestamp:

03/10/14 11:50:04 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Schema patterns should be anchored.
• App returns validation result on error.

Location:

Dev/trunk/src/server

Files:

• app.js (modified) (4 diffs)
• config/couchdb-schema.json (modified) (13 diffs)

Dev/trunk/src/server/app.js

@@ -225 +225 @@
     function putDocument(id,rev,type,doc) {
         var priv = stripAndReturnPrivates(doc);
-        if ( doc.type === type && validator(doc, schema).valid ) {
+        var valid;
+        if ( doc.type === type && (valid = validator(doc, schema)).valid ) {
             var opts = rev ? {headers:{'If-Match':'"'+rev+'"'}} : {};
             return HTTPResult.fromResponsePromise(couch.put(id,doc,opts).response,
@@ -241 +242 @@
             });
         } else {
-            return new HTTPResult(400,{error: "Document failed schema verification."});
+            return new HTTPResult(400,{error: "Document failed schema verification.", valid: valid});
         }
     }
@@ -262 +263 @@
     function postDocument(type,doc) {
         var priv = stripAndReturnPrivates(doc);
-        if ( doc.type === type && validator(doc, schema).valid ) {
+        var valid;
+        if ( doc.type === type && (valid = validator(doc, schema)).valid ) {
             return HTTPResult.fromResponsePromise(couch.post(doc).response,
                                                   handleUnknownError)
@@ -274 +276 @@
             });
         } else {
-            return new HTTPResult(400,{error: "Document failed schema verification."});
+            return new HTTPResult(400,{error: "Document failed schema verification.", valid: valid});
         }
     }

Dev/trunk/src/server/config/couchdb-schema.json

@@ -12 +12 @@
       "type": "object",
       "properties": {
-          "_id": { "type": "string", "pattern": "schemaInfo" },
+          "_id": { "type": "string", "pattern": "^schemaInfo$" },
           "_rev": { "type": "string" },
           "version": { "type": "string" }
@@ -32 +32 @@
         "type": "object",
         "properties": {
-          "type": { "type": "string", "pattern": "Question" },
+          "type": { "type": "string", "pattern": "^Question$" },
           "_id": { "type": "string" },
           "_rev": { "type": "string" },
@@ -49 +49 @@
         "type": "object",
         "properties": {
-          "type": { "type": "string", "pattern": "Survey" },
+          "type": { "type": "string", "pattern": "^Survey$" },
           "_id": { "type": "string" },
           "_rev": { "type": "string" },
@@ -63 +63 @@
         "type": "object",
         "properties": {
-          "type": { "type": "string", "pattern": "SurveyRun" },
+          "type": { "type": "string", "pattern": "^SurveyRun$" },
           "_id": { "type": "string" },
           "_rev": { "type": "string" },
@@ -82 +82 @@
         "type": "object",
         "properties": {
-          "type": { "type": "string", "pattern": "Response" },
+          "type": { "type": "string", "pattern": "^Response$" },
           "_id": { "type": "string" },
           "_rev": { "type": "string" },
@@ -112 +112 @@
         "type": "object",
         "properties": {
-          "type": { "type": "string", "pattern": "Header" },
+          "type": { "type": "string", "pattern": "^Header$" },
           "text": { "type": "string" }
         },
@@ -121 +121 @@
         "type": "object",
         "properties": {
-          "type": { "type": "string", "pattern": "Text" },
+          "type": { "type": "string", "pattern": "^Text$" },
           "text": { "type": "string" }
         },
@@ -130 +130 @@
         "type": "object",
         "properties": {
-          "type": { "type": "string", "pattern": "Divider" }
+          "type": { "type": "string", "pattern": "^Divider$" }
         },
         "additionalProperties": false
@@ -137 +137 @@
         "type": "object",
         "properties": {
-          "type": { "type": "string", "pattern": "StringInput" },
+          "type": { "type": "string", "pattern": "^StringInput$" },
           "text": { "type": "string" }
         },
@@ -146 +146 @@
         "type": "object",
         "properties": {
-          "type": { "type": "string", "pattern": "TextInput" },
+          "type": { "type": "string", "pattern": "^TextInput$" },
           "maxLength": { "type": "integer" },
           "text": { "type": "string" }
@@ -156 +156 @@
         "type": "object",
         "properties": {
-          "type": { "type": "string", "pattern": "NumberInput" },
+          "type": { "type": "string", "pattern": "^NumberInput$" },
           "min": { "type": "integer" },
           "max": { "type": "integer" },
@@ -168 +168 @@
         "type": "object",
         "properties": {
-          "type": { "type": "string", "pattern": "ScaleInput" },
+          "type": { "type": "string", "pattern": "^ScaleInput$" },
           "minLabel": { "type": "string" },
           "min": { "type": "integer" },
@@ -191 +191 @@
         "type": "object",
         "properties": {
-          "type": { "type": "string", "pattern": "MultipleChoiceInput" },
+          "type": { "type": "string", "pattern": "^MultipleChoiceInput$" },
           "allowMultiple": { "type": "boolean" },
           "items": { "type": "array", "items": {