@harars/opencode-switch-openai-auth-plugin 0.1.3 → 0.1.4

package/dist/index.js

@@ -437,6 +437,37 @@ function same(prev, next) {
     return false;
   return prev.refresh === next.refresh;
 }
+function unwrap(input) {
+  if (!input || typeof input !== "object") {
+    return {
+      ok: true,
+      data: input
+    };
+  }
+  if ("error" in input && input.error !== undefined) {
+    return {
+      ok: false
+    };
+  }
+  if ("data" in input) {
+    return input.data === undefined ? {
+      ok: false
+    } : {
+      ok: true,
+      data: input.data
+    };
+  }
+  return {
+    ok: true,
+    data: input
+  };
+}
+async function authMethods(api) {
+  const res = unwrap(await api.client.provider.auth());
+  if (!res.ok)
+    return [];
+  return res.data.openai ?? [];
+}
 function bind(api, authz) {
   useKeyboard((evt) => {
     if (evt.name !== "c" || evt.ctrl || evt.meta)
@@ -668,17 +699,15 @@ async function auto(api, index, method, authz) {
 }
 async function hasLogin(api) {
   try {
-    const res = await api.client.provider.auth();
-    const methods = res.data?.openai ?? [];
-    return methods.some((item) => item.type === "oauth");
+    return (await authMethods(api)).some((item) => item.type === "oauth");
   } catch {
     return false;
   }
 }
 async function loginOpenAI(api) {
   try {
-    const auth = await api.client.provider.auth();
-    const methods = (auth.data?.openai ?? []).map((method2, index2) => ({
+    const available = await authMethods(api);
+    const methods = available.map((method2, index2) => ({
       method: method2,
       index: index2
     })).filter((item) => item.method.type === "oauth");
@@ -697,12 +726,12 @@ async function loginOpenAI(api) {
     const inputs = await prompts(api, method.label, method);
     if (method.prompts?.length && !inputs)
       return false;
-    const authz = await api.client.provider.oauth.authorize({
+    const authz = unwrap(await api.client.provider.oauth.authorize({
       providerID: "openai",
       method: picked.index,
       inputs
-    });
-    if (authz.error || !authz.data) {
+    }));
+    if (!authz.ok) {
       api.ui.toast({
         variant: "error",
         message: "Login failed"

package/dist/tui.js

@@ -437,6 +437,37 @@ function same(prev, next) {
     return false;
   return prev.refresh === next.refresh;
 }
+function unwrap(input) {
+  if (!input || typeof input !== "object") {
+    return {
+      ok: true,
+      data: input
+    };
+  }
+  if ("error" in input && input.error !== undefined) {
+    return {
+      ok: false
+    };
+  }
+  if ("data" in input) {
+    return input.data === undefined ? {
+      ok: false
+    } : {
+      ok: true,
+      data: input.data
+    };
+  }
+  return {
+    ok: true,
+    data: input
+  };
+}
+async function authMethods(api) {
+  const res = unwrap(await api.client.provider.auth());
+  if (!res.ok)
+    return [];
+  return res.data.openai ?? [];
+}
 function bind(api, authz) {
   useKeyboard((evt) => {
     if (evt.name !== "c" || evt.ctrl || evt.meta)
@@ -668,17 +699,15 @@ async function auto(api, index, method, authz) {
 }
 async function hasLogin(api) {
   try {
-    const res = await api.client.provider.auth();
-    const methods = res.data?.openai ?? [];
-    return methods.some((item) => item.type === "oauth");
+    return (await authMethods(api)).some((item) => item.type === "oauth");
   } catch {
     return false;
   }
 }
 async function loginOpenAI(api) {
   try {
-    const auth = await api.client.provider.auth();
-    const methods = (auth.data?.openai ?? []).map((method2, index2) => ({
+    const available = await authMethods(api);
+    const methods = available.map((method2, index2) => ({
       method: method2,
       index: index2
     })).filter((item) => item.method.type === "oauth");
@@ -697,12 +726,12 @@ async function loginOpenAI(api) {
     const inputs = await prompts(api, method.label, method);
     if (method.prompts?.length && !inputs)
       return false;
-    const authz = await api.client.provider.oauth.authorize({
+    const authz = unwrap(await api.client.provider.oauth.authorize({
       providerID: "openai",
       method: picked.index,
       inputs
-    });
-    if (authz.error || !authz.data) {
+    }));
+    if (!authz.ok) {
       api.ui.toast({
         variant: "error",
         message: "Login failed"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harars/opencode-switch-openai-auth-plugin",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "OpenCode TUI plugin for switching saved OpenAI OAuth accounts",
   "repository": {
     "type": "git",