From c212986fb53e4860d92c915dd5256437f42aa98f Mon Sep 17 00:00:00 2001 From: headlessdev Date: Wed, 30 Apr 2025 19:53:15 +0200 Subject: [PATCH] Bcrypt to Bcryptjs to support ARM based systems --- app/api/auth/edit_password/route.ts | 2 +- app/api/auth/login/route.ts | 2 +- package-lock.json | 18 ++++++++++++++++++ package.json | 2 ++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/app/api/auth/edit_password/route.ts b/app/api/auth/edit_password/route.ts index dd162a8..677a9af 100644 --- a/app/api/auth/edit_password/route.ts +++ b/app/api/auth/edit_password/route.ts @@ -1,7 +1,7 @@ import { NextResponse, NextRequest } from "next/server"; import jwt from 'jsonwebtoken'; import { prisma } from "@/lib/prisma"; -import bcrypt from 'bcrypt'; +import bcrypt from 'bcryptjs'; interface EditEmailRequest { oldPassword: string; diff --git a/app/api/auth/login/route.ts b/app/api/auth/login/route.ts index 0e55791..3498043 100644 --- a/app/api/auth/login/route.ts +++ b/app/api/auth/login/route.ts @@ -1,7 +1,7 @@ import { NextResponse, NextRequest } from "next/server"; import jwt from 'jsonwebtoken'; import { prisma } from "@/lib/prisma"; -import bcrypt from 'bcrypt'; +import bcrypt from 'bcryptjs'; interface LoginRequest { username: string; diff --git a/package-lock.json b/package-lock.json index 8d29db0..0417651 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,6 +31,7 @@ "@xyflow/react": "^12.5.5", "axios": "^1.8.4", "bcrypt": "^5.1.1", + "bcryptjs": "^3.0.2", "chart.js": "^4.4.9", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", @@ -50,6 +51,7 @@ }, "devDependencies": { "@tailwindcss/postcss": "^4", + "@types/bcryptjs": "^2.4.6", "@types/node": "^20", "@types/react": "^19", "@types/react-dom": "^19", @@ -2476,6 +2478,13 @@ "@types/node": "*" } }, + "node_modules/@types/bcryptjs": { + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/@types/bcryptjs/-/bcryptjs-2.4.6.tgz", + "integrity": "sha512-9xlo6R2qDs5uixm0bcIqCeMCE6HiQsIyel9KQySStiyqNl2tnj2mP3DX1Nf56MD6KMenNNlBBsy3LJ7gUEQPXQ==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/d3-color": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz", @@ -2746,6 +2755,15 @@ "node": ">= 10.0.0" } }, + "node_modules/bcryptjs": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-3.0.2.tgz", + "integrity": "sha512-k38b3XOZKv60C4E2hVsXTolJWfkGRMbILBIe2IBITXciy5bOsTKot5kDrf3ZfufQtQOUN5mXceUEpU1rTl9Uog==", + "license": "BSD-3-Clause", + "bin": { + "bcrypt": "bin/bcrypt" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", diff --git a/package.json b/package.json index 3f4e45f..40de5b9 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "@xyflow/react": "^12.5.5", "axios": "^1.8.4", "bcrypt": "^5.1.1", + "bcryptjs": "^3.0.2", "chart.js": "^4.4.9", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", @@ -51,6 +52,7 @@ }, "devDependencies": { "@tailwindcss/postcss": "^4", + "@types/bcryptjs": "^2.4.6", "@types/node": "^20", "@types/react": "^19", "@types/react-dom": "^19",