Merge pull request #628 from sugarforever/fix/bcrypt-broken-docker

fix: clean up legacy code with bcrypt

Author: sugarforever

docker-compose.yaml

@@ -15,8 +15,10 @@ services:
       - COHERE_API_KEY=xxxxx
       - COHERE_MODEL=ms-marco-MiniLM-L-6-v2
       - COHERE_BASE_URL=http://peanutshell:8000/v1
-    image: 0001coder/chatollama:latest
-    pull_policy: always
+    image: chat-ollama:dev
+    # Using locally built image instead of pulling from Docker Hub
+    # image: 0001coder/chatollama:latest
+    # pull_policy: always
     #extra_hosts:
     #  - "host.docker.internal:host-gateway"
     ports:

package.json

@@ -16,7 +16,6 @@
   "devDependencies": {
     "@nuxtjs/google-fonts": "^3.2.0",
     "@sidebase/nuxt-auth": "^0.7.1",
-    "@types/bcrypt": "^5.0.2",
     "@types/html-to-text": "^9.0.4",
     "@types/jsdom": "^21.1.6",
     "@types/jsonwebtoken": "^9.0.6",

pnpm-lock.yaml

@@ -1,50 +1,50 @@
 import prisma from "@/server/utils/prisma"
-import bcrypt from "bcrypt"
+import bcrypt from "bcryptjs"
 
 export enum Role {
-  USER = 0,
-  ADMIN = 1,
-  SUPERADMIN = 2
+    USER = 0,
+    ADMIN = 1,
+    SUPERADMIN = 2
 }
 
 const signUp = async (name: string, email: string, password: string) => {
-  if (!name || !password) {
-    throw createError({
-      statusCode: 400,
-      statusMessage: 'Name and password cannot be empty'
-    })
-  }
-
-  const exist = await prisma.user.count({ where: { name: name } }) > 0
-  if (exist) {
-    throw createError({
-      statusCode: 409,
-      statusMessage: `User ${name} already exist`
-    })
-  }
+    if (!name || !password) {
+        throw createError({
+            statusCode: 400,
+            statusMessage: 'Name and password cannot be empty'
+        })
+    }
 
-  const hashedPassword = await bcrypt.hash(password, 10)
-  return await prisma.user.create({
-    data: {
-      name,
-      email,
-      password: hashedPassword,
-      role: process.env.SUPER_ADMIN_NAME === name ? Role.SUPERADMIN : Role.USER
+    const exist = await prisma.user.count({ where: { name: name } }) > 0
+    if (exist) {
+        throw createError({
+            statusCode: 409,
+            statusMessage: `User ${name} already exist`
+        })
     }
-  })
+
+    const hashedPassword = await bcrypt.hash(password, 10)
+    return await prisma.user.create({
+        data: {
+            name,
+            email,
+            password: hashedPassword,
+            role: process.env.SUPER_ADMIN_NAME === name ? Role.SUPERADMIN : Role.USER
+        }
+    })
 }
 
 export default defineEventHandler(async (event) => {
-  const { name, email, password } = await readBody(event)
-  try {
-    const result = await signUp(name, email, password)
-    return {
-      status: "success",
-      user: {
-        id: result?.id
-      }
+    const { name, email, password } = await readBody(event)
+    try {
+        const result = await signUp(name, email, password)
+        return {
+            status: "success",
+            user: {
+                id: result?.id
+            }
+        }
+    } catch (error) {
+        throw error
     }
-  } catch (error) {
-    throw error
-  }
 })