feat: self healing skyvern api key (#3614)
Co-authored-by: Suchintan <suchintan@users.noreply.github.com> Co-authored-by: Shuchang Zheng <wintonzheng0325@gmail.com>
This commit is contained in:
@@ -16,10 +16,10 @@ import { useCredentialGetter } from "@/hooks/useCredentialGetter";
|
||||
import { statusIsNotFinalized } from "@/routes/tasks/types";
|
||||
import { useClientIdStore } from "@/store/useClientIdStore";
|
||||
import {
|
||||
envCredential,
|
||||
environment,
|
||||
wssBaseUrl,
|
||||
newWssBaseUrl,
|
||||
getRuntimeApiKey,
|
||||
} from "@/util/env";
|
||||
import { cn } from "@/util/utils";
|
||||
|
||||
@@ -140,22 +140,18 @@ function BrowserStream({
|
||||
|
||||
const getWebSocketParams = useCallback(async () => {
|
||||
const clientIdQueryParam = `client_id=${clientId}`;
|
||||
let credentialQueryParam = "";
|
||||
const runtimeApiKey = getRuntimeApiKey();
|
||||
|
||||
if (environment === "local") {
|
||||
credentialQueryParam = `apikey=${envCredential}`;
|
||||
} else {
|
||||
if (credentialGetter) {
|
||||
const token = await credentialGetter();
|
||||
credentialQueryParam = `token=Bearer ${token}`;
|
||||
} else {
|
||||
credentialQueryParam = `apikey=${envCredential}`;
|
||||
}
|
||||
let credentialQueryParam = runtimeApiKey ? `apikey=${runtimeApiKey}` : "";
|
||||
|
||||
if (environment !== "local" && credentialGetter) {
|
||||
const token = await credentialGetter();
|
||||
credentialQueryParam = token ? `token=Bearer ${token}` : "";
|
||||
}
|
||||
|
||||
const params = [credentialQueryParam, clientIdQueryParam].join("&");
|
||||
|
||||
return `${params}`;
|
||||
return credentialQueryParam
|
||||
? `${credentialQueryParam}&${clientIdQueryParam}`
|
||||
: clientIdQueryParam;
|
||||
}, [clientId, credentialGetter]);
|
||||
|
||||
// browser is ready
|
||||
|
||||
202
skyvern-frontend/src/components/SelfHealApiKeyBanner.tsx
Normal file
202
skyvern-frontend/src/components/SelfHealApiKeyBanner.tsx
Normal file
@@ -0,0 +1,202 @@
|
||||
import { useState } from "react";
|
||||
|
||||
import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { useToast } from "@/components/ui/use-toast";
|
||||
import { getClient, setApiKeyHeader } from "@/api/AxiosClient";
|
||||
import {
|
||||
AuthStatusValue,
|
||||
useAuthDiagnostics,
|
||||
} from "@/hooks/useAuthDiagnostics";
|
||||
|
||||
type BannerStatus = Exclude<AuthStatusValue, "ok"> | "error";
|
||||
|
||||
function getCopy(status: BannerStatus): { title: string; description: string } {
|
||||
switch (status) {
|
||||
case "missing_env":
|
||||
return {
|
||||
title: "Skyvern API key missing",
|
||||
description:
|
||||
"All requests from the UI to the local backend will fail until a valid key is configured.",
|
||||
};
|
||||
case "invalid_format":
|
||||
return {
|
||||
title: "Skyvern API key is invalid",
|
||||
description:
|
||||
"The configured key cannot be decoded. Regenerate a new key to continue using the UI.",
|
||||
};
|
||||
case "invalid":
|
||||
return {
|
||||
title: "Skyvern API key not recognized",
|
||||
description:
|
||||
"The backend rejected the configured key. Regenerate it to refresh local auth.",
|
||||
};
|
||||
case "expired":
|
||||
return {
|
||||
title: "Skyvern API key expired",
|
||||
description:
|
||||
"The current key is no longer valid. Generate a fresh key to restore connectivity.",
|
||||
};
|
||||
case "not_found":
|
||||
return {
|
||||
title: "Local organization missing",
|
||||
description:
|
||||
"The backend could not find the Skyvern-local organization. Regenerate the key to recreate it.",
|
||||
};
|
||||
case "error":
|
||||
default:
|
||||
return {
|
||||
title: "Unable to verify Skyvern API key",
|
||||
description:
|
||||
"The UI could not reach the diagnostics endpoint. Ensure the backend is running locally.",
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
function SelfHealApiKeyBanner() {
|
||||
const diagnosticsQuery = useAuthDiagnostics();
|
||||
const { toast } = useToast();
|
||||
const [isRepairing, setIsRepairing] = useState(false);
|
||||
const [errorMessage, setErrorMessage] = useState<string | null>(null);
|
||||
const isProductionBuild = !import.meta.env.DEV;
|
||||
|
||||
const { data, error, isLoading, refetch } = diagnosticsQuery;
|
||||
|
||||
const rawStatus = data?.status;
|
||||
const bannerStatus: BannerStatus | null = error
|
||||
? "error"
|
||||
: rawStatus && rawStatus !== "ok"
|
||||
? rawStatus
|
||||
: null;
|
||||
|
||||
if (!bannerStatus && !errorMessage) {
|
||||
if (isLoading) {
|
||||
return null;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
const copy = getCopy(bannerStatus ?? "missing_env");
|
||||
const queryErrorMessage = error?.message ?? null;
|
||||
|
||||
const handleRepair = async () => {
|
||||
setIsRepairing(true);
|
||||
setErrorMessage(null);
|
||||
try {
|
||||
const client = await getClient(null);
|
||||
const response = await client.post<{
|
||||
fingerprint?: string;
|
||||
api_key?: string;
|
||||
backend_env_path?: string;
|
||||
frontend_env_path?: string;
|
||||
}>("/internal/auth/repair");
|
||||
|
||||
const {
|
||||
fingerprint,
|
||||
api_key: apiKey,
|
||||
backend_env_path: backendEnvPath,
|
||||
frontend_env_path: frontendEnvPath,
|
||||
} = response.data;
|
||||
|
||||
if (!apiKey) {
|
||||
throw new Error("Repair succeeded but no API key was returned.");
|
||||
}
|
||||
|
||||
setApiKeyHeader(apiKey);
|
||||
|
||||
const fingerprintSuffix = fingerprint
|
||||
? ` (fingerprint ${fingerprint})`
|
||||
: "";
|
||||
|
||||
const pathsElements = [];
|
||||
if (backendEnvPath) {
|
||||
pathsElements.push(<div key="backend">Backend: {backendEnvPath}</div>);
|
||||
}
|
||||
if (frontendEnvPath) {
|
||||
pathsElements.push(
|
||||
<div key="frontend">Frontend: {frontendEnvPath}</div>,
|
||||
);
|
||||
}
|
||||
|
||||
toast({
|
||||
title: "API key regenerated",
|
||||
description: (
|
||||
<div>
|
||||
<div>
|
||||
Requests now use the updated key automatically{fingerprintSuffix}{" "}
|
||||
persisted to sessionStorage and written to the following .env
|
||||
paths:
|
||||
</div>
|
||||
{pathsElements.length > 0 && (
|
||||
<div className="mt-2 space-y-2">{pathsElements}</div>
|
||||
)}
|
||||
{isProductionBuild && (
|
||||
<div className="mt-3">
|
||||
Restart the UI server for more robust API key persistence.
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
),
|
||||
});
|
||||
|
||||
await refetch({ throwOnError: false });
|
||||
} catch (fetchError) {
|
||||
const message =
|
||||
fetchError instanceof Error
|
||||
? fetchError.message
|
||||
: "Unable to repair API key";
|
||||
setErrorMessage(message);
|
||||
} finally {
|
||||
setIsRepairing(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="px-4 pt-4">
|
||||
<Alert className="flex flex-col items-center gap-2 border-slate-700 bg-slate-900 text-slate-50">
|
||||
<AlertTitle className="text-center text-base font-semibold tracking-wide">
|
||||
{copy.title}
|
||||
</AlertTitle>
|
||||
<AlertDescription className="space-y-3 text-center text-sm leading-6">
|
||||
{bannerStatus !== "error" ? (
|
||||
<>
|
||||
<p>
|
||||
{copy.description} Update <code>VITE_SKYVERN_API_KEY</code> in{" "}
|
||||
<code className="mx-1">skyvern-frontend/.env</code>
|
||||
by running <code>skyvern init</code> or click the button below
|
||||
to regenerate it automatically.
|
||||
</p>
|
||||
{isProductionBuild && (
|
||||
<p className="text-yellow-300">
|
||||
When running a production build, the regenerated API key is
|
||||
stored in sessionStorage. Closing this tab or browser window
|
||||
will lose the key. Restart the UI server for more robust
|
||||
persistence.
|
||||
</p>
|
||||
)}
|
||||
<div className="flex justify-center">
|
||||
<Button
|
||||
onClick={handleRepair}
|
||||
disabled={isRepairing}
|
||||
variant="secondary"
|
||||
>
|
||||
{isRepairing ? "Regenerating…" : "Regenerate API key"}
|
||||
</Button>
|
||||
</div>
|
||||
</>
|
||||
) : (
|
||||
<p>{copy.description}</p>
|
||||
)}
|
||||
{errorMessage ? (
|
||||
<p className="text-xs text-rose-200">{errorMessage}</p>
|
||||
) : null}
|
||||
{queryErrorMessage && !errorMessage ? (
|
||||
<p className="text-xs text-rose-200">{queryErrorMessage}</p>
|
||||
) : null}
|
||||
</AlertDescription>
|
||||
</Alert>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export { SelfHealApiKeyBanner };
|
||||
Reference in New Issue
Block a user