oauth2-cli 0.5.0 → 0.6.0

package/dist/index.d.ts

@@ -1,4 +1,6 @@
 export * from './Client.js';
-export * from './FileStorage.js';
-export * from './Token.js';
-export * from './TokenStorage.js';
+export * as Credentials from './Credentials.js';
+export * as Errors from './Errors/index.js';
+export * as Request from './Request/index.js';
+export * as Token from './Token/index.js';
+export * from './WebServer.js';

package/dist/index.js

@@ -1,4 +1,6 @@
 export * from './Client.js';
-export * from './FileStorage.js';
-export * from './Token.js';
-export * from './TokenStorage.js';
+export * as Credentials from './Credentials.js';
+export * as Errors from './Errors/index.js';
+export * as Request from './Request/index.js';
+export * as Token from './Token/index.js';
+export * from './WebServer.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oauth2-cli",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Acquire API access tokens via OAuth 2.0 within CLI tools",
   "homepage": "https://github.com/battis/oauth2-cli/tree/main/packages/oauth2-cli#readme",
   "repository": {
@@ -16,19 +16,23 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
+    "@qui-cli/colors": "^3.2.3",
     "async-mutex": "^0.5.0",
     "express": "^5.2.1",
+    "gcrtl": "^0.1.6",
+    "oauth4webapi": "^3.8.4",
     "open": "^11.0.0",
-    "openid-client": "^6.8.1",
-    "@battis/oauth2-configure": "0.1.4"
+    "openid-client": "^6.8.2",
+    "ora": "^9.3.0"
   },
   "devDependencies": {
-    "@battis/typescript-tricks": "^0.7.6",
-    "@tsconfig/node24": "^24.0.3",
-    "@types/ejs": "^3.1.5",
+    "@battis/descriptive-types": "^0.2.6",
+    "@battis/typescript-tricks": "^0.7.7",
+    "@tsconfig/node24": "^24.0.4",
     "@types/express": "^5.0.6",
+    "@types/node": "^24.10.13",
     "commit-and-tag-version": "^12.6.1",
-    "del-cli": "^6.0.0",
+    "del-cli": "^7.0.0",
     "npm-run-all": "^4.1.5",
     "typescript": "^5.9.3"
   },
@@ -49,6 +53,6 @@
     "build": "run-s build:*",
     "build:clean": "run-s clean",
     "build:compile": "tsc",
-    "release": "commit-and-tag-version"
+    "version": "commit-and-tag-version"
   }
 }

package/dist/Localhost.d.ts

@@ -1,14 +0,0 @@
-import * as Configuration from '@battis/oauth2-configure';
-import * as OpenIDClient from 'openid-client';
-type Options = Configuration.Options & {
-    authorization_url: string;
-    redirect_uri: string;
-    headers?: Record<string, string>;
-    code_verifier?: string;
-    state?: string;
-    resolve: (tokens?: OpenIDClient.TokenEndpointResponse) => void;
-    reject: (error: unknown) => void;
-    views?: string;
-};
-export declare function redirectServer(options: Options): Promise<void>;
-export {};

package/dist/Localhost.js

@@ -1,88 +0,0 @@
-import * as Configuration from '@battis/oauth2-configure';
-import express from 'express';
-import fs from 'node:fs';
-import path from 'node:path';
-import open from 'open';
-import * as OpenIDClient from 'openid-client';
-const ejs = await import('ejs');
-const portRegistry = [];
-export async function redirectServer(options) {
-    const { authorization_url, redirect_uri, code_verifier, state, headers, resolve, reject, views = '../views' } = options;
-    const redirectUrl = new URL(redirect_uri);
-    const configuration = await Configuration.acquire(options);
-    const app = express();
-    const port = redirectUrl.port !== '' ? redirectUrl.port : 80;
-    const server = app.listen(port);
-    let view = 'complete.ejs';
-    let tokens = undefined;
-    let error = undefined;
-    /*
-     * FIXME Multiple clients with `redirect_uri` on the same localhost port
-     *   This seems to be some sort of an issue with Express (or node http?) in
-     *   which, despite a fresh invocation of express() for each redirect
-     *   listener, every listener subsequent to the first _on the same port_
-     *   retains the original routing stack of the first listener on that port.
-     *   I have tried:
-     *     - Setting a manual delay (up to 10 seconds) between the receipt of
-     *       the token and resolving it to allow the server to close.
-     *     - Using a mutex semaphore to ensure that no two instances of
-     *       Localhost are running simultaneously
-     *     - Separating the routing into a separate Router middleware
-     *     - Manually removing the routing stack (which does, at least, break
-     *       the routing of the subsequent instances, supporting the idea that
-     *       the app is getting reused by Express)
-     */
-    if (portRegistry.includes(port)) {
-        throw new Error(`Multiple OAuth clients are attempting to redirect to port ${port}. This will result in failure. Please reconfigure your credentials so that each client is redirecting to a distinct port on http://localhost (e.g. 3000, 3001, 3002)`);
-    }
-    else {
-        portRegistry.push(port);
-    }
-    app.get('/authorize', async (req, res) => {
-        const viewPath = path.resolve(import.meta.dirname, views, 'authorize');
-        if (ejs && fs.existsSync(viewPath)) {
-            res.send(await ejs.renderFile(viewPath));
-        }
-        else {
-            res.redirect(authorization_url);
-        }
-    });
-    app.get(redirectUrl.pathname, async (req, res) => {
-        try {
-            const currentUrl = new URL(req.originalUrl, redirect_uri);
-            tokens = await OpenIDClient.authorizationCodeGrant(configuration, currentUrl, {
-                pkceCodeVerifier: code_verifier,
-                expectedState: state
-            }, 
-            // @ts-expect-error 2322 undocumented arg pass-through to oauth4webapi
-            { headers });
-        }
-        catch (e) {
-            error = e;
-            view = 'error.ejs';
-        }
-        if (!tokens && !error) {
-            error = 'No tokens received in response to authorization code';
-        }
-        if (ejs) {
-            res.send(await ejs.renderFile(path.resolve(import.meta.dirname, views, view), {
-                tokens,
-                error
-            }));
-        }
-        else {
-            res.send(error || 'You may close this window.');
-        }
-        server.close();
-        if (error) {
-            reject(error);
-        }
-        else {
-            resolve(tokens);
-        }
-    });
-    app.get('*path', (_, res) => {
-        res.status(404).send();
-    });
-    open(`http://localhost:${port}/authorize`);
-}

package/dist/Token.d.ts

@@ -1,18 +0,0 @@
-import * as OpenIDClient from 'openid-client';
-interface TokenResponse extends OpenIDClient.TokenEndpointResponse {
-    [key: string]: any;
-}
-export declare class Token implements TokenResponse {
-    readonly access_token: string;
-    readonly token_type: Lowercase<string>;
-    readonly timestamp?: any;
-    readonly refresh_token?: string;
-    readonly refresh_token_expires_in?: number;
-    readonly scope?: string;
-    readonly id_token?: string;
-    readonly expires_in?: number;
-    private constructor();
-    static fromResponse(response?: OpenIDClient.TokenEndpointResponse, refresh_token?: string): Token | undefined;
-    hasExpired(): boolean;
-}
-export {};

package/dist/Token.js

@@ -1,26 +0,0 @@
-export class Token {
-    access_token;
-    token_type;
-    timestamp;
-    refresh_token;
-    refresh_token_expires_in;
-    scope;
-    id_token;
-    expires_in;
-    constructor(response) {
-        this.access_token = response.access_token;
-        this.token_type = response.token_type;
-        this.timestamp = response.timestamp;
-        Object.assign(this, response);
-    }
-    static fromResponse(response, refresh_token) {
-        if (response) {
-            return new Token({ refresh_token, timestamp: Date.now(), ...response });
-        }
-        return undefined;
-    }
-    hasExpired() {
-        return (this.expires_in === undefined ||
-            Date.now() > this.timestamp + this.expires_in);
-    }
-}

package/dist/TokenStorage.d.ts

@@ -1,5 +0,0 @@
-import { Token } from './Token.js';
-export interface TokenStorage {
-    load(): Promise<Token | undefined>;
-    save(tokens: Token): Promise<void>;
-}