@tsingroc/tsingroc-components 5.0.0-alpha.23 → 5.0.0-alpha.25

package/dist/components/auth/Fetcher.d.ts

@@ -14,11 +14,11 @@ export type Fetcher = (resource: RequestInfo | URL, options?: RequestInit & Fetc
  * ```
  */
 export interface FetcherExtraOptions {
-    loginOn401?: boolean;
+    logoutOn401?: boolean;
 }
 /** 在请求中添加 Authorization 头的 fetcher 中间件。 */
 export declare function fetcherWithBearerToken(token: string): (fetcher: Fetcher) => Fetcher;
-/** 在请求返回 401 错误时自动尝试登录的 fetcher 中间件。 */
+/** 在请求返回 401 错误时自动退出登录的 fetcher 中间件。 */
 export declare function fetcherWithLoginOn401(sessionStore: SessionStore): (fetcher: Fetcher) => Fetcher;
 /** 获取当前上下文的 fetcher。 */
 export declare function useFetcher(): Fetcher;

package/dist/components/auth/Fetcher.js

@@ -31,14 +31,15 @@ export function fetcherWithBearerToken(token) {
   };
 }
 
-/** 在请求返回 401 错误时自动尝试登录的 fetcher 中间件。 */
+/** 在请求返回 401 错误时自动退出登录的 fetcher 中间件。 */
 export function fetcherWithLoginOn401(sessionStore) {
   return fetcher => async (resource, options) => {
     const loggedIn = !!sessionStore.session;
     const resp = await fetcher(resource, options);
-    if (resp.status === 401) {
+    const logoutOn401 = options?.logoutOn401 ?? true;
+    if (logoutOn401 && resp.status === 401) {
       await sessionStore.clear();
-      void sessionStore.get();
+      // LoginCheck 会负责自动重新登录，所以这里不需要调用 sessionStore.get()
       throw new Error(`对 ${resp.url} 的请求需要鉴权，但用户${loggedIn ? "登录状态已失效" : "未登录"}。`);
     }
     return resp;

package/dist/components/auth/LoginCheck.js

@@ -21,7 +21,20 @@ export function LoginCheck(props) {
     return () => sessionStore.addEventListener(onChange);
   }, () => sessionStore.session);
   const [status, setStatus] = useState(session ? "loaded" : "loading");
-  const onSessionStoreEvent = useEffectEvent(event => {
+  const startLoading = useEffectEvent(async () => {
+    try {
+      onBeforeGetSession?.();
+      void (await sessionStore.get());
+    } finally {
+      setStatus("loaded");
+    }
+  });
+  useEffect(() => {
+    if (status === "loading") {
+      startLoading();
+    }
+  }, [status]);
+  const onSessionStoreEvent = useEffectEvent(async event => {
     switch (event.type) {
       case "failed":
         onFailed?.(event.reason);
@@ -34,6 +47,8 @@ export function LoginCheck(props) {
         break;
       case "invalidated":
         onInvalidated?.(event.reason);
+        onBeforeGetSession?.();
+        void (await sessionStore.get());
         break;
     }
   });
@@ -41,18 +56,5 @@ export function LoginCheck(props) {
     sessionStore.addEventListener(onSessionStoreEvent);
     return () => sessionStore.removeEventListener(onSessionStoreEvent);
   }, [sessionStore]);
-  const startLoading = useEffectEvent(async () => {
-    try {
-      onBeforeGetSession?.();
-      void (await sessionStore.get());
-    } finally {
-      setStatus("loaded");
-    }
-  });
-  useEffect(() => {
-    if (status === "loading") {
-      startLoading();
-    }
-  }, [status]);
   return status === "loading" ? loading : session ? children : failed;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsingroc/tsingroc-components",
-  "version": "5.0.0-alpha.23",
+  "version": "5.0.0-alpha.25",
   "author": "",
   "license": "ISC",
   "description": "",