@oauth2-cli/qui-cli 0.5.0 → 0.5.2

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 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.5.2](https://github.com/battis/oauth2-cli/compare/qui-cli-plugin/0.5.1...qui-cli-plugin/0.5.2) (2026-01-15)
+
+
+### Features
+
+* allow injection of custom oauth2-cli Client implementations via instantiateClient() ([cb1b94f](https://github.com/battis/oauth2-cli/commit/cb1b94fb1891343f00b5793fd6f7db33e6489c14))
+* re-export all of oauth2-cli under the plugin module/class namespaces ([0cbdafc](https://github.com/battis/oauth2-cli/commit/0cbdafc84853f4a904e33640b65e4f0300f00b4a))
+
+## [0.5.1](https://github.com/battis/oauth2-cli/compare/qui-cli-plugin/0.5.0...qui-cli-plugin/0.5.1) (2026-01-15)
+
+
+### Bug Fixes
+
+* implement convenience methods as methods, not properties ([a3f67fe](https://github.com/battis/oauth2-cli/commit/a3f67fecde50ae19d8cf960fe6828623e745126b))
+
 ## [0.5.0](https://github.com/battis/oauth2-cli/compare/qui-cli-plugin/0.4.3...qui-cli-plugin/0.5.0) (2026-01-14)
 
 

package/dist/Module.d.ts

@@ -1,10 +1,11 @@
+export * from './EnvironmentStorage.js';
 export * from './OAuth2.js';
 export declare const name: string;
 export declare const configure: (proposal?: import("./OAuth2.js").ConfigurationProposal) => void;
 export declare const options: () => import("@qui-cli/plugin").Options;
 export declare const init: ({ values }: import("@qui-cli/plugin").ExpectedArguments<typeof this.options>) => Promise<void>;
-export declare const getToken: () => Promise<import("oauth2-cli").Token | undefined>;
-export declare const getClient: () => import("oauth2-cli").Client;
+export declare const getToken: () => Promise<import("oauth2-cli/dist/Token.js").Token | undefined>;
+export declare const getClient: () => import("oauth2-cli/dist/Client.js").Client;
 export declare const request: (url: string | URL, method?: string | undefined, body?: import("openid-client").FetchBody, headers?: Headers | undefined, dPoPOptions?: import("openid-client").DPoPOptions | undefined) => Promise<Response>;
 export declare const requestJSON: <T extends import("@battis/typescript-tricks").JSONValue>(url: string | URL, method?: string | undefined, body?: import("openid-client").FetchBody, headers?: Headers | undefined, dPoPOptions?: import("openid-client").DPoPOptions | undefined) => Promise<T>;
 export declare const fetch: (endpoint: string | URL | Request, init?: RequestInit | undefined) => Promise<Response>;

package/dist/Module.js

@@ -1,13 +1,14 @@
-import { OAuth2 } from './OAuth2.js';
+import { OAuth2Plugin } from './OAuth2.js';
+export * from './EnvironmentStorage.js';
 export * from './OAuth2.js';
-const plugin = new OAuth2();
-export const name = plugin.name;
-export const configure = plugin.configure.bind(plugin);
-export const options = plugin.options.bind(plugin);
-export const init = plugin.init.bind(plugin);
-export const getToken = plugin.getToken.bind(plugin);
-export const getClient = plugin.getClient.bind(plugin);
-export const request = plugin.request.bind(plugin);
-export const requestJSON = plugin.requestJSON.bind(plugin);
-export const fetch = plugin.fetch.bind(plugin);
-export const fetchJSON = plugin.fetchJSON.bind(plugin);
+const oauth2 = new OAuth2Plugin();
+export const name = oauth2.name;
+export const configure = oauth2.configure.bind(oauth2);
+export const options = oauth2.options.bind(oauth2);
+export const init = oauth2.init.bind(oauth2);
+export const getToken = oauth2.getToken.bind(oauth2);
+export const getClient = oauth2.getClient.bind(oauth2);
+export const request = oauth2.request.bind(oauth2);
+export const requestJSON = oauth2.requestJSON.bind(oauth2);
+export const fetch = oauth2.fetch.bind(oauth2);
+export const fetchJSON = oauth2.fetchJSON.bind(oauth2);

package/dist/OAuth2.d.ts

@@ -2,7 +2,7 @@ import { PathString, URLString } from '@battis/descriptive-types';
 import { JSONValue } from '@battis/typescript-tricks';
 import * as Plugin from '@qui-cli/plugin';
 import * as OAuth2CLI from 'oauth2-cli';
-export { Credentials } from 'oauth2-cli';
+export * from 'oauth2-cli';
 type ParamNames = 'clientId' | 'clientSecret' | 'redirectUri' | 'authorizationEndpoint' | 'tokenEndpoint' | 'tokenPath' | 'accessToken';
 type EnvironmentVars = Record<ParamNames, string>;
 type SupportUrls = Record<ParamNames, URLString>;
@@ -34,7 +34,7 @@ export type ConfigurationProposal = Partial<Omit<Configuration, 'opt' | 'env' |
     env?: Partial<EnvironmentVars>;
     man?: Partial<Usage>;
 };
-export declare class OAuth2 {
+export declare class OAuth2Plugin {
     readonly name: string;
     [key: string]: unknown;
     private static names;
@@ -45,10 +45,11 @@ export declare class OAuth2 {
     configure(proposal?: ConfigurationProposal): void;
     options(): Plugin.Options;
     init({ values }: Plugin.ExpectedArguments<typeof this.options>): Promise<void>;
+    protected instantiateClient(...args: ConstructorParameters<typeof OAuth2CLI.Client>): void;
     getClient(): OAuth2CLI.Client;
-    getToken: () => Promise<OAuth2CLI.Token | undefined>;
-    request: (...args: Parameters<OAuth2CLI.Client["request"]>) => Promise<Response>;
-    fetch: (...args: Parameters<OAuth2CLI.Client["fetch"]>) => Promise<Response>;
-    requestJSON: <T extends JSONValue>(...args: Parameters<OAuth2CLI.Client["requestJSON"]>) => Promise<T>;
-    fetchJSON: <T extends JSONValue>(...args: Parameters<OAuth2CLI.Client["fetchJSON"]>) => Promise<T>;
+    getToken(): Promise<OAuth2CLI.Token | undefined>;
+    request(...args: Parameters<OAuth2CLI.Client['request']>): Promise<Response>;
+    requestJSON<T extends JSONValue>(...args: Parameters<OAuth2CLI.Client['requestJSON']>): Promise<T>;
+    fetch(...args: Parameters<OAuth2CLI.Client['fetch']>): Promise<Response>;
+    fetchJSON<T extends JSONValue>(...args: Parameters<OAuth2CLI.Client['fetchJSON']>): Promise<T>;
 }

package/dist/OAuth2.js

@@ -5,13 +5,14 @@ import { Root } from '@qui-cli/root';
 import path from 'node:path';
 import * as OAuth2CLI from 'oauth2-cli';
 import { EnvironmentStorage } from './EnvironmentStorage.js';
-export class OAuth2 {
+export * from 'oauth2-cli';
+export class OAuth2Plugin {
     name;
     static names = [];
     static ports = {};
     constructor(name = '@oauth2-cli/qui-cli') {
         this.name = name;
-        if (OAuth2.names.includes(name)) {
+        if (OAuth2Plugin.names.includes(name)) {
             throw new Error(`A @qui-cli/plugin named ${Colors.value(name)} has already been instantiated.`);
         }
     }
@@ -69,9 +70,10 @@ export class OAuth2 {
                 Log.warning(`The ${Colors.url(url.protocol)} protocol may not work without additional configuration. The ` +
                     `server listening for the redirect will be running at ${Colors.url(`http://localhost:${url.port}`)}`);
             }
-            if (OAuth2.ports[url.port] && OAuth2.ports[url.port] !== this.name) {
+            if (OAuth2Plugin.ports[url.port] &&
+                OAuth2Plugin.ports[url.port] !== this.name) {
                 Log.warning(`The port ${Colors.value(url.port)} has already been registered to another instance of this plugin ` +
-                    `named ${Colors.value(OAuth2.ports[url.port])}. This will likely cause a failure if both instances of the ` +
+                    `named ${Colors.value(OAuth2Plugin.ports[url.port])}. This will likely cause a failure if both instances of the ` +
                     `plugin are listening for redirects at relatively proximate ` +
                     `moments in time.`);
             }
@@ -139,6 +141,9 @@ export class OAuth2 {
         }
         this.configure(proposal);
     }
+    instantiateClient(...args) {
+        this.client = new OAuth2CLI.Client(...args);
+    }
     getClient() {
         if (!this.client) {
             const { clientId: client_id, clientSecret: client_secret, redirectUri: redirect_uri, authorizationEndpoint: authorization_endpoint, tokenEndpoint: token_endpoint, headers, store } = this.cliConfig;
@@ -154,7 +159,7 @@ export class OAuth2 {
             if (!authorization_endpoint) {
                 throw new Error('OAuth 2.0 authorization endpoint not defined');
             }
-            this.client = new OAuth2CLI.Client({
+            this.instantiateClient({
                 client_id,
                 client_secret,
                 redirect_uri,
@@ -164,11 +169,24 @@ export class OAuth2 {
                 store
             });
         }
+        if (!this.client) {
+            throw new Error('Failed to instantiate oauth2-cli Client.');
+        }
         return this.client;
     }
-    getToken = () => this.getClient().getToken();
-    request = (...args) => this.getClient().request(...args);
-    fetch = (...args) => this.getClient().fetch(...args);
-    requestJSON = (...args) => this.getClient().requestJSON(...args);
-    fetchJSON = (...args) => this.getClient().fetchJSON(...args);
+    getToken() {
+        return this.getClient().getToken();
+    }
+    request(...args) {
+        return this.getClient().request(...args);
+    }
+    requestJSON(...args) {
+        return this.getClient().requestJSON(...args);
+    }
+    fetch(...args) {
+        return this.getClient().fetch(...args);
+    }
+    fetchJSON(...args) {
+        return this.getClient().fetchJSON(...args);
+    }
 }

package/dist/index.d.ts

@@ -1,3 +1,2 @@
 import * as OAuth2 from './Module.js';
-export * from './EnvironmentStorage.js';
 export { OAuth2 };

package/dist/index.js

@@ -1,5 +1,4 @@
 import { register } from '@qui-cli/plugin';
 import * as OAuth2 from './Module.js';
-export * from './EnvironmentStorage.js';
 export { OAuth2 };
 await register(OAuth2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oauth2-cli/qui-cli",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "@qui-cli/plugin wrapper for oauth2-cli",
   "homepage": "https://github.com/battis/oauth2-cli/tree/main/packages/qui-cli#readme",
   "repository": {
@@ -29,7 +29,7 @@
     "@qui-cli/root": "^3.0.6",
     "@tsconfig/node24": "^24.0.3",
     "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"
   },