From aa6eaffc760d181c8afe7980b2958a6b64c21fe9 Mon Sep 17 00:00:00 2001 From: Izan Gil <66965250+SrIzan10@users.noreply.github.com> Date: Sat, 14 Dec 2024 00:03:26 +0100 Subject: [PATCH] chore: remove oslo dependency --- next.config.mjs | 2 +- package.json | 5 +- src/lib/auth/actions.ts | 6 +- yarn.lock | 138 +++++++++++++++++++++++++++++++++++++--- 4 files changed, 137 insertions(+), 14 deletions(-) diff --git a/next.config.mjs b/next.config.mjs index 4a0e570..b5bcefb 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -1,7 +1,7 @@ /** @type {import('next').NextConfig} */ const nextConfig = { webpack: (config) => { - config.externals.push("@node-rs/argon2", "@node-rs/bcrypt"); + config.externals.push("@node-rs/argon2"); return config; } }; diff --git a/package.json b/package.json index 6aece60..25fd18f 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ }, "dependencies": { "@lucia-auth/adapter-prisma": "^4.0.1", + "@node-rs/argon2": "^2.0.2", "@prisma/client": "^5.12.1", "@radix-ui/react-avatar": "^1.0.4", "@radix-ui/react-dropdown-menu": "^2.1.2", @@ -23,7 +24,6 @@ "lucide-react": "^0.368.0", "next": "^14.2.3", "next-themes": "^0.3.0", - "oslo": "^1.2.1", "react": "^18", "react-dom": "^18", "sonner": "^1.4.41", @@ -41,5 +41,6 @@ "prisma": "^5.12.1", "tailwindcss": "^3.4.1", "typescript": "^5" - } + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/src/lib/auth/actions.ts b/src/lib/auth/actions.ts index 87bcb07..52cc150 100644 --- a/src/lib/auth/actions.ts +++ b/src/lib/auth/actions.ts @@ -4,9 +4,9 @@ import { cookies } from "next/headers"; import { lucia, validateRequest } from "."; import { redirect } from "next/navigation"; import prisma from "../db"; -import { Argon2id } from "oslo/password"; import { generateId } from "lucia"; import { accountSchema } from "./zod"; +import { hash, verify } from "@node-rs/argon2"; export async function logout() { const { session } = await validateRequest(); @@ -46,7 +46,7 @@ export async function login(prev: any, data: FormData) { }; } - const validPassword = await new Argon2id().verify(existingUser.hashed_password, password); + const validPassword = await verify(existingUser.hashed_password, password); if (!validPassword) { return { error: "Incorrect username or password", @@ -69,7 +69,7 @@ export async function signup(prev: any, formData: FormData): Promise