@dropsh/plugin-oauth2 0.0.2 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dropsh/plugin-oauth2",
-  "version": "0.0.2",
+  "version": "0.1.1",
   "type": "module",
   "main": "./dist/plugins/oauth2/src/index.js",
   "exports": {
@@ -19,7 +19,7 @@
   "devDependencies": {
     "typescript": "^5.6.0",
     "vitest": "^4.1.8",
-    "dropsh": "0.0.2"
+    "dropsh": "0.1.1"
   },
   "scripts": {
     "build": "tsc",

package/dist/plugins/oauth2/src/oauth2-authcode.js

@@ -1,64 +0,0 @@
-import { AuthError, createHttpClient, HttpError } from "dropsh/plugin";
-import { readToken, writeToken } from "./token-store.js";
-export function createOAuth2AuthCodeAuth(cfg, deps = {}) {
-    const now = deps.now ?? Date.now;
-    const http = deps.http ?? createHttpClient();
-    // Derive base URL for token storage key
-    const baseUrl = cfg.token_url.replace(/\/oauth\/token$/, "");
-    return {
-        async apply(req) {
-            const stored = await readToken(baseUrl, deps.tokenDir);
-            if (!stored) {
-                throw new AuthError("Session expired. Run 'dropsh login' to authenticate.");
-            }
-            if (stored.expires_at - 30_000 > now()) {
-                return {
-                    ...req,
-                    headers: { ...(req.headers ?? {}), Authorization: `Bearer ${stored.access_token}` },
-                };
-            }
-            if (!stored.refresh_token) {
-                throw new AuthError("Session expired. Run 'dropsh login' to authenticate.");
-            }
-            try {
-                const params = new URLSearchParams({
-                    grant_type: "refresh_token",
-                    refresh_token: stored.refresh_token,
-                    client_id: cfg.client_id,
-                });
-                const res = await http.send({
-                    method: "POST",
-                    url: cfg.token_url,
-                    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-                    body: params.toString(),
-                });
-                const body = JSON.parse(res.body);
-                if (typeof body.access_token !== "string") {
-                    throw new AuthError("Token endpoint returned no access_token");
-                }
-                const ttlSec = typeof body.expires_in === "number" ? body.expires_in : 3600;
-                const refreshed = {
-                    access_token: body.access_token,
-                    refresh_token: typeof body.refresh_token === "string" ? body.refresh_token : stored.refresh_token,
-                    expires_at: now() + ttlSec * 1000 - 5000,
-                };
-                await writeToken(baseUrl, refreshed, deps.tokenDir);
-                return {
-                    ...req,
-                    headers: { ...(req.headers ?? {}), Authorization: `Bearer ${refreshed.access_token}` },
-                };
-            }
-            catch (err) {
-                if (err instanceof AuthError)
-                    throw err;
-                if (err instanceof HttpError) {
-                    throw new AuthError("Session expired. Run 'dropsh login' to authenticate.", {
-                        status: err.status,
-                        body: err.body,
-                    });
-                }
-                throw new AuthError("Session expired. Run 'dropsh login' to authenticate.");
-            }
-        },
-    };
-}

package/dist/plugins/oauth2/src/oauth2.js

@@ -1,56 +0,0 @@
-import { AuthError, createHttpClient, HttpError } from "dropsh/plugin";
-export function createOAuth2Auth(cfg, deps = {}) {
-    const now = deps.now ?? Date.now;
-    const http = deps.http ?? createHttpClient();
-    const params = new URLSearchParams({
-        client_id: cfg.client_id,
-        client_secret: cfg.client_secret,
-    });
-    if (cfg.type === "oauth2_password") {
-        params.set("grant_type", "password");
-        params.set("username", cfg.username);
-        params.set("password", cfg.password);
-        if (cfg.scope)
-            params.set("scope", cfg.scope);
-    }
-    else {
-        params.set("grant_type", "client_credentials");
-        if (cfg.scope)
-            params.set("scope", cfg.scope);
-    }
-    let cached = null;
-    async function fetchToken() {
-        try {
-            const res = await http.send({
-                method: "POST",
-                url: cfg.token_url,
-                headers: { "Content-Type": "application/x-www-form-urlencoded" },
-                body: params.toString(),
-            });
-            const body = JSON.parse(res.body);
-            if (typeof body.access_token !== "string") {
-                throw new AuthError("Token endpoint returned no access_token");
-            }
-            const ttlSec = typeof body.expires_in === "number" ? body.expires_in : 3600;
-            return { token: body.access_token, expiresAt: now() + ttlSec * 1000 - 5000 };
-        }
-        catch (err) {
-            if (err instanceof HttpError) {
-                throw new AuthError(`Token request failed: HTTP ${err.status}`, { body: err.body });
-            }
-            if (err instanceof AuthError)
-                throw err;
-            throw new AuthError(`Token request failed: ${err.message}`);
-        }
-    }
-    return {
-        async apply(req) {
-            if (!cached || cached.expiresAt <= now())
-                cached = await fetchToken();
-            return {
-                ...req,
-                headers: { ...(req.headers ?? {}), Authorization: `Bearer ${cached.token}` },
-            };
-        },
-    };
-}

package/dist/plugins/oauth2/src/token-store.js

@@ -1,26 +0,0 @@
-import { mkdir, readFile, writeFile } from "node:fs/promises";
-import { homedir } from "node:os";
-import { join } from "node:path";
-function hostnameFromUrl(baseUrl) {
-    return new URL(baseUrl).hostname;
-}
-export function defaultTokenDir() {
-    return join(homedir(), ".config", "dropsh");
-}
-export async function readToken(baseUrl, dir) {
-    const tokenDir = dir ?? defaultTokenDir();
-    const tokenPath = join(tokenDir, `${hostnameFromUrl(baseUrl)}.json`);
-    try {
-        const raw = await readFile(tokenPath, "utf8");
-        return JSON.parse(raw);
-    }
-    catch {
-        return null;
-    }
-}
-export async function writeToken(baseUrl, token, dir) {
-    const tokenDir = dir ?? defaultTokenDir();
-    await mkdir(tokenDir, { recursive: true });
-    const tokenPath = join(tokenDir, `${hostnameFromUrl(baseUrl)}.json`);
-    await writeFile(tokenPath, JSON.stringify(token, null, 2), { encoding: "utf8", mode: 0o600 });
-}