@jcbuisson/express-x 1.7.3 → 1.7.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcbuisson/express-x",
-  "version": "1.7.3",
+  "version": "1.7.5",
   "description": "",
   "type": "module",
   "main": "src/index.mjs",

package/src/common-hooks.mjs

@@ -1,6 +1,8 @@
 
 import bcrypt from 'bcryptjs'
 
+import { getConnectionDataItem } from './context.mjs'
+
 
 // hash password of user record
 export const hashPassword = (passwordField) => async (context) => {
@@ -22,3 +24,25 @@ export function protect(field) {
       return (context)
    }
 }
+
+
+export async function isAuthenticated(context) {
+   // extract sessionId from connection data
+   const sessionId = await getConnectionDataItem(context, 'sessionId')
+   if (!sessionId) throw new Error('not-authenticated')
+}
+
+export const isNotExpired = async (context) => {
+   const expireAt = await getConnectionDataItem(context, 'expireAt')
+   if (expireAt) {
+      const expireAtDate = new Date(expireAt)
+      const now = new Date()
+      if (now > expireAtDate) {
+         // expiration date is met: clear connection data & throw exception
+         await resetConnection(context)
+         throw new Error('session-expired')
+      }
+   } else {
+      throw new Error('session-expired')
+   }
+}

package/src/index.mjs

@@ -1,6 +1,6 @@
 
 import { expressX } from './server.mjs'
-import { hashPassword, protect } from './common-hooks.mjs'
+import { hashPassword, protect, isAuthenticated, isNotExpired } from './common-hooks.mjs'
 import { getContextConnection, resetConnection, getConnectionDataItem, setConnectionDataItem, removeConnectionDataItem, sendServiceEventToClient } from './context.mjs'
 
 export {
@@ -17,4 +17,6 @@ export {
 
    hashPassword,
    protect,
+   isAuthenticated,
+   isNotExpired,
 }

package/src/server.mjs

@@ -2,6 +2,7 @@
 import http from 'http'
 import { Server } from "socket.io"
 import express from 'express'
+import config from 'config'
 
 /*
  * Enhance `app` express application with services and real-time features
@@ -45,7 +46,7 @@ export function expressX(prisma, options = {}) {
       try {
          await prisma.Connection.delete({ where: { id }})
       } catch(err) {
-         // it may be necessary in rare situations (not sure...)
+         // in case it would no longer exist
       }
    }
 
@@ -334,7 +335,7 @@ export function expressX(prisma, options = {}) {
          socket.on('disconnect', () => {
             app.log('verbose', `Client disconnected ${connection.id}`)
 
-            // remove connection record after 1mn (leaves time in case of connection transfer)
+            // remove connection record after expiration delay, if it still exists
             setTimeout(async () => {
                const connectionId = connection.id
                // check if connection still exists
@@ -343,7 +344,7 @@ export function expressX(prisma, options = {}) {
                   app.log('verbose', `Delete connection ${connectionId}`)
                   await deleteConnection(connectionId)
                }
-            }, 10 * 1000)
+            }, config.SESSION_EXPIRE_DELAY || 24*60*60000)
          })