fixing old var refs

frontend/__tests__/routes/settings.test.tsx

@@ -71,7 +71,7 @@ describe("Settings Screen", () => {
       renderSettingsScreen();
 
       await waitFor(() => {
-        screen.getByTestId("github-token-input");
+        screen.getByTestId("token-input");
         screen.getByTestId("github-token-help-anchor");
         screen.getByTestId("language-input");
         screen.getByTestId("enable-analytics-switch");
@@ -82,13 +82,13 @@ describe("Settings Screen", () => {
     it.skip("should render an indicator if the GitHub token is not set", async () => {
       getSettingsSpy.mockResolvedValue({
         ...MOCK_DEFAULT_USER_SETTINGS,
-        github_token_is_set: false,
+        token_is_set: false,
       });
 
       renderSettingsScreen();
 
       await waitFor(() => {
-        const input = screen.getByTestId("github-token-input");
+        const input = screen.getByTestId("token-input");
         const inputParent = input.parentElement;
 
         if (inputParent) {
@@ -103,26 +103,26 @@ describe("Settings Screen", () => {
     it("should set asterik placeholder if the GitHub token is set", async () => {
       getSettingsSpy.mockResolvedValue({
         ...MOCK_DEFAULT_USER_SETTINGS,
-        github_token_is_set: true,
+        token_is_set: true,
       });
 
       renderSettingsScreen();
 
       await waitFor(() => {
-        const input = screen.getByTestId("github-token-input");
+        const input = screen.getByTestId("token-input");
         expect(input).toHaveProperty("placeholder", "**********");
       });
     });
 
     it("should render an indicator if the GitHub token is set", async () => {
       getSettingsSpy.mockResolvedValue({
         ...MOCK_DEFAULT_USER_SETTINGS,
-        github_token_is_set: true,
+        token_is_set: true,
       });
 
       renderSettingsScreen();
 
-      const input = await screen.findByTestId("github-token-input");
+      const input = await screen.findByTestId("token-input");
       const inputParent = input.parentElement;
 
       if (inputParent) {
@@ -136,7 +136,7 @@ describe("Settings Screen", () => {
     it("should render a disabled 'Disconnect from GitHub' button if the GitHub token is not set", async () => {
       getSettingsSpy.mockResolvedValue({
         ...MOCK_DEFAULT_USER_SETTINGS,
-        github_token_is_set: false,
+        token_is_set: false,
       });
 
       renderSettingsScreen();
@@ -149,7 +149,7 @@ describe("Settings Screen", () => {
     it("should render an enabled 'Disconnect from GitHub' button if the GitHub token is set", async () => {
       getSettingsSpy.mockResolvedValue({
         ...MOCK_DEFAULT_USER_SETTINGS,
-        github_token_is_set: true,
+        token_is_set: true,
       });
 
       renderSettingsScreen();
@@ -158,7 +158,7 @@ describe("Settings Screen", () => {
       expect(button).toBeEnabled();
 
       // input should still be rendered
-      const input = await screen.findByTestId("github-token-input");
+      const input = await screen.findByTestId("token-input");
       expect(input).toBeInTheDocument();
     });
 
@@ -167,7 +167,7 @@ describe("Settings Screen", () => {
 
       getSettingsSpy.mockResolvedValue({
         ...MOCK_DEFAULT_USER_SETTINGS,
-        github_token_is_set: true,
+        token_is_set: true,
       });
 
       renderSettingsScreen();
@@ -213,7 +213,7 @@ describe("Settings Screen", () => {
       renderSettingsScreen();
 
       await waitFor(() => {
-        const input = screen.queryByTestId("github-token-input");
+        const input = screen.queryByTestId("token-input");
         const helpAnchor = screen.queryByTestId("github-token-help-anchor");
 
         expect(input).not.toBeInTheDocument();
@@ -225,7 +225,7 @@ describe("Settings Screen", () => {
       const user = userEvent.setup();
       getSettingsSpy.mockResolvedValue({
         ...MOCK_DEFAULT_USER_SETTINGS,
-        github_token_is_set: false,
+        token_is_set: false,
         llm_model: "anthropic/claude-3-5-sonnet-20241022",
       });
       saveSettingsSpy.mockRejectedValueOnce(new Error("Invalid GitHub token"));
@@ -238,7 +238,7 @@ describe("Settings Screen", () => {
       expect(llmProviderInput).toHaveValue("Anthropic");
       expect(llmModelInput).toHaveValue("claude-3-5-sonnet-20241022");
 
-      const input = await screen.findByTestId("github-token-input");
+      const input = await screen.findByTestId("token-input");
       await user.type(input, "invalid-token");
 
       const saveButton = screen.getByText("Save Changes");
@@ -646,7 +646,7 @@ describe("Settings Screen", () => {
       getSettingsSpy.mockResolvedValue({
         ...MOCK_DEFAULT_USER_SETTINGS,
         language: "no",
-        github_token_is_set: true,
+        token_is_set: true,
         user_consents_to_analytics: true,
         llm_base_url: "https://test.com",
         llm_model: "anthropic/claude-3-5-sonnet-20241022",
@@ -699,7 +699,7 @@ describe("Settings Screen", () => {
       expect(saveSettingsSpy).toHaveBeenCalledWith(
         expect.objectContaining({
           llm_api_key: "", // empty because it's not set previously
-          github_token: undefined,
+          token: undefined,
           language: "no",
         }),
       );
@@ -736,7 +736,7 @@ describe("Settings Screen", () => {
 
       expect(saveSettingsSpy).toHaveBeenCalledWith(
         expect.objectContaining({
-          github_token: undefined,
+          token: undefined,
           llm_api_key: "", // empty because it's not set previously
           llm_model: "openai/gpt-4o",
         }),
@@ -773,13 +773,13 @@ describe("Settings Screen", () => {
       const mockCopy: Partial<PostApiSettings> = {
         ...MOCK_DEFAULT_USER_SETTINGS,
       };
-      delete mockCopy.github_token_is_set;
-      delete mockCopy.unset_github_token;
+      delete mockCopy.token_is_set;
+      delete mockCopy.unset_token;
       delete mockCopy.user_consents_to_analytics;
 
       expect(saveSettingsSpy).toHaveBeenCalledWith({
         ...mockCopy,
-        github_token: undefined, // not set
+        token: undefined, // not set
         llm_api_key: "", // reset as well
       });
       expect(screen.queryByTestId("reset-modal")).not.toBeInTheDocument();

frontend/src/components/features/chat/action-suggestions.tsx

@@ -13,7 +13,7 @@ interface ActionSuggestionsProps {
 export function ActionSuggestions({
   onSuggestionsClick,
 }: ActionSuggestionsProps) {
-  const { githubTokenIsSet } = useAuth();
+  const { tokenIsSet } = useAuth();
   const { selectedRepository } = useSelector(
     (state: RootState) => state.initialQuery,
   );
@@ -32,7 +32,7 @@ export function ActionSuggestions({
         onClose={handleDownloadClose}
         isOpen={isDownloading}
       />
-      {githubTokenIsSet && selectedRepository ? (
+      {tokenIsSet && selectedRepository ? (
         <div className="flex flex-row gap-2 justify-center w-full">
           {!hasPullRequest ? (
             <>

frontend/src/context/auth-context.tsx

@@ -12,9 +12,7 @@ interface AuthContextProps extends React.PropsWithChildren {
 const AuthContext = React.createContext<AuthContextType | undefined>(undefined);
 
 function AuthProvider({ children, initialTokenIsSet }: AuthContextProps) {
-  const [tokenIsSet, setTokenIsSet] = React.useState(
-    !!initialTokenIsSet,
-  );
+  const [tokenIsSet, setTokenIsSet] = React.useState(!!initialTokenIsSet);
 
   const value = React.useMemo(
     () => ({

frontend/src/hooks/mutation/use-logout.ts

@@ -3,13 +3,13 @@ import OpenHands from "#/api/open-hands";
 import { useAuth } from "#/context/auth-context";
 
 export const useLogout = () => {
-  const { setGitHubTokenIsSet } = useAuth();
+  const { setTokenIsSet } = useAuth();
   const queryClient = useQueryClient();
 
   return useMutation({
     mutationFn: OpenHands.logout,
     onSuccess: async () => {
-      setGitHubTokenIsSet(false);
+      setTokenIsSet(false);
       await queryClient.invalidateQueries();
     },
   });

frontend/src/hooks/mutation/use-save-settings.ts

@@ -18,7 +18,6 @@ const saveSettingsMutationFn = async (settings: Partial<PostSettings>) => {
       : settings.LLM_API_KEY?.trim() || undefined,
     remote_runtime_resource_factor: settings.REMOTE_RUNTIME_RESOURCE_FACTOR,
     token: settings.token,
-    token_type: settings.token_type,
     unset_token: settings.unset_token,
     enable_default_condenser: settings.ENABLE_DEFAULT_CONDENSER,
     enable_sound_notifications: settings.ENABLE_SOUND_NOTIFICATIONS,

frontend/src/hooks/query/use-app-installations.ts

@@ -5,14 +5,12 @@ import { useAuth } from "#/context/auth-context";
 
 export const useAppInstallations = () => {
   const { data: config } = useConfig();
-  const { githubTokenIsSet } = useAuth();
+  const { tokenIsSet } = useAuth();
 
   return useQuery({
-    queryKey: ["installations", githubTokenIsSet, config?.GITHUB_CLIENT_ID],
+    queryKey: ["installations", tokenIsSet, config?.GITHUB_CLIENT_ID],
     queryFn: OpenHands.getGitHubUserInstallationIds,
     enabled:
-      githubTokenIsSet &&
-      !!config?.GITHUB_CLIENT_ID &&
-      config?.APP_MODE === "saas",
+      tokenIsSet && !!config?.GITHUB_CLIENT_ID && config?.APP_MODE === "saas",
   });
 };

frontend/src/hooks/query/use-app-repositories.ts

@@ -6,12 +6,12 @@ import { useConfig } from "./use-config";
 import { useAuth } from "#/context/auth-context";
 
 export const useAppRepositories = () => {
-  const { githubTokenIsSet } = useAuth();
+  const { tokenIsSet } = useAuth();
   const { data: config } = useConfig();
   const { data: installations } = useAppInstallations();
 
   const repos = useInfiniteQuery({
-    queryKey: ["repositories", githubTokenIsSet, installations],
+    queryKey: ["repositories", tokenIsSet, installations],
     queryFn: async ({
       pageParam,
     }: {
@@ -46,7 +46,7 @@ export const useAppRepositories = () => {
       return null;
     },
     enabled:
-      githubTokenIsSet &&
+      tokenIsSet &&
       Array.isArray(installations) &&
       installations.length > 0 &&
       config?.APP_MODE === "saas",

frontend/src/hooks/query/use-is-authed.ts

@@ -5,13 +5,13 @@ import { useConfig } from "./use-config";
 import { useAuth } from "#/context/auth-context";
 
 export const useIsAuthed = () => {
-  const { githubTokenIsSet } = useAuth();
+  const { tokenIsSet } = useAuth();
   const { data: config } = useConfig();
 
   const appMode = React.useMemo(() => config?.APP_MODE, [config]);
 
   return useQuery({
-    queryKey: ["user", "authenticated", githubTokenIsSet, appMode],
+    queryKey: ["user", "authenticated", tokenIsSet, appMode],
     queryFn: () => OpenHands.authenticate(appMode!),
     enabled: !!appMode,
     staleTime: 1000 * 60 * 5, // 5 minutes

frontend/src/hooks/query/use-settings.ts

@@ -19,7 +19,6 @@ const getSettingsQueryFn = async () => {
     LLM_API_KEY: apiSettings.llm_api_key,
     REMOTE_RUNTIME_RESOURCE_FACTOR: apiSettings.remote_runtime_resource_factor,
     TOKEN_IS_SET: apiSettings.token_is_set,
-    TOKEN_TYPE: apiSettings.token_type,
     ENABLE_DEFAULT_CONDENSER: apiSettings.enable_default_condenser,
     ENABLE_SOUND_NOTIFICATIONS: apiSettings.enable_sound_notifications,
     USER_CONSENTS_TO_ANALYTICS: apiSettings.user_consents_to_analytics,

frontend/src/hooks/query/use-user-repositories.ts

@@ -5,16 +5,16 @@ import { useConfig } from "./use-config";
 import { useAuth } from "#/context/auth-context";
 
 export const useUserRepositories = () => {
-  const { githubTokenIsSet } = useAuth();
+  const { tokenIsSet } = useAuth();
   const { data: config } = useConfig();
 
   const repos = useInfiniteQuery({
-    queryKey: ["repositories", githubTokenIsSet],
+    queryKey: ["repositories", tokenIsSet],
     queryFn: async ({ pageParam }) =>
       retrieveGitHubUserRepositories(pageParam, 100),
     initialPageParam: 1,
     getNextPageParam: (lastPage) => lastPage.nextPage,
-    enabled: githubTokenIsSet && config?.APP_MODE === "oss",
+    enabled: tokenIsSet && config?.APP_MODE === "oss",
   });
 
   // TODO: Once we create our custom dropdown component, we should fetch data onEndReached

frontend/src/hooks/use-github-auth-url.ts

@@ -9,15 +9,15 @@ interface UseGitHubAuthUrlConfig {
 }
 
 export const useGitHubAuthUrl = (config: UseGitHubAuthUrlConfig) => {
-  const { githubTokenIsSet } = useAuth();
+  const { tokenIsSet } = useAuth();
 
   return React.useMemo(() => {
-    if (config.appMode === "saas" && !githubTokenIsSet)
+    if (config.appMode === "saas" && !tokenIsSet)
       return generateGitHubAuthUrl(
         config.gitHubClientId || "",
         new URL(window.location.href),
       );
 
     return null;
-  }, [githubTokenIsSet, config.appMode, config.gitHubClientId]);
+  }, [tokenIsSet, config.appMode, config.gitHubClientId]);
 };

frontend/src/mocks/handlers.ts

@@ -19,7 +19,6 @@ export const MOCK_DEFAULT_USER_SETTINGS: ApiSettings | PostApiSettings = {
   remote_runtime_resource_factor:
     DEFAULT_SETTINGS.REMOTE_RUNTIME_RESOURCE_FACTOR,
   token_is_set: DEFAULT_SETTINGS.TOKEN_IS_SET,
-  token_type: DEFAULT_SETTINGS.TOKEN_TYPE,
   enable_default_condenser: DEFAULT_SETTINGS.ENABLE_DEFAULT_CONDENSER,
   enable_sound_notifications: DEFAULT_SETTINGS.ENABLE_SOUND_NOTIFICATIONS,
   user_consents_to_analytics: DEFAULT_SETTINGS.USER_CONSENTS_TO_ANALYTICS,
@@ -204,7 +203,6 @@ export const handlers = [
         if (newSettings.unset_token) {
           newSettings.token = undefined;
           newSettings.token_is_set = false;
-          newSettings.token_type = undefined;
           delete newSettings.unset_token;
         }
       }

frontend/src/routes/_oh/route.tsx

@@ -44,7 +44,7 @@ export function ErrorBoundary() {
 }
 
 export default function MainApp() {
-  const { githubTokenIsSet } = useAuth();
+  const { tokenIsSet } = useAuth();
   const { data: settings } = useSettings();
   const { migrateUserConsent } = useMigrateUserConsent();
 
@@ -104,7 +104,7 @@ export default function MainApp() {
 
       {renderWaitlistModal && (
         <WaitlistModal
-          ghTokenIsSet={githubTokenIsSet}
+          ghTokenIsSet={tokenIsSet}
           githubAuthUrl={gitHubAuthUrl}
         />
       )}

frontend/src/routes/account-settings.tsx

@@ -109,8 +109,7 @@ function AccountSettings() {
 
     saveSettings(
       {
-        token:
-          formData.get("token-input")?.toString() || undefined,
+        token: formData.get("token-input")?.toString() || undefined,
         LANGUAGE: languageValue,
         user_consents_to_analytics: userConsentsToAnalytics,
         ENABLE_DEFAULT_CONDENSER: enableMemoryCondenser,
@@ -347,13 +346,11 @@ function AccountSettings() {
                 <SettingsInput
                   testId="token-input"
                   name="token-input"
-                  label={`${settings.TOKEN_TYPE === 'gitlab' ? 'GitLab' : 'GitHub'} Token`}
+                  label="GitHub Token"
                   type="password"
                   className="w-[680px]"
                   startContent={
-                    isTokenSet && (
-                      <KeyStatusIcon isSet={!!isTokenSet} />
-                    )
+                    isTokenSet && <KeyStatusIcon isSet={!!isTokenSet} />
                   }
                   placeholder={isTokenSet ? "**********" : ""}
                 />

frontend/src/services/settings.ts

@@ -12,7 +12,6 @@ export const DEFAULT_SETTINGS: Settings = {
   SECURITY_ANALYZER: "",
   REMOTE_RUNTIME_RESOURCE_FACTOR: 1,
   TOKEN_IS_SET: false,
-  TOKEN_TYPE: null,
   ENABLE_DEFAULT_CONDENSER: true,
   ENABLE_SOUND_NOTIFICATIONS: false,
   USER_CONSENTS_TO_ANALYTICS: false,

frontend/src/types/core/variances.ts

@@ -21,7 +21,6 @@ export interface InitConfig {
     LLM_MODEL: string;
   };
   token?: string;
-  token_type?: 'github' | 'gitlab';
   latest_event_id?: unknown; // Not sure what this is
 }