-
- );
-}
-
-type GoogleDiscoveryTemplate = GoogleDiscoveryPreset & {
- readonly discoveryUrl: string;
- readonly service: string;
- readonly version: string;
-};
-
-const GOOGLE_G_ICON = "https://fonts.gstatic.com/s/i/productlogos/googleg/v6/192px.svg";
-
-function parseGoogleDiscoveryPreset(preset: GoogleDiscoveryPreset): GoogleDiscoveryTemplate {
- // oxlint-disable-next-line executor/no-try-catch-or-throw -- boundary: URL constructor normalizes user-provided preset URLs
- try {
- const url = new URL(preset.url);
- const parts = url.pathname.split("/").filter(Boolean);
- const apisIndex = parts.indexOf("apis");
- const service = apisIndex >= 0 ? parts[apisIndex + 1] : undefined;
- const version =
- apisIndex >= 0 ? parts[apisIndex + 2] : (url.searchParams.get("version") ?? undefined);
- return {
- ...preset,
- discoveryUrl: preset.url,
- service: service ?? url.hostname.replace(/\.googleapis\.com$/, ""),
- version: version ?? "",
- };
- } catch {
- return { ...preset, discoveryUrl: preset.url, service: preset.id, version: "" };
- }
-}
-
-const GOOGLE_DISCOVERY_TEMPLATES = googleDiscoveryPresets.map(parseGoogleDiscoveryPreset);
-
-const iconForService = (service: string): string | undefined =>
- GOOGLE_DISCOVERY_TEMPLATES.find((template) => template.service === service)?.icon;
-
-function GoogleServiceIcon(props: {
- readonly icon?: string;
- readonly service?: string;
- readonly className?: string;
-}) {
- const { icon, service, className = "size-11" } = props;
- const src = icon ?? (service ? iconForService(service) : undefined) ?? GOOGLE_G_ICON;
-
- return (
-
- );
-}
-
-type ProbeOperation = {
- toolPath: string;
- method: string;
- pathTemplate: string;
- description: string | null;
-};
-
-type ProbeResult = {
- name: string;
- title: string | null;
- service: string;
- version: string;
- toolCount: number;
- scopes: readonly string[];
- operations: readonly ProbeOperation[];
-};
-
-type OAuthAuth = {
- kind: "oauth2";
- connectionId: string;
- clientIdSecretId: string;
- clientSecretSecretId: string | null;
- scopes: string[];
-};
-
-export default function AddGoogleDiscoverySource(props: {
- readonly onComplete: () => void;
- readonly onCancel: () => void;
- readonly initialUrl?: string;
- readonly initialPreset?: string;
-}) {
- const defaultTemplate =
- GOOGLE_DISCOVERY_TEMPLATES.find((template) => template.id === props.initialPreset) ??
- GOOGLE_DISCOVERY_TEMPLATES.find((template) => template.id === "google-sheets") ??
- GOOGLE_DISCOVERY_TEMPLATES[0]!;
- const [discoveryUrl, setDiscoveryUrl] = useState(
- props.initialUrl ?? defaultTemplate.discoveryUrl,
- );
- const [selectedTemplateId, setSelectedTemplateId] = useState(
- props.initialUrl ? "" : defaultTemplate.id,
- );
- const selectedTemplate =
- GOOGLE_DISCOVERY_TEMPLATES.find((template) => template.id === selectedTemplateId) ?? null;
- const [authKind, setAuthKind] = useState
- {label}
- {help &&
- {help}
} -
-
-
- onSelect(id)}
- secrets={secretList}
- placeholder={placeholder}
- suggestedId={props.suggestedSecretId}
- secretLabel={label}
- targetScope={props.targetScope}
- />
-
- {clearable && secretId && (
-
- )}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- )}
-
-
-
-
- {error && (
-
-
-
-
-
- );
-}
diff --git a/packages/plugins/google-discovery/src/react/EditGoogleDiscoverySource.tsx b/packages/plugins/google-discovery/src/react/EditGoogleDiscoverySource.tsx
deleted file mode 100644
index 04c50d8ac..000000000
--- a/packages/plugins/google-discovery/src/react/EditGoogleDiscoverySource.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { useAtomValue } from "@effect/atom-react";
-import * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
-import { useScope } from "@executor-js/react/api/scope-context";
-import { Badge } from "@executor-js/react/components/badge";
-import { Button } from "@executor-js/react/components/button";
-
-import { googleDiscoverySourceAtom } from "./atoms";
-import GoogleDiscoverySignInButton from "./GoogleDiscoverySignInButton";
-
-export default function EditGoogleDiscoverySource({
- sourceId,
- onSave,
-}: {
- readonly sourceId: string;
- readonly onSave: () => void;
-}) {
- const scopeId = useScope();
- const sourceResult = useAtomValue(googleDiscoverySourceAtom(scopeId, sourceId));
-
- const source = AsyncResult.isSuccess(sourceResult) ? sourceResult.value : null;
- const config = source?.config;
- const authKind = config?.auth.kind ?? "none";
-
- return (
-
-
-
- Add Google Discovery Source
-- Connect a Google API from its Discovery document and register its methods as tools. -
-
- {
- setSelectedTemplateId("");
- setDiscoveryUrl((e.target as HTMLInputElement).value);
- setProbe(null);
- setOauthAuth(null);
- setError(null);
- }}
- placeholder="https://www.googleapis.com/discovery/v1/apis/sheets/v4/rest"
- className="w-full pr-9 font-mono text-sm"
- />
- {loadingProbe && (
-
-
-
- )}
-
-
-
-
-
-
-
-
- {probe.title ?? probe.name}
-- {probe.service} · {probe.version} -
-
- {probe.toolCount} tools
- {probe.scopes.length} scopes
-
-
- Authentication
-
- tabs={[
- { value: "none", label: "None" },
- { value: "oauth2", label: "OAuth" },
- ]}
- value={authKind}
- onChange={setAuthKind}
- />
-
-
- {authKind === "oauth2" && (
-
-
-
-
-
- {oauthAuth && (
-
- )}
-
-
-
-
-
-
- )}
-
- - {canUseOAuth - ? `${probe?.scopes.length ?? 0} scopes will be requested from Google.` - : "This API does not advertise OAuth scopes."} -
- {canUseOAuth && (probe?.scopes.length ?? 0) > 0 && ( -
-
- {oauth.busy && (
-
- )}
-
-
-
- -
- {(probe?.scopes ?? []).map((scope) => (
-
- - {scope} - - ))} -
- Connected. Manage this connection from the Connections page.
-
- )}
-
- {error}
-
- )}
-
-
-
- );
-}
diff --git a/packages/plugins/google-discovery/src/react/GoogleDiscoverySignInButton.tsx b/packages/plugins/google-discovery/src/react/GoogleDiscoverySignInButton.tsx
deleted file mode 100644
index 01e971f83..000000000
--- a/packages/plugins/google-discovery/src/react/GoogleDiscoverySignInButton.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import { useCallback } from "react";
-import { useAtomSet, useAtomValue } from "@effect/atom-react";
-import * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
-
-import { connectionsAtom } from "@executor-js/react/api/atoms";
-import { useScope, useUserScope } from "@executor-js/react/api/scope-context";
-import { connectionWriteKeys, sourceWriteKeys } from "@executor-js/react/api/reactivity-keys";
-import {
- OAuthSignInButton,
- oauthCallbackUrl,
- useOAuthPopupFlow,
- type OAuthCompletionPayload,
-} from "@executor-js/react/plugins/oauth-sign-in";
-
-import { googleDiscoverySourceAtom, updateGoogleDiscoverySource } from "./atoms";
-import { GOOGLE_DISCOVERY_OAUTH_POPUP_NAME, googleDiscoveryOAuthStrategy } from "./oauth";
-
-// ---------------------------------------------------------------------------
-// GoogleDiscoverySignInButton — top-bar action on the source detail page.
-//
-// Drives the shared /scopes/:scopeId/oauth/{start,callback} surface with
-// a Google-specific `authorization-code` strategy. On success rewrites
-// the source's auth pointer to the freshly minted connection id. Works
-// whether or not the previous Connection still exists — source-owned
-// OAuth config is the source of truth.
-// ---------------------------------------------------------------------------
-
-const signInWriteKeys = [...sourceWriteKeys, ...connectionWriteKeys] as const;
-
-export default function GoogleDiscoverySignInButton(props: { sourceId: string }) {
- const scopeId = useScope();
- const userScopeId = useUserScope();
- const sourceResult = useAtomValue(googleDiscoverySourceAtom(scopeId, props.sourceId));
- const connectionsResult = useAtomValue(connectionsAtom(scopeId));
- const doUpdate = useAtomSet(updateGoogleDiscoverySource, { mode: "promise" });
- const oauth = useOAuthPopupFlow({
- popupName: GOOGLE_DISCOVERY_OAUTH_POPUP_NAME,
- popupBlockedMessage: "OAuth popup was blocked",
- popupClosedMessage: "OAuth cancelled: popup was closed before completing the flow.",
- });
-
- const source =
- AsyncResult.isSuccess(sourceResult) && sourceResult.value ? sourceResult.value : null;
- const auth = source?.config.auth;
- const oauth2 = auth && auth.kind === "oauth2" ? auth : null;
- const connections = AsyncResult.isSuccess(connectionsResult) ? connectionsResult.value : null;
- const isConnected =
- oauth2 !== null &&
- connections !== null &&
- connections.some((c: { readonly id: string }) => c.id === oauth2.connectionId);
-
- const handleSignIn = useCallback(async () => {
- if (!oauth2 || !source) return;
- const scopes = [...oauth2.scopes];
- await oauth.start({
- payload: {
- endpoint: source.config.discoveryUrl,
- redirectUrl: oauthCallbackUrl(),
- connectionId: oauth2.connectionId,
- tokenScope: userScopeId,
- identityLabel: `${source.name.trim() || props.sourceId} OAuth`,
- strategy: googleDiscoveryOAuthStrategy({
- clientIdSecretId: oauth2.clientIdSecretId,
- clientSecretSecretId: oauth2.clientSecretSecretId,
- scopes,
- }),
- pluginId: "google-discovery",
- },
- onSuccess: async (result: OAuthCompletionPayload) => {
- await doUpdate({
- params: { scopeId, namespace: props.sourceId },
- payload: {
- auth: {
- kind: "oauth2",
- connectionId: result.connectionId,
- clientIdSecretId: oauth2.clientIdSecretId,
- clientSecretSecretId: oauth2.clientSecretSecretId,
- scopes,
- },
- },
- reactivityKeys: signInWriteKeys,
- });
- },
- });
- }, [oauth2, source, scopeId, props.sourceId, doUpdate, oauth, userScopeId]);
-
- if (!oauth2) return null;
-
- return (
-
-
-
- Edit Google Discovery Source
-- View configuration for this Google API source. To change authentication, remove and re-add - the source with updated OAuth credentials. -
-
-
- Google Discovery
-
-
-
- {config && (
-
-
- - {source?.name ?? sourceId} -
- {config?.discoveryUrl && ( -- {config.discoveryUrl} -
- )} -
-
- )}
-
-
-
-
-
-
- Service
-{config.service}
-
-
- Version
-{config.version}
-
-
- - Authentication -
-
-
- - {authKind === "oauth2" ? "OAuth 2.0" : authKind} -
- {authKind === "oauth2" &&
-
-
-