Pre schema validation, closes hapijs#1049

jmonster · Dec 8, 2013 · 9c4a09e · 9c4a09e
1 parent 22c838c
commit 9c4a09e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/lib/handler.js b/lib/handler.js
@@ -162,16 +162,17 @@ exports.prerequisites = function (config, server) {
 
     /*
         [
-            function (request, next) { },
-            {
-                method: function (request, next) { }
-                assign: key1
-            },
-            {
-                method: function (request, next) { },
-                assign: key2,
-                mode: parallel
-            },
+            [
+                function (request, next) { },
+                {
+                    method: function (request, next) { }
+                    assign: key1
+                },
+                {
+                    method: function (request, next) { },
+                    assign: key2
+                }
+            ],
             'user(params.id)'
         ]
     */
@@ -187,17 +188,8 @@ exports.prerequisites = function (config, server) {
             pre = { method: pre };
         }
 
-        Utils.assert(pre.method, 'Prerequisite config missing method');
-        Utils.assert(typeof pre.method === 'function' || typeof pre.method === 'string', 'Prerequisite method must be a function or helper name');
-
         pre.mode = pre.mode || 'serial';
-        Utils.assert(pre.mode === 'serial' || pre.mode === 'parallel', 'Unknown prerequisite mode:', pre.mode);
-
-        pre.failAction = pre.failAction || 'error';
-        Utils.assert(['error', 'ignore', 'log'].indexOf(pre.failAction) !== -1, 'Unknown failAction:', pre.failAction);
-
         pre.failAction = pre.failAction || 'error';
-        Utils.assert(['error', 'ignore', 'log'].indexOf(pre.failAction) !== -1, 'Unknown failAction:', pre.failAction);
 
         if (typeof pre.method === 'string') {
             var preMethodParts = pre.method.match(/^(\w+)(?:\s*)\((\s*\w+(?:\.\w+)*\s*(?:\,\s*\w+(?:\.\w+)*\s*)*)?\)$/);

diff --git a/lib/schema.js b/lib/schema.js
@@ -263,7 +263,18 @@ internals.routeConfigSchema = {
     }),
     cors: Joi.boolean(),
     jsonp: Joi.string(),
-    pre: Joi.array(),
+    pre: Joi.array().includes([
+        Joi.string(),
+        Joi.func(),
+        Joi.object({
+            method: [Joi.string().required(), Joi.func().required()],
+            assign: Joi.string(),
+            mode: Joi.string().valid('serial', 'parallel'),
+            type: Joi.string().valid('pre', 'handler'),
+            output: Joi.string().valid('raw', 'response'),
+            failAction: Joi.string().valid('error', 'log', 'ignore')
+        })
+    ]),
     app: Joi.object().allow(null),
     plugins: Joi.object(),
     description: Joi.string(),