From cb5eb6d45c44a6707f38350d2a748183866c9de3 Mon Sep 17 00:00:00 2001 From: Hossein Rahmani Date: Sun, 5 May 2024 13:00:04 +0330 Subject: [PATCH] Login and authentication completed --- .env | 2 + app/dashboard/layout.tsx | 7 +++ app/dashboard/page.tsx | 5 ++ app/layout.tsx | 8 ++-- components/Login.tsx | 53 ++++++++++++--------- components/LoginForm.tsx | 58 +++++++++++++++++------ components/ProgressBar.tsx | 19 ++++++++ components/ui/sonner.tsx | 4 +- constants/index.ts | 15 ++++++ lib/api/Authenticate.ts | 13 +++++- lib/api/apiInstance.ts | 4 +- lib/authActions.ts | 47 +++++++++++++++++++ lib/utils.ts | 12 +++-- package-lock.json | 94 ++++++++++++++++++++++++++++++++++++++ package.json | 5 ++ types/index.ts | 5 ++ 16 files changed, 305 insertions(+), 46 deletions(-) create mode 100644 app/dashboard/layout.tsx create mode 100644 app/dashboard/page.tsx create mode 100644 components/ProgressBar.tsx create mode 100644 lib/authActions.ts create mode 100644 types/index.ts diff --git a/.env b/.env index e69de29..027301d 100644 --- a/.env +++ b/.env @@ -0,0 +1,2 @@ +NEXT_PUBLIC_BASE_URL_APP = "https://shahrbinapi.shetabdahi.ir/" +SECRET_KEY = "gfonmdkfjbglnskmfsngldfgnkjndfglglkdgnhjkgflks;dlghljkgjkn;lasknfkjsdfsdjfnnjksngk" \ No newline at end of file diff --git a/app/dashboard/layout.tsx b/app/dashboard/layout.tsx new file mode 100644 index 0000000..19c25f2 --- /dev/null +++ b/app/dashboard/layout.tsx @@ -0,0 +1,7 @@ +export default function RootLayout({ + children, +}: Readonly<{ + children: React.ReactNode; +}>) { + return
{children}
; +} diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx new file mode 100644 index 0000000..89443d9 --- /dev/null +++ b/app/dashboard/page.tsx @@ -0,0 +1,5 @@ +import React from "react"; + +export default function page() { + return
page
; +} diff --git a/app/layout.tsx b/app/layout.tsx index 5d5dc6f..e807810 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -3,6 +3,7 @@ import { Inter } from "next/font/google"; import "./globals.css"; import Provider from "../lib/ReactQuery/Provider"; import { Toaster } from "@/components/ui/sonner"; +import ProgressBarProviders from "@/components/ProgressBar"; const inter = Inter({ subsets: ["latin"] }); @@ -20,9 +21,10 @@ export default function RootLayout({ -
- {children} -
+ + + {children} +
diff --git a/components/Login.tsx b/components/Login.tsx index af53c76..d2e7e50 100644 --- a/components/Login.tsx +++ b/components/Login.tsx @@ -2,36 +2,47 @@ import Image from "next/image"; import React from "react"; import LoginForm from "./LoginForm"; import Link from "next/link"; +import { cn } from "@/lib/utils"; export default function Login() { return ( -
- ostandari - -
+
+
ostandari -
-

ورود به پنل کاربری

- - -

فراموشی رمز عبور

- + + +
+ + +
+

ورود به پنل کاربری

+ + +

فراموشی رمز عبور

+ +
); } + +const LoginLogo = ({ className }: { className: string }) => { + return ( + logo + ); +}; diff --git a/components/LoginForm.tsx b/components/LoginForm.tsx index ccbb45e..5ad8949 100644 --- a/components/LoginForm.tsx +++ b/components/LoginForm.tsx @@ -16,18 +16,20 @@ import { } from "@/components/ui/form"; import { Input } from "@/components/ui/input"; import { Eye, EyeOff, Lock, RefreshCcw, Shield, UserRound } from "lucide-react"; -import { useQuery } from "@tanstack/react-query"; -import { getCaptcha } from "@/lib/api/Authenticate"; +import { useMutation, useQuery } from "@tanstack/react-query"; +import { LoginStaff, getCaptcha } from "@/lib/api/Authenticate"; import { Oval, ThreeDots } from "react-loader-spinner"; import Image from "next/image"; import { useState } from "react"; +import { useRouter } from "next/navigation"; +import { login } from "@/lib/authActions"; const FormSchema = z.object({ - username: z.string().min(2, { - message: "Username must be at least 2 characters.", + username: z.string().min(1, { + message: "لطفا نام کاربری خود را وارد نمایید.", }), - password: z.string().min(2, { - message: "Username must be at least 2 characters.", + password: z.string().min(1, { + message: "لطفا رمز عبور خود را وارد نمایید.", }), captcha: z .string({ required_error: "لطفا کد امنیتی را وارد نمایید." }) @@ -36,7 +38,9 @@ const FormSchema = z.object({ export default function LoginForm() { const [showPassword, setShowPassword] = useState(false); + const router = useRouter(); + //Queries const { data: CaptchaData, isLoading, @@ -47,6 +51,20 @@ export default function LoginForm() { refetchOnWindowFocus: false, }); + const loginMutation = useMutation({ + mutationKey: ["loginStaff"], + mutationFn: LoginStaff, + onSuccess: (res) => { + console.log(res.data.authToken); + + login(JSON.stringify(res.data.authToken), ""); + // router.push("/Dashboard"); + }, + onError: (err) => { + refetch(); + }, + }); + // const form = useForm>({ resolver: zodResolver(FormSchema), defaultValues: { @@ -56,13 +74,23 @@ export default function LoginForm() { function onSubmit(data: z.infer) { console.log("🚀 ~ onSubmit ~ data:", data); + console.log(CaptchaData); + loginMutation.mutate({ + username: data.username, + password: data.password, + captcha: { + key: CaptchaData?.headers["captcha-key"], + value: data.captcha, + }, + }); } - console.log(CaptchaData); - const srcForImage = CaptchaData ? URL.createObjectURL(CaptchaData) : null; + const srcForImage = CaptchaData + ? URL.createObjectURL(CaptchaData.data) + : null; return ( -
+
- +
- +
- +
{isLoading ? ( -
+
refetch()} - size={23} + size={20} color="#003778" />
diff --git a/components/ProgressBar.tsx b/components/ProgressBar.tsx new file mode 100644 index 0000000..052fc58 --- /dev/null +++ b/components/ProgressBar.tsx @@ -0,0 +1,19 @@ +"use client"; + +import { AppProgressBar as ProgressBar } from "next-nprogress-bar"; + +const ProgressBarProviders = ({ children }: { children: React.ReactNode }) => { + return ( + <> + {children} + + + ); +}; + +export default ProgressBarProviders; diff --git a/components/ui/sonner.tsx b/components/ui/sonner.tsx index 452f4d9..54d21d9 100644 --- a/components/ui/sonner.tsx +++ b/components/ui/sonner.tsx @@ -6,12 +6,12 @@ import { Toaster as Sonner } from "sonner" type ToasterProps = React.ComponentProps const Toaster = ({ ...props }: ToasterProps) => { - const { theme = "system" } = useTheme() + const { theme = "light" } = useTheme() return ( { + "use server"; + const session = await getIronSession(cookies(), sessionOptions); + + if (!session.isLoggedIn) { + session.isLoggedIn = defaultSession.isLoggedIn; + } + + return session; +}; + +export const login = async (res: string, history: any) => { + "use server"; + const data: { jwtToken: string; refreshToken: string } = JSON.parse(res); + const session = await getSession(); + const decodedToken = jwtDecode(data.jwtToken); + const cookieStore = cookies(); + const roles = + decodedToken[ + "http://schemas.microsoft.com/ws/2008/06/identity/claims/role" + ]; + console.log(roles); + + cookieStore.set("Shahrbin-Admin-Roles", JSON.stringify(roles)); + session.jwtToken = data.jwtToken; + session.refreshToken = data.refreshToken; + await session.save(); + + const to = hasRole(["Mayor", "Manager", "Admin"], roles) + ? "/dashboard/infos" + : hasRole(["ComplaintInspector"], roles) + ? "/dashboard/complaints" + : hasRole(["ComplaintAdmin"], roles) + ? "/dashboard/complaints-categories" + : "/dashboard/newReports"; + + redirect(to); +}; diff --git a/lib/utils.ts b/lib/utils.ts index d084cca..a0acd77 100644 --- a/lib/utils.ts +++ b/lib/utils.ts @@ -1,6 +1,12 @@ -import { type ClassValue, clsx } from "clsx" -import { twMerge } from "tailwind-merge" +import { type ClassValue, clsx } from "clsx"; +import { twMerge } from "tailwind-merge"; export function cn(...inputs: ClassValue[]) { - return twMerge(clsx(inputs)) + return twMerge(clsx(inputs)); } + +export const hasRole = (userRoles: string[], acceptedRoles = []) => { + const contains = userRoles.some((r) => acceptedRoles.indexOf(r) !== -1); + if (contains) return true; + else return false; +}; diff --git a/package-lock.json b/package-lock.json index 58a3898..c7743b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,8 +16,13 @@ "axios": "^1.6.8", "class-variance-authority": "^0.7.0", "clsx": "^2.1.1", + "cookies-next": "^4.1.1", + "iron-session": "^8.0.1", + "jwt-decode": "^4.0.0", "lucide-react": "^0.376.0", "next": "14.2.3", + "next-nprogress-bar": "^2.3.11", + "next-runtime-env": "^3.2.1", "next-themes": "^0.3.0", "react": "^18", "react-dom": "^18", @@ -600,6 +605,11 @@ "react": "^18.0.0" } }, + "node_modules/@types/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==" + }, "node_modules/@types/json5": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", @@ -1330,6 +1340,29 @@ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", "dev": true }, + "node_modules/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookies-next": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/cookies-next/-/cookies-next-4.1.1.tgz", + "integrity": "sha512-20QaN0iQSz87Os0BhNg9M71eM++gylT3N5szTlhq2rK6QvXn1FYGPB4eAgU4qFTunbQKhD35zfQ95ZWgzUy3Cg==", + "dependencies": { + "@types/cookie": "^0.6.0", + "@types/node": "^16.10.2", + "cookie": "^0.6.0" + } + }, + "node_modules/cookies-next/node_modules/@types/node": { + "version": "16.18.96", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.96.tgz", + "integrity": "sha512-84iSqGXoO+Ha16j8pRZ/L90vDMKX04QTYMTfYeE1WrjWaZXuchBehGUZEpNgx7JnmlrIHdnABmpjrQjhCnNldQ==" + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -2688,6 +2721,28 @@ "node": ">= 0.4" } }, + "node_modules/iron-session": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/iron-session/-/iron-session-8.0.1.tgz", + "integrity": "sha512-ZQKazQRn/J5YaXY+CQ69V9lx9boh4swl+BgnNC1knxyZgBjhiXuGpY60URRntMPib9QdrsN9qAOTqdMFMbGYXg==", + "funding": [ + "https://github.com/sponsors/vvo", + "https://github.com/sponsors/brc-dd" + ], + "dependencies": { + "cookie": "0.6.0", + "iron-webcrypto": "1.0.0", + "uncrypto": "0.1.3" + } + }, + "node_modules/iron-webcrypto": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/iron-webcrypto/-/iron-webcrypto-1.0.0.tgz", + "integrity": "sha512-anOK1Mktt8U1Xi7fCM3RELTuYbnFikQY5VtrDj7kPgpejV7d43tWKhzgioO0zpkazLEL/j/iayRqnJhrGfqUsg==", + "funding": { + "url": "https://github.com/sponsors/brc-dd" + } + }, "node_modules/is-array-buffer": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", @@ -3160,6 +3215,14 @@ "node": ">=4.0" } }, + "node_modules/jwt-decode": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-4.0.0.tgz", + "integrity": "sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==", + "engines": { + "node": ">=18" + } + }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -3417,6 +3480,27 @@ } } }, + "node_modules/next-nprogress-bar": { + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/next-nprogress-bar/-/next-nprogress-bar-2.3.11.tgz", + "integrity": "sha512-OjSvsQwgSWa2qBMYO478QreGG9Jt82tr4wTQptmiyzNqqjzHCyKZNkhANnzPrjuFAoelIvmruJuakODofSnvTQ==", + "dependencies": { + "nprogress": "^0.2.0" + } + }, + "node_modules/next-runtime-env": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/next-runtime-env/-/next-runtime-env-3.2.1.tgz", + "integrity": "sha512-vyuTpUMwnGUA9GjOGXNnuosqFQOa52IcKmu4mnTaQi4EqeFoCy3aYUxSF6mLaKkQ5yNC8yLa/gFjny74czpc9Q==", + "dependencies": { + "next": "^14", + "react": "^18" + }, + "peerDependencies": { + "next": "^14", + "react": "^18" + } + }, "node_modules/next-themes": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/next-themes/-/next-themes-0.3.0.tgz", @@ -3461,6 +3545,11 @@ "node": ">=0.10.0" } }, + "node_modules/nprogress": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz", + "integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==" + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -4942,6 +5031,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/uncrypto": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/uncrypto/-/uncrypto-0.1.3.tgz", + "integrity": "sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==" + }, "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", diff --git a/package.json b/package.json index 3cb7516..01fadb4 100644 --- a/package.json +++ b/package.json @@ -17,8 +17,13 @@ "axios": "^1.6.8", "class-variance-authority": "^0.7.0", "clsx": "^2.1.1", + "cookies-next": "^4.1.1", + "iron-session": "^8.0.1", + "jwt-decode": "^4.0.0", "lucide-react": "^0.376.0", "next": "14.2.3", + "next-nprogress-bar": "^2.3.11", + "next-runtime-env": "^3.2.1", "next-themes": "^0.3.0", "react": "^18", "react-dom": "^18", diff --git a/types/index.ts b/types/index.ts new file mode 100644 index 0000000..f7c460c --- /dev/null +++ b/types/index.ts @@ -0,0 +1,5 @@ +export interface SessionData { + jwtToken?: string; + refreshToken?: string; + isLoggedIn?: boolean; +}