feat: refactor admin authentication to staff authentication with updated cookie handling

This commit is contained in:
Ardeman 2025-03-03 16:47:59 +08:00
parent 4f4e94389e
commit 459e25c010
11 changed files with 120 additions and 90 deletions

View File

@ -1,7 +1,7 @@
import { z } from 'zod' import { z } from 'zod'
import { type TLoginSchema } from '~/layouts/news/form-login'
import { HttpServer } from '~/libs/http-server' import { HttpServer } from '~/libs/http-server'
import type { TLoginSchema } from '~/pages/admin-login'
const loginResponseSchema = z.object({ const loginResponseSchema = z.object({
data: z.object({ data: z.object({

View File

@ -2,6 +2,6 @@ export const USER_COOKIES = {
token: '__lg-usr-tkn', token: '__lg-usr-tkn',
} }
export const ADMIN_COOKIES = { export const STAFF_COOKIES = {
token: '__lg-adm-tkn', token: '__lg-stf-tkn',
} }

View File

@ -1,6 +1,6 @@
import { createCookie } from 'react-router' import { createCookie } from 'react-router'
import { ADMIN_COOKIES, USER_COOKIES } from '~/configs/cookies' import { STAFF_COOKIES, USER_COOKIES } from '~/configs/cookies'
export const userTokenCookieConfig = createCookie(USER_COOKIES.token, { export const userTokenCookieConfig = createCookie(USER_COOKIES.token, {
httpOnly: false, httpOnly: false,
@ -10,7 +10,7 @@ export const userTokenCookieConfig = createCookie(USER_COOKIES.token, {
path: '/', path: '/',
}) })
export const adminTokenCookieConfig = createCookie(ADMIN_COOKIES.token, { export const staffTokenCookieConfig = createCookie(STAFF_COOKIES.token, {
httpOnly: false, httpOnly: false,
sameSite: 'lax', sameSite: 'lax',
secure: process.env.NODE_ENV === 'production', secure: process.env.NODE_ENV === 'production',

View File

@ -1,16 +1,16 @@
import { adminTokenCookieConfig, userTokenCookieConfig } from './cookie.server' import { staffTokenCookieConfig, userTokenCookieConfig } from './cookie.server'
export const handleCookie = async (request: Request) => { export const handleCookie = async (request: Request) => {
const headers = request.headers const headers = request.headers
const userToken = (await userTokenCookieConfig.parse( const userToken = (await userTokenCookieConfig.parse(
headers.get('Cookie'), headers.get('Cookie'),
)) as string )) as string
const adminToken = (await adminTokenCookieConfig.parse( const staffToken = (await staffTokenCookieConfig.parse(
headers.get('Cookie'), headers.get('Cookie'),
)) as string )) as string
return { return {
userToken, userToken,
adminToken, staffToken,
} }
} }

View File

@ -1,4 +1,4 @@
import { ADMIN_COOKIES, USER_COOKIES } from '~/configs/cookies' import { STAFF_COOKIES, USER_COOKIES } from '~/configs/cookies'
export const setUserLogoutHeaders = () => { export const setUserLogoutHeaders = () => {
const responseHeaders = new Headers() const responseHeaders = new Headers()
@ -10,11 +10,11 @@ export const setUserLogoutHeaders = () => {
return responseHeaders return responseHeaders
} }
export const setAdminLogoutHeaders = () => { export const setStaffLogoutHeaders = () => {
const responseHeaders = new Headers() const responseHeaders = new Headers()
responseHeaders.append( responseHeaders.append(
'Set-Cookie', 'Set-Cookie',
`${ADMIN_COOKIES.token}=; Path=/lg-admin; HttpOnly; SameSite=Strict; Max-Age=0`, `${STAFF_COOKIES.token}=; Path=/lg-admin; HttpOnly; SameSite=Strict; Max-Age=0`,
) )
return responseHeaders return responseHeaders

View File

@ -1,12 +1,43 @@
import { useState } from 'react' import { zodResolver } from '@hookform/resolvers/zod'
import { Link } from 'react-router' import { useEffect, useState } from 'react'
import { Link, useFetcher } from 'react-router'
import { RemixFormProvider, useRemixForm } from 'remix-hook-form'
import { z } from 'zod'
import { EyeIcon } from '~/components/icons/eye'
import { Button } from '~/components/ui/button' import { Button } from '~/components/ui/button'
import { Input } from '~/components/ui/input'
import { APP } from '~/configs/meta' import { APP } from '~/configs/meta'
export const loginSchema = z.object({
email: z.string().email('Email tidak valid'),
password: z.string().min(6, 'Kata sandi minimal 6 karakter'),
})
export type TLoginSchema = z.infer<typeof loginSchema>
export const AdminLoginPage = () => { export const AdminLoginPage = () => {
const [showPassword, setShowPassword] = useState(false) const fetcher = useFetcher()
const formMethods = useRemixForm<TLoginSchema>({
mode: 'onSubmit',
fetcher,
resolver: zodResolver(loginSchema),
})
const [error, setError] = useState<string>()
const [disabled, setDisabled] = useState(false)
const { handleSubmit } = formMethods
useEffect(() => {
if (!fetcher.data?.success) {
setError(fetcher.data?.message)
setDisabled(false)
return
}
setDisabled(true)
setError(undefined)
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [fetcher])
return ( return (
<div className="flex min-h-dvh min-w-dvw flex-col items-center justify-center space-y-8"> <div className="flex min-h-dvh min-w-dvw flex-col items-center justify-center space-y-8">
@ -24,53 +55,31 @@ export const AdminLoginPage = () => {
Selamat Datang, silakan masukkan akun Anda untuk melanjutkan! Selamat Datang, silakan masukkan akun Anda untuk melanjutkan!
</p> </p>
<div> <div>
<form> <RemixFormProvider {...formMethods}>
{/* Input Email / No Telepon */} <fetcher.Form
<div className="mb-4"> method="post"
<label onSubmit={handleSubmit}
htmlFor="email" className="space-y-4"
className="mb-1 block text-gray-700" action="/actions/admin/login"
> >
Email/No. Telepon <Input
</label> id="email"
<input label="Email"
type="text"
placeholder="Contoh: legal@legalgo.id" placeholder="Contoh: legal@legalgo.id"
className="focus:inheriten w-full rounded-md border border-[#DFDFDF] p-2" name="email"
/> />
</div>
{/* Input Password */} <Input
<div className="relative mb-4"> id="password"
<label label="Kata Sandi"
htmlFor="password"
className="mb-1 block text-gray-700 focus:outline-[#2E2F7C]"
>
Kata Sandi
</label>
<input
type={showPassword ? 'text' : 'password'}
placeholder="Masukkan Kata Sandi" placeholder="Masukkan Kata Sandi"
className="w-full rounded-md border border-[#DFDFDF] p-2 pr-10 focus:outline-[#2E2F7C]" name="password"
/> type="password"
<button
type="button"
className="absolute top-9 right-3 text-gray-500"
onClick={() => setShowPassword(!showPassword)}
>
{showPassword ? (
<EyeIcon
width={15}
height={15}
/>
) : (
<EyeIcon
width={15}
height={15}
/> />
{error && (
<div className="text-sm text-red-500 capitalize">{error}</div>
)} )}
</button>
</div>
{/* Lupa Kata Sandi */} {/* Lupa Kata Sandi */}
<div className="mb-4 flex justify-between"> <div className="mb-4 flex justify-between">
@ -83,11 +92,15 @@ export const AdminLoginPage = () => {
</Link> </Link>
</div> </div>
{/* Tombol Masuk */} <Button
<Button className="w-full rounded-md bg-[#2E2F7C] py-2 text-white transition hover:bg-blue-800"> disabled={disabled}
type="submit"
className="w-full rounded-md bg-[#2E2F7C] py-2 text-white transition hover:bg-blue-800"
>
Masuk Masuk
</Button> </Button>
</form> </fetcher.Form>
</RemixFormProvider>
</div> </div>
</div> </div>
{/* Link Daftar */} {/* Link Daftar */}

View File

@ -9,18 +9,18 @@ import { handleCookie } from '~/libs/cookies'
import type { Route } from './+types/_admin.lg-admin' import type { Route } from './+types/_admin.lg-admin'
export const loader = async ({ request }: Route.LoaderArgs) => { export const loader = async ({ request }: Route.LoaderArgs) => {
const { adminToken } = await handleCookie(request) const { staffToken } = await handleCookie(request)
const { pathname } = new URL(request.url) const { pathname } = new URL(request.url)
const isAuthPage = AUTH_PAGES.includes(pathname) const isAuthPage = AUTH_PAGES.includes(pathname)
let adminData let adminData
if (!isAuthPage && !adminToken) { if (!isAuthPage && !staffToken) {
throw redirect('/lg-admin/login') throw redirect('/lg-admin/login')
} }
if (adminToken) { if (staffToken) {
const { data } = await getStaff({ const { data } = await getStaff({
accessToken: adminToken, accessToken: staffToken,
}) })
adminData = data adminData = data
} }

View File

@ -3,10 +3,10 @@ import { data } from 'react-router'
import { getValidatedFormData } from 'remix-hook-form' import { getValidatedFormData } from 'remix-hook-form'
import { XiorError } from 'xior' import { XiorError } from 'xior'
import { getUser } from '~/apis/news/get-user' import { getStaff } from '~/apis/admin/get-staff'
import { userLoginRequest } from '~/apis/news/login-user' import { staffLoginRequest } from '~/apis/admin/login-staff'
import { loginSchema, type TLoginSchema } from '~/layouts/news/form-login' import { loginSchema, type TLoginSchema } from '~/pages/admin-login'
import { generateTokenCookie } from '~/utils/token' import { generateStaffTokenCookie } from '~/utils/token'
import type { Route } from './+types/actions.login' import type { Route } from './+types/actions.login'
@ -26,12 +26,12 @@ export const action = async ({ request }: Route.ActionArgs) => {
return data({ success: false, errors, defaultValues }, { status: 400 }) return data({ success: false, errors, defaultValues }, { status: 400 })
} }
const { data: loginData } = await userLoginRequest(payload) const { data: loginData } = await staffLoginRequest(payload)
const { token } = loginData const { token } = loginData
const { data: userData } = await getUser({ const { data: staffData } = await getStaff({
accessToken: token, accessToken: token,
}) })
const tokenCookie = generateTokenCookie({ const tokenCookie = generateStaffTokenCookie({
token, token,
}) })
@ -41,7 +41,7 @@ export const action = async ({ request }: Route.ActionArgs) => {
return data( return data(
{ {
success: true, success: true,
user: userData, staff: staffData,
}, },
{ {
headers, headers,

View File

@ -6,7 +6,7 @@ import { XiorError } from 'xior'
import { getUser } from '~/apis/news/get-user' import { getUser } from '~/apis/news/get-user'
import { userLoginRequest } from '~/apis/news/login-user' import { userLoginRequest } from '~/apis/news/login-user'
import { loginSchema, type TLoginSchema } from '~/layouts/news/form-login' import { loginSchema, type TLoginSchema } from '~/layouts/news/form-login'
import { generateTokenCookie } from '~/utils/token' import { generateUserTokenCookie } from '~/utils/token'
import type { Route } from './+types/actions.login' import type { Route } from './+types/actions.login'
@ -31,7 +31,7 @@ export const action = async ({ request }: Route.ActionArgs) => {
const { data: userData } = await getUser({ const { data: userData } = await getUser({
accessToken: token, accessToken: token,
}) })
const tokenCookie = generateTokenCookie({ const tokenCookie = generateUserTokenCookie({
token, token,
}) })

View File

@ -9,7 +9,7 @@ import {
registerSchema, registerSchema,
type TRegisterSchema, type TRegisterSchema,
} from '~/layouts/news/form-register' } from '~/layouts/news/form-register'
import { generateTokenCookie } from '~/utils/token' import { generateUserTokenCookie } from '~/utils/token'
import type { Route } from './+types/actions.register' import type { Route } from './+types/actions.register'
@ -34,7 +34,7 @@ export const action = async ({ request }: Route.ActionArgs) => {
const { data: userData } = await getUser({ const { data: userData } = await getUser({
accessToken: token, accessToken: token,
}) })
const tokenCookie = generateTokenCookie({ const tokenCookie = generateUserTokenCookie({
token, token,
}) })

View File

@ -1,12 +1,15 @@
import { decodeJwt } from 'jose' import { decodeJwt } from 'jose'
import { userTokenCookieConfig } from '~/libs/cookie.server' import {
staffTokenCookieConfig,
userTokenCookieConfig,
} from '~/libs/cookie.server'
type TTokenCookie = { type TTokenCookie = {
token: string token: string
} }
export const generateTokenCookie = (parameters: TTokenCookie) => { export const generateUserTokenCookie = (parameters: TTokenCookie) => {
const { token } = parameters const { token } = parameters
const decodedToken = decodeJwt(token) const decodedToken = decodeJwt(token)
@ -19,3 +22,17 @@ export const generateTokenCookie = (parameters: TTokenCookie) => {
expires: expirationDate, expires: expirationDate,
}) })
} }
export const generateStaffTokenCookie = (parameters: TTokenCookie) => {
const { token } = parameters
const decodedToken = decodeJwt(token)
const decodedTokenExp = decodedToken.exp
const expirationDate = decodedTokenExp
? new Date(decodedTokenExp * 1000)
: undefined
return staffTokenCookieConfig.serialize(token, {
expires: expirationDate,
})
}