fix(auth): preserve backend roles on login
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user