deps: egg-cookies@2 (#155)

eggjs · Nov 22, 2016 · 912fd2a · 912fd2a
1 parent 4062648
commit 912fd2a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 157 deletions.
diff --git a/app/extend/application.js b/app/extend/application.js
@@ -2,7 +2,6 @@
 
 const http = require('http');
 const assert = require('assert');
-const Keygrip = require('../../lib/core/keygrip');
 const Service = require('../../lib/core/base_service');
 const view = require('../../lib/core/view');
 const AppWorkerClient = require('../../lib/core/app_worker_client');
@@ -127,8 +126,8 @@ module.exports = {
           throw new Error('Please set config.keys first');
         }
       }
-      const keyConfig = this.config.keys.split(',').map(s => s.trim());
-      this[KEYS] = new Keygrip(keyConfig);
+
+      this[KEYS] = this.config.keys.split(',').map(s => s.trim());
     }
     return this[KEYS];
   },

diff --git a/examples/cookie/test/index.test.js b/examples/cookie/test/index.test.js
@@ -42,6 +42,6 @@ describe('example cookie test', () => {
       .get('/forget')
       .expect(302)
       .expect('Location', '/')
-      .expect('Set-Cookie', /^remember=; path=\/; expires=[^;]+; httponly$/);
+      .expect('Set-Cookie', /^remember=; path=\/; expires=[^;]+; httponly,remember\.sig=; path=\/; expires=[^;]+; httponly$/);
   });
 });
diff --git a/lib/core/keygrip.js b/lib/core/keygrip.js
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "debug": "^2.3.0",
     "delegates": "^1.0.0",
     "egg-cluster": "^1.0.0",
-    "egg-cookies": "^1.0.0",
+    "egg-cookies": "^2.1.0",
     "egg-core": "^1.1.0",
     "egg-cors": "^1.0.0",
     "egg-development": "^1.0.2",

diff --git a/test/fixtures/apps/encrypt-cookies/app/controller/home.js b/test/fixtures/apps/encrypt-cookies/app/controller/home.js
@@ -2,12 +2,12 @@ module.exports = function* () {
   var encrypt = this.getCookie('foo', {
     encrypt: true
   });
-  var encryptWrong = this.getCookie('foo');
-  var plain = this.getCookie('plain');
+  var encryptWrong = this.getCookie('foo', { signed: false });
+  var plain = this.getCookie('plain', { signed: false });
   this.setCookie('foo', 'bar 中文', {
     encrypt: true
   });
-  this.setCookie('plain', 'text ok');
+  this.setCookie('plain', 'text ok', { signed: false });
   this.body = {
     set: 'bar 中文',
     encrypt: encrypt,

diff --git a/test/lib/core/cookies.test.js b/test/lib/core/cookies.test.js
@@ -30,6 +30,7 @@ describe('test/lib/core/cookies.test.js', () => {
       ctx.response.get('set-cookie').should.eql([
         'foo=bar',
         'foo1=bar1; path=/; httponly',
+        'foo1.sig=Fqo9DaOWFOs3Gxsv0OHgyhhnJrjuY8jItBdSO-5WRgM; path=/; httponly',
       ]);
     });
 
@@ -40,7 +41,7 @@ describe('test/lib/core/cookies.test.js', () => {
         ctx.setCookie('foo', 'bar', {
           encrypt: true,
         });
-      }).should.throw('.keys required for encrypt cookies');
+      }).should.throw('.keys required for encrypt/sign cookies');
     });
 
     it('should throw TypeError when get encrypt on keys not exists', () => {
@@ -51,7 +52,7 @@ describe('test/lib/core/cookies.test.js', () => {
         ctx.getCookie('foo', {
           encrypt: true,
         });
-      }).should.throw('.keys required for encrypt cookies');
+      }).should.throw('.keys required for encrypt/sign cookies');
     });
 
     it('should not set secure when request protocol is http', done => {