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
+4 -4
View File
@@ -9,18 +9,18 @@ import { handleCookie } from '~/libs/cookies'
import type { Route } from './+types/_admin.lg-admin'
export const loader = async ({ request }: Route.LoaderArgs) => {
const { adminToken } = await handleCookie(request)
const { staffToken } = await handleCookie(request)
const { pathname } = new URL(request.url)
const isAuthPage = AUTH_PAGES.includes(pathname)
let adminData
if (!isAuthPage && !adminToken) {
if (!isAuthPage && !staffToken) {
throw redirect('/lg-admin/login')
}
if (adminToken) {
if (staffToken) {
const { data } = await getStaff({
accessToken: adminToken,
accessToken: staffToken,
})
adminData = data
}
+8 -8
View File
@@ -3,10 +3,10 @@ import { data } from 'react-router'
import { getValidatedFormData } from 'remix-hook-form'
import { XiorError } from 'xior'
import { getUser } from '~/apis/news/get-user'
import { userLoginRequest } from '~/apis/news/login-user'
import { loginSchema, type TLoginSchema } from '~/layouts/news/form-login'
import { generateTokenCookie } from '~/utils/token'
import { getStaff } from '~/apis/admin/get-staff'
import { staffLoginRequest } from '~/apis/admin/login-staff'
import { loginSchema, type TLoginSchema } from '~/pages/admin-login'
import { generateStaffTokenCookie } from '~/utils/token'
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 })
}
const { data: loginData } = await userLoginRequest(payload)
const { data: loginData } = await staffLoginRequest(payload)
const { token } = loginData
const { data: userData } = await getUser({
const { data: staffData } = await getStaff({
accessToken: token,
})
const tokenCookie = generateTokenCookie({
const tokenCookie = generateStaffTokenCookie({
token,
})
@@ -41,7 +41,7 @@ export const action = async ({ request }: Route.ActionArgs) => {
return data(
{
success: true,
user: userData,
staff: staffData,
},
{
headers,
+2 -2
View File
@@ -6,7 +6,7 @@ import { XiorError } from 'xior'
import { getUser } from '~/apis/news/get-user'
import { userLoginRequest } from '~/apis/news/login-user'
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'
@@ -31,7 +31,7 @@ export const action = async ({ request }: Route.ActionArgs) => {
const { data: userData } = await getUser({
accessToken: token,
})
const tokenCookie = generateTokenCookie({
const tokenCookie = generateUserTokenCookie({
token,
})
+2 -2
View File
@@ -9,7 +9,7 @@ import {
registerSchema,
type TRegisterSchema,
} from '~/layouts/news/form-register'
import { generateTokenCookie } from '~/utils/token'
import { generateUserTokenCookie } from '~/utils/token'
import type { Route } from './+types/actions.register'
@@ -34,7 +34,7 @@ export const action = async ({ request }: Route.ActionArgs) => {
const { data: userData } = await getUser({
accessToken: token,
})
const tokenCookie = generateTokenCookie({
const tokenCookie = generateUserTokenCookie({
token,
})