Skip to content

AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.

fix(frontend): say when a connection was removed instead of quietly swapping it (#14059)

Nicholas Tindlebb6121a4f478
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/__tests__/FormCreator.credentials.test.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/__tests__/FormCreator.credentials.test.tsx
index 975ca63a6d..c706568ec2 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/__tests__/FormCreator.credentials.test.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/__tests__/FormCreator.credentials.test.tsx
@@ -61,12 +61,20 @@ function makeNode(schema: RJSFSchema): CustomNode {
}
function makeProviders(...names: string[]): CredentialsProvidersContextType {
- const entries = names.map((name) => [
+ return makeProvidersWithCredentials(
+ Object.fromEntries(names.map((name) => [name, []])),
+ );
+}
+
+function makeProvidersWithCredentials(
+ byProvider: Record<string, unknown[]>,
+): CredentialsProvidersContextType {
+ const entries = Object.entries(byProvider).map(([name, savedCredentials]) => [
name,
{
provider: name,
providerName: name,
- savedCredentials: [],
+ savedCredentials,
isSystemProvider: false,
},
]);
@@ -150,7 +158,18 @@ describe("FormCreator credential emission", () => {
useHistoryStore.setState({ past: [], future: [] });
render(
- <CredentialsProvidersContext.Provider value={makeProviders("codex")}>
+ <CredentialsProvidersContext.Provider
+ value={makeProvidersWithCredentials({
+ codex: [
+ {
+ id: "codex-oauth-1",
+ provider: "codex",
+ type: "oauth2",
+ title: "ChatGPT for Codex",
+ },
+ ],
+ })}
+ >
<FormCreator
jsonSchema={autopilotSchema}
nodeId="autopilot-node"
diff --git a/autogpt_platform/frontend/src/components/contextual/CredentialsInput/CredentialsInput.tsx b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/CredentialsInput.tsx
index b2303ad984..ba6b233fc7 100644
--- a/autogpt_platform/frontend/src/components/contextual/CredentialsInput/CredentialsInput.tsx
+++ b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/CredentialsInput.tsx
@@ -1,6 +1,7 @@
"use client";
import { Text } from "@/components/atoms/Text/Text";
+import { Alert, AlertDescription } from "@/components/molecules/Alert/Alert";
import {
BlockIOCredentialsSubSchema,
CredentialsMetaInput,
@@ -18,7 +19,7 @@ import { DeviceAuthCredentialsModal } from "./components/DeviceAuthCredentialsMo
import { HostScopedCredentialsModal } from "./components/HotScopedCredentialsModal/HotScopedCredentialsModal";
import { OAuthFlowWaitingModal } from "./components/OAuthWaitingModal/OAuthWaitingModal";
import { PasswordCredentialsModal } from "./components/PasswordCredentialsModal/PasswordCredentialsModal";
-import { isSystemCredential } from "./helpers";
+import { getRemovedCredentialMessage, isSystemCredential } from "./helpers";
import {
CredentialsInputState,
useCredentialsInput,
@@ -87,6 +88,7 @@ export function CredentialsInput({
userCredentials,
systemCredentials,
oAuthError,
+ removedCredentialTitle,
isAPICredentialsModalOpen,
isUserPasswordCredentialsModalOpen,
isHostScopedCredentialsModalOpen,
@@ -110,6 +112,7 @@ export function CredentialsInput({
deleteWarningMessage,
setCredentialToDelete,
isDeletingCredential,
+ handleCredentialChange,
} = hookData;
const displayName = toDisplayName(provider);
@@ -131,7 +134,7 @@ export function CredentialsInput({
credentials={allCredentials}
selectedCredential={selectedCredential}
onSelectCredential={handleCredentialSelect}
- onClearCredential={() => onSelectCredential(undefined)}
+ onClearCredential={() => handleCredentialChange(undefined)}
onAddCredential={
usesConnectDialog
? () => setConnectDialogOpen(true)
@@ -165,7 +168,7 @@ export function CredentialsInput({
providerName={providerName}
supportedTypes={supportedTypes}
onCredentialsCreate={(creds) => {
- onSelectCredential(creds);
+ handleCredentialChange(creds);
}}
onOAuthLogin={handleOAuthLogin}
onOpenPasswordModal={() =>
@@ -183,7 +186,7 @@ export function CredentialsInput({
open={isAPICredentialsModalOpen}
onClose={() => setAPICredentialsModalOpen(false)}
onCredentialsCreate={(credsMeta) => {
- onSelectCredential(credsMeta);
+ handleCredentialChange(credsMeta);
setAPICredentialsModalOpen(false);
}}
siblingInputs={siblingInputs}
@@ -204,7 +207,7 @@ export function CredentialsInput({
provider={provider}
providerName={providerName}
onCredentialsCreate={(creds) => {
- onSelectCredential(creds);
+ handleCredentialChange(creds);
setDeviceAuthModalOpen(false);
}}
/>
@@ -215,7 +218,7 @@ export function CredentialsInput({
open={isUserPasswordCredentialsModalOpen}
onClose={() => setUserPasswordCredentialsModalOpen(false)}
onCredentialsCreate={(creds) => {
- onSelectCredential(creds);
+ handleCredentialChange(creds);
setUserPasswordCredentialsModalOpen(false);
}}
siblingInputs={siblingInputs}
@@ -227,13 +230,27 @@ export function CredentialsInput({
open={isHostScopedCredentialsModalOpen}
onClose={() => setHostScopedCredentialsModalOpen(false)}
onCredentialsCreate={(creds) => {
- onSelectCredential(creds);
+ handleCredentialChange(creds);
setHostScopedCredentialsModalOpen(false);
}}
siblingInputs={siblingInputs}
/>
)}
+ {removedCredentialTitle && (
+ <Alert variant="warning" aria-live="polite" className="mt-2">
+ <AlertDescription>
+ <Text variant="body" unmask={false}>
+ {getRemovedCredentialMessage(
+ removedCredentialTitle,
+ selectedCredential,
+ displayName,
+ )}
+ </Text>
+ </AlertDescription>
+ </Alert>
+ )}
+
{oAuthError && (
<Text variant="body" className="mt-2 text-red-500">
Error: {oAuthError}
diff --git a/autogpt_platform/frontend/src/components/contextual/CredentialsInput/__tests__/CredentialsInput.test.tsx b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/__tests__/CredentialsInput.test.tsx
index bf7b5bd4d3..777eca6eea 100644
--- a/autogpt_platform/frontend/src/components/contextual/CredentialsInput/__tests__/CredentialsInput.test.tsx
+++ b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/__tests__/CredentialsInput.test.tsx
@@ -6,7 +6,12 @@ import {
waitFor,
} from "@/tests/integrations/test-utils";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import type { BlockIOCredentialsSubSchema } from "@/lib/autogpt-server-api";
+import type {
+ BlockIOCredentialsSubSchema,
+ CredentialsMetaInput,
+ CredentialsMetaResponse,
+} from "@/lib/autogpt-server-api";
+import React from "react";
import { CredentialsInput } from "../CredentialsInput";
vi.mock("@/hooks/useCredentials", () => ({ default: vi.fn() }));
@@ -49,12 +54,14 @@ const mockPreOpenOAuthPopup = preOpenOAuthPopup as unknown as ReturnType<
const mockToast = toast as unknown as ReturnType<typeof vi.fn>;
const baseSchema: BlockIOCredentialsSubSchema = {
- credentials_provider: ["google"],
+ type: "object",
+ properties: {},
+ credentials_provider: ["codex"],
credentials_types: ["oauth2"],
credentials_scopes: ["drive.file", "drive.metadata"],
-} as BlockIOCredentialsSubSchema;
+};
-type CredentialsReturn = ReturnType<typeof useCredentials>;
+type CredentialsReturn = NonNullable<ReturnType<typeof useCredentials>>;
type BackendAPI = ReturnType<typeof useBackendAPI>;
function makeCredentialsReturn(overrides: Partial<CredentialsReturn> = {}) {
@@ -62,6 +69,7 @@ function makeCredentialsReturn(overrides: Partial<CredentialsReturn> = {}) {
provider: "google",
providerName: "Google",
savedCredentials: [],
+ allProviderCredentials: [],
upgradeableCredentials: [],
supportsApiKey: false,
supportsOAuth2: true,
@@ -521,3 +529,330 @@ describe("CredentialsInput – device auth", () => {
expect(mockPreOpenOAuthPopup).not.toHaveBeenCalled();
});
});
+function StatefulCredentialsInput({
+ initial,
+ onSelectionChange,
+}: {
+ initial?: CredentialsMetaInput;
+ onSelectionChange?: (credential?: CredentialsMetaInput) => void;
+}) {
+ const [selected, setSelected] = React.useState<
+ CredentialsMetaInput | undefined
+ >(initial);
+
+ function handleSelectionChange(credential?: CredentialsMetaInput) {
+ setSelected(credential);
+ onSelectionChange?.(credential);
+ }
+
+ return (
+ <CredentialsInput
+ schema={baseSchema}
+ selectedCredentials={selected}
+ onSelectCredentials={handleSelectionChange}
+ showTitle={false}
+ />
+ );
+}
+
+describe("CredentialsInput – a removed connection", () => {
+ const codexCredential = {
+ id: "codex-1",
+ provider: "codex",
+ type: "oauth2" as const,
+ title: "ChatGPT for Codex",
+ scopes: [],
+ };
+
+ const deleted = {
+ id: "deleted-cred",
+ provider: "codex",
+ type: "oauth2" as const,
+ title: "Old ChatGPT connection",
+ };
+
+ function mockProvider(
+ savedCredentials: CredentialsMetaResponse[],
+ allProviderCredentials: CredentialsMetaResponse[] = savedCredentials,
+ ) {
+ mockUseCredentials.mockReturnValue(
+ makeCredentialsReturn({
+ provider: "codex",
+ providerName: "Codex",
+ schema: baseSchema,
+ savedCredentials,
+ allProviderCredentials,
+ }),
+ );
+ }
+
+ it("heals the node and reports the swap", async () => {
+ // Healing is the point: reconnecting mints a new id, and adopting it is
+ // what makes disconnect/reconnect just work. Refusing to adopt would force
+ // a manual re-pick in the common case (same account) to warn about the
+ // rare one (a different account). So heal — and say so.
+ mockProvider([codexCredential]);
+
+ render(<StatefulCredentialsInput initial={deleted} />);
+
+ expect(
+ await screen.findByText(
+ /Old ChatGPT connection was removed — now using ChatGPT for Codex\./i,
+ ),
+ ).toBeDefined();
+ });
+
+ it("asks the user to choose when nothing is left to heal with", async () => {
+ // Deleting your only connection: nothing to adopt, so say what happened
+ // and ask. Previously an empty list was read as "still loading", so this
+ // case was skipped entirely — a stale selection with no warning.
+ mockProvider([]);
+
+ render(<StatefulCredentialsInput initial={deleted} />);
+
+ expect(
+ await screen.findByText(
+ /Old ChatGPT connection was removed\. Choose a connection/i,
+ ),
+ ).toBeDefined();
+ });
+
+ it("does not announce an external removal while deleting the selected credential", async () => {
+ const rerenderRef: {
+ current?: ReturnType<typeof render>["rerender"];
+ } = {};
+ let resolveDelete:
+ | ((result: { deleted: true; revoked: null }) => void)
+ | undefined;
+ const deleteCredentials = vi.fn(async () => {
+ mockProvider([]);
+ if (!rerenderRef.current)
+ throw new Error("expected the input to be rendered");
+ rerenderRef.current(
+ <StatefulCredentialsInput
+ initial={{ ...codexCredential, type: "oauth2" }}
+ />,
+ );
+
+ return new Promise<{ deleted: true; revoked: null }>((resolve) => {
+ resolveDelete = resolve;
+ });
+ });
+ mockUseCredentials.mockReturnValue(
+ makeCredentialsReturn({
+ provider: "codex",
+ providerName: "Codex",
+ schema: baseSchema,
+ savedCredentials: [codexCredential],
+ allProviderCredentials: [codexCredential],
+ deleteCredentials,
+ }),
+ );
+
+ const view = render(
+ <StatefulCredentialsInput
+ initial={{ ...codexCredential, type: "oauth2" }}
+ />,
+ );
+ rerenderRef.current = view.rerender;
+
+ const menuTrigger = screen
+ .getAllByRole("button")
+ .find((button) => button.getAttribute("aria-haspopup") === "menu");
+ if (!menuTrigger) throw new Error("expected the credential actions menu");
+ fireEvent.pointerDown(menuTrigger, { button: 0 });
+ fireEvent.click(await screen.findByRole("menuitem", { name: "Delete" }));
+ fireEvent.click(await screen.findByRole("button", { name: "Delete" }));
+
+ await waitFor(() => expect(deleteCredentials).toHaveBeenCalled());
+ await waitFor(() => expect(screen.queryByText(/was removed/i)).toBeNull());
+
+ if (!resolveDelete) throw new Error("expected the deletion to be pending");
+ resolveDelete({ deleted: true, revoked: null });
+ await waitFor(() => expect(screen.queryByText(/was removed/i)).toBeNull());
+ });
+
+ it("stays quiet while the provider list is still loading", async () => {
+ mockUseCredentials.mockReturnValue(null);
+
+ const view = render(<StatefulCredentialsInput initial={deleted} />);
+
+ await waitFor(() => expect(screen.queryByText(/was removed/i)).toBeNull());
+
+ mockProvider([codexCredential]);
+ view.rerender(<StatefulCredentialsInput initial={deleted} />);
+
+ expect(
+ await screen.findByText(
+ /Old ChatGPT connection was removed — now using ChatGPT for Codex/i,
+ ),
+ ).toBeDefined();
+ });
+
+ it("says nothing when the configured connection still resolves", async () => {
+ mockProvider([codexCredential]);
+
+ render(
+ <StatefulCredentialsInput
+ initial={{ ...codexCredential, type: "oauth2" }}
+ />,
+ );
+
+ await waitFor(() => expect(screen.queryByText(/was removed/i)).toBeNull());
+ });
+
+ it("clears an existing credential when filtering excludes it", async () => {
+ const onSelectionChange = vi.fn();
+ mockProvider([], [{ ...codexCredential }]);
+
+ render(
+ <StatefulCredentialsInput
+ initial={{ ...codexCredential, type: "oauth2" }}
+ onSelectionChange={onSelectionChange}
+ />,
+ );
+
+ await waitFor(() =>
+ expect(onSelectionChange).toHaveBeenCalledWith(undefined),
+ );
+ await waitFor(() => expect(screen.queryByText(/was removed/i)).toBeNull());
+ });
+
+ it("heals again after an auto-selected connection is itself deleted", async () => {
+ // The auto-select flag latches after the first run, so without resetting it
+ // the field stayed empty instead of adopting whatever remained.
+ const second = {
+ ...codexCredential,
+ id: "codex-2",
+ title: "Second ChatGPT",
+ };
+ mockProvider([second], [second]);
+
+ render(
+ <StatefulCredentialsInput
+ initial={{ ...codexCredential, type: "oauth2" }}
+ />,
+ );
+
+ expect(await screen.findByText(/now using Second ChatGPT/i)).toBeDefined();
+ });
+
+ it("still auto-selects a lone connection when nothing was configured before", async () => {
+ const onSelectionChange = vi.fn();
+ mockProvider([codexCredential]);
+
+ render(<StatefulCredentialsInput onSelectionChange={onSelectionChange} />);
+
+ await waitFor(() =>
+ expect(onSelectionChange).toHaveBeenCalledWith({
+ id: codexCredential.id,
+ provider: codexCredential.provider,
+ title: codexCredential.title,
+ type: codexCredential.type,
+ }),
+ );
+ await waitFor(() => expect(screen.queryByText(/was removed/i)).toBeNull());
+ });
+
+ it("dismisses the notice after an explicit dropdown selection", async () => {
+ const replacement = {
+ ...codexCredential,
+ id: "codex-2",
+ title: "Replacement ChatGPT",
+ };
+ const onSelectionChange = vi.fn();
+ mockProvider([codexCredential, replacement]);
+
+ render(
+ <StatefulCredentialsInput
+ initial={deleted}
+ onSelectionChange={onSelectionChange}
+ />,
+ );
+
+ expect(
+ await screen.findByText(
+ /Old ChatGPT connection was removed\. Choose a connection/i,
+ ),
+ ).toBeDefined();
+
+ fireEvent.change(
+ screen.getByRole("combobox", { name: /Select OpenAI credential/i }),
+ { target: { value: replacement.id } },
+ );
+
+ await waitFor(() =>
+ expect(onSelectionChange).toHaveBeenCalledWith({
+ id: replacement.id,
+ provider: replacement.provider,
+ title: replacement.title,
+ type: replacement.type,
+ }),
+ );
+ await waitFor(() => expect(screen.queryByText(/was removed/i)).toBeNull());
+ });
+
+ it("names an adopted title-less credential with the existing fallback", async () => {
+ mockProvider([
+ {
+ ...codexCredential,
+ title: undefined,
+ },
+ ]);
+
+ render(<StatefulCredentialsInput initial={deleted} />);
+
+ expect(
+ await screen.findByText(/now using Your OpenAI account\./i),
+ ).toBeDefined();
+ });
+
+ it("dismisses the notice once OAuth reconnects the account", async () => {
+ // Reconnecting is an explicit choice, same as picking from the dropdown,
+ // so the notice has done its job. Only `handleCredentialSelect` used to
+ // clear it, which left the warning up after the user had already fixed
+ // the thing it was warning about.
+ // The provider list starts empty and gains the connection when the
+ // callback resolves, which is what really happens: `oAuthCallback` mints
+ // the credential and refreshes the list.
+ const reconnected = {
+ id: "new-cred",
+ provider: "codex",
+ type: "oauth2" as const,
+ title: "Reconnected ChatGPT",
+ scopes: ["drive.file", "drive.metadata"],
+ };
+ const list: CredentialsMetaResponse[] = [];
+ mockUseCredentials.mockReturnValue(
+ makeCredentialsReturn({
+ provider: "codex",
+ providerName: "Codex",
+ schema: baseSchema,
+ savedCredentials: list,
+ allProviderCredentials: list,
+ oAuthCallback: vi.fn().mockImplementation(async () => {
+ list.push(reconnected);
+ return reconnected;
+ }),
+ }),
+ );
+ mockOpenOAuthPopup.mockReturnValue({
+ promise: Promise.resolve({ code: "code-1", state: "state-xyz" }),
+ cleanup: { abort: vi.fn() },
+ });
+
+ render(<StatefulCredentialsInput initial={deleted} />);
+
+ expect(
+ await screen.findByText(
+ /Old ChatGPT connection was removed\. Choose a connection/i,
+ ),
+ ).toBeDefined();
+
+ fireEvent.click(
+ screen.getByRole("button", { name: /sign in with chatgpt/i }),
+ );
+
+ await waitFor(() => expect(screen.queryByText(/was removed/i)).toBeNull());
+ });
+});
diff --git a/autogpt_platform/frontend/src/components/contextual/CredentialsInput/helpers.ts b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/helpers.ts
index f3ab08360e..2396ec6f74 100644
--- a/autogpt_platform/frontend/src/components/contextual/CredentialsInput/helpers.ts
+++ b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/helpers.ts
@@ -186,7 +186,7 @@ export function getActionButtonText(
}
export function getCredentialDisplayName(
- credential: { title?: string; username?: string },
+ credential: { title?: string | null; username?: string },
displayName: string,
): string {
return (
@@ -194,6 +194,24 @@ export function getCredentialDisplayName(
);
}
+export function getRemovedCredentialMessage(
+ removedCredentialTitle: string,
+ selectedCredential:
+ | { id: string; title?: string | null; username?: string }
+ | undefined,
+ providerName: string,
+): string {
+ if (!selectedCredential?.id) {
+ return `${removedCredentialTitle} was removed. Choose a connection to keep this agent running.`;
+ }
+
+ const replacement = getCredentialDisplayName(
+ selectedCredential,
+ providerName,
+ );
+ return `${removedCredentialTitle} was removed — now using ${replacement}.`;
+}
+
export const OAUTH_TIMEOUT_MS = 5 * 60 * 1000;
export const MASKED_KEY_LENGTH = 15;
diff --git a/autogpt_platform/frontend/src/components/contextual/CredentialsInput/useCredentialsInput.ts b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/useCredentialsInput.ts
index a02ee189ff..93b8fac228 100644
--- a/autogpt_platform/frontend/src/components/contextual/CredentialsInput/useCredentialsInput.ts
+++ b/autogpt_platform/frontend/src/components/contextual/CredentialsInput/useCredentialsInput.ts
@@ -60,6 +60,9 @@ export function useCredentialsInput({
const [isOAuth2FlowInProgress, setOAuth2FlowInProgress] = useState(false);
const [oAuthPopupBlocked, setOAuthPopupBlocked] = useState(false);
const [oAuthError, setOAuthError] = useState<string | null>(null);
+ const [removedCredentialTitle, setRemovedCredentialTitle] = useState<
+ string | null
+ >(null);
const [credentialToDelete, setCredentialToDelete] = useState<{
id: string;
title: string;
@@ -93,16 +96,13 @@ export function useCredentialsInput({
useEffect(() => {
if (onLoaded) {
- onLoaded(Boolean(credentials && credentials.isLoading === false));
+ onLoaded(Boolean(credentials));
}
}, [credentials, onLoaded]);
- // Unselect credential if not available in the loaded credential list.
- // Skip when no credentials have been loaded yet (empty list could mean
- // the provider data hasn't finished loading, not that the credential is invalid).
useEffect(() => {
if (readOnly) return;
- if (!credentials || !("savedCredentials" in credentials)) return;
+ if (!credentials) return;
const availableCreds = credentials.savedCredentials;
if (
selectedCredential &&
@@ -112,23 +112,41 @@ export function useCredentialsInput({
hasAttemptedAutoSelect.current = false;
return;
}
- if (availableCreds.length === 0) return;
- if (
- selectedCredential &&
- !availableCreds.some((c) => c.id === selectedCredential.id)
- ) {
- onSelectCredential(undefined);
- // Reset auto-selection flag so it can run again after unsetting invalid credential
- hasAttemptedAutoSelect.current = false;
+
+ if (!selectedCredential) return;
+ const stillUsable = availableCreds.some(
+ (credential) => credential.id === selectedCredential.id,
+ );
+ if (stillUsable) return;
+
+ const stillExists = credentials.allProviderCredentials.some(
+ (credential) => credential.id === selectedCredential.id,
+ );
+
+ const isDeletingSelected =
+ isDeletingCredential && credentialToDelete?.id === selectedCredential.id;
+ if (!stillExists && !isDeletingSelected) {
+ setRemovedCredentialTitle(
+ selectedCredential.title || credentials.providerName,
+ );
}
- }, [credentials, selectedCredential, onSelectCredential, readOnly]);
+ onSelectCredential(undefined);
+ hasAttemptedAutoSelect.current = false;
+ }, [
+ credentialToDelete?.id,
+ credentials,
+ isDeletingCredential,
+ onSelectCredential,
+ readOnly,
+ selectedCredential,
+ ]);
// Auto-select the first available credential on initial mount
// Once a user has made a selection, we don't override it
useEffect(
function autoSelectCredential() {
if (readOnly) return;
- if (!credentials || !("savedCredentials" in credentials)) return;
+ if (!credentials) return;
if (selectedCredential?.id) return;
const savedCreds = credentials.savedCredentials;
@@ -146,7 +164,7 @@ export function useCredentialsInput({
id: cred.id,
type: cred.type,
provider: credentials.provider,
- title: (cred as any).title,
+ title: cred.title,
});
},
[
@@ -158,11 +176,7 @@ export function useCredentialsInput({
],
);
- if (
- !credentials ||
- credentials.isLoading ||
- !("savedCredentials" in credentials)
- ) {
+ if (!credentials) {
return {
isLoading: true,
};
@@ -191,6 +205,11 @@ export function useCredentialsInput({
upgradeableCredentials,
);
+ function handleCredentialChange(newValue?: CredentialsMetaInput) {
+ setRemovedCredentialTitle(null);
+ onSelectCredential(newValue);
+ }
+
async function executeOAuthFlow(credentialID?: string) {
setOAuthError(null);
@@ -308,7 +327,7 @@ export function useCredentialsInput({
}
}
- onSelectCredential({
+ handleCredentialChange({
id: credentialResult.id,
type: "oauth2",
title: credentialResult.title,
@@ -408,11 +427,11 @@ export function useCredentialsInput({
function handleCredentialSelect(credentialId: string) {
const selectedCreds = savedCredentials.find((c) => c.id === credentialId);
if (selectedCreds) {
- onSelectCredential({
+ handleCredentialChange({
id: selectedCreds.id,
type: selectedCreds.type,
provider: provider,
- title: (selectedCreds as any).title,
+ title: selectedCreds.title,
});
}
}
@@ -435,6 +454,10 @@ export function useCredentialsInput({
return;
setIsDeletingCredential(true);
+ const isDeletingSelected = credentialToDelete.id === selectedCredential?.id;
+ if (isDeletingSelected) {
+ setRemovedCredentialTitle(null);
+ }
try {
const state = await processCredentialDeletion(
credentialToDelete,
@@ -444,7 +467,7 @@ export function useCredentialsInput({
);
if (state.shouldUnselectCurrent) {
- onSelectCredential(undefined);
+ handleCredentialChange(undefined);
}
setDeleteWarningMessage(state.warningMessage);
setCredentialToDelete(state.credentialToDelete);
@@ -477,6 +500,7 @@ export function useCredentialsInput({
systemCredentials,
allCredentials: savedCredentials,
selectedCredential,
+ removedCredentialTitle,
oAuthError,
isAPICredentialsModalOpen,
isUserPasswordCredentialsModalOpen,
@@ -511,7 +535,7 @@ export function useCredentialsInput({
handleOAuthLogin,
handleScopeUpgrade,
userUpgradeableCredentials,
- onSelectCredential,
+ handleCredentialChange,
schema,
siblingInputs,
};
diff --git a/autogpt_platform/frontend/src/hooks/__tests__/useCredentials.test.ts b/autogpt_platform/frontend/src/hooks/__tests__/useCredentials.test.ts
index 9c270cfd1a..557e4b866a 100644
--- a/autogpt_platform/frontend/src/hooks/__tests__/useCredentials.test.ts
+++ b/autogpt_platform/frontend/src/hooks/__tests__/useCredentials.test.ts
@@ -1,6 +1,13 @@
import type { BlockIOCredentialsSubSchema } from "@/lib/autogpt-server-api";
-import { describe, expect, it } from "vitest";
+import { renderHook } from "@testing-library/react";
+import React from "react";
+import { describe, expect, it, vi } from "vitest";
import {
+ CredentialsProviderData,
+ CredentialsProvidersContext,
+ CredentialsProvidersContextType,
+} from "@/providers/agent-credentials/credentials-provider";
+import useCredentials, {
deriveAuthMethods,
getSupportedCredentialTypes,
} from "../useCredentials";
@@ -89,3 +96,63 @@ describe("deriveAuthMethods", () => {
});
});
});
+
+describe("useCredentials provider list", () => {
+ it("exposes the unfiltered provider credentials alongside the filtered ones", async () => {
+ const oauthOnly = {
+ id: "codex-1",
+ provider: "codex",
+ type: "oauth2" as const,
+ title: "ChatGPT for Codex",
+ };
+ const apiKeyToo = {
+ id: "codex-2",
+ provider: "codex",
+ type: "api_key" as const,
+ title: "A key",
+ };
+
+ const provider = {
+ provider: "codex",
+ providerName: "Codex",
+ savedCredentials: [oauthOnly, apiKeyToo],
+ isSystemProvider: false,
+ oAuthCallback: vi.fn(),
+ mcpOAuthCallback: vi.fn(),
+ createAPIKeyCredentials: vi.fn(),
+ createUserPasswordCredentials: vi.fn(),
+ createHostScopedCredentials: vi.fn(),
+ deleteCredentials: vi.fn(),
+ } satisfies CredentialsProviderData;
+ const providers: CredentialsProvidersContextType = { codex: provider };
+
+ const codexOnlySchema = {
+ type: "object",
+ properties: {},
+ credentials_provider: ["codex"],
+ credentials_types: ["oauth2"],
+ } as unknown as BlockIOCredentialsSubSchema;
+
+ const { result } = renderHook(() => useCredentials(codexOnlySchema, {}), {
+ wrapper: ({ children }: { children: React.ReactNode }) =>
+ React.createElement(
+ CredentialsProvidersContext.Provider,
+ { value: providers },
+ children,
+ ),
+ });
+
+ if (result.current === null) {
+ throw new Error("expected the provider to resolve");
+ }
+
+ // The api_key one is filtered out of savedCredentials by the schema's
+ // supported types, but must still be present in the unfiltered list.
+ expect(
+ result.current.savedCredentials.map((credential) => credential.id),
+ ).toEqual(["codex-1"]);
+ expect(
+ result.current.allProviderCredentials.map((credential) => credential.id),
+ ).toEqual(["codex-1", "codex-2"]);
+ });
+});
diff --git a/autogpt_platform/frontend/src/hooks/useCredentials.ts b/autogpt_platform/frontend/src/hooks/useCredentials.ts
index 3814d75dda..a41b26410e 100644
--- a/autogpt_platform/frontend/src/hooks/useCredentials.ts
+++ b/autogpt_platform/frontend/src/hooks/useCredentials.ts
@@ -65,29 +65,18 @@ export function classifyCredentials(
return { savedCredentials, upgradeableCredentials };
}
-export type CredentialsData =
- | {
- provider: string;
- schema: BlockIOCredentialsSubSchema;
- supportsApiKey: boolean;
- supportsOAuth2: boolean;
- supportsDeviceCode: boolean;
- supportsUserPassword: boolean;
- supportsHostScoped: boolean;
- isLoading: true;
- discriminatorValue?: string;
- }
- | (CredentialsProviderData & {
- schema: BlockIOCredentialsSubSchema;
- supportsApiKey: boolean;
- supportsOAuth2: boolean;
- supportsDeviceCode: boolean;
- supportsUserPassword: boolean;
- supportsHostScoped: boolean;
- isLoading: false;
- discriminatorValue?: string;
- upgradeableCredentials: CredentialsMetaResponse[];
- });
+export type CredentialsData = CredentialsProviderData & {
+ schema: BlockIOCredentialsSubSchema;
+ supportsApiKey: boolean;
+ supportsOAuth2: boolean;
+ supportsDeviceCode: boolean;
+ supportsUserPassword: boolean;
+ supportsHostScoped: boolean;
+ isLoading: false;
+ discriminatorValue?: string;
+ upgradeableCredentials: CredentialsMetaResponse[];
+ allProviderCredentials: CredentialsMetaResponse[];
+};
export function getSupportedCredentialTypes(
schema: BlockIOCredentialsSubSchema,
@@ -202,6 +191,7 @@ export default function useCredentials(
return {
...provider,
+ allProviderCredentials: provider.savedCredentials,
provider: providerName,
schema: effectiveSchema,
supportsApiKey,