- Updated Kiro OAuth configuration

This commit is contained in:
decolua
2026-01-27 11:35:28 +07:00
parent 79342c0c3e
commit 31cc79ab23
29 changed files with 1165 additions and 26 deletions
+2 -2
View File
@@ -94,8 +94,8 @@ export default function Header({ onMenuClick, showMenuButton = true }) {
alt={crumb.label}
width={28}
height={28}
className="object-contain rounded"
style={{ width: "auto", height: "auto" }}
className="object-contain rounded max-w-[28px] max-h-[28px]"
sizes="28px"
onError={(e) => { e.currentTarget.style.display = "none"; }}
/>
)}
+325
View File
@@ -0,0 +1,325 @@
"use client";
import { useState } from "react";
import PropTypes from "prop-types";
import { Modal, Button, Input } from "@/shared/components";
import { useCopyToClipboard } from "@/shared/hooks/useCopyToClipboard";
/**
* Kiro Auth Method Selection Modal
* Allows user to choose between multiple Kiro authentication methods:
* 1. AWS Builder ID (Device Code)
* 2. AWS IAM Identity Center/IDC (Device Code with custom startUrl/region)
* 3. Google Social Login (Manual callback)
* 4. GitHub Social Login (Manual callback)
* 5. Import Token (Paste refresh token)
*/
export default function KiroAuthModal({ isOpen, onMethodSelect, onClose }) {
const [selectedMethod, setSelectedMethod] = useState(null);
const [idcStartUrl, setIdcStartUrl] = useState("");
const [idcRegion, setIdcRegion] = useState("us-east-1");
const [refreshToken, setRefreshToken] = useState("");
const [error, setError] = useState(null);
const [importing, setImporting] = useState(false);
const { copied, copy } = useCopyToClipboard();
const handleMethodSelect = (method) => {
setSelectedMethod(method);
setError(null);
};
const handleBack = () => {
setSelectedMethod(null);
setError(null);
};
const handleImportToken = async () => {
if (!refreshToken.trim()) {
setError("Please enter a refresh token");
return;
}
setImporting(true);
setError(null);
try {
const res = await fetch("/api/oauth/kiro/import", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ refreshToken: refreshToken.trim() }),
});
const data = await res.json();
if (!res.ok) {
throw new Error(data.error || "Import failed");
}
// Success - close modal
onClose();
} catch (err) {
setError(err.message);
} finally {
setImporting(false);
}
};
const handleIdcContinue = () => {
if (!idcStartUrl.trim()) {
setError("Please enter your IDC start URL");
return;
}
onMethodSelect("idc", { startUrl: idcStartUrl.trim(), region: idcRegion });
};
const handleSocialLogin = (provider) => {
onMethodSelect("social", { provider });
};
return (
<Modal isOpen={isOpen} title="Connect Kiro" onClose={onClose} size="lg">
<div className="flex flex-col gap-4">
{/* Method Selection */}
{!selectedMethod && (
<div className="space-y-3">
<p className="text-sm text-text-muted mb-4">
Choose your authentication method:
</p>
{/* AWS Builder ID */}
<button
onClick={() => onMethodSelect("builder-id")}
className="w-full p-4 text-left border border-border rounded-lg hover:bg-sidebar transition-colors"
>
<div className="flex items-start gap-3">
<span className="material-symbols-outlined text-primary mt-0.5">shield</span>
<div className="flex-1">
<h3 className="font-semibold mb-1">AWS Builder ID</h3>
<p className="text-sm text-text-muted">
Recommended for most users. Free AWS account required.
</p>
</div>
</div>
</button>
{/* AWS IAM Identity Center (IDC) - HIDDEN */}
<button
onClick={() => handleMethodSelect("idc")}
className="hidden w-full p-4 text-left border border-border rounded-lg hover:bg-sidebar transition-colors"
>
<div className="flex items-start gap-3">
<span className="material-symbols-outlined text-primary mt-0.5">business</span>
<div className="flex-1">
<h3 className="font-semibold mb-1">AWS IAM Identity Center</h3>
<p className="text-sm text-text-muted">
For enterprise users with custom AWS IAM Identity Center.
</p>
</div>
</div>
</button>
{/* Google Social Login - HIDDEN */}
<button
onClick={() => handleMethodSelect("social-google")}
className="hidden w-full p-4 text-left border border-border rounded-lg hover:bg-sidebar transition-colors"
>
<div className="flex items-start gap-3">
<span className="material-symbols-outlined text-primary mt-0.5">account_circle</span>
<div className="flex-1">
<h3 className="font-semibold mb-1">Google Account</h3>
<p className="text-sm text-text-muted">
Login with your Google account (manual callback).
</p>
</div>
</div>
</button>
{/* GitHub Social Login - HIDDEN */}
<button
onClick={() => handleMethodSelect("social-github")}
className="hidden w-full p-4 text-left border border-border rounded-lg hover:bg-sidebar transition-colors"
>
<div className="flex items-start gap-3">
<span className="material-symbols-outlined text-primary mt-0.5">code</span>
<div className="flex-1">
<h3 className="font-semibold mb-1">GitHub Account</h3>
<p className="text-sm text-text-muted">
Login with your GitHub account (manual callback).
</p>
</div>
</div>
</button>
{/* Import Token */}
<button
onClick={() => handleMethodSelect("import")}
className="w-full p-4 text-left border border-border rounded-lg hover:bg-sidebar transition-colors"
>
<div className="flex items-start gap-3">
<span className="material-symbols-outlined text-primary mt-0.5">file_upload</span>
<div className="flex-1">
<h3 className="font-semibold mb-1">Import Token</h3>
<p className="text-sm text-text-muted">
Paste refresh token from Kiro IDE.
</p>
</div>
</div>
</button>
</div>
)}
{/* IDC Configuration */}
{selectedMethod === "idc" && (
<div className="space-y-4">
<div>
<label className="block text-sm font-medium mb-2">
IDC Start URL <span className="text-red-500">*</span>
</label>
<Input
value={idcStartUrl}
onChange={(e) => setIdcStartUrl(e.target.value)}
placeholder="https://your-org.awsapps.com/start"
className="font-mono text-sm"
/>
<p className="text-xs text-text-muted mt-1">
Your organization's AWS IAM Identity Center URL
</p>
</div>
<div>
<label className="block text-sm font-medium mb-2">
AWS Region
</label>
<Input
value={idcRegion}
onChange={(e) => setIdcRegion(e.target.value)}
placeholder="us-east-1"
className="font-mono text-sm"
/>
<p className="text-xs text-text-muted mt-1">
AWS region for your Identity Center (default: us-east-1)
</p>
</div>
{error && (
<p className="text-sm text-red-600">{error}</p>
)}
<div className="flex gap-2">
<Button onClick={handleIdcContinue} fullWidth>
Continue
</Button>
<Button onClick={handleBack} variant="ghost" fullWidth>
Back
</Button>
</div>
</div>
)}
{/* Social Login Info (Google) */}
{selectedMethod === "social-google" && (
<div className="space-y-4">
<div className="bg-amber-50 dark:bg-amber-900/20 p-4 rounded-lg border border-amber-200 dark:border-amber-800">
<div className="flex gap-2">
<span className="material-symbols-outlined text-amber-600 dark:text-amber-400">info</span>
<div className="flex-1 text-sm">
<p className="font-medium text-amber-900 dark:text-amber-100 mb-1">
Manual Callback Required
</p>
<p className="text-amber-800 dark:text-amber-200">
After login, you'll need to copy the callback URL from your browser and paste it back here.
</p>
</div>
</div>
</div>
<div className="flex gap-2">
<Button onClick={() => handleSocialLogin("google")} fullWidth>
Continue with Google
</Button>
<Button onClick={handleBack} variant="ghost" fullWidth>
Back
</Button>
</div>
</div>
)}
{/* Social Login Info (GitHub) */}
{selectedMethod === "social-github" && (
<div className="space-y-4">
<div className="bg-amber-50 dark:bg-amber-900/20 p-4 rounded-lg border border-amber-200 dark:border-amber-800">
<div className="flex gap-2">
<span className="material-symbols-outlined text-amber-600 dark:text-amber-400">info</span>
<div className="flex-1 text-sm">
<p className="font-medium text-amber-900 dark:text-amber-100 mb-1">
Manual Callback Required
</p>
<p className="text-amber-800 dark:text-amber-200">
After login, you'll need to copy the callback URL from your browser and paste it back here.
</p>
</div>
</div>
</div>
<div className="flex gap-2">
<Button onClick={() => handleSocialLogin("github")} fullWidth>
Continue with GitHub
</Button>
<Button onClick={handleBack} variant="ghost" fullWidth>
Back
</Button>
</div>
</div>
)}
{/* Import Token */}
{selectedMethod === "import" && (
<div className="space-y-4">
<div className="bg-blue-50 dark:bg-blue-900/20 p-3 rounded-lg border border-blue-200 dark:border-blue-800 mb-4">
<p className="text-sm text-blue-800 dark:text-blue-200">
💡 Please login to Kiro IDE first.
</p>
</div>
<div>
<label className="block text-sm font-medium mb-2">
Refresh Token <span className="text-red-500">*</span>
</label>
<Input
value={refreshToken}
onChange={(e) => setRefreshToken(e.target.value)}
placeholder="aorAAAAAG..."
className="font-mono text-sm"
type="password"
/>
<p className="text-xs text-text-muted mt-1">
Find it in Kiro IDE at: <code className="bg-sidebar px-1 rounded">~/.aws/sso/cache/kiro-auth-token.json</code>
</p>
</div>
{error && (
<div className="bg-red-50 dark:bg-red-900/20 p-3 rounded-lg">
<p className="text-sm text-red-600 dark:text-red-400">{error}</p>
</div>
)}
<div className="flex gap-2">
<Button onClick={handleImportToken} fullWidth disabled={importing}>
{importing ? "Importing..." : "Import Token"}
</Button>
<Button onClick={handleBack} variant="ghost" fullWidth>
Back
</Button>
</div>
</div>
)}
</div>
</Modal>
);
}
KiroAuthModal.propTypes = {
isOpen: PropTypes.bool.isRequired,
onMethodSelect: PropTypes.func.isRequired,
onClose: PropTypes.func.isRequired,
};
+101
View File
@@ -0,0 +1,101 @@
"use client";
import { useState, useCallback } from "react";
import PropTypes from "prop-types";
import OAuthModal from "./OAuthModal";
import KiroAuthModal from "./KiroAuthModal";
import KiroSocialOAuthModal from "./KiroSocialOAuthModal";
/**
* Kiro OAuth Wrapper
* Orchestrates between method selection, device code flow, and social login flow
*/
export default function KiroOAuthWrapper({ isOpen, providerInfo, onSuccess, onClose }) {
const [authMethod, setAuthMethod] = useState(null); // null | "builder-id" | "idc" | "social" | "import"
const [socialProvider, setSocialProvider] = useState(null); // "google" | "github"
const [idcConfig, setIdcConfig] = useState(null);
const handleMethodSelect = useCallback((method, config) => {
if (method === "builder-id") {
// Use device code flow (AWS Builder ID)
setAuthMethod("builder-id");
} else if (method === "idc") {
// Use device code flow with IDC config
setAuthMethod("idc");
setIdcConfig(config);
} else if (method === "social") {
// Use social login with manual callback
setAuthMethod("social");
setSocialProvider(config.provider);
} else if (method === "import") {
// Import handled in KiroAuthModal, just close
onSuccess?.();
}
}, [onSuccess]);
const handleBack = () => {
setAuthMethod(null);
setSocialProvider(null);
setIdcConfig(null);
};
const handleSocialSuccess = () => {
setAuthMethod(null);
setSocialProvider(null);
onSuccess?.();
};
const handleDeviceSuccess = () => {
setAuthMethod(null);
setIdcConfig(null);
onSuccess?.();
};
// Show method selection first
if (!authMethod) {
return (
<KiroAuthModal
isOpen={isOpen}
onMethodSelect={handleMethodSelect}
onClose={onClose}
/>
);
}
// Show device code flow (Builder ID or IDC)
if (authMethod === "builder-id" || authMethod === "idc") {
return (
<OAuthModal
isOpen={isOpen}
provider="kiro"
providerInfo={providerInfo}
onSuccess={handleDeviceSuccess}
onClose={handleBack}
idcConfig={idcConfig}
/>
);
}
// Show social login flow (Google/GitHub with manual callback)
if (authMethod === "social" && socialProvider) {
return (
<KiroSocialOAuthModal
isOpen={isOpen}
provider={socialProvider}
onSuccess={handleSocialSuccess}
onClose={handleBack}
/>
);
}
return null;
}
KiroOAuthWrapper.propTypes = {
isOpen: PropTypes.bool.isRequired,
providerInfo: PropTypes.shape({
name: PropTypes.string,
}),
onSuccess: PropTypes.func,
onClose: PropTypes.func.isRequired,
};
@@ -0,0 +1,205 @@
"use client";
import { useState, useEffect } from "react";
import PropTypes from "prop-types";
import { Modal, Button, Input } from "@/shared/components";
import { useCopyToClipboard } from "@/shared/hooks/useCopyToClipboard";
/**
* Kiro Social OAuth Modal (Google/GitHub)
* Handles manual callback URL flow for social login
*/
export default function KiroSocialOAuthModal({ isOpen, provider, onSuccess, onClose }) {
const [step, setStep] = useState("loading"); // loading | input | success | error
const [authUrl, setAuthUrl] = useState("");
const [authData, setAuthData] = useState(null);
const [callbackUrl, setCallbackUrl] = useState("");
const [error, setError] = useState(null);
const { copied, copy } = useCopyToClipboard();
// Initialize auth flow
useEffect(() => {
if (!isOpen || !provider) return;
const initAuth = async () => {
try {
setError(null);
setStep("loading");
const res = await fetch(`/api/oauth/kiro/social-authorize?provider=${provider}`);
const data = await res.json();
if (!res.ok) {
throw new Error(data.error);
}
setAuthData(data);
setAuthUrl(data.authUrl);
setStep("input");
// Auto-open browser
window.open(data.authUrl, "_blank");
} catch (err) {
setError(err.message);
setStep("error");
}
};
initAuth();
}, [isOpen, provider]);
const handleManualSubmit = async () => {
try {
setError(null);
// Parse callback URL - can be either kiro:// or http://localhost format
let url;
try {
url = new URL(callbackUrl);
} catch (e) {
// If URL parsing fails, might be malformed
throw new Error("Invalid callback URL format");
}
const code = url.searchParams.get("code");
const state = url.searchParams.get("state");
const errorParam = url.searchParams.get("error");
if (errorParam) {
throw new Error(url.searchParams.get("error_description") || errorParam);
}
if (!code) {
throw new Error("No authorization code found in URL");
}
// Exchange code for tokens
const res = await fetch("/api/oauth/kiro/social-exchange", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({
code,
codeVerifier: authData.codeVerifier,
provider,
}),
});
const data = await res.json();
if (!res.ok) throw new Error(data.error);
setStep("success");
onSuccess?.();
} catch (err) {
setError(err.message);
setStep("error");
}
};
const providerName = provider === "google" ? "Google" : "GitHub";
return (
<Modal isOpen={isOpen} title={`Connect Kiro via ${providerName}`} onClose={onClose} size="lg">
<div className="flex flex-col gap-4">
{/* Loading */}
{step === "loading" && (
<div className="text-center py-6">
<div className="size-16 mx-auto mb-4 rounded-full bg-primary/10 flex items-center justify-center">
<span className="material-symbols-outlined text-3xl text-primary animate-spin">
progress_activity
</span>
</div>
<h3 className="text-lg font-semibold mb-2">Initializing...</h3>
<p className="text-sm text-text-muted">
Setting up {providerName} authentication
</p>
</div>
)}
{/* Manual Input Step */}
{step === "input" && (
<>
<div className="space-y-4">
<div>
<p className="text-sm font-medium mb-2">Step 1: Open this URL in your browser</p>
<div className="flex gap-2">
<Input value={authUrl} readOnly className="flex-1 font-mono text-xs" />
<Button
variant="secondary"
icon={copied === "auth_url" ? "check" : "content_copy"}
onClick={() => copy(authUrl, "auth_url")}
>
Copy
</Button>
</div>
</div>
<div>
<p className="text-sm font-medium mb-2">Step 2: Paste the callback URL here</p>
<p className="text-xs text-text-muted mb-2">
After authorization, copy the full URL from your browser address bar.
</p>
<Input
value={callbackUrl}
onChange={(e) => setCallbackUrl(e.target.value)}
placeholder="kiro://kiro.kiroAgent/authenticate-success?code=..."
className="font-mono text-xs"
/>
</div>
</div>
<div className="flex gap-2">
<Button onClick={handleManualSubmit} fullWidth disabled={!callbackUrl}>
Connect
</Button>
<Button onClick={onClose} variant="ghost" fullWidth>
Cancel
</Button>
</div>
</>
)}
{/* Success */}
{step === "success" && (
<div className="text-center py-6">
<div className="size-16 mx-auto mb-4 rounded-full bg-green-100 dark:bg-green-900/30 flex items-center justify-center">
<span className="material-symbols-outlined text-3xl text-green-600">check_circle</span>
</div>
<h3 className="text-lg font-semibold mb-2">Connected Successfully!</h3>
<p className="text-sm text-text-muted mb-4">
Your Kiro account via {providerName} has been connected.
</p>
<Button onClick={onClose} fullWidth>
Done
</Button>
</div>
)}
{/* Error */}
{step === "error" && (
<div className="text-center py-6">
<div className="size-16 mx-auto mb-4 rounded-full bg-red-100 dark:bg-red-900/30 flex items-center justify-center">
<span className="material-symbols-outlined text-3xl text-red-600">error</span>
</div>
<h3 className="text-lg font-semibold mb-2">Connection Failed</h3>
<p className="text-sm text-red-600 mb-4">{error}</p>
<div className="flex gap-2">
<Button onClick={() => setStep("input")} variant="secondary" fullWidth>
Try Again
</Button>
<Button onClick={onClose} variant="ghost" fullWidth>
Cancel
</Button>
</div>
</div>
)}
</div>
</Modal>
);
}
KiroSocialOAuthModal.propTypes = {
isOpen: PropTypes.bool.isRequired,
provider: PropTypes.oneOf(["google", "github"]).isRequired,
onSuccess: PropTypes.func,
onClose: PropTypes.func.isRequired,
};
+4
View File
@@ -18,7 +18,11 @@ export { default as ModelSelectModal } from "./ModelSelectModal";
export { default as ManualConfigModal } from "./ManualConfigModal";
export { default as UsageStats } from "./UsageStats";
export { default as RequestLogger } from "./RequestLogger";
export { default as KiroAuthModal } from "./KiroAuthModal";
export { default as KiroOAuthWrapper } from "./KiroOAuthWrapper";
export { default as KiroSocialOAuthModal } from "./KiroSocialOAuthModal";
// Layouts
export * from "./layouts";