Ext: logout when user not found

Author: PopDaph

extension/app/src/components/assistants/usePublicAgentConfigurations.ts

@@ -1,6 +1,7 @@
+import { logout } from "@extension/lib/auth";
 import { useDustAPI } from "@extension/lib/dust_api";
 import { useSWRWithDefaults } from "@extension/lib/swr";
-import { useMemo } from "react";
+import { useEffect, useMemo } from "react";
 
 export function usePublicAgentConfigurations() {
   const dustAPI = useDustAPI();
@@ -19,6 +20,15 @@ export function usePublicAgentConfigurations() {
       agentConfigurationsFetcher
     );
 
+  useEffect(() => {
+    if (
+      typeof error?.message === "string" &&
+      error?.message.includes("User not found")
+    ) {
+      void logout();
+    }
+  }, [error]);
+
   return {
     agentConfigurations: useMemo(() => data ?? [], [data]),
     isAgentConfigurationsLoading: !error && !data,

extension/app/src/components/conversation/useConversations.ts

@@ -1,6 +1,7 @@
+import { logout } from "@extension/lib/auth";
 import { useDustAPI } from "@extension/lib/dust_api";
 import { useSWRWithDefaults } from "@extension/lib/swr";
-import { useMemo } from "react";
+import { useEffect, useMemo } from "react";
 
 export function useConversations() {
   const dustAPI = useDustAPI();
@@ -17,6 +18,15 @@ export function useConversations() {
     conversationsFetcher
   );
 
+  useEffect(() => {
+    if (
+      typeof error?.message === "string" &&
+      error?.message.includes("User not found")
+    ) {
+      void logout();
+    }
+  }, [error]);
+
   return {
     conversations: useMemo(() => data ?? [], [data]),
     isConversationsLoading: !error && !data,

extension/app/src/components/conversation/usePublicConversation.ts

@@ -1,6 +1,8 @@
 import type { ConversationPublicType } from "@dust-tt/client";
+import { logout } from "@extension/lib/auth";
 import { useDustAPI } from "@extension/lib/dust_api";
 import { useSWRWithDefaults } from "@extension/lib/swr";
+import { useEffect } from "react";
 import type { KeyedMutator } from "swr";
 
 export function usePublicConversation({
@@ -34,6 +36,15 @@ export function usePublicConversation({
     conversationFetcher
   );
 
+  useEffect(() => {
+    if (
+      typeof error?.message === "string" &&
+      error?.message.includes("User not found")
+    ) {
+      void logout();
+    }
+  }, [error]);
+
   return {
     conversation: data ? data : null,
     isConversationLoading: !error && !data,

extension/app/src/lib/swr.ts

@@ -3,11 +3,6 @@ import { getAccessToken } from "@extension/lib/storage";
 import { useCallback } from "react";
 import type { Fetcher, Key, SWRConfiguration } from "swr";
 import useSWR, { useSWRConfig } from "swr";
-import type {
-  SWRInfiniteConfiguration,
-  SWRInfiniteKeyLoader,
-} from "swr/infinite";
-import useSWRInfinite from "swr/infinite";
 
 const DEFAULT_SWR_CONFIG: SWRConfiguration = {
   errorRetryCount: 16,
@@ -97,15 +92,6 @@ export function useSWRWithDefaults<TKey extends Key, TData>(
   }
 }
 
-export function useSWRInfiniteWithDefaults<TKey extends Key, TData>(
-  getKey: SWRInfiniteKeyLoader<TData, TKey>,
-  fetcher: Fetcher<TData, TKey> | null,
-  config?: SWRInfiniteConfiguration
-) {
-  const mergedConfig = { ...DEFAULT_SWR_CONFIG, ...config };
-  return useSWRInfinite<TData>(getKey, fetcher, mergedConfig);
-}
-
 const resHandler = async (res: Response) => {
   if (res.status < 300) {
     return res.json();