@zhafron/opencode-kiro-auth 1.2.0 → 1.2.1

package/dist/plugin/server.js

@@ -50,25 +50,46 @@ export async function startIDCAuthServer(authData, startPort = 19847, portRange
         };
         const poll = async () => {
             try {
-                const body = new URLSearchParams({
-                    grant_type: 'urn:ietf:params:oauth:grant-type:device_code',
-                    device_code: authData.deviceCode,
-                    client_id: authData.clientId,
-                    client_secret: authData.clientSecret
-                });
+                const body = {
+                    grantType: 'urn:ietf:params:oauth:grant-type:device_code',
+                    deviceCode: authData.deviceCode,
+                    clientId: authData.clientId,
+                    clientSecret: authData.clientSecret
+                };
                 const res = await fetch(`https://oidc.${authData.region}.amazonaws.com/token`, {
                     method: 'POST',
-                    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-                    body: body.toString()
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(body)
                 });
-                const d = await res.json();
+                const responseText = await res.text();
+                let d = {};
+                if (responseText) {
+                    try {
+                        d = JSON.parse(responseText);
+                    }
+                    catch (parseError) {
+                        logger.error(`Auth polling error: Failed to parse JSON (status ${res.status})`, parseError);
+                        throw parseError;
+                    }
+                }
                 if (res.ok) {
-                    const acc = d.access_token, ref = d.refresh_token, exp = Date.now() + d.expires_in * 1000;
-                    const infoRes = await fetch('https://view.awsapps.com/api/user/info', {
-                        headers: { Authorization: `Bearer ${acc}` }
-                    });
-                    const info = await infoRes.json();
-                    const email = info.email || info.userName || 'builder-id@aws.amazon.com';
+                    const acc = d.access_token || d.accessToken, ref = d.refresh_token || d.refreshToken, exp = Date.now() + (d.expires_in || d.expiresIn || 0) * 1000;
+                    let email = 'builder-id@aws.amazon.com';
+                    try {
+                        const infoRes = await fetch('https://view.awsapps.com/api/user/info', {
+                            headers: { Authorization: `Bearer ${acc}` }
+                        });
+                        if (infoRes.ok) {
+                            const info = await infoRes.json();
+                            email = info.email || info.userName || email;
+                        }
+                        else {
+                            logger.warn(`User info request failed with status ${infoRes.status}; using fallback email`);
+                        }
+                    }
+                    catch (infoError) {
+                        logger.warn(`Failed to fetch user info; using fallback email: ${infoError?.message || infoError}`);
+                    }
                     status.status = 'success';
                     if (resolver)
                         resolver({
@@ -87,7 +108,7 @@ export async function startIDCAuthServer(authData, startPort = 19847, portRange
                 else {
                     status.status = 'failed';
                     status.error = d.error_description || d.error;
-                    logger.error(`Auth polling failed: ${status.error}`);
+                    logger.error(`Auth polling failed a: ${status.error}`);
                     if (rejector)
                         rejector(new Error(status.error));
                     setTimeout(cleanup, 2000);
@@ -96,7 +117,7 @@ export async function startIDCAuthServer(authData, startPort = 19847, portRange
             catch (e) {
                 status.status = 'failed';
                 status.error = e.message;
-                logger.error(`Auth polling error: ${e.message}`, e);
+                logger.error(`Auth polling error b: ${e.message}`, e);
                 if (rejector)
                     rejector(e);
                 setTimeout(cleanup, 2000);

package/dist/plugin/storage.js

@@ -67,7 +67,11 @@ export async function loadAccounts() {
     return withLock(path, async () => {
         try {
             const content = await fs.readFile(path, 'utf-8');
-            return JSON.parse(content);
+            const parsed = JSON.parse(content);
+            if (!parsed || !Array.isArray(parsed.accounts)) {
+                return { version: 1, accounts: [], activeIndex: -1 };
+            }
+            return parsed;
         }
         catch {
             return { version: 1, accounts: [], activeIndex: -1 };
@@ -93,7 +97,11 @@ export async function loadUsage() {
     return withLock(path, async () => {
         try {
             const content = await fs.readFile(path, 'utf-8');
-            return JSON.parse(content);
+            const parsed = JSON.parse(content);
+            if (!parsed || typeof parsed.usage !== 'object' || parsed.usage === null) {
+                return { version: 1, usage: {} };
+            }
+            return parsed;
         }
         catch {
             return { version: 1, usage: {} };

package/dist/plugin.js

@@ -1,4 +1,5 @@
 import { loadConfig } from './plugin/config';
+import { exec } from 'node:child_process';
 import { AccountManager, generateAccountId } from './plugin/accounts';
 import { accessTokenExpired, encodeRefreshToken } from './kiro/auth';
 import { refreshAccessToken } from './plugin/token';
@@ -23,6 +24,19 @@ const formatUsageMessage = (usedCount, limitCount, email) => {
     }
     return `Usage (${email}): ${usedCount}`;
 };
+const openBrowser = (url) => {
+    const escapedUrl = url.replace(/"/g, '\\"');
+    const platform = process.platform;
+    const command = platform === 'win32'
+        ? `cmd /c start "" "${escapedUrl}"`
+        : platform === 'darwin'
+            ? `open "${escapedUrl}"`
+            : `xdg-open "${escapedUrl}"`;
+    exec(command, (error) => {
+        if (error)
+            logger.warn(`Failed to open browser automatically: ${error.message}`, error);
+    });
+};
 export const createKiroPlugin = (id) => async ({ client, directory }) => {
     const config = loadConfig(directory);
     const showToast = (message, variant) => {
@@ -272,9 +286,10 @@ export const createKiroPlugin = (id) => async ({ client, directory }) => {
                         try {
                             const authData = await authorizeKiroIDC(region);
                             const { url, waitForAuth } = await startIDCAuthServer(authData, config.auth_server_port_start, config.auth_server_port_range);
+                            openBrowser(url);
                             resolve({
                                 url,
-                                instructions: 'Opening browser...',
+                                instructions: `Open this URL to continue: ${url}`,
                                 method: 'auto',
                                 callback: async () => {
                                     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhafron/opencode-kiro-auth",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "OpenCode plugin for AWS Kiro (CodeWhisperer) providing access to Claude models",
   "type": "module",
   "main": "dist/index.js",