dsh-codex-oauth 0.2.3 → 0.2.5

package/client/index.jsx

@@ -22,12 +22,11 @@ function CodexSettings() {
     const timer = setInterval(refresh, 1000);
     return () => clearInterval(timer);
   }, [refresh, state.status]);
-  const signIn = async () => {
+  const signIn = () => {
     setBusy(true); setState({ status: "signing-in" });
-    const popup = window.open("about:blank", "_blank", "noopener,noreferrer");
-    try { const challenge = await request(LOGIN, "POST"); if (!popup) throw new Error("Please allow popups to sign in"); popup.location.replace(challenge.url); }
-    catch (error) { popup?.close(); setState({ status: "error", message: error.message }); }
-    finally { setBusy(false); }
+    const popup = window.open(LOGIN, "_blank", "noopener,noreferrer");
+    if (!popup) { setBusy(false); setState({ status: "error", message: "Please allow popups to sign in" }); }
+    else setTimeout(() => setBusy(false), 500);
   };
   const signOut = async () => { setBusy(true); try { await request(LOGOUT, "POST"); setState({ status: "signed-out" }); } catch (error) { setState({ status: "error", message: error.message }); } finally { setBusy(false); } };
   const signedIn = state.status === "signed-in";

package/lib/adapter.js

@@ -14,8 +14,9 @@ function tokenProvider(provider) {
       apiKey: {
         name: "OpenAI Codex OAuth bearer token",
         async resolve({ credential }) {
-          return credential?.access
-            ? { auth: { apiKey: credential.access }, source: "Pi OAuth" }
+          const access = credential?.access ?? credential?.key;
+          return access
+            ? { auth: { apiKey: access }, source: "DSH Codex OAuth" }
             : undefined;
         },
       },

package/lib/client.js

@@ -58,20 +58,14 @@ function CodexSettings() {
     const timer = setInterval(refresh, 1e3);
     return () => clearInterval(timer);
   }, [refresh, state.status]);
-  const signIn = async () => {
+  const signIn = () => {
     setBusy(true);
     setState({ status: "signing-in" });
-    const popup = window.open("about:blank", "_blank", "noopener,noreferrer");
-    try {
-      const challenge = await request(LOGIN, "POST");
-      if (!popup) throw new Error("Please allow popups to sign in");
-      popup.location.replace(challenge.url);
-    } catch (error) {
-      popup?.close();
-      setState({ status: "error", message: error.message });
-    } finally {
+    const popup = window.open(LOGIN, "_blank", "noopener,noreferrer");
+    if (!popup) {
       setBusy(false);
-    }
+      setState({ status: "error", message: "Please allow popups to sign in" });
+    } else setTimeout(() => setBusy(false), 500);
   };
   const signOut = async () => {
     setBusy(true);

package/lib/web-auth.js

@@ -48,9 +48,14 @@ export function registerWebAuth(ctx, store) {
         json(res, 200, state);
       }}),
       web.webServer.register({ kind: "exact", path: AUTH_LOGIN_PATH, handler: async (req, res) => {
-        if (req.method !== "POST" || !trusted(req)) return json(res, req.method === "POST" ? 403 : 405, { error: "forbidden" });
-        try { start(); for (let i = 0; i < 50 && !challenge && operation; i++) await new Promise((resolve) => setTimeout(resolve, 100)); if (!challenge) throw new Error("OAuth URL was not created"); json(res, 200, challenge); }
-        catch (error) { json(res, 500, { error: safeMessage(error) }); }
+        if (!trusted(req) || !["GET", "POST"].includes(req.method)) return json(res, req.method === "GET" || req.method === "POST" ? 403 : 405, { error: "forbidden" });
+        try {
+          start();
+          for (let i = 0; i < 50 && !challenge && operation; i++) await new Promise((resolve) => setTimeout(resolve, 100));
+          if (!challenge) throw new Error("OAuth URL was not created");
+          if (req.method === "GET") { res.writeHead(302, { location: challenge.url, "cache-control": "no-store" }); res.end(); }
+          else json(res, 200, challenge);
+        } catch (error) { json(res, 500, { error: safeMessage(error) }); }
       }}),
       web.webServer.register({ kind: "exact", path: AUTH_LOGOUT_PATH, handler: async (req, res) => {
         if (req.method !== "POST" || !trusted(req)) return json(res, req.method === "POST" ? 403 : 405, { error: "forbidden" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-oauth",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Use a ChatGPT Codex subscription in DeepSeek Harness through standalone OAuth",
   "repository": {
     "type": "git",