Merge e916cd3 into 9270602

koajs · Mar 1, 2015 · 80d083a · 80d083a
2 parents 9270602 + e916cd3
commit 80d083a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/lib/csrf.js b/lib/csrf.js
@@ -52,10 +52,7 @@ module.exports = function (options) {
     var validate = impl.validate || _impl.validate;
     var _token = _impl.token || _impl;
     // Set the token
-    if (!this.locals) {
-      this.locals = {};
-    }
-    this.locals[key] = _token;
+    this.state[key] = _token;
 
     // Move along for safe verbs
     var method = this.method;

diff --git a/test/csrf.js b/test/csrf.js
@@ -25,7 +25,7 @@ describe('CSRF', function () {
 
     app.get('/csrf', function* () {
       this.body = {
-        token: this.locals._csrf
+        token: this.state._csrf
       };
     });
 
@@ -44,13 +44,13 @@ describe('CSRF', function () {
 
     app.get('/csrf', function* () {
       this.body = {
-        token: this.locals._csrf
+        token: this.state._csrf
       };
     });
 
     app.post('/csrf', function* () {
       this.body = {
-        token: this.locals._csrf
+        token: this.state._csrf
       };
     });
 
@@ -85,7 +85,7 @@ describe('CSRF', function () {
 
     app.all('/csrf', function* () {
       this.body = {
-        token: this.locals.foobar
+        token: this.state.foobar
       };
     });
 
@@ -107,7 +107,7 @@ describe('CSRF', function () {
     var app = mock({ csrf: true });
     app.all('/csrf', function* () {
       this.body = {
-        token: this.locals._csrf
+        token: this.state._csrf
       };
     });
 
@@ -136,7 +136,7 @@ describe('CSRF', function () {
 
     app.all('/csrf', function* () {
       this.body = {
-        token: this.locals._csrf
+        token: this.state._csrf
       };
     });
 
@@ -166,7 +166,7 @@ describe('CSRF', function () {
 
     app.all('/csrf', function* () {
       this.body = {
-        token: this.locals._csrf
+        token: this.state._csrf
       };
     });