Removed in page callback (#6657)

All-Hands-AI · Feb 10, 2025 · 707cb07 · 707cb07
1 parent 61c709b
commit 707cb07
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 52 deletions.
diff --git a/frontend/__tests__/components/modals/settings/account-settings-modal.test.tsx b/frontend/__tests__/components/modals/settings/account-settings-modal.test.tsx
@@ -132,6 +132,7 @@ describe("AccountSettingsModal", () => {
       agent: "CodeActAgent",
       confirmation_mode: false,
       enable_default_condenser: false,
+      github_token: undefined,
       language: "en",
       llm_base_url: "",
       llm_model: "anthropic/claude-3-5-sonnet-20241022",

diff --git a/frontend/src/context/auth-context.tsx b/frontend/src/context/auth-context.tsx
@@ -5,10 +5,16 @@ interface AuthContextType {
   setGitHubTokenIsSet: (value: boolean) => void;
 }
 
+interface AuthContextProps extends React.PropsWithChildren {
+  initialGithubTokenIsSet?: boolean;
+}
+
 const AuthContext = React.createContext<AuthContextType | undefined>(undefined);
 
-function AuthProvider({ children }: React.PropsWithChildren) {
-  const [githubTokenIsSet, setGitHubTokenIsSet] = React.useState(false);
+function AuthProvider({ children, initialGithubTokenIsSet }: AuthContextProps) {
+  const [githubTokenIsSet, setGitHubTokenIsSet] = React.useState(
+    !!initialGithubTokenIsSet,
+  );
 
   const value = React.useMemo(
     () => ({

diff --git a/frontend/src/hooks/query/use-settings.ts b/frontend/src/hooks/query/use-settings.ts
@@ -50,13 +50,5 @@ export const useSettings = () => {
     setGitHubTokenIsSet(!!query.data?.GITHUB_TOKEN_IS_SET);
   }, [query.data?.GITHUB_TOKEN_IS_SET, query.isFetched]);
 
-  // Return default settings if in SAAS mode and not authenticated
-  if (config?.APP_MODE === "saas" && !githubTokenIsSet) {
-    return {
-      ...query,
-      data: DEFAULT_SETTINGS,
-    };
-  }
-
   return query;
 };
diff --git a/frontend/src/routes.ts b/frontend/src/routes.ts
@@ -15,6 +15,4 @@ export default [
       route("served", "routes/app.tsx"),
     ]),
   ]),
-
-  route("oauth/github/callback", "routes/oauth.github.callback.tsx"),
 ] satisfies RouteConfig;
diff --git a/frontend/src/routes/oauth.github.callback.tsx b/frontend/src/routes/oauth.github.callback.tsx
diff --git a/frontend/test-utils.tsx b/frontend/test-utils.tsx
@@ -66,7 +66,7 @@ export function renderWithProviders(
   function Wrapper({ children }: PropsWithChildren) {
     return (
       <Provider store={store}>
-        <AuthProvider>
+        <AuthProvider initialGithubTokenIsSet={true}>
           <QueryClientProvider
             client={
               new QueryClient({