oauth2-cli 0.7.3 → 0.8.1

package/CHANGELOG.md

@@ -2,115 +2,132 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
-## [0.7.3](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.7.2...oauth2-cli/0.7.3) (2026-02-17)
+## [0.8.1](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.8.0...oauth2-cli/0.8.1) (2026-02-18)
 
 
-### Bug Fixes
+### Features
 
-* push past failed well-known URL ([48eca87](https://github.com/battis/oauth2-cli/commit/48eca875e9fffe30adc88ad1b5fdf0202722bb12))
+* provide parameterized credentials with simplified typing ([5a92c67](https://github.com/battis/oauth2-cli/commit/5a92c67dbd4ab52fa4f0b02a910e788f5ae67adb))
 
-## [0.7.2](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.7.1...oauth2-cli/0.7.2) (2026-02-16)
+## [0.8.0](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.7.3...oauth2-cli/0.8.0) (2026-02-17)
+
+### ⚠ BREAKING CHANGES
+
+- clarify subclass groupings and extensibility
+- simplify credentials structure
+- rename Token.TokenStorage to less redundant Token.Storage
+- simplify namespacing of Injection and Scope
+- improved clarity of errors and causes
 
+### Features
+
+- base_url for API requests preempts issuer, if present ([972496a](https://github.com/battis/oauth2-cli/commit/972496a663751c12dce7271b33134c8055d84191))
+- clarify subclass groupings and extensibility ([4fec372](https://github.com/battis/oauth2-cli/commit/4fec372019603c4bfada0e26d1813b3c196db536))
+- rename Token.TokenStorage to less redundant Token.Storage ([149d65a](https://github.com/battis/oauth2-cli/commit/149d65ac218a2c230ed8bca76963e44a5a6ff441))
+- simplify credentials structure ([0e95439](https://github.com/battis/oauth2-cli/commit/0e95439a30f78268ddf7363dc4feeb0b1ff0edba))
+- simplify namespacing of Injection and Scope ([b5db750](https://github.com/battis/oauth2-cli/commit/b5db7503f557a0c2092d327742b1bdd82be0edbb))
 
 ### Bug Fixes
 
-* resolve remaining requestish requests correctly ([2be680c](https://github.com/battis/oauth2-cli/commit/2be680c9575bcfe9e816e450c85b94ccf5c8f950))
+- export Scope without accidentally registering plugin ([3816537](https://github.com/battis/oauth2-cli/commit/38165376d6581b323cbb141a4923cd5613edeb63))
+- improved clarity of errors and causes ([9f1ddce](https://github.com/battis/oauth2-cli/commit/9f1ddcec82c3295e39fc8857784634da072e7570))
+- treat base_url as true base URL ([8a4b76c](https://github.com/battis/oauth2-cli/commit/8a4b76cb48041e31c7d0a72adb0312febad3ff28))
 
-## [0.7.1](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.7.0...oauth2-cli/0.7.1) (2026-02-16)
+## [0.7.3](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.7.2...oauth2-cli/0.7.3) (2026-02-17)
 
-## [0.7.0](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.6.0...oauth2-cli/0.7.0) (2026-02-16)
+### Bug Fixes
+
+- push past failed well-known URL ([48eca87](https://github.com/battis/oauth2-cli/commit/48eca875e9fffe30adc88ad1b5fdf0202722bb12))
+
+## [0.7.2](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.7.1...oauth2-cli/0.7.2) (2026-02-16)
+
+### Bug Fixes
 
+- resolve remaining requestish requests correctly ([2be680c](https://github.com/battis/oauth2-cli/commit/2be680c9575bcfe9e816e450c85b94ccf5c8f950))
+
+## [0.7.0](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.6.0...oauth2-cli/0.7.0) (2026-02-16)
 
 ### ⚠ BREAKING CHANGES
 
-* make more properties of Client accessible to subclasses
+- make more properties of Client accessible to subclasses
 
 ### Features
 
-* make more properties of Client accessible to subclasses ([74ef874](https://github.com/battis/oauth2-cli/commit/74ef874804323a9c3c496ddf7b0e24bac9e671e1))
+- make more properties of Client accessible to subclasses ([74ef874](https://github.com/battis/oauth2-cli/commit/74ef874804323a9c3c496ddf7b0e24bac9e671e1))
 
 ## [0.6.0](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.5.1...oauth2-cli/0.6.0) (2026-02-15)
 
-
 ### ⚠ BREAKING CHANGES
 
-* limit TokenStorage to storing _only_ refresh_tokens
-* improve express shutdown, refactor entire package
+- limit TokenStorage to storing _only_ refresh_tokens
+- improve express shutdown, refactor entire package
 
 ### Features
 
-* compatible with @battis/google-cloud-run-to-localhost ([3e449b1](https://github.com/battis/oauth2-cli/commit/3e449b14d546759f7e6543c86350ea83b60a80a7))
-* display authorization starting URL on command line as well as opening browser ([fb72bcf](https://github.com/battis/oauth2-cli/commit/fb72bcffafaf66453f8f8f0f8af4b27ef11827c6))
-* externalize path/port identification to gcrtl ([0f6c28b](https://github.com/battis/oauth2-cli/commit/0f6c28b31a7888eac524b28bcdc9c8eabbf57d91))
-* fallback to package templates if ejs present but no alternative template providedd ([6b05454](https://github.com/battis/oauth2-cli/commit/6b05454976b1fb4144f91ba51fc1c9331f1c0f34))
-* limit TokenStorage to storing _only_ refresh_tokens ([3de9c96](https://github.com/battis/oauth2-cli/commit/3de9c96510d15eebd51a0be7d8df278614541f95))
-
+- compatible with @battis/google-cloud-run-to-localhost ([3e449b1](https://github.com/battis/oauth2-cli/commit/3e449b14d546759f7e6543c86350ea83b60a80a7))
+- display authorization starting URL on command line as well as opening browser ([fb72bcf](https://github.com/battis/oauth2-cli/commit/fb72bcffafaf66453f8f8f0f8af4b27ef11827c6))
+- externalize path/port identification to gcrtl ([0f6c28b](https://github.com/battis/oauth2-cli/commit/0f6c28b31a7888eac524b28bcdc9c8eabbf57d91))
+- fallback to package templates if ejs present but no alternative template providedd ([6b05454](https://github.com/battis/oauth2-cli/commit/6b05454976b1fb4144f91ba51fc1c9331f1c0f34))
+- limit TokenStorage to storing _only_ refresh_tokens ([3de9c96](https://github.com/battis/oauth2-cli/commit/3de9c96510d15eebd51a0be7d8df278614541f95))
 
 ### Bug Fixes
 
-* attempt to authorize and retry when encountering 401 error ([bc75fed](https://github.com/battis/oauth2-cli/commit/bc75fed052b548e41411287f7d98fa78c3f27ee5))
-* improve express shutdown, refactor entire package ([a740313](https://github.com/battis/oauth2-cli/commit/a740313c33d26f07ebab5b282607d8828cf3c3a7))
+- attempt to authorize and retry when encountering 401 error ([bc75fed](https://github.com/battis/oauth2-cli/commit/bc75fed052b548e41411287f7d98fa78c3f27ee5))
+- improve express shutdown, refactor entire package ([a740313](https://github.com/battis/oauth2-cli/commit/a740313c33d26f07ebab5b282607d8828cf3c3a7))
 
 ## [0.5.1](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.5.0...oauth2-cli/0.5.1) (2026-01-20)
 
-
 ### Bug Fixes
 
-* allow extending private methods for debugging ([ea9957f](https://github.com/battis/oauth2-cli/commit/ea9957f71629c4a177ebdf6acf0aecaa299a5260))
+- allow extending private methods for debugging ([ea9957f](https://github.com/battis/oauth2-cli/commit/ea9957f71629c4a177ebdf6acf0aecaa299a5260))
 
 ## [0.5.0](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.4.0...oauth2-cli/0.5.0) (2026-01-14)
 
-
 ### ⚠ BREAKING CHANGES
 
-* move to Node.js v24 support
+- move to Node.js v24 support
 
 ### Features
 
-* move to Node.js v24 support ([03d5cf4](https://github.com/battis/oauth2-cli/commit/03d5cf455e38f7beb2fbf93f1612acb906c5f5a0))
+- move to Node.js v24 support ([03d5cf4](https://github.com/battis/oauth2-cli/commit/03d5cf455e38f7beb2fbf93f1612acb906c5f5a0))
 
 ## [0.4.0](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.3.0...oauth2-cli/0.4.0) (2026-01-04)
 
-
 ### ⚠ BREAKING CHANGES
 
-* remove deprecated TokenManager
+- remove deprecated TokenManager
 
 ### Features
 
-* provide fetch() and fetchJSON() methods to translate to openid-client requests ([3fe454f](https://github.com/battis/oauth2-cli/commit/3fe454f28497d704041ea4e599a4ad5b2b08b469))
-
+- provide fetch() and fetchJSON() methods to translate to openid-client requests ([3fe454f](https://github.com/battis/oauth2-cli/commit/3fe454f28497d704041ea4e599a4ad5b2b08b469))
 
 ### Bug Fixes
 
-* remove deprecated TokenManager ([2dde67e](https://github.com/battis/oauth2-cli/commit/2dde67edd70b151bd1bab6de3845839a06957e65))
+- remove deprecated TokenManager ([2dde67e](https://github.com/battis/oauth2-cli/commit/2dde67edd70b151bd1bab6de3845839a06957e65))
 
 ## [0.3.0](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.2.3...oauth2-cli/0.3.0) (2025-12-24)
 
-
 ### ⚠ BREAKING CHANGES
 
-* resolve 1Password secret references successfully
+- resolve 1Password secret references successfully
 
 ### Bug Fixes
 
-* resolve 1Password secret references successfully ([c4446e1](https://github.com/battis/oauth2-cli/commit/c4446e197a66271dac3ea8d58ff44725cc6be1db))
+- resolve 1Password secret references successfully ([c4446e1](https://github.com/battis/oauth2-cli/commit/c4446e197a66271dac3ea8d58ff44725cc6be1db))
 
 ## [0.2.3](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.2.2...oauth2-cli/0.2.3) (2025-12-23)
 
-
 ### Bug Fixes
 
-* add wildcard param name ([97b2e58](https://github.com/battis/oauth2-cli/commit/97b2e58835941797fce564c736d8c4bd6e3ce97f))
+- add wildcard param name ([97b2e58](https://github.com/battis/oauth2-cli/commit/97b2e58835941797fce564c736d8c4bd6e3ce97f))
 
 ## [0.2.2](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.2.1...oauth2-cli/0.2.2) (2025-12-23)
 
 ## [0.2.1](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.2.0...oauth2-cli/0.2.1) (2025-09-11)
 
-
 ### Bug Fixes
 
-* update dependencies to address transient openid-client config error ([f0ca9a8](https://github.com/battis/oauth2-cli/commit/f0ca9a8d2bb4551b80a49e48aa43df5ba66a5a9b))
+- update dependencies to address transient openid-client config error ([f0ca9a8](https://github.com/battis/oauth2-cli/commit/f0ca9a8d2bb4551b80a49e48aa43df5ba66a5a9b))
 
 ## [0.2.0](https://github.com/battis/oauth2-cli/compare/oauth2-cli/0.1.6...oauth2-cli/0.2.0) (2025-03-09)
 

package/README.md

@@ -39,7 +39,7 @@ Broadly speaking, having provided the configuration, the client is immediately r
 
 A `Client` requires some minimal information in order to interact with an OAuth 2.0 authorized API. The OAuth 2.0 base set is a `client_id`, `client_secret`, `authorization_endpoint`, `token_endpoint`, and a `redirect_uri`. For an OpenID-authenticated API, you could provide a `client_id`, `client_secret`, `issuer`, and `redirect_uri` and the Client will query the issuer for further details regarding required connection parameters (it is built on to of [openid-client](https://www.npmjs.com/package/openid-client)).
 
-In both cases, the token can be persisted by passing an implementation of [`TokenStorage`](https://github.com/battis/oauth2-cli/blob/main/packages/oauth2-cli/src/Token/TokenStorage.ts), such as [`FileStorage`](https://github.com/battis/oauth2-cli/blob/main/packages/oauth2-cli/src/Token/FileStorage.ts) which expects a path to a location to store a JSON file of access token data. _There are more secure ways to store your tokens, such as [@oauth2-cli/qui-cli](https://www.npmjs.com/package/@oauth2-cli/qui-cli)'s [`EnvironmentStorage`](https://github.com/battis/oauth2-cli/blob/main/packages/qui-cli/src/EnvironmentStorage.ts) which can be linked to a [1Password vault](https://github.com/battis/qui-cli/tree/main/packages/env#1password-integration)._
+In both cases, the token can be persisted by passing an implementation of [`Token.Storage`](https://github.com/battis/oauth2-cli/blob/main/packages/oauth2-cli/src/Token/TokenStorage.ts), such as [`FileStorage`](https://github.com/battis/oauth2-cli/blob/main/packages/oauth2-cli/src/Token/FileStorage.ts) which expects a path to a location to store a JSON file of access token data. _There are more secure ways to store your tokens, such as [@oauth2-cli/qui-cli](https://www.npmjs.com/package/@oauth2-cli/qui-cli)'s [`EnvironmentStorage`](https://github.com/battis/oauth2-cli/blob/main/packages/qui-cli/src/EnvironmentStorage.ts) which can be linked to a [1Password vault](https://github.com/battis/qui-cli/tree/main/packages/env#1password-integration)._
 
 #### `redirect_uri` to Localhost
 

package/dist/Client.d.ts

@@ -1,10 +1,11 @@
 import { PathString } from '@battis/descriptive-types';
+import { JSONValue } from '@battis/typescript-tricks';
 import { Request } from 'express';
 import { EventEmitter } from 'node:events';
 import * as OpenIDClient from 'openid-client';
 import * as requestish from 'requestish';
-import * as Credentials from './Credentials.js';
-import * as Req from './Request/index.js';
+import { Credentials } from './Credentials.js';
+import { Injection } from './Injection.js';
 import { Session, SessionOptions } from './Session.js';
 import * as Token from './Token/index.js';
 /**
@@ -12,22 +13,24 @@ import * as Token from './Token/index.js';
  * `redirect_uri` values
  */
 export declare const DEFAULT_REDIRECT_URI = "http://localhost:3000/oauth2-cli/redirect";
-export type ClientOptions = {
+export type ClientOptions<C extends Credentials = Credentials> = {
     /** Credentials for server access */
-    credentials: Credentials.Combined;
+    credentials: C;
     /** Optional request components to inject */
     inject?: {
         search?: requestish.URLSearchParams.ish;
         headers?: requestish.Headers.ish;
         body?: requestish.Body.ish;
     };
+    /** Base URL for all non-absolute requests */
+    base_url?: requestish.URL.ish;
     /**
      * Optional absolute path to EJS view templates directory, see
      * [WebServer.setViews()](./Webserver.ts)
      */
     views?: PathString;
     /** Optional {@link TokenStorage} implementation to manage tokens */
-    storage?: Token.TokenStorage;
+    storage?: Token.Storage;
 };
 type RefreshOptions = {
     /**
@@ -38,7 +41,7 @@ type RefreshOptions = {
      */
     refresh_token?: string;
     /** Additional request injection for refresh grant flow */
-    inject?: Req.Injection;
+    inject?: Injection;
 };
 type GetTokenOptions = {
     /**
@@ -52,7 +55,7 @@ type GetTokenOptions = {
      * Additional request injection for authorization code grant and/or refresh
      * grant flows
      */
-    inject?: Req.Injection;
+    inject?: Injection;
 };
 /**
  * Wrap {@link https://www.npmjs.com/package/openid-client openid-client} in a
@@ -61,16 +64,17 @@ type GetTokenOptions = {
  *
  * Emits {@link Client.TokenEvent} whenever a new access token is received
  */
-export declare class Client extends EventEmitter {
+export declare class Client<C extends Credentials = Credentials> extends EventEmitter {
     static readonly TokenEvent = "token";
-    protected credentials: Credentials.Combined;
+    protected credentials: C;
+    protected base_url?: requestish.URL.ish;
     protected config?: OpenIDClient.Configuration;
+    protected inject?: Injection;
     protected views?: PathString;
-    protected inject?: Req.Injection;
     private token?;
     private tokenLock;
     private storage?;
-    constructor({ credentials, views, inject, storage }: ClientOptions);
+    constructor({ credentials, base_url, views, inject, storage }: ClientOptions<C>);
     get redirect_uri(): requestish.URL.ish;
     /**
      * @throws IndeterminateConfiguration if provided credentials combined with
@@ -104,10 +108,10 @@ export declare class Client extends EventEmitter {
     private toJSON;
     /**
      * Returns the result of {@link request} as a parsed JSON object, optionally
-     * typed as `T`
+     * typed as `J`
      */
-    requestJSON<T extends OpenIDClient.JsonValue = OpenIDClient.JsonValue>(url: requestish.URL.ish, method?: string, body?: OpenIDClient.FetchBody, headers?: requestish.Headers.ish, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<T>;
+    requestJSON<J extends JSONValue = JSONValue>(url: requestish.URL.ish, method?: string, body?: OpenIDClient.FetchBody, headers?: requestish.Headers.ish, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<J>;
     fetch(input: requestish.URL.ish, init?: RequestInit, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<Response>;
-    fetchJSON<T extends OpenIDClient.JsonValue = OpenIDClient.JsonValue>(input: requestish.URL.ish, init?: RequestInit, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<T>;
+    fetchJSON<J extends JSONValue = JSONValue>(input: requestish.URL.ish, init?: RequestInit, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<J>;
 }
 export {};

package/dist/Client.js

@@ -1,9 +1,9 @@
 import { Mutex } from 'async-mutex';
 import { EventEmitter } from 'node:events';
+import path from 'node:path';
 import * as OpenIDClient from 'openid-client';
 import * as requestish from 'requestish';
-import * as Errors from './Errors/index.js';
-import * as Req from './Request/index.js';
+import * as Scope from './Scope.js';
 import { Session } from './Session.js';
 /**
  * A generic `redirect_uri` to use if the server does not require pre-registered
@@ -20,15 +20,17 @@ export const DEFAULT_REDIRECT_URI = 'http://localhost:3000/oauth2-cli/redirect';
 export class Client extends EventEmitter {
     static TokenEvent = 'token';
     credentials;
+    base_url;
     config;
-    views;
     inject;
+    views;
     token;
     tokenLock = new Mutex();
     storage;
-    constructor({ credentials, views, inject, storage }) {
+    constructor({ credentials, base_url, views, inject, storage }) {
         super();
         this.credentials = credentials;
+        this.base_url = base_url;
         this.views = views;
         this.inject = inject;
         this.storage = storage;
@@ -41,12 +43,13 @@ export class Client extends EventEmitter {
      *   OpenID discovery fail to generate a complete configuration
      */
     async getConfiguration() {
+        let error = undefined;
         if (!this.config && this.credentials.issuer) {
             try {
                 this.config = await OpenIDClient.discovery(requestish.URL.from(this.credentials.issuer), this.credentials.client_id, { client_secret: this.credentials.client_secret });
             }
-            catch (_) {
-                // ignore error
+            catch (e) {
+                error = e;
             }
         }
         if (!this.config && this.credentials?.authorization_endpoint) {
@@ -58,7 +61,12 @@ export class Client extends EventEmitter {
             }, this.credentials.client_id, { client_secret: this.credentials.client_secret });
         }
         if (!this.config) {
-            throw new Errors.IndeterminateConfiguration();
+            throw new Error('The client configuration could not be constructed from provided credentials.', {
+                cause: {
+                    credentials: this.credentials,
+                    'OpenID configuration result': error
+                }
+            });
         }
         return this.config;
     }
@@ -69,7 +77,7 @@ export class Client extends EventEmitter {
         params.set('code_challenge_method', 'S256');
         params.set('state', session.state);
         if (this.credentials.scope) {
-            params.set('scope', Req.Scope.toString(this.credentials.scope));
+            params.set('scope', Scope.toString(this.credentials.scope));
         }
         return params;
     }
@@ -139,7 +147,9 @@ export class Client extends EventEmitter {
     async save(token) {
         this.token = token;
         if (!token.access_token) {
-            throw new Errors.MissingAccessToken();
+            throw new Error('No access_token in response.', {
+                cause: token
+            });
         }
         if (this.storage && this.token.refresh_token) {
             await this.storage.save(this.token.refresh_token);
@@ -160,11 +170,19 @@ export class Client extends EventEmitter {
             url = requestish.URL.from(url);
         }
         catch (error) {
-            if (this.credentials.issuer) {
-                url = new URL(url, this.credentials.issuer);
+            if (this.base_url || this.credentials.issuer) {
+                url = path.join(
+                // @ts-expect-error 2345 TS, I _just_ tested this!
+                requestish.URL.toString(this.base_url || this.credentials.issuer), requestish.URL.toString(url).replace(/^\/?/, ''));
             }
             else {
-                throw error;
+                throw new Error(`Invalid request URL "${url}"`, {
+                    cause: {
+                        base_url: this.base_url,
+                        issuer: this.credentials.issuer,
+                        error
+                    }
+                });
             }
         }
         const request = async () => await OpenIDClient.fetchProtectedResource(await this.getConfiguration(), (await this.getToken()).access_token, requestish.URL.from(requestish.URLSearchParams.appendTo(url, this.inject?.search || {})), method, body, requestish.Headers.merge(this.inject?.headers, headers), dPoPOptions);
@@ -189,12 +207,14 @@ export class Client extends EventEmitter {
             return (await response.json());
         }
         else {
-            throw new Errors.BadResponse(response);
+            throw new Error('The response could not be parsed as JSON.', {
+                cause: response
+            });
         }
     }
     /**
      * Returns the result of {@link request} as a parsed JSON object, optionally
-     * typed as `T`
+     * typed as `J`
      */
     async requestJSON(url, method = 'GET', body, headers = {}, dPoPOptions) {
         return await this.toJSON(await this.request(url, method, body, headers, dPoPOptions));

package/dist/Credentials.d.ts

@@ -1,24 +1,10 @@
 import * as requestish from 'requestish';
-import * as Req from './Request/index.js';
-export type OAuth2 = {
+import * as Scope from './Scope.js';
+export type Credentials = {
     client_id: string;
     client_secret: string;
     redirect_uri: requestish.URL.ish;
-    authorization_endpoint: requestish.URL.ish;
-    token_endpoint: requestish.URL.ish;
-    scope?: Req.Scope.ish;
-};
-export type OpenID = {
-    issuer: requestish.URL.ish;
-    client_id: string;
-    client_secret: string;
-    redirect_uri: requestish.URL.ish;
-};
-export type Combined = {
-    client_id: string;
-    client_secret: string;
-    redirect_uri: requestish.URL.ish;
-    scope?: Req.Scope.ish;
+    scope?: Scope.ish;
 } & ({
     issuer?: requestish.URL.ish;
     authorization_endpoint: requestish.URL.ish;

package/dist/Session.d.ts

@@ -1,7 +1,7 @@
 import { PathString } from '@battis/descriptive-types';
 import { Request } from 'express';
 import { Client } from './Client.js';
-import * as Req from './Request/index.js';
+import { Injection } from './Injection.js';
 import * as Token from './Token/index.js';
 import * as WebServer from './WebServer.js';
 export type SessionOptions = {
@@ -9,7 +9,7 @@ export type SessionOptions = {
     /** See {@link WebServer.setViews Webserver.setViews()} */
     views?: PathString;
     /** Additional request injection for authorization code grant flow */
-    inject?: Req.Injection;
+    inject?: Injection;
 };
 export type Resolver = (response?: Token.Response, error?: Error) => void | Promise<void>;
 export declare class Session {
@@ -20,7 +20,7 @@ export declare class Session {
     /** OAuth 2.0 state (if PKCE is not supported) */
     readonly state: string;
     /** Additional request injection for Authorization Code Grant request */
-    readonly inject?: Req.Injection;
+    readonly inject?: Injection;
     private _resolve?;
     private spinner?;
     /**

package/dist/Session.js

@@ -3,7 +3,6 @@ import * as gcrtl from 'gcrtl';
 import open from 'open';
 import * as OpenIDClient from 'openid-client';
 import ora from 'ora';
-import * as Errors from './Errors/index.js';
 import * as WebServer from './WebServer.js';
 export class Session {
     client;
@@ -49,7 +48,7 @@ export class Session {
                     resolve(response);
                 }
                 else {
-                    reject(new Errors.MissingAccessToken());
+                    reject(new Error('Authorization Code Grant response undefined.'));
                 }
             };
             const url = gcrtl

package/dist/Token/FileStorage.d.ts

@@ -1,5 +1,5 @@
-import { TokenStorage } from './TokenStorage.js';
-export declare class FileStorage implements TokenStorage {
+import { Storage } from './Storage.js';
+export declare class FileStorage implements Storage {
     private fileLock;
     private readonly filePath;
     constructor(filePath: string);

package/dist/Token/{TokenStorage.d.ts → Storage.d.ts}

@@ -1,4 +1,4 @@
-export interface TokenStorage {
+export interface Storage {
     load(): Promise<string | undefined>;
     save(refresh_token: string): Promise<void>;
 }

package/dist/Token/index.d.ts

@@ -1,3 +1,3 @@
 export * from './FileStorage.js';
 export * from './Response.js';
-export * from './TokenStorage.js';
+export * from './Storage.js';

package/dist/Token/index.js

@@ -1,3 +1,3 @@
 export * from './FileStorage.js';
 export * from './Response.js';
-export * from './TokenStorage.js';
+export * from './Storage.js';

package/dist/WebServer.js

@@ -3,7 +3,6 @@ import * as gcrtl from 'gcrtl';
 import fs from 'node:fs';
 import path from 'node:path';
 import * as requestish from 'requestish';
-import * as Errors from './Errors/index.js';
 let ejs = undefined;
 try {
     ejs = (await import('ejs')).default;
@@ -31,7 +30,7 @@ export class WebServer {
         const url = requestish.URL.from(this.session.redirect_uri);
         this.port = url.port;
         if (WebServer.activePorts.includes(this.port)) {
-            throw new Errors.PortCollision(url.port);
+            throw new Error(`Another process is already running at http://localhost:${url.port}.`, { cause: { activePorts: WebServer.activePorts } });
         }
         WebServer.activePorts.push(this.port);
         const app = express();

package/dist/index.d.ts

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

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oauth2-cli",
-  "version": "0.7.3",
+  "version": "0.8.1",
   "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": {

package/dist/Errors/BadResponse.d.ts

@@ -1,3 +0,0 @@
-export declare class BadResponse extends Error {
-    constructor(response: Response);
-}

package/dist/Errors/BadResponse.js

@@ -1,7 +0,0 @@
-export class BadResponse extends Error {
-    constructor(response) {
-        super(`Response error ${response.status}: ${response.statusText}`, {
-            cause: response
-        });
-    }
-}

package/dist/Errors/IndeterminateConfiguration.d.ts

@@ -1,3 +0,0 @@
-export declare class IndeterminateConfiguration extends Error {
-    constructor();
-}

package/dist/Errors/IndeterminateConfiguration.js

@@ -1,5 +0,0 @@
-export class IndeterminateConfiguration extends Error {
-    constructor() {
-        super('A configuration could not be determined from the provided credentials.');
-    }
-}

package/dist/Errors/MissingAccessToken.d.ts

@@ -1,3 +0,0 @@
-export declare class MissingAccessToken extends Error {
-    constructor();
-}

package/dist/Errors/MissingAccessToken.js

@@ -1,5 +0,0 @@
-export class MissingAccessToken extends Error {
-    constructor() {
-        super('No access token available.');
-    }
-}

package/dist/Errors/PortCollision.d.ts

@@ -1,3 +0,0 @@
-export declare class PortCollision extends Error {
-    constructor(port: string);
-}

package/dist/Errors/PortCollision.js

@@ -1,5 +0,0 @@
-export class PortCollision extends Error {
-    constructor(port) {
-        super(`Cannot start authorization: another process is already running at http://localhost:${port}.`);
-    }
-}

package/dist/Errors/index.d.ts

@@ -1,4 +0,0 @@
-export * from './BadResponse.js';
-export * from './IndeterminateConfiguration.js';
-export * from './MissingAccessToken.js';
-export * from './PortCollision.js';

package/dist/Errors/index.js

@@ -1,4 +0,0 @@
-export * from './BadResponse.js';
-export * from './IndeterminateConfiguration.js';
-export * from './MissingAccessToken.js';
-export * from './PortCollision.js';

package/dist/Request/index.d.ts

@@ -1,2 +0,0 @@
-export * from './Injection.js';
-export * as Scope from './Scope.js';

package/dist/Request/index.js

@@ -1,2 +0,0 @@
-export * from './Injection.js';
-export * as Scope from './Scope.js';