@jcbuisson/express-x 1.5.24 → 1.5.26

package/package.json

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

package/src/common-hooks.mjs

@@ -36,7 +36,9 @@ export async function isAuthenticated(context) {
    if (!userId) throw Error(`Not authenticated`)
 }
 
-export const isExpired = (delay) => async (context) => {
+export const isNotExpired = (delay) => async (context) => {
    if (context.transport !== 'ws') return
-   // TODO
+   const expireAt = await getConnectionDataItem(context, 'expireAt')
+   const now = new Date()
+   if (expireAt > now) throw new Error('session expired')
 }

package/src/index.mjs

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

package/src/server.mjs

@@ -9,7 +9,7 @@ import express from 'express'
 export function expressX(prisma, options = {}) {
 
    const app = express()
-   app.set('prisma', prisma)
+   // app.set('prisma', prisma)
 
    if (options.ws === undefined) options.ws = { ws_prefix: "expressx" }
 
@@ -434,6 +434,7 @@ export function expressX(prisma, options = {}) {
 
    // enhance `app` with objects and methods
    return Object.assign(app, {
+      prisma,
       options,
       cnx2Socket,
       createDatabaseService,