@jcbuisson/express-x 1.3.5 → 1.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcbuisson/express-x",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "",
   "type": "module",
   "main": "src/index.mjs",
@@ -21,7 +21,7 @@
     "@jcbuisson/express-x-client": "^1.0.10",
     "@prisma/client": "^4.10.1",
     "axios": "^1.4.0",
-    "bcrypt": "^5.1.0",
+    "bcryptjs": "^2.4.3",
     "config": "^3.3.9",
     "express": "^4.18.2",
     "socket.io": "^4.6.0"

package/src/common-hooks.mjs

@@ -1,6 +1,6 @@
 
 import config from 'config'
-import bcrypt from 'bcrypt'
+import bcrypt from 'bcryptjs'
 
 
 // hash password of user record

package/src/server.mjs

@@ -2,14 +2,14 @@
 import http from 'http'
 import { Server } from "socket.io"
 import express from 'express'
-import { PrismaClient } from '@prisma/client'
 
 /*
  * Enhance `app` express application with services and real-time features
  */
-export function expressX(options = {}) {
+export function expressX(prisma, options = {}) {
 
    const app = express()
+   app.set('prisma', prisma)
 
    if (options.ws === undefined) options.ws = { ws_prefix: "expressx" }
 
@@ -28,13 +28,6 @@ export function expressX(options = {}) {
     * create a service `name` based on Prisma table `entity`
     */
    function createDatabaseService(name, prismaOptions = { entity: name }) {
-
-      let prisma = app.get('prisma')
-      if (!prisma) {
-         prisma = new PrismaClient()
-         app.set('prisma', prisma)
-      }
-
       // take all prisma methods on `entity` table
       const methods = prisma[prismaOptions.entity]
 
@@ -74,7 +67,7 @@ export function expressX(options = {}) {
 
             // call method
             const result = await method(...context.args)
-            app.log('debug', `result ${result}`)
+            app.log('debug', 'result ' + JSON.stringify(result))
    
             // call 'after' hooks
             const afterMethodHooks = service?.hooks?.after && service.hooks.after[methodName] || []