From 3c982d5dfa6b3a4f80cac6846daad3cd787feb33 Mon Sep 17 00:00:00 2001 From: Alireza Dorrani Date: Wed, 12 Mar 2025 23:24:32 +0330 Subject: [PATCH 01/13] [ADD] sign up api route --- src/app/api/auth/sign-up/route.ts | 16 ++++++++++++++++ src/types/api.response.ts | 7 +++++++ src/utils/api.utils.ts | 17 +++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 src/app/api/auth/sign-up/route.ts create mode 100644 src/types/api.response.ts create mode 100644 src/utils/api.utils.ts diff --git a/src/app/api/auth/sign-up/route.ts b/src/app/api/auth/sign-up/route.ts new file mode 100644 index 0000000..447d664 --- /dev/null +++ b/src/app/api/auth/sign-up/route.ts @@ -0,0 +1,16 @@ +import { NextResponse } from "next/server"; + +import prisma from "@/lib/prisma"; + +import { ApiResponseType } from "@/types/api.response"; +import { wrapWithTryCatch } from "@/utils/api.utils"; + +export async function POST(request: Request): Promise> { + return wrapWithTryCatch(async () => { + const body = await request.json(); + + await prisma.user.create({ data: body }); + + return NextResponse.json({ data: null }, { status: 201 }); + }); +}; \ No newline at end of file diff --git a/src/types/api.response.ts b/src/types/api.response.ts new file mode 100644 index 0000000..a876021 --- /dev/null +++ b/src/types/api.response.ts @@ -0,0 +1,7 @@ +import { NextResponse } from "next/server"; + +export type fetchDataType = + | { data: TData; error?: undefined } + | { data?: undefined; error: string }; + +export type ApiResponseType = NextResponse>; \ No newline at end of file diff --git a/src/utils/api.utils.ts b/src/utils/api.utils.ts new file mode 100644 index 0000000..3c09338 --- /dev/null +++ b/src/utils/api.utils.ts @@ -0,0 +1,17 @@ +import { NextResponse } from "next/server"; + +import { ApiResponseType } from "@/types/api.response"; + +export async function wrapWithTryCatch( + callback: () => Promise>, +): Promise> { + try { + return await callback() + } catch (error) { + if (error instanceof Error) { + return NextResponse.json({ error: error.message }, { status: 400 }); + }; + + return NextResponse.json({ error: "خطای غیرمنتظره رخ داده." }, { status: 500 }); + } +} \ No newline at end of file From cca5822f596b0c33d02f8840eb9d88e0b231b651 Mon Sep 17 00:00:00 2001 From: Alireza Dorrani Date: Wed, 12 Mar 2025 23:46:06 +0330 Subject: [PATCH 02/13] [ADD] parseBody --- src/app/api/auth/sign-up/route.ts | 11 +++++++++-- src/dto/auth.dto.ts | 3 +++ src/utils/api.utils.ts | 24 ++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 src/dto/auth.dto.ts diff --git a/src/app/api/auth/sign-up/route.ts b/src/app/api/auth/sign-up/route.ts index 447d664..e66c035 100644 --- a/src/app/api/auth/sign-up/route.ts +++ b/src/app/api/auth/sign-up/route.ts @@ -1,13 +1,20 @@ import { NextResponse } from "next/server"; +import { SignUpDto } from "@/dto/auth.dto"; + import prisma from "@/lib/prisma"; import { ApiResponseType } from "@/types/api.response"; -import { wrapWithTryCatch } from "@/utils/api.utils"; + +import { parseBody, wrapWithTryCatch } from "@/utils/api.utils"; export async function POST(request: Request): Promise> { return wrapWithTryCatch(async () => { - const body = await request.json(); + const [parseError, body] = await parseBody(request); + + if (parseError !== null) { + return NextResponse.json({ error: parseError }, { status: 400 }); + } await prisma.user.create({ data: body }); diff --git a/src/dto/auth.dto.ts b/src/dto/auth.dto.ts new file mode 100644 index 0000000..031b1ed --- /dev/null +++ b/src/dto/auth.dto.ts @@ -0,0 +1,3 @@ +import Prisma from "@prisma/client"; + +export type SignUpDto = Omit \ No newline at end of file diff --git a/src/utils/api.utils.ts b/src/utils/api.utils.ts index 3c09338..9c3af5b 100644 --- a/src/utils/api.utils.ts +++ b/src/utils/api.utils.ts @@ -2,6 +2,30 @@ import { NextResponse } from "next/server"; import { ApiResponseType } from "@/types/api.response"; +type ParseBodyResult = [error: null, data: T] | [error: string, data: null]; + +export async function parseBody( + request: Request, +): Promise> { + try { + const body = await request.json(); + return [null, body]; + } catch (error) { + if (error instanceof Error) { + // return [error.message, null]; + if (error.name === "SyntaxError") { + return ["فرمت body نادرست است.", null] + } + } + + if (typeof error === "string") { + return [error, null]; + } + + return ["خطای غیر منتظره رخ داده.", null]; + } +} + export async function wrapWithTryCatch( callback: () => Promise>, ): Promise> { From 4d879c46e716065222dd71771841e3409bf0ef5d Mon Sep 17 00:00:00 2001 From: Alireza Dorrani Date: Sat, 15 Mar 2025 21:41:58 +0330 Subject: [PATCH 03/13] [ADD] username and email validatuion --- src/app/api/auth/sign-up/route.ts | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/app/api/auth/sign-up/route.ts b/src/app/api/auth/sign-up/route.ts index e66c035..2ae6793 100644 --- a/src/app/api/auth/sign-up/route.ts +++ b/src/app/api/auth/sign-up/route.ts @@ -16,6 +16,28 @@ export async function POST(request: Request): Promise> { return NextResponse.json({ error: parseError }, { status: 400 }); } + let foundUser = await prisma.user.findUnique({ + where: { username: body.username } + }); + + if (foundUser) { + return NextResponse.json( + { error: "نام کاربری تکراری است." }, + { status: 400 } + ); + }; + + foundUser = await prisma.user.findUnique({ + where: { email: body.email } + }); + + if (foundUser) { + return NextResponse.json( + { error: "ایمیل تکراری است." }, + { status: 400 } + ); + }; + await prisma.user.create({ data: body }); return NextResponse.json({ data: null }, { status: 201 }); From 0e0f865358a0a39a86934569fe90b75390e90f68 Mon Sep 17 00:00:00 2001 From: Alireza Dorrani Date: Sat, 15 Mar 2025 23:02:04 +0330 Subject: [PATCH 04/13] [ADD] react-toastify --- package-lock.json | 13 ++++++++ package.json | 1 + .../sign-up-form/sign-up-form.component.tsx | 32 +++++++++++++++++++ src/app/layout.tsx | 2 ++ src/components/toaster/toaster.component.tsx | 24 ++++++++++++++ .../toaster/toaster/toaster.module.css | 2 ++ 6 files changed, 74 insertions(+) create mode 100644 src/components/toaster/toaster.component.tsx create mode 100644 src/components/toaster/toaster/toaster.module.css diff --git a/package-lock.json b/package-lock.json index e788456..56e3c41 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "next": "14.2.20", "react": "^18", "react-dom": "^18", + "react-toastify": "^11.0.3", "sharp": "^0.33.5" }, "devDependencies": { @@ -4524,6 +4525,18 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", "dev": true }, + "node_modules/react-toastify": { + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-11.0.3.tgz", + "integrity": "sha512-cbPtHJPfc0sGqVwozBwaTrTu1ogB9+BLLjd4dDXd863qYLj7DGrQ2sg5RAChjFUB4yc3w8iXOtWcJqPK/6xqRQ==", + "dependencies": { + "clsx": "^2.1.1" + }, + "peerDependencies": { + "react": "^18 || ^19", + "react-dom": "^18 || ^19" + } + }, "node_modules/reflect.getprototypeof": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.8.tgz", diff --git a/package.json b/package.json index 1a2d696..f0d9f21 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "next": "14.2.20", "react": "^18", "react-dom": "^18", + "react-toastify": "^11.0.3", "sharp": "^0.33.5" }, "devDependencies": { diff --git a/src/app/auth/components/sign-up-form/sign-up-form.component.tsx b/src/app/auth/components/sign-up-form/sign-up-form.component.tsx index 46681da..5a251d5 100644 --- a/src/app/auth/components/sign-up-form/sign-up-form.component.tsx +++ b/src/app/auth/components/sign-up-form/sign-up-form.component.tsx @@ -5,6 +5,8 @@ import { ReactElement, FormEvent } from "react"; import Image from "next/image"; import Link from "next/link"; +import { toast } from "react-toastify"; + import signUpImage from "@/assets/images/sign-up.webp"; import { ButtonComponent } from "@/components/button/button.component"; @@ -12,6 +14,8 @@ import CardComponent from "@/components/card/card.component"; import NormalInputComponent from "@/components/normal-input/normal-input.component"; import PasswordInputComponent from "@/components/password-input/password-input.component"; +import { SignUpDto } from "@/dto/auth.dto"; + import MingcuteIncognitoModeLine from "@/icons/MingcuteIncognitoModeLine"; import MingcuteUser3Line from "@/icons/MingcuteUser3Line"; import MingcuteMailLine from "@/icons/MingcuteMailLine"; @@ -23,6 +27,34 @@ const SignUpFormComponent = (): ReactElement => { e: FormEvent, ): Promise => { e.preventDefault(); + const formData = new FormData(e.currentTarget); + + const dto: SignUpDto = { + name: formData.get("name") as string, + username: formData.get("username") as string, + email: formData.get("email") as string, + password: formData.get("password") as string, + }; + + const response = await fetch("/api/auth/sign-up", { + method: "POST", + body: JSON.stringify(dto), + }); + + const result = await response.json(); + + if (!response.ok) { + let message: string = "خطای غیرمنتظره رخ داد."; + + if ("error" in result) { + message = result.error; + } + + toast.error(message); + return; + } + + toast.success("ثبت‌نام با موفقیت انجام شد."); }; return ( diff --git a/src/app/layout.tsx b/src/app/layout.tsx index bf70ef8..173a979 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -5,6 +5,7 @@ import localFont from "next/font/local"; import FooterComponent from "@/components/footer/footer.component"; import HeaderComponent from "@/components/header/header.component"; +import ToasterComponent from "@/components/toaster/toaster.component"; import "@/styles/typography.css"; import "./globals.css"; @@ -79,6 +80,7 @@ export default function RootLayout({ نوبت دهی پزشکی، سامانه نوبت دهی اینترنتی بیمارستان و پزشکان

+ ); diff --git a/src/components/toaster/toaster.component.tsx b/src/components/toaster/toaster.component.tsx new file mode 100644 index 0000000..ffd64c5 --- /dev/null +++ b/src/components/toaster/toaster.component.tsx @@ -0,0 +1,24 @@ +import { ReactElement } from "react"; + +import { Bounce, ToastContainer, ToastContainerProps } from "react-toastify"; + +type Props = Partial; + +export default function ToasterComponent(props: Props): ReactElement { + return ( + + ); +} \ No newline at end of file diff --git a/src/components/toaster/toaster/toaster.module.css b/src/components/toaster/toaster/toaster.module.css new file mode 100644 index 0000000..33ac140 --- /dev/null +++ b/src/components/toaster/toaster/toaster.module.css @@ -0,0 +1,2 @@ +.toaster { +} From 33bdd9bc4c58da0ae58cfab20a5b529d6b8c54e9 Mon Sep 17 00:00:00 2001 From: Alireza Dorrani Date: Sat, 15 Mar 2025 23:02:35 +0330 Subject: [PATCH 05/13] [FIX] fade colors when input is not empty --- src/components/normal-input/normal-input.component.tsx | 2 +- src/components/normal-input/normal-input.module.css | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/normal-input/normal-input.component.tsx b/src/components/normal-input/normal-input.component.tsx index 4ed7ad3..afc068e 100644 --- a/src/components/normal-input/normal-input.component.tsx +++ b/src/components/normal-input/normal-input.component.tsx @@ -31,7 +31,7 @@ function NormalInputComponent( {prefixIcon && (
{prefixIcon}
)} - + {suffixIcon && ( Date: Sat, 15 Mar 2025 23:07:30 +0330 Subject: [PATCH 06/13] [ADD] fetchWithToast --- .../sign-up-form/sign-up-form.component.tsx | 38 +++++++++---------- src/utils/fetch-utils.ts | 34 +++++++++++++++++ 2 files changed, 52 insertions(+), 20 deletions(-) create mode 100644 src/utils/fetch-utils.ts diff --git a/src/app/auth/components/sign-up-form/sign-up-form.component.tsx b/src/app/auth/components/sign-up-form/sign-up-form.component.tsx index 5a251d5..6872d9d 100644 --- a/src/app/auth/components/sign-up-form/sign-up-form.component.tsx +++ b/src/app/auth/components/sign-up-form/sign-up-form.component.tsx @@ -1,12 +1,10 @@ "use client"; -import { ReactElement, FormEvent } from "react"; +import { ReactElement, FormEvent, useRef } from "react"; import Image from "next/image"; import Link from "next/link"; -import { toast } from "react-toastify"; - import signUpImage from "@/assets/images/sign-up.webp"; import { ButtonComponent } from "@/components/button/button.component"; @@ -20,13 +18,18 @@ import MingcuteIncognitoModeLine from "@/icons/MingcuteIncognitoModeLine"; import MingcuteUser3Line from "@/icons/MingcuteUser3Line"; import MingcuteMailLine from "@/icons/MingcuteMailLine"; +import { fetchWithToast } from "@/utils/fetch-utils"; + import styles from "@/app/auth/styles/auth-form.module.css"; const SignUpFormComponent = (): ReactElement => { + const formRef = useRef(null); + const formSubmitHandler = async ( e: FormEvent, ): Promise => { e.preventDefault(); + const formData = new FormData(e.currentTarget); const dto: SignUpDto = { @@ -36,25 +39,20 @@ const SignUpFormComponent = (): ReactElement => { password: formData.get("password") as string, }; - const response = await fetch("/api/auth/sign-up", { - method: "POST", - body: JSON.stringify(dto), - }); - - const result = await response.json(); - - if (!response.ok) { - let message: string = "خطای غیرمنتظره رخ داد."; - - if ("error" in result) { - message = result.error; - } + const result = await fetchWithToast( + "/api/auth/sign-up", + { + method: "POST", + body: JSON.stringify(dto), + }, + "ثبت‌نام با موفقیت انجام شد.", + ); - toast.error(message); + if (result.error) { return; } - toast.success("ثبت‌نام با موفقیت انجام شد."); + formRef.current?.reset(); }; return ( @@ -63,7 +61,7 @@ const SignUpFormComponent = (): ReactElement => {

ثبت‌نام!

-
+ {
); -}; +} export default SignUpFormComponent; diff --git a/src/utils/fetch-utils.ts b/src/utils/fetch-utils.ts new file mode 100644 index 0000000..efcf889 --- /dev/null +++ b/src/utils/fetch-utils.ts @@ -0,0 +1,34 @@ +import { toast } from "react-toastify"; + +import { fetchDataType } from "@/types/api.response"; + +export async function fetchWithToast( + input: RequestInfo | URL, + init: RequestInit = {}, + successMessage?: string, +): Promise> { + const response = await fetch(input, { + headers: { "Content-Type": "application/json" }, + ...init, + }); + + const result = await response.json(); + + if (!response.ok) { + let message: string = "خطای غیرمنتظره رخ داد."; + + if ("error" in result) { + message = result.error; + } + + toast.error(message); + + return { error: message }; + } + + if (successMessage) { + toast.success(successMessage); + } + + return { data: result.data }; +} \ No newline at end of file From 46e6f4add745667805db3b57d2ace5bdafd6e755 Mon Sep 17 00:00:00 2001 From: Alireza Dorrani Date: Sun, 16 Mar 2025 00:13:46 +0330 Subject: [PATCH 07/13] [ADD] sign in api --- src/app/api/auth/sign-in/route.ts | 39 +++++++++++++++++ .../sign-in-form/sign-in-form.component.tsx | 43 +++++++++++++++---- src/dto/auth.dto.ts | 3 +- 3 files changed, 76 insertions(+), 9 deletions(-) create mode 100644 src/app/api/auth/sign-in/route.ts diff --git a/src/app/api/auth/sign-in/route.ts b/src/app/api/auth/sign-in/route.ts new file mode 100644 index 0000000..60a285d --- /dev/null +++ b/src/app/api/auth/sign-in/route.ts @@ -0,0 +1,39 @@ +import { NextResponse } from "next/server"; + +import { SignInDto } from "@/dto/auth.dto"; + +import prisma from "@/lib/prisma"; + +import { ApiResponseType } from "@/types/api.response"; + +import { parseBody, wrapWithTryCatch } from "@/utils/api.utils"; + +export async function POST(request: Request): Promise> { + return wrapWithTryCatch(async () => { + const [parseError, body] = await parseBody(request); + + if (parseError !== null) { + return NextResponse.json({ error: parseError }, { status: 400 }); + } + + const foundUser = await prisma.user.findUnique({ + where: { username: body.username } + }); + + if (!foundUser) { + return NextResponse.json( + { error: "کاربری با این مشخصات پیدا نشد." }, + { status: 404 } + ); + }; + + if (body.password !== foundUser.password) { + return NextResponse.json( + { error: "نام کاربری و یا رمز عبور اشتباه است." }, + { status: 401 }, + ) + } + + return NextResponse.json({ data: null }, { status: 201 }); + }); +}; \ No newline at end of file diff --git a/src/app/auth/components/sign-in-form/sign-in-form.component.tsx b/src/app/auth/components/sign-in-form/sign-in-form.component.tsx index 00fd9df..38fea8f 100644 --- a/src/app/auth/components/sign-in-form/sign-in-form.component.tsx +++ b/src/app/auth/components/sign-in-form/sign-in-form.component.tsx @@ -1,12 +1,14 @@ "use client"; -import { FormEvent, ReactElement } from "react"; +import { FormEvent, ReactElement, useRef } from "react"; import Image from "next/image"; import Link from "next/link"; import signInImage from "@/assets/images/sign-in.webp"; +import { SignInDto } from "@/dto/auth.dto"; + import { ButtonComponent } from "@/components/button/button.component"; import CardComponent from "@/components/card/card.component"; import NormalInputComponent from "@/components/normal-input/normal-input.component"; @@ -14,22 +16,47 @@ import PasswordInputComponent from "@/components/password-input/password-input.c import MingcuteUser3Line from "@/icons/MingcuteUser3Line"; +import { fetchWithToast } from "@/utils/fetch-utils"; + import styles from "@/app/auth/styles/auth-form.module.css"; export default function SignInFormComponent(): ReactElement { - const formSubmitHandler = async ( - e: FormEvent, - ): Promise => { - e.preventDefault(); - }; - + const formRef = useRef(null); + + const formSubmitHandler = async ( + e: FormEvent, + ): Promise => { + e.preventDefault(); + + const formData = new FormData(e.currentTarget); + + const dto: SignInDto = { + username: formData.get("username") as string, + password: formData.get("password") as string, + }; + + const result = await fetchWithToast( + "/api/auth/sign-in", + { + method: "POST", + body: JSON.stringify(dto), + }, + "خوش آمدید.", + ); + + if (result.error) { + return; + } + + formRef.current?.reset(); + }; return (

ورود!

- + \ No newline at end of file +export type SignUpDto = Omit +export type SignInDto = Pick \ No newline at end of file From f684e125623635bd5f3deee462b220af9a8370e7 Mon Sep 17 00:00:00 2001 From: Alireza Dorrani Date: Sun, 16 Mar 2025 00:42:29 +0330 Subject: [PATCH 08/13] [ADD] setAuthCookie --- src/app/api/auth/sign-in/route.ts | 6 +- src/app/api/auth/sign-up/route.ts | 4 +- .../sign-in-form/sign-in-form.component.tsx | 60 ++++++++++--------- .../sign-up-form/sign-up-form.component.tsx | 4 ++ src/utils/api.utils.ts | 23 +++++++ 5 files changed, 66 insertions(+), 31 deletions(-) diff --git a/src/app/api/auth/sign-in/route.ts b/src/app/api/auth/sign-in/route.ts index 60a285d..7843e96 100644 --- a/src/app/api/auth/sign-in/route.ts +++ b/src/app/api/auth/sign-in/route.ts @@ -6,7 +6,7 @@ import prisma from "@/lib/prisma"; import { ApiResponseType } from "@/types/api.response"; -import { parseBody, wrapWithTryCatch } from "@/utils/api.utils"; +import { parseBody, setAuthCookie, wrapWithTryCatch } from "@/utils/api.utils"; export async function POST(request: Request): Promise> { return wrapWithTryCatch(async () => { @@ -33,7 +33,9 @@ export async function POST(request: Request): Promise> { { status: 401 }, ) } - + + await setAuthCookie(); + return NextResponse.json({ data: null }, { status: 201 }); }); }; \ No newline at end of file diff --git a/src/app/api/auth/sign-up/route.ts b/src/app/api/auth/sign-up/route.ts index 2ae6793..5a6ddac 100644 --- a/src/app/api/auth/sign-up/route.ts +++ b/src/app/api/auth/sign-up/route.ts @@ -6,7 +6,7 @@ import prisma from "@/lib/prisma"; import { ApiResponseType } from "@/types/api.response"; -import { parseBody, wrapWithTryCatch } from "@/utils/api.utils"; +import { parseBody,setAuthCookie, wrapWithTryCatch } from "@/utils/api.utils"; export async function POST(request: Request): Promise> { return wrapWithTryCatch(async () => { @@ -40,6 +40,8 @@ export async function POST(request: Request): Promise> { await prisma.user.create({ data: body }); + await setAuthCookie(); + return NextResponse.json({ data: null }, { status: 201 }); }); }; \ No newline at end of file diff --git a/src/app/auth/components/sign-in-form/sign-in-form.component.tsx b/src/app/auth/components/sign-in-form/sign-in-form.component.tsx index 38fea8f..91d23cf 100644 --- a/src/app/auth/components/sign-in-form/sign-in-form.component.tsx +++ b/src/app/auth/components/sign-in-form/sign-in-form.component.tsx @@ -4,6 +4,7 @@ import { FormEvent, ReactElement, useRef } from "react"; import Image from "next/image"; import Link from "next/link"; +import { useRouter } from "next/navigation"; import signInImage from "@/assets/images/sign-in.webp"; @@ -21,35 +22,38 @@ import { fetchWithToast } from "@/utils/fetch-utils"; import styles from "@/app/auth/styles/auth-form.module.css"; export default function SignInFormComponent(): ReactElement { - const formRef = useRef(null); - - const formSubmitHandler = async ( - e: FormEvent, - ): Promise => { - e.preventDefault(); - - const formData = new FormData(e.currentTarget); - - const dto: SignInDto = { - username: formData.get("username") as string, - password: formData.get("password") as string, - }; - - const result = await fetchWithToast( - "/api/auth/sign-in", - { - method: "POST", - body: JSON.stringify(dto), - }, - "خوش آمدید.", - ); - - if (result.error) { - return; - } - - formRef.current?.reset(); + const router = useRouter(); + + const formRef = useRef(null); + + const formSubmitHandler = async ( + e: FormEvent, + ): Promise => { + e.preventDefault(); + + const formData = new FormData(e.currentTarget); + + const dto: SignInDto = { + username: formData.get("username") as string, + password: formData.get("password") as string, }; + + const result = await fetchWithToast( + "/api/auth/sign-in", + { + method: "POST", + body: JSON.stringify(dto), + }, + "خوش آمدید.", + ); + + if (result.error) { + return; + } + + formRef.current?.reset(); + router.push("/dashboard"); + }; return (
diff --git a/src/app/auth/components/sign-up-form/sign-up-form.component.tsx b/src/app/auth/components/sign-up-form/sign-up-form.component.tsx index 6872d9d..6206576 100644 --- a/src/app/auth/components/sign-up-form/sign-up-form.component.tsx +++ b/src/app/auth/components/sign-up-form/sign-up-form.component.tsx @@ -4,6 +4,7 @@ import { ReactElement, FormEvent, useRef } from "react"; import Image from "next/image"; import Link from "next/link"; +import { useRouter } from "next/navigation"; import signUpImage from "@/assets/images/sign-up.webp"; @@ -23,6 +24,8 @@ import { fetchWithToast } from "@/utils/fetch-utils"; import styles from "@/app/auth/styles/auth-form.module.css"; const SignUpFormComponent = (): ReactElement => { + const router = useRouter(); + const formRef = useRef(null); const formSubmitHandler = async ( @@ -53,6 +56,7 @@ const SignUpFormComponent = (): ReactElement => { } formRef.current?.reset(); + router.push("/dashboard"); }; return ( diff --git a/src/utils/api.utils.ts b/src/utils/api.utils.ts index 9c3af5b..11fb8de 100644 --- a/src/utils/api.utils.ts +++ b/src/utils/api.utils.ts @@ -1,9 +1,15 @@ +import { cookies } from "next/headers"; import { NextResponse } from "next/server"; +import * as jose from "jose"; + import { ApiResponseType } from "@/types/api.response"; type ParseBodyResult = [error: null, data: T] | [error: string, data: null]; +const alg = "HS256"; +const secret = new TextEncoder().encode(process.env.TOKEN_SECRET); + export async function parseBody( request: Request, ): Promise> { @@ -38,4 +44,21 @@ export async function wrapWithTryCatch( return NextResponse.json({ error: "خطای غیرمنتظره رخ داده." }, { status: 500 }); } +} + +export async function setAuthCookie(): Promise { + const cookieStore = cookies(); + + const token = await new jose.SignJWT() + .setProtectedHeader({ alg }) + .setIssuedAt() + .setExpirationTime("3d") + .sign(secret); + + cookieStore.set(process.env.TOKEN_KEY!, token, { + secure: true, + httpOnly: true, + sameSite: "none", + maxAge: 3 * 24 * 3600, + }); } \ No newline at end of file From 9e8a1cdee583b0c63d2aa609600834ac00eafafd Mon Sep 17 00:00:00 2001 From: Alireza Dorrani Date: Sun, 16 Mar 2025 00:50:27 +0330 Subject: [PATCH 09/13] [ADD] middleware --- middleware.ts | 26 ++++++++++++++++++++++++++ src/utils/api.utils.ts | 18 +++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 middleware.ts diff --git a/middleware.ts b/middleware.ts new file mode 100644 index 0000000..07e2536 --- /dev/null +++ b/middleware.ts @@ -0,0 +1,26 @@ +import { NextRequest } from "next/server"; + +import { isSignedIn } from "@/utils/api.utils"; + +const onlySignedInRoutes = ["/dashboard"]; +const onlyNotSignedInRoutes = ["/auth/sign-up", "/auth/sign-in"]; + +export async function middleware(request: NextRequest) { + const path = request.nextUrl.pathname; + const isOnlySignedInRoutes = onlySignedInRoutes.includes(path); + const isOnlyNotSignedInRoutes = onlyNotSignedInRoutes.includes(path); + + if (await isSignedIn(request)) { + if (isOnlyNotSignedInRoutes && !path.startsWith("/dashboard")) { + return Response.redirect(new URL("/dashboard", request.url)); + } + } else { + if (isOnlySignedInRoutes && !path.startsWith("/auth/sign-in")) { + return Response.redirect(new URL("/auth/sign-in", request.url)); + } + } +} + +export const config = { + matcher: ["/((?!api|_next/static|_next/image|.*\\.png$).*)"], +}; \ No newline at end of file diff --git a/src/utils/api.utils.ts b/src/utils/api.utils.ts index 11fb8de..5f1c8ba 100644 --- a/src/utils/api.utils.ts +++ b/src/utils/api.utils.ts @@ -1,5 +1,5 @@ import { cookies } from "next/headers"; -import { NextResponse } from "next/server"; +import { NextRequest, NextResponse } from "next/server"; import * as jose from "jose"; @@ -61,4 +61,20 @@ export async function setAuthCookie(): Promise { sameSite: "none", maxAge: 3 * 24 * 3600, }); +} + +export async function isSignedIn(request: NextRequest): Promise { + const token = request.cookies.get(process.env.TOKEN_KEY!)?.value; + + if (!token) { + return false; + } + + try { + await jose.jwtVerify(token, secret); + return true; + } catch (error) { + console.log(error); + return false; + } } \ No newline at end of file From c5bcb67a7402c06995b4ea996d21c30560c93c99 Mon Sep 17 00:00:00 2001 From: Alireza Dorrani Date: Sun, 16 Mar 2025 01:00:08 +0330 Subject: [PATCH 10/13] [ADD] sign out api --- src/app/api/auth/sign-in/route.ts | 2 +- src/app/api/auth/sign-out/route.ts | 13 +++++++++++ src/app/api/auth/sign-up/route.ts | 2 +- src/app/dashboard/page.tsx | 22 ++++++++++++++++++- .../{api.response.ts => api-response.type.ts} | 0 src/utils/api.utils.ts | 7 +++++- src/utils/fetch-utils.ts | 2 +- 7 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 src/app/api/auth/sign-out/route.ts rename src/types/{api.response.ts => api-response.type.ts} (100%) diff --git a/src/app/api/auth/sign-in/route.ts b/src/app/api/auth/sign-in/route.ts index 7843e96..8fd275f 100644 --- a/src/app/api/auth/sign-in/route.ts +++ b/src/app/api/auth/sign-in/route.ts @@ -4,7 +4,7 @@ import { SignInDto } from "@/dto/auth.dto"; import prisma from "@/lib/prisma"; -import { ApiResponseType } from "@/types/api.response"; +import { ApiResponseType } from "@/types/api-response.type"; import { parseBody, setAuthCookie, wrapWithTryCatch } from "@/utils/api.utils"; diff --git a/src/app/api/auth/sign-out/route.ts b/src/app/api/auth/sign-out/route.ts new file mode 100644 index 0000000..14e3aca --- /dev/null +++ b/src/app/api/auth/sign-out/route.ts @@ -0,0 +1,13 @@ +import { NextResponse } from "next/server"; + +import { ApiResponseType } from "@/types/api-response.type"; + +import { removeAuthCookie, wrapWithTryCatch } from "@/utils/api.utils"; + +export async function POST(): Promise> { + return wrapWithTryCatch(async () => { + await removeAuthCookie(); + + return NextResponse.json({ data: null }, { status: 200 }); + }); +} \ No newline at end of file diff --git a/src/app/api/auth/sign-up/route.ts b/src/app/api/auth/sign-up/route.ts index 5a6ddac..2f9b2ea 100644 --- a/src/app/api/auth/sign-up/route.ts +++ b/src/app/api/auth/sign-up/route.ts @@ -4,7 +4,7 @@ import { SignUpDto } from "@/dto/auth.dto"; import prisma from "@/lib/prisma"; -import { ApiResponseType } from "@/types/api.response"; +import { ApiResponseType } from "@/types/api-response.type"; import { parseBody,setAuthCookie, wrapWithTryCatch } from "@/utils/api.utils"; diff --git a/src/app/dashboard/page.tsx b/src/app/dashboard/page.tsx index f14262d..9c521bb 100644 --- a/src/app/dashboard/page.tsx +++ b/src/app/dashboard/page.tsx @@ -2,12 +2,32 @@ import { ReactElement } from "react"; +import { useRouter } from "next/navigation"; + import { ButtonComponent } from "@/components/button/button.component"; +import { fetchWithToast } from "@/utils/fetch-utils"; + import styles from "./page.module.css"; export default function Page(): ReactElement { - const signOutButtonClickHandler = async (): Promise => {}; + const router = useRouter(); + + const signOutButtonClickHandler = async (): Promise => { + const result = await fetchWithToast( + "/api/auth/sign-out", + { + method: "POST", + }, + "به امید دیدار!", + ); + + if (result.error) { + return; + } + + router.push("/"); + }; return (
diff --git a/src/types/api.response.ts b/src/types/api-response.type.ts similarity index 100% rename from src/types/api.response.ts rename to src/types/api-response.type.ts diff --git a/src/utils/api.utils.ts b/src/utils/api.utils.ts index 5f1c8ba..4323dbc 100644 --- a/src/utils/api.utils.ts +++ b/src/utils/api.utils.ts @@ -3,7 +3,7 @@ import { NextRequest, NextResponse } from "next/server"; import * as jose from "jose"; -import { ApiResponseType } from "@/types/api.response"; +import { ApiResponseType } from "@/types/api-response.type"; type ParseBodyResult = [error: null, data: T] | [error: string, data: null]; @@ -63,6 +63,11 @@ export async function setAuthCookie(): Promise { }); } +export async function removeAuthCookie(): Promise { + const cookieStore = cookies(); + cookieStore.delete(process.env.TOKEN_KEY!); +} + export async function isSignedIn(request: NextRequest): Promise { const token = request.cookies.get(process.env.TOKEN_KEY!)?.value; diff --git a/src/utils/fetch-utils.ts b/src/utils/fetch-utils.ts index efcf889..db01089 100644 --- a/src/utils/fetch-utils.ts +++ b/src/utils/fetch-utils.ts @@ -1,6 +1,6 @@ import { toast } from "react-toastify"; -import { fetchDataType } from "@/types/api.response"; +import { fetchDataType } from "@/types/api-response.type"; export async function fetchWithToast( input: RequestInfo | URL, From f2ec7207f9318707d1e04c92ab2ad2e6506a41b1 Mon Sep 17 00:00:00 2001 From: Alireza Dorrani Date: Sun, 16 Mar 2025 01:25:13 +0330 Subject: [PATCH 11/13] [ADD] password hashing --- prisma/seed.ts | 4 +++- src/app/api/auth/sign-in/route.ts | 3 ++- src/app/api/auth/sign-up/route.ts | 6 ++++-- src/utils/bcrypt.utils.ts | 13 +++++++++++++ 4 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 src/utils/bcrypt.utils.ts diff --git a/prisma/seed.ts b/prisma/seed.ts index 7bd0020..ef8652b 100644 --- a/prisma/seed.ts +++ b/prisma/seed.ts @@ -1,4 +1,5 @@ import { Prisma, PrismaClient } from "@prisma/client"; +import { hashPassword } from "@/utils/bcrypt.utils"; const prisma = new PrismaClient(); @@ -13,7 +14,8 @@ const users: Prisma.UserCreateInput[] = [ export async function main() { for (const user of users) { - await prisma.user.create({ data: user }); + const hashedPassword = await hashPassword(user.password); + await prisma.user.create({ data: { ...user, password: hashedPassword } }); } } diff --git a/src/app/api/auth/sign-in/route.ts b/src/app/api/auth/sign-in/route.ts index 8fd275f..38638d3 100644 --- a/src/app/api/auth/sign-in/route.ts +++ b/src/app/api/auth/sign-in/route.ts @@ -7,6 +7,7 @@ import prisma from "@/lib/prisma"; import { ApiResponseType } from "@/types/api-response.type"; import { parseBody, setAuthCookie, wrapWithTryCatch } from "@/utils/api.utils"; +import { comparePassword } from "@/utils/bcrypt.utils"; export async function POST(request: Request): Promise> { return wrapWithTryCatch(async () => { @@ -27,7 +28,7 @@ export async function POST(request: Request): Promise> { ); }; - if (body.password !== foundUser.password) { + if (!(await comparePassword(body.password, foundUser.password))) { return NextResponse.json( { error: "نام کاربری و یا رمز عبور اشتباه است." }, { status: 401 }, diff --git a/src/app/api/auth/sign-up/route.ts b/src/app/api/auth/sign-up/route.ts index 2f9b2ea..49373ee 100644 --- a/src/app/api/auth/sign-up/route.ts +++ b/src/app/api/auth/sign-up/route.ts @@ -6,7 +6,8 @@ import prisma from "@/lib/prisma"; import { ApiResponseType } from "@/types/api-response.type"; -import { parseBody,setAuthCookie, wrapWithTryCatch } from "@/utils/api.utils"; +import { parseBody, setAuthCookie, wrapWithTryCatch } from "@/utils/api.utils"; +import { hashPassword } from "@/utils/bcrypt.utils"; export async function POST(request: Request): Promise> { return wrapWithTryCatch(async () => { @@ -38,7 +39,8 @@ export async function POST(request: Request): Promise> { ); }; - await prisma.user.create({ data: body }); + const hashedPassword = await hashPassword(body.password); + await prisma.user.create({ data: { ...body, password: hashedPassword } }); await setAuthCookie(); diff --git a/src/utils/bcrypt.utils.ts b/src/utils/bcrypt.utils.ts new file mode 100644 index 0000000..e26c5cb --- /dev/null +++ b/src/utils/bcrypt.utils.ts @@ -0,0 +1,13 @@ +import bcrypt from "bcrypt"; + +export async function hashPassword(password: string): Promise { + const salt = await bcrypt.genSalt(); + return await bcrypt.hash(password, salt); +} + +export function comparePassword( + password: string, + hashed: string, +): Promise { + return bcrypt.compare(password, hashed); +} \ No newline at end of file From 491dd57c8f68837babcb201d6eda8c42b2cdac93 Mon Sep 17 00:00:00 2001 From: Alireza Dorrani Date: Sun, 16 Mar 2025 01:26:09 +0330 Subject: [PATCH 12/13] [PRETTIER] fixed code format --- middleware.ts | 26 ++-- src/app/api/auth/sign-in/route.ts | 58 ++++----- src/app/api/auth/sign-out/route.ts | 10 +- src/app/api/auth/sign-up/route.ts | 55 ++++----- .../sign-up-form/sign-up-form.component.tsx | 2 +- src/components/toaster/toaster.component.tsx | 34 +++--- src/dto/auth.dto.ts | 4 +- src/types/api-response.type.ts | 6 +- src/utils/api.utils.ts | 115 +++++++++--------- src/utils/bcrypt.utils.ts | 12 +- src/utils/fetch-utils.ts | 42 +++---- 11 files changed, 182 insertions(+), 182 deletions(-) diff --git a/middleware.ts b/middleware.ts index 07e2536..90e3192 100644 --- a/middleware.ts +++ b/middleware.ts @@ -6,21 +6,21 @@ const onlySignedInRoutes = ["/dashboard"]; const onlyNotSignedInRoutes = ["/auth/sign-up", "/auth/sign-in"]; export async function middleware(request: NextRequest) { - const path = request.nextUrl.pathname; - const isOnlySignedInRoutes = onlySignedInRoutes.includes(path); - const isOnlyNotSignedInRoutes = onlyNotSignedInRoutes.includes(path); + const path = request.nextUrl.pathname; + const isOnlySignedInRoutes = onlySignedInRoutes.includes(path); + const isOnlyNotSignedInRoutes = onlyNotSignedInRoutes.includes(path); - if (await isSignedIn(request)) { - if (isOnlyNotSignedInRoutes && !path.startsWith("/dashboard")) { - return Response.redirect(new URL("/dashboard", request.url)); - } - } else { - if (isOnlySignedInRoutes && !path.startsWith("/auth/sign-in")) { - return Response.redirect(new URL("/auth/sign-in", request.url)); - } + if (await isSignedIn(request)) { + if (isOnlyNotSignedInRoutes && !path.startsWith("/dashboard")) { + return Response.redirect(new URL("/dashboard", request.url)); } + } else { + if (isOnlySignedInRoutes && !path.startsWith("/auth/sign-in")) { + return Response.redirect(new URL("/auth/sign-in", request.url)); + } + } } export const config = { - matcher: ["/((?!api|_next/static|_next/image|.*\\.png$).*)"], -}; \ No newline at end of file + matcher: ["/((?!api|_next/static|_next/image|.*\\.png$).*)"], +}; diff --git a/src/app/api/auth/sign-in/route.ts b/src/app/api/auth/sign-in/route.ts index 38638d3..a5b47cb 100644 --- a/src/app/api/auth/sign-in/route.ts +++ b/src/app/api/auth/sign-in/route.ts @@ -10,33 +10,33 @@ import { parseBody, setAuthCookie, wrapWithTryCatch } from "@/utils/api.utils"; import { comparePassword } from "@/utils/bcrypt.utils"; export async function POST(request: Request): Promise> { - return wrapWithTryCatch(async () => { - const [parseError, body] = await parseBody(request); - - if (parseError !== null) { - return NextResponse.json({ error: parseError }, { status: 400 }); - } - - const foundUser = await prisma.user.findUnique({ - where: { username: body.username } - }); - - if (!foundUser) { - return NextResponse.json( - { error: "کاربری با این مشخصات پیدا نشد." }, - { status: 404 } - ); - }; - - if (!(await comparePassword(body.password, foundUser.password))) { - return NextResponse.json( - { error: "نام کاربری و یا رمز عبور اشتباه است." }, - { status: 401 }, - ) - } - - await setAuthCookie(); - - return NextResponse.json({ data: null }, { status: 201 }); + return wrapWithTryCatch(async () => { + const [parseError, body] = await parseBody(request); + + if (parseError !== null) { + return NextResponse.json({ error: parseError }, { status: 400 }); + } + + const foundUser = await prisma.user.findUnique({ + where: { username: body.username }, }); -}; \ No newline at end of file + + if (!foundUser) { + return NextResponse.json( + { error: "کاربری با این مشخصات پیدا نشد." }, + { status: 404 }, + ); + } + + if (!(await comparePassword(body.password, foundUser.password))) { + return NextResponse.json( + { error: "نام کاربری و یا رمز عبور اشتباه است." }, + { status: 401 }, + ); + } + + await setAuthCookie(); + + return NextResponse.json({ data: null }, { status: 201 }); + }); +} diff --git a/src/app/api/auth/sign-out/route.ts b/src/app/api/auth/sign-out/route.ts index 14e3aca..6f0263f 100644 --- a/src/app/api/auth/sign-out/route.ts +++ b/src/app/api/auth/sign-out/route.ts @@ -5,9 +5,9 @@ import { ApiResponseType } from "@/types/api-response.type"; import { removeAuthCookie, wrapWithTryCatch } from "@/utils/api.utils"; export async function POST(): Promise> { - return wrapWithTryCatch(async () => { - await removeAuthCookie(); + return wrapWithTryCatch(async () => { + await removeAuthCookie(); - return NextResponse.json({ data: null }, { status: 200 }); - }); -} \ No newline at end of file + return NextResponse.json({ data: null }, { status: 200 }); + }); +} diff --git a/src/app/api/auth/sign-up/route.ts b/src/app/api/auth/sign-up/route.ts index 49373ee..99cc65a 100644 --- a/src/app/api/auth/sign-up/route.ts +++ b/src/app/api/auth/sign-up/route.ts @@ -10,40 +10,37 @@ import { parseBody, setAuthCookie, wrapWithTryCatch } from "@/utils/api.utils"; import { hashPassword } from "@/utils/bcrypt.utils"; export async function POST(request: Request): Promise> { - return wrapWithTryCatch(async () => { - const [parseError, body] = await parseBody(request); + return wrapWithTryCatch(async () => { + const [parseError, body] = await parseBody(request); - if (parseError !== null) { - return NextResponse.json({ error: parseError }, { status: 400 }); - } + if (parseError !== null) { + return NextResponse.json({ error: parseError }, { status: 400 }); + } - let foundUser = await prisma.user.findUnique({ - where: { username: body.username } - }); + let foundUser = await prisma.user.findUnique({ + where: { username: body.username }, + }); - if (foundUser) { - return NextResponse.json( - { error: "نام کاربری تکراری است." }, - { status: 400 } - ); - }; + if (foundUser) { + return NextResponse.json( + { error: "نام کاربری تکراری است." }, + { status: 400 }, + ); + } - foundUser = await prisma.user.findUnique({ - where: { email: body.email } - }); + foundUser = await prisma.user.findUnique({ + where: { email: body.email }, + }); - if (foundUser) { - return NextResponse.json( - { error: "ایمیل تکراری است." }, - { status: 400 } - ); - }; + if (foundUser) { + return NextResponse.json({ error: "ایمیل تکراری است." }, { status: 400 }); + } - const hashedPassword = await hashPassword(body.password); - await prisma.user.create({ data: { ...body, password: hashedPassword } }); + const hashedPassword = await hashPassword(body.password); + await prisma.user.create({ data: { ...body, password: hashedPassword } }); - await setAuthCookie(); + await setAuthCookie(); - return NextResponse.json({ data: null }, { status: 201 }); - }); -}; \ No newline at end of file + return NextResponse.json({ data: null }, { status: 201 }); + }); +} diff --git a/src/app/auth/components/sign-up-form/sign-up-form.component.tsx b/src/app/auth/components/sign-up-form/sign-up-form.component.tsx index 6206576..03c5a08 100644 --- a/src/app/auth/components/sign-up-form/sign-up-form.component.tsx +++ b/src/app/auth/components/sign-up-form/sign-up-form.component.tsx @@ -104,6 +104,6 @@ const SignUpFormComponent = (): ReactElement => {
); -} +}; export default SignUpFormComponent; diff --git a/src/components/toaster/toaster.component.tsx b/src/components/toaster/toaster.component.tsx index ffd64c5..347fd27 100644 --- a/src/components/toaster/toaster.component.tsx +++ b/src/components/toaster/toaster.component.tsx @@ -5,20 +5,20 @@ import { Bounce, ToastContainer, ToastContainerProps } from "react-toastify"; type Props = Partial; export default function ToasterComponent(props: Props): ReactElement { - return ( - - ); -} \ No newline at end of file + return ( + + ); +} diff --git a/src/dto/auth.dto.ts b/src/dto/auth.dto.ts index ade394f..845cda2 100644 --- a/src/dto/auth.dto.ts +++ b/src/dto/auth.dto.ts @@ -1,4 +1,4 @@ import Prisma from "@prisma/client"; -export type SignUpDto = Omit -export type SignInDto = Pick \ No newline at end of file +export type SignUpDto = Omit; +export type SignInDto = Pick; diff --git a/src/types/api-response.type.ts b/src/types/api-response.type.ts index a876021..3a494f4 100644 --- a/src/types/api-response.type.ts +++ b/src/types/api-response.type.ts @@ -1,7 +1,7 @@ import { NextResponse } from "next/server"; export type fetchDataType = - | { data: TData; error?: undefined } - | { data?: undefined; error: string }; + | { data: TData; error?: undefined } + | { data?: undefined; error: string }; -export type ApiResponseType = NextResponse>; \ No newline at end of file +export type ApiResponseType = NextResponse>; diff --git a/src/utils/api.utils.ts b/src/utils/api.utils.ts index 4323dbc..3fcc919 100644 --- a/src/utils/api.utils.ts +++ b/src/utils/api.utils.ts @@ -11,75 +11,78 @@ const alg = "HS256"; const secret = new TextEncoder().encode(process.env.TOKEN_SECRET); export async function parseBody( - request: Request, + request: Request, ): Promise> { - try { - const body = await request.json(); - return [null, body]; - } catch (error) { - if (error instanceof Error) { - // return [error.message, null]; - if (error.name === "SyntaxError") { - return ["فرمت body نادرست است.", null] - } - } - - if (typeof error === "string") { - return [error, null]; - } - - return ["خطای غیر منتظره رخ داده.", null]; + try { + const body = await request.json(); + return [null, body]; + } catch (error) { + if (error instanceof Error) { + // return [error.message, null]; + if (error.name === "SyntaxError") { + return ["فرمت body نادرست است.", null]; + } } + + if (typeof error === "string") { + return [error, null]; + } + + return ["خطای غیر منتظره رخ داده.", null]; + } } export async function wrapWithTryCatch( - callback: () => Promise>, + callback: () => Promise>, ): Promise> { - try { - return await callback() - } catch (error) { - if (error instanceof Error) { - return NextResponse.json({ error: error.message }, { status: 400 }); - }; - - return NextResponse.json({ error: "خطای غیرمنتظره رخ داده." }, { status: 500 }); + try { + return await callback(); + } catch (error) { + if (error instanceof Error) { + return NextResponse.json({ error: error.message }, { status: 400 }); } + + return NextResponse.json( + { error: "خطای غیرمنتظره رخ داده." }, + { status: 500 }, + ); + } } export async function setAuthCookie(): Promise { - const cookieStore = cookies(); - - const token = await new jose.SignJWT() - .setProtectedHeader({ alg }) - .setIssuedAt() - .setExpirationTime("3d") - .sign(secret); - - cookieStore.set(process.env.TOKEN_KEY!, token, { - secure: true, - httpOnly: true, - sameSite: "none", - maxAge: 3 * 24 * 3600, - }); + const cookieStore = cookies(); + + const token = await new jose.SignJWT() + .setProtectedHeader({ alg }) + .setIssuedAt() + .setExpirationTime("3d") + .sign(secret); + + cookieStore.set(process.env.TOKEN_KEY!, token, { + secure: true, + httpOnly: true, + sameSite: "none", + maxAge: 3 * 24 * 3600, + }); } export async function removeAuthCookie(): Promise { - const cookieStore = cookies(); - cookieStore.delete(process.env.TOKEN_KEY!); + const cookieStore = cookies(); + cookieStore.delete(process.env.TOKEN_KEY!); } export async function isSignedIn(request: NextRequest): Promise { - const token = request.cookies.get(process.env.TOKEN_KEY!)?.value; - - if (!token) { - return false; - } - - try { - await jose.jwtVerify(token, secret); - return true; - } catch (error) { - console.log(error); - return false; - } -} \ No newline at end of file + const token = request.cookies.get(process.env.TOKEN_KEY!)?.value; + + if (!token) { + return false; + } + + try { + await jose.jwtVerify(token, secret); + return true; + } catch (error) { + console.log(error); + return false; + } +} diff --git a/src/utils/bcrypt.utils.ts b/src/utils/bcrypt.utils.ts index e26c5cb..69d370c 100644 --- a/src/utils/bcrypt.utils.ts +++ b/src/utils/bcrypt.utils.ts @@ -1,13 +1,13 @@ import bcrypt from "bcrypt"; export async function hashPassword(password: string): Promise { - const salt = await bcrypt.genSalt(); - return await bcrypt.hash(password, salt); + const salt = await bcrypt.genSalt(); + return await bcrypt.hash(password, salt); } export function comparePassword( - password: string, - hashed: string, + password: string, + hashed: string, ): Promise { - return bcrypt.compare(password, hashed); -} \ No newline at end of file + return bcrypt.compare(password, hashed); +} diff --git a/src/utils/fetch-utils.ts b/src/utils/fetch-utils.ts index db01089..fa8b29d 100644 --- a/src/utils/fetch-utils.ts +++ b/src/utils/fetch-utils.ts @@ -3,32 +3,32 @@ import { toast } from "react-toastify"; import { fetchDataType } from "@/types/api-response.type"; export async function fetchWithToast( - input: RequestInfo | URL, - init: RequestInit = {}, - successMessage?: string, + input: RequestInfo | URL, + init: RequestInit = {}, + successMessage?: string, ): Promise> { - const response = await fetch(input, { - headers: { "Content-Type": "application/json" }, - ...init, - }); + const response = await fetch(input, { + headers: { "Content-Type": "application/json" }, + ...init, + }); - const result = await response.json(); + const result = await response.json(); - if (!response.ok) { - let message: string = "خطای غیرمنتظره رخ داد."; + if (!response.ok) { + let message: string = "خطای غیرمنتظره رخ داد."; - if ("error" in result) { - message = result.error; - } + if ("error" in result) { + message = result.error; + } - toast.error(message); + toast.error(message); - return { error: message }; - } + return { error: message }; + } - if (successMessage) { - toast.success(successMessage); - } + if (successMessage) { + toast.success(successMessage); + } - return { data: result.data }; -} \ No newline at end of file + return { data: result.data }; +} From 4534e6951d3855362a6a9093c4edcfa00c411ce1 Mon Sep 17 00:00:00 2001 From: Alireza Dorrani Date: Mon, 17 Mar 2025 19:45:40 +0330 Subject: [PATCH 13/13] [ADD] jose and bycript --- package-lock.json | 452 +++++++++++++++++++++++++++++++++++++++++++--- package.json | 3 + 2 files changed, 429 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index 56e3c41..eec5ad2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,10 @@ "version": "0.1.0", "dependencies": { "@prisma/client": "^6.4.1", + "bcrypt": "^5.1.1", "clsx": "^2.1.1", "dompurify": "^3.2.4", + "jose": "^6.0.10", "next": "14.2.20", "react": "^18", "react-dom": "^18", @@ -18,6 +20,7 @@ "sharp": "^0.33.5" }, "devDependencies": { + "@types/bcrypt": "^5.0.2", "@types/node": "^20", "@types/react": "^18", "@types/react-dom": "^18", @@ -964,6 +967,25 @@ "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, + "node_modules/@mapbox/node-pre-gyp": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz", + "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==", + "dependencies": { + "detect-libc": "^2.0.0", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.7", + "nopt": "^5.0.0", + "npmlog": "^5.0.1", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.11" + }, + "bin": { + "node-pre-gyp": "bin/node-pre-gyp" + } + }, "node_modules/@next/env": { "version": "14.2.20", "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.20.tgz", @@ -1259,6 +1281,15 @@ "tslib": "^2.4.0" } }, + "node_modules/@types/bcrypt": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@types/bcrypt/-/bcrypt-5.0.2.tgz", + "integrity": "sha512-6atioO8Y75fNcbmj0G7UjI9lXN2pQ/IGJ2FWT4a/btd0Lk9lQalHLKhkgKVZ3r+spnmWUKfbMi1GEe9wyHQfNQ==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/json5": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", @@ -1519,6 +1550,11 @@ "integrity": "sha512-fEzPV3hSkSMltkw152tJKNARhOupqbH96MZWyRjNaYZOMIzbrTeQDG+MTc6Mr2pgzFQzFxAfmhGDNP5QK++2ZA==", "dev": true }, + "node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, "node_modules/acorn": { "version": "8.14.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", @@ -1540,6 +1576,17 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -1560,7 +1607,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -1580,6 +1626,24 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/aproba": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==" + }, + "node_modules/are-we-there-yet": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", + "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", + "deprecated": "This package is no longer supported.", + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -1787,14 +1851,25 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "node_modules/bcrypt": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.1.1.tgz", + "integrity": "sha512-AGBHOG5hPYZ5Xl9KXzU5iKq9516yEmvCKDg3ecP5kX2aB6UqTeXZxk2ELnDgDm6BQSMlLt9rDB4LoSMx0rYwww==", + "hasInstallScript": true, + "dependencies": { + "@mapbox/node-pre-gyp": "^1.0.11", + "node-addon-api": "^5.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1914,6 +1989,14 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "engines": { + "node": ">=10" + } + }, "node_modules/client-only": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", @@ -1964,11 +2047,23 @@ "simple-swizzle": "^0.2.2" } }, + "node_modules/color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "bin": { + "color-support": "bin.js" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + }, + "node_modules/console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" }, "node_modules/cross-spawn": { "version": "7.0.6", @@ -2063,7 +2158,6 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", - "devOptional": true, "dependencies": { "ms": "^2.1.3" }, @@ -2116,6 +2210,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==" + }, "node_modules/detect-libc": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", @@ -2968,11 +3067,32 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "node_modules/fsevents": { "version": "2.3.3", @@ -3024,6 +3144,49 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/gauge": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", + "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", + "deprecated": "This package is no longer supported.", + "dependencies": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.2", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.1", + "object-assign": "^4.1.1", + "signal-exit": "^3.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/gauge/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/gauge/node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + }, + "node_modules/gauge/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/get-intrinsic": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.6.tgz", @@ -3261,6 +3424,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==" + }, "node_modules/hasown": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", @@ -3273,6 +3441,18 @@ "node": ">= 0.4" } }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", @@ -3312,7 +3492,6 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", - "dev": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -3321,8 +3500,7 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/internal-slot": { "version": "1.1.0", @@ -3502,7 +3680,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, "engines": { "node": ">=8" } @@ -3775,6 +3952,14 @@ "@pkgjs/parseargs": "^0.11.0" } }, + "node_modules/jose": { + "version": "6.0.10", + "resolved": "https://registry.npmjs.org/jose/-/jose-6.0.10.tgz", + "integrity": "sha512-skIAxZqcMkOrSwjJvplIPYrlXGpxTPnro2/QWTDCxAdWQrSTV5/KqspMWmi5WAx5+ULswASJiZ0a+1B/Lxt9cw==", + "funding": { + "url": "https://github.com/sponsors/panva" + } + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -3915,6 +4100,28 @@ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "dev": true }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/math-intrinsics": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.0.0.tgz", @@ -3950,7 +4157,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -3976,11 +4182,44 @@ "node": ">=16 || 14 >=14.17" } }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "devOptional": true + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/nanoid": { "version": "3.3.8", @@ -4081,11 +4320,60 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/node-addon-api": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz", + "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==" + }, + "node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/npmlog": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", + "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", + "deprecated": "This package is no longer supported.", + "dependencies": { + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^3.0.0", + "set-blocking": "^2.0.0" + } + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4196,7 +4484,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, "dependencies": { "wrappy": "1" } @@ -4273,7 +4560,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4537,6 +4823,19 @@ "react-dom": "^18 || ^19" } }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/reflect.getprototypeof": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.8.tgz", @@ -4627,7 +4926,6 @@ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dev": true, "dependencies": { "glob": "^7.1.3" }, @@ -4643,7 +4941,6 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -4701,6 +4998,25 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/safe-regex-test": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", @@ -4737,6 +5053,11 @@ "node": ">=10" } }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" + }, "node_modules/set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", @@ -4942,6 +5263,14 @@ "node": ">=10.0.0" } }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, "node_modules/string-width": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", @@ -5117,7 +5446,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -5214,6 +5542,30 @@ "node": ">=6" } }, + "node_modules/tar": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/tar/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "engines": { + "node": ">=8" + } + }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -5232,6 +5584,11 @@ "node": ">=8.0" } }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, "node_modules/ts-api-utils": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz", @@ -5424,8 +5781,21 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } }, "node_modules/which": { "version": "2.0.2", @@ -5525,6 +5895,32 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", + "dependencies": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, + "node_modules/wide-align/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/wide-align/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", @@ -5631,8 +6027,12 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yocto-queue": { "version": "0.1.0", diff --git a/package.json b/package.json index f0d9f21..f29fa8e 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,10 @@ }, "dependencies": { "@prisma/client": "^6.4.1", + "bcrypt": "^5.1.1", "clsx": "^2.1.1", "dompurify": "^3.2.4", + "jose": "^6.0.10", "next": "14.2.20", "react": "^18", "react-dom": "^18", @@ -24,6 +26,7 @@ "sharp": "^0.33.5" }, "devDependencies": { + "@types/bcrypt": "^5.0.2", "@types/node": "^20", "@types/react": "^18", "@types/react-dom": "^18",