diff --git a/package.json b/package.json index ef19084..87e60cc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pi-provider-qoder", - "version": "0.2.5", + "version": "0.2.6", "description": "Pi extension for Qoder AI — with OAuth authentication, COSY signatures and WAF bypass", "type": "module", "license": "MIT", diff --git a/src/__tests__/oauth.test.ts b/src/__tests__/oauth.test.ts new file mode 100644 index 0000000..67da5f5 --- /dev/null +++ b/src/__tests__/oauth.test.ts @@ -0,0 +1,55 @@ +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { autoLoginQoderFromEnvironment, getCachedCredentials, getQoderPatForMode } from "../oauth.js"; + +vi.mock("../pat.js", () => ({ + credentialsFromPat: vi.fn().mockResolvedValue({ + access: "mock-access-token", + refresh: "mock-refresh-token", + expires: Date.now() + 3600000, + userID: "mock-user-123", + email: "test@example.com", + name: "Test User", + machineID: "mock-machine-id", + type: "oauth", + }), + isPatRefresh: vi.fn().mockReturnValue(false), + decodePatRefresh: vi.fn(), +})); + +vi.mock("../models.js", () => ({ + updateQoderModelsCache: vi.fn().mockResolvedValue(undefined), + getCachedModels: vi.fn().mockReturnValue([]), + isCacheStale: vi.fn().mockReturnValue(true), + staticModels: [], + staticCnModels: [], +})); + +describe("oauth autoLoginQoderFromEnvironment", () => { + const originalEnv = process.env; + + beforeEach(() => { + vi.clearAllMocks(); + process.env = { ...originalEnv }; + }); + + afterEach(() => { + process.env = originalEnv; + }); + + it("extracts PAT correctly from env for global and CN mode", () => { + process.env.QODER_PERSONAL_ACCESS_TOKEN = "pt-global-123"; + expect(getQoderPatForMode("global")).toBe("pt-global-123"); + + process.env.QODERCN_PERSONAL_ACCESS_TOKEN = "pt-cn-456"; + expect(getQoderPatForMode("cn")).toBe("pt-cn-456"); + }); + + it("does nothing if no PAT in environment", async () => { + delete process.env.QODER_PERSONAL_ACCESS_TOKEN; + delete process.env.QODER_API_KEY; + delete process.env.QODER_PAT; + + await autoLoginQoderFromEnvironment("qoder-test-provider", "global"); + expect(getCachedCredentials("mock-token", "qoder-test-provider")).toBeNull(); + }); +}); diff --git a/src/oauth.ts b/src/oauth.ts index 6707f22..3326d35 100644 --- a/src/oauth.ts +++ b/src/oauth.ts @@ -1,6 +1,6 @@ -import { existsSync, readFileSync } from "node:fs"; +import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs"; import { homedir } from "node:os"; -import { join } from "node:path"; +import { dirname, join } from "node:path"; import type { OAuthCredentials, OAuthLoginCallbacks } from "@earendil-works/pi-ai"; import { AuthStorage } from "@earendil-works/pi-coding-agent"; import { getMachineId, getQoderMode, getQoderRefreshURL, isQoderCNMode } from "./cosy.js"; @@ -25,16 +25,45 @@ export function getQoderPatForMode(mode: string): string { return process.env.QODER_API_KEY || process.env.QODER_PERSONAL_ACCESS_TOKEN || process.env.QODER_PAT || ""; } +function saveCredentialsToAuthFile(providerID: string, credentials: OAuthCredentials): void { + try { + const dir = dirname(AUTH_FILE); + if (!existsSync(dir)) { + mkdirSync(dir, { recursive: true, mode: 0o700 }); + } + let auth: Record = {}; + if (existsSync(AUTH_FILE)) { + try { + auth = JSON.parse(readFileSync(AUTH_FILE, "utf-8")); + } catch {} + } + auth[providerID] = { type: "oauth", ...credentials }; + writeFileSync(AUTH_FILE, JSON.stringify(auth, null, 2), { encoding: "utf-8", mode: 0o600 }); + } catch (err) { + console.error(`[pi-provider-qoder] Failed to write auth storage for ${providerID}:`, err); + } +} + /** Exchange an environment PAT before pi resolves its initial model. */ export async function autoLoginQoderFromEnvironment(providerID: string, mode: string): Promise { const pat = getQoderPatForMode(mode); if (!pat) return; - const authStorage = AuthStorage.create(); - if (authStorage.get(providerID)) return; + if (getCachedCredentials("", providerID)) return; const credentials = await credentialsFromPat(pat, mode); - authStorage.set(providerID, { type: "oauth", ...credentials }); + + if (typeof AuthStorage !== "undefined" && typeof AuthStorage?.create === "function") { + try { + const authStorage = AuthStorage.create(); + authStorage.set(providerID, { type: "oauth", ...credentials }); + } catch { + saveCredentialsToAuthFile(providerID, credentials); + } + } else { + saveCredentialsToAuthFile(providerID, credentials); + } + const qCreds = credentials as QoderCredentials; updateQoderModelsCache(qCreds.access, qCreds.userID, qCreds.name, qCreds.email, mode).catch(() => {}); } @@ -52,7 +81,7 @@ export function getCachedCredentials(_accessToken: string, providerID = "qoder") try { const auth = JSON.parse(readFileSync(AUTH_FILE, "utf-8")); const creds = auth?.[providerID] || (providerID === "qoder" ? auth?.qoder : null); - if (creds?.userID) { + if (creds?.userID || creds?.access) { return creds as QoderCredentials; } } catch {}