fix(chat): redirect unauthenticated users from chat
This commit is contained in:
@@ -34,6 +34,8 @@ interface AuthState {
|
||||
errorMessage: string | null;
|
||||
/** 当前登录状态(未登录 / 游客 / OAuth / 邮箱) */
|
||||
loginStatus: MachineContext["loginStatus"];
|
||||
/** 启动时的本地登录态恢复是否已经完成 */
|
||||
hasInitialized: MachineContext["hasInitialized"];
|
||||
/**
|
||||
* 一次性的"刚按了"信号 —— Skip / Facebook / 邮箱登录按钮派完业务事件后置 true,
|
||||
* splash-screen / auth-screen 看到 `pendingRedirect && loginStatus !== "notLoggedIn"`
|
||||
@@ -67,12 +69,14 @@ export function AuthProvider({ children }: AuthProviderProps) {
|
||||
state.matches("loadingEmailLogin") ||
|
||||
state.matches("loadingEmailRegister") ||
|
||||
state.matches("loadingOAuth") ||
|
||||
state.matches("initializing") ||
|
||||
state.matches("loggingOut") ||
|
||||
state.matches("syncingGoogleBackend") ||
|
||||
state.matches("syncingFacebookBackend") ||
|
||||
state.matches("loadingGuestLogin"),
|
||||
errorMessage: state.context.errorMessage,
|
||||
loginStatus: state.context.loginStatus,
|
||||
hasInitialized: state.context.hasInitialized,
|
||||
pendingRedirect: state.context.pendingRedirect,
|
||||
}),
|
||||
[state],
|
||||
|
||||
@@ -111,6 +111,7 @@ export const authMachine = setup({
|
||||
target: "idle", // ← init 完回 idle(从 storage 拿到 loginStatus 后落地)
|
||||
actions: assign({
|
||||
loginStatus: ({ event }) => event.output,
|
||||
hasInitialized: true,
|
||||
// 不置 pendingRedirect —— 状态查询是被动读 token,不算"用户意图"
|
||||
errorMessage: null,
|
||||
}),
|
||||
@@ -120,6 +121,7 @@ export const authMachine = setup({
|
||||
actions: assign({
|
||||
errorMessage: ({ event }) =>
|
||||
event.error instanceof Error ? event.error.message : String(event.error),
|
||||
hasInitialized: true,
|
||||
}),
|
||||
},
|
||||
},
|
||||
@@ -137,6 +139,7 @@ export const authMachine = setup({
|
||||
// Skip 点击后已在 splash 里立即跳 /chat;guest login 不再依赖 pendingRedirect。
|
||||
pendingRedirect: false,
|
||||
errorMessage: null,
|
||||
hasInitialized: true,
|
||||
}),
|
||||
},
|
||||
onError: {
|
||||
@@ -144,6 +147,7 @@ export const authMachine = setup({
|
||||
actions: assign({
|
||||
errorMessage: ({ event }) =>
|
||||
event.error instanceof Error ? event.error.message : String(event.error),
|
||||
hasInitialized: true,
|
||||
}),
|
||||
},
|
||||
},
|
||||
@@ -164,6 +168,7 @@ export const authMachine = setup({
|
||||
loginStatus: ({ event }) => event.output,
|
||||
pendingRedirect: true, // ← 邮箱登录成功 → 跳
|
||||
errorMessage: null,
|
||||
hasInitialized: true,
|
||||
}),
|
||||
},
|
||||
onError: {
|
||||
@@ -171,6 +176,7 @@ export const authMachine = setup({
|
||||
actions: assign({
|
||||
errorMessage: ({ event }) =>
|
||||
event.error instanceof Error ? event.error.message : String(event.error),
|
||||
hasInitialized: true,
|
||||
}),
|
||||
},
|
||||
},
|
||||
@@ -196,6 +202,7 @@ export const authMachine = setup({
|
||||
loginStatus: ({ event }) => event.output,
|
||||
pendingRedirect: true, // ← 注册成功 → 跳
|
||||
errorMessage: null,
|
||||
hasInitialized: true,
|
||||
}),
|
||||
},
|
||||
onError: {
|
||||
@@ -203,6 +210,7 @@ export const authMachine = setup({
|
||||
actions: assign({
|
||||
errorMessage: ({ event }) =>
|
||||
event.error instanceof Error ? event.error.message : String(event.error),
|
||||
hasInitialized: true,
|
||||
}),
|
||||
},
|
||||
},
|
||||
@@ -236,12 +244,16 @@ export const authMachine = setup({
|
||||
src: "logout",
|
||||
onDone: {
|
||||
target: "idle",
|
||||
actions: assign(() => initialState),
|
||||
actions: assign(() => ({
|
||||
...initialState,
|
||||
hasInitialized: true,
|
||||
})),
|
||||
},
|
||||
onError: {
|
||||
target: "idle",
|
||||
actions: assign(({ event }) => ({
|
||||
...initialState,
|
||||
hasInitialized: true,
|
||||
errorMessage:
|
||||
event.error instanceof Error ? event.error.message : String(event.error),
|
||||
})),
|
||||
@@ -263,6 +275,7 @@ export const authMachine = setup({
|
||||
loginStatus: ({ event }) => event.output,
|
||||
pendingRedirect: true, // ← OAuth sync 成功 → 跳
|
||||
errorMessage: null,
|
||||
hasInitialized: true,
|
||||
}),
|
||||
},
|
||||
onError: {
|
||||
@@ -270,6 +283,7 @@ export const authMachine = setup({
|
||||
actions: assign({
|
||||
errorMessage: ({ event }) =>
|
||||
event.error instanceof Error ? event.error.message : String(event.error),
|
||||
hasInitialized: true,
|
||||
}),
|
||||
},
|
||||
},
|
||||
@@ -289,6 +303,7 @@ export const authMachine = setup({
|
||||
loginStatus: ({ event }) => event.output,
|
||||
pendingRedirect: true, // ← OAuth sync 成功 → 跳
|
||||
errorMessage: null,
|
||||
hasInitialized: true,
|
||||
}),
|
||||
},
|
||||
onError: {
|
||||
@@ -296,6 +311,7 @@ export const authMachine = setup({
|
||||
actions: assign({
|
||||
errorMessage: ({ event }) =>
|
||||
event.error instanceof Error ? event.error.message : String(event.error),
|
||||
hasInitialized: true,
|
||||
}),
|
||||
},
|
||||
},
|
||||
|
||||
@@ -15,6 +15,8 @@ export interface AuthState {
|
||||
errorMessage: string | null;
|
||||
/** 当前登录状态(未登录 / 游客 / OAuth / 邮箱) */
|
||||
loginStatus: LoginStatus;
|
||||
/** 启动时的本地登录态恢复是否已经完成 */
|
||||
hasInitialized: boolean;
|
||||
/**
|
||||
* 一次性的"刚按了"信号 —— Skip / Facebook / 邮箱登录按钮刚派事件 → 置 true
|
||||
* → splash-screen / auth-screen 看到 `pendingRedirect && loginStatus !== "notLoggedIn"` 触发跳转
|
||||
@@ -35,5 +37,6 @@ export const initialState: AuthState = {
|
||||
confirmPassword: "",
|
||||
errorMessage: null,
|
||||
loginStatus: "notLoggedIn",
|
||||
hasInitialized: false,
|
||||
pendingRedirect: false,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user