fix(auth): preserve backend roles on login

This commit is contained in:
zetaloop
2026-04-24 09:06:44 +08:00
parent ffb420f7e7
commit d59f7c6dc8
4 changed files with 22 additions and 18 deletions
+1 -1
View File
@@ -36,7 +36,7 @@ export default function LoginPage() {
const onSubmit = async (data: z.infer<typeof loginSchema>) => {
try {
const user = await loginApi({ username: data.username, password: data.password })
storeLogin(user, ["consumer", "player", "owner"])
storeLogin(user, user.verifiedRoles)
router.push("/")
} catch (err) {
notifyInfo(toApiError(err).msg)
+1 -1
View File
@@ -84,7 +84,7 @@ export default function RegisterPage() {
vcode: data.vcode,
requestId,
})
storeLogin(user, ["consumer"])
storeLogin(user, user.verifiedRoles ?? ["consumer"])
router.push("/")
} catch (err) {
notifyInfo(toApiError(err).msg)
+1 -1
View File
@@ -45,7 +45,7 @@ export function LoginDialog({ open, onOpenChange }: LoginDialogProps) {
const onSubmit = async (data: z.infer<typeof loginSchema>) => {
try {
const user = await loginApi({ username: data.username, password: data.password })
storeLogin(user, ["consumer", "player", "owner"])
storeLogin(user, user.verifiedRoles)
consumePendingAction()
onOpenChange(false)
} catch (err) {
+19 -15
View File
@@ -125,23 +125,27 @@ export const useAuthStore = create<AuthState>((set, get) => ({
},
}
}),
login: (user, verifiedRoles = ["consumer"], themePreference) =>
set((state) => ({
isAuthenticated: true,
user,
currentRole: user.role,
verifiedRoles,
verificationStatus: verifiedRoles.reduce<Partial<Record<UserRole, VerificationStatus>>>(
(acc, role) => {
login: (user, verifiedRoles, themePreference) =>
set((state) => {
const nextVerifiedRoles = verifiedRoles ?? user.verifiedRoles ?? [user.role]
const nextVerificationStatus =
user.verificationStatus ??
nextVerifiedRoles.reduce<Partial<Record<UserRole, VerificationStatus>>>((acc, role) => {
acc[role] = "approved"
return acc
},
{},
),
verificationReasons: {},
notificationPrefs: state.notificationPrefs,
themePreference: themePreference ?? state.themePreference,
})),
}, {})
return {
isAuthenticated: true,
user,
currentRole: user.role,
verifiedRoles: nextVerifiedRoles,
verificationStatus: nextVerificationStatus,
verificationReasons: {},
notificationPrefs: state.notificationPrefs,
themePreference: themePreference ?? state.themePreference,
}
}),
logout: () =>
set({
isAuthenticated: false,