Changeset 499 for Dev/trunk/src/server/app.js

Timestamp:

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

Author:

hendrikvanantwerpen

Message:

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

File:

• Dev/trunk/src/server/app.js (modified) (4 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});
         }
     }