Revert "Ignore workspace settings for untrusted folders" (#6672)

This commit is contained in:
Jacob Richman
2025-08-20 12:49:15 -07:00
committed by GitHub
parent fd64d89da0
commit 52e340a11b
16 changed files with 122 additions and 386 deletions

View File

@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
import { useState, useCallback, useEffect, useContext } from 'react';
import { useState, useCallback, useEffect } from 'react';
import { LoadedSettings, SettingScope } from '../../config/settings.js';
import {
AuthType,
@@ -13,7 +13,6 @@ import {
getErrorMessage,
} from '@google/gemini-cli-core';
import { runExitCleanup } from '../../utils/cleanup.js';
import { SettingsContext } from '../contexts/SettingsContext.js';
export const useAuthCommand = (
settings: LoadedSettings,
@@ -23,7 +22,6 @@ export const useAuthCommand = (
const [isAuthDialogOpen, setIsAuthDialogOpen] = useState(
settings.merged.selectedAuthType === undefined,
);
const settingsContext = useContext(SettingsContext);
const openAuthDialog = useCallback(() => {
setIsAuthDialogOpen(true);
@@ -58,7 +56,7 @@ export const useAuthCommand = (
if (authType) {
await clearCachedCredentialFile();
settingsContext?.settings.setValue(scope, 'selectedAuthType', authType);
settings.setValue(scope, 'selectedAuthType', authType);
if (
authType === AuthType.LOGIN_WITH_GOOGLE &&
config.isBrowserLaunchSuppressed()
@@ -77,7 +75,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
setIsAuthDialogOpen(false);
setAuthError(null);
},
[settingsContext, setAuthError, config],
[settings, setAuthError, config],
);
const cancelAuthentication = useCallback(() => {