Merge pull request #39 from rfink/sess_id_optional_check

Sess id optional check
koajs · Jan 15, 2015 · 129acbd · 129acbd
2 parents a7e874f + 0646a4d
commit 129acbd
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/lib/session.js b/lib/session.js
@@ -124,9 +124,11 @@ module.exports = function (options) {
 
     if (!matchPath(this)) return;
 
-    this.sessionId = this.cookies.get(key, {
-      signed: cookie.signed
-    });
+    if (!this.sessionId) {
+      this.sessionId = this.cookies.get(key, {
+        signed: cookie.signed
+      });
+    }
 
     var session;
     var isNew = false;

diff --git a/test/session.test.js b/test/session.test.js
@@ -165,5 +165,18 @@ describe('test/koa-session.test.js', function () {
         .get('/session/id?test_sid_append=test')
         .expect(/test$/, done);
     });
+
+    it('should force a session id ok', function (done) {
+      request(app)
+        .get('/session/get')
+        .expect(/.*/, function(err, res) {
+          should.not.exist(err);
+          cookie = res.headers['set-cookie'][0].split(';');
+          var val = cookie[0].split('=').pop();
+          request(app)
+            .get('/session/id?force_session_id=' + val)
+            .expect(new RegExp(val), done);
+        });
+    });
   });
 });
diff --git a/test/support/server.js b/test/support/server.js
@@ -26,6 +26,14 @@ app.keys = ['keys', 'keykeys'];
 app.proxy = true; // to support `X-Forwarded-*` header
 
 var store = new Store();
+
+app.use(function*(next) {
+  if (this.request.query.force_session_id) {
+    this.sessionId = this.request.query.force_session_id;
+  }
+  return yield next;
+});
+
 app.use(session({
   key: 'koss:test_sid',
   prefix: 'koss:test',