Merge pull request #83 from aiibe/fastify-session-fix-isExpired-rollback

Fix crash session.isExpired() is not a function
SerayaEryn · Nov 18, 2019 · 3063e7d · 3063e7d
2 parents 2473a07 + 9f6b421
commit 3063e7d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/lib/fastifySession.js b/lib/fastifySession.js
@@ -58,7 +58,7 @@ function preValidation (options) {
             newSession(secret, request, cookieOpts, done)
             return
           }
-          if (session.isExpired()) {
+          if (session && session.expires && session.expires <= Date.now()) {
             options.store.destroy(sessionId, getDestroyCallback(secret, request, reply, done, cookieOpts))
             return
           }

diff --git a/lib/session.js b/lib/session.js
@@ -34,10 +34,6 @@ module.exports = class Session {
     this.encryptedSessionId = this[sign]()
   }
 
-  isExpired () {
-    return this.expires != null && this.expires <= Date.now()
-  }
-
   [addDataToSession] (prevSession) {
     for (const key in prevSession) {
       if (!['expires', 'cookie'].includes(key)) {