Move state.js out. For #1877

hapijs · Aug 22, 2014 · 8c702cd · 8c702cd
1 parent dcf6a1d
commit 8c702cd
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 1,038 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -6,7 +6,7 @@ exports.Server = require('./server');
 exports.Pack = require('./pack');
 
 exports.state = {
-    prepareValue: require('./state').prepareValue
+    prepareValue: require('statehood').prepareValue
 };
 
 exports.createServer = function () {

diff --git a/lib/response/headers.js b/lib/response/headers.js
@@ -2,7 +2,7 @@
 
 var Boom = require('boom');
 var Items = require('items');
-var State = require('../state');
+var Statehood = require('statehood');
 var Auth = null;                        // Delay load due to circular dependencies
 
 
@@ -224,7 +224,7 @@ internals.state = function (response, request, next) {
             return next();
         }
 
-        State.generateSetCookieHeader(states, request.server, function (err, header) {
+        Statehood.format(states, request.server, function (err, header) {
 
             if (err) {
                 return next(err);

diff --git a/lib/route.js b/lib/route.js
@@ -1,11 +1,11 @@
 // Load modules
 
 var Catbox = require('catbox');
-var Joi = require('joi');
 var Hoek = require('hoek');
+var Joi = require('joi');
+var Statehood = require('statehood');
 var Schema = require('./schema');
 var Request = require('./request');
-var State = require('./state');
 var Auth = require('./auth');
 var Payload = require('./payload');
 var Validation = require('./validation');
@@ -142,7 +142,7 @@ internals.Route.prototype.lifecycle = function () {
     // 'onRequest'
 
     if (this.server.settings.state.cookies.parse) {
-        cycle.push(State.parseCookies);
+        cycle.push(internals.state);
     }
 
     cycle.push('onPreAuth');
@@ -540,3 +540,45 @@ internals.compareMixed = function (aSegment, bSegment, p) {
         }
     }
 };
+
+
+internals.state = function (request, next) {
+
+    request.state = {};
+
+    var req = request.raw.req;
+    var cookies = req.headers.cookie;
+    if (!cookies) {
+        return next();
+    }
+
+    var definitions = request.server._stateDefinitions;
+    var settings = request.server.settings.state;
+
+    Statehood.parse(cookies, definitions, settings, function (err, state, invalids) {
+
+        request.state = state;
+
+        var names = Object.keys(invalids);
+        for (var i = 0, il = names.length; i < il; ++i) {
+            var name = names[i];
+            var definition = definitions[name];
+
+            if (definition &&
+                definition.clearInvalid !== undefined ? definition.clearInvalid : settings.cookies.clearInvalid) {
+
+                request._clearState(name);
+            }
+
+            // failAction: 'error', 'log', 'ignore'
+
+            var failAction = (definition && definition.failAction !== undefined ? definition.failAction
+                                                                                : settings.cookies.failAction);
+            if (failAction !== 'ignore') {
+                request.log(['hapi', 'state', 'error'], invalids[name]);
+            }
+        }
+
+        return next(err);
+    });
+};