@jcbuisson/express-x 1.5.1 → 1.5.3

package/package.json

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

package/src/common-hooks.mjs

@@ -2,6 +2,8 @@
 import config from 'config'
 import bcrypt from 'bcryptjs'
 
+import { getConnectionDataItem } from './context.mjs'
+
 
 // hash password of user record
 // name of the password field is found in `config.authentication.local.passwordField` (default: 'password')
@@ -12,23 +14,6 @@ export async function hashPassword(context) {
 }
 
 
-export async function authenticate(context) {
-   console.log('authenticate hook', context.transport, context.name, context.action, context?.connection?.accessToken)
-   return context
-
-   if (context.transport === 'ws') {
-      // for WS transport, just check that connection.accessToken is set and valid
-      if (!context?.connection?.accessToken) throw new Error("WS connection is not secured by a JWT access token")
-      // TODO: check token validity
-
-   } else if (context.transport === 'http') {
-      // for HTTP transport, check that the associated request has a header with a valid JWT
-      // TODO: check headers for access token
-   }
-   return (context)
-}
-
-
 // remove `field` from `result`
 export function protect(field) {
    return async (context) => {
@@ -47,9 +32,10 @@ export function protect(field) {
 export async function isAuthenticated(context) {
    if (context.transport !== 'ws') return
    // extract user from connection data
-   const id = context.params.connectionId
-   const connection = await context.app.service('Connection')._findUnique({ where: { id }})
-   const data = JSON.parse(connection.data)
-   const user = data.user
+   const user = await getConnectionDataItem(context, 'user')
+   // const id = context.params.connectionId
+   // const connection = await context.app.service('Connection')._findUnique({ where: { id }})
+   // const data = JSON.parse(connection.data)
+   // const user = data.user
    if (!user) throw Error(`AuthCode hook: not authenticated ${id}`)
 }

package/src/context.mjs

@@ -0,0 +1,33 @@
+
+export async function getConnectionDataItem(context, key) {
+   const id = context.params.connectionId
+   const connection = await context.app.service('Connection')._findUnique({ where: { id }})
+   const data = JSON.parse(connection.data)
+   return data[key]
+}
+
+export async function setConnectionDataItem(context, key, value) {
+   const id = context.params.connectionId
+   const connection = await context.app.service('Connection')._findUnique({ where: { id }})
+   const data = JSON.parse(connection.data)
+   data[key] = value
+   await context.app.service('Connection').update({
+      where: { id },
+      data: {
+         data: JSON.stringify(data)
+      }
+   })
+}
+
+export async function removeConnectionDataItem(context, key) {
+   const id = context.params.connectionId
+   const connection = await context.app.service('Connection')._findUnique({ where: { id }})
+   const data = JSON.parse(connection.data)
+   delete data[key]
+   await context.app.service('Connection').update({
+      where: { id },
+      data: {
+         data: JSON.stringify(data)
+      }
+   })
+}

package/src/index.mjs

@@ -1,10 +1,15 @@
 
 import { expressX } from './server.mjs'
-import { hashPassword, protect, } from './common-hooks.mjs'
+import { hashPassword, protect, isAuthenticated } from './common-hooks.mjs'
+import { getConnectionDataItem, setConnectionDataItem, removeConnectionDataItem } from './context.mjs'
 
 export {
    expressX,
 
+   getConnectionDataItem,
+   setConnectionDataItem,
+   removeConnectionDataItem,
+
    hashPassword,
    protect,
    isAuthenticated,