From 40f7e82c7f46f933959af45f3025afabcf69af59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= Date: Fri, 13 Oct 2023 13:46:36 +0200 Subject: [PATCH] bcryptjs --- dashboard/15-final/app/ui/login-form.tsx | 5 ++++- dashboard/15-final/auth.ts | 2 +- dashboard/15-final/package.json | 2 ++ pnpm-lock.yaml | 14 ++++++++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dashboard/15-final/app/ui/login-form.tsx b/dashboard/15-final/app/ui/login-form.tsx index 2e8fde1..c600354 100644 --- a/dashboard/15-final/app/ui/login-form.tsx +++ b/dashboard/15-final/app/ui/login-form.tsx @@ -17,7 +17,10 @@ export default async function LoginForm() {
{ 'use server'; - await signIn('credentials', Object.fromEntries(formData)); + await signIn('credentials', { + ...Object.fromEntries(formData), + redirectTo: '/dashboard', + }); }} className="space-y-3" > diff --git a/dashboard/15-final/auth.ts b/dashboard/15-final/auth.ts index 88aac2c..8dd8458 100644 --- a/dashboard/15-final/auth.ts +++ b/dashboard/15-final/auth.ts @@ -1,6 +1,6 @@ import NextAuth from 'next-auth'; import Credentials from 'next-auth/providers/credentials'; -import bcrypt from 'bcrypt'; +import bcrypt from 'bcryptjs'; import { sql } from '@vercel/postgres'; import type { User } from '@/app/lib/definitions'; diff --git a/dashboard/15-final/package.json b/dashboard/15-final/package.json index 6de37f4..ba17e12 100644 --- a/dashboard/15-final/package.json +++ b/dashboard/15-final/package.json @@ -16,6 +16,7 @@ "@vercel/postgres": "^0.5.0", "autoprefixer": "10.4.16", "bcrypt": "^5.1.1", + "bcryptjs": "^2.4.3", "clsx": "^2.0.0", "next": "13.5.5-canary.4", "next-auth": "0.0.0-manual.dacbe24d", @@ -29,6 +30,7 @@ }, "devDependencies": { "@types/bcrypt": "^5.0.0", + "@types/bcryptjs": "^2.4.4", "dotenv": "^16.3.1", "prettier": "^3.0.3" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1082197..70f173f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -237,6 +237,9 @@ importers: bcrypt: specifier: ^5.1.1 version: 5.1.1 + bcryptjs: + specifier: ^2.4.3 + version: 2.4.3 clsx: specifier: ^2.0.0 version: 2.0.0 @@ -271,6 +274,9 @@ importers: '@types/bcrypt': specifier: ^5.0.0 version: 5.0.0 + '@types/bcryptjs': + specifier: ^2.4.4 + version: 2.4.4 dotenv: specifier: ^16.3.1 version: 16.3.1 @@ -980,6 +986,10 @@ packages: '@types/node': 20.8.3 dev: true + /@types/bcryptjs@2.4.4: + resolution: {integrity: sha512-9wlJI7k5gRyJEC4yrV7DubzNQFTPiykYxUA6lBtsk5NlOfW9oWLJ1HdIA4YtE+6C3i3mTpDQQEosJ2rVZfBWnw==} + dev: true + /@types/debug@4.1.9: resolution: {integrity: sha512-8Hz50m2eoS56ldRlepxSBa6PWEVCtzUo/92HgLc2qTMnotJNIm7xP+UZhyWoYsyOdd5dxZ+NZLb24rsKyFs2ow==} dependencies: @@ -1559,6 +1569,10 @@ packages: - supports-color dev: false + /bcryptjs@2.4.3: + resolution: {integrity: sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==} + dev: false + /big-integer@1.6.51: resolution: {integrity: sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==} engines: {node: '>=0.6'}