@oauth2-cli/qui-cli 0.5.8 → 0.5.9

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.9](https://github.com/battis/oauth2-cli/compare/qui-cli-plugin/0.5.8...qui-cli-plugin/0.5.9) (2026-01-17)
+
+
+### Bug Fixes
+
+* debug request/response/JSON from Client rather than plugin ([2ed73e1](https://github.com/battis/oauth2-cli/commit/2ed73e18089ffed4fe75d717d523fc86e2ae7f91))
+
 ## [0.5.8](https://github.com/battis/oauth2-cli/compare/qui-cli-plugin/0.5.7...qui-cli-plugin/0.5.8) (2026-01-17)
 
 

package/dist/Client.d.ts

@@ -0,0 +1,7 @@
+import { JSONValue } from '@battis/typescript-tricks';
+import * as OAuth2CLI from 'oauth2-cli';
+import { DPoPOptions, FetchBody } from 'openid-client';
+export declare class Client extends OAuth2CLI.Client {
+    request(url: URL | string, method?: string, body?: FetchBody, headers?: Headers, dPoPOptions?: DPoPOptions): Promise<Response>;
+    requestJSON<T extends JSONValue = JSONValue>(url: URL | string, method?: string, body?: FetchBody, headers?: Headers, dPoPOptions?: DPoPOptions): Promise<T>;
+}

package/dist/Client.js

@@ -0,0 +1,15 @@
+import { Log } from '@qui-cli/log';
+import * as OAuth2CLI from 'oauth2-cli';
+export class Client extends OAuth2CLI.Client {
+    async request(url, method, body, headers, dPoPOptions) {
+        Log.debug({ request: { method, url, headers, body, dPoPOptions } });
+        const response = await super.request(url, method, body, headers, dPoPOptions);
+        Log.debug({ response });
+        return response;
+    }
+    async requestJSON(url, method, body, headers, dPoPOptions) {
+        const json = await super.requestJSON(url, method, body, headers, dPoPOptions);
+        Log.debug({ json });
+        return json;
+    }
+}

package/dist/Module.d.ts

@@ -4,7 +4,7 @@ export declare const configure: (proposal?: import("./OAuth2.js").ConfigurationP
 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/dist/Token.js").Token | undefined>;
-export declare const getClient: () => import("oauth2-cli/dist/Client.js").Client;
+export declare const getClient: () => import("./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/OAuth2.d.ts

@@ -2,7 +2,9 @@ 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 * from 'oauth2-cli';
+import { Client } from './Client.js';
+export { Credentials, FileStorage, Token, TokenStorage } from 'oauth2-cli';
+export * from './Client.js';
 export * from './EnvironmentStorage.js';
 type ParamNames = 'clientId' | 'clientSecret' | 'scope' | 'redirectUri' | 'authorizationEndpoint' | 'tokenEndpoint' | 'tokenPath' | 'accessToken';
 type EnvironmentVars = Record<ParamNames, string>;
@@ -36,7 +38,7 @@ export type ConfigurationProposal = Partial<Omit<Configuration, 'opt' | 'env' |
     env?: Partial<EnvironmentVars>;
     man?: Partial<Usage>;
 };
-export declare class OAuth2Plugin<C extends OAuth2CLI.Client = OAuth2CLI.Client> {
+export declare class OAuth2Plugin<C extends Client = Client> {
     readonly name: string;
     [key: string]: unknown;
     private static names;

package/dist/OAuth2.js

@@ -5,7 +5,8 @@ import { Root } from '@qui-cli/root';
 import path from 'node:path';
 import * as OAuth2CLI from 'oauth2-cli';
 import { EnvironmentStorage } from './EnvironmentStorage.js';
-export * from 'oauth2-cli';
+export { FileStorage, Token } from 'oauth2-cli';
+export * from './Client.js';
 export * from './EnvironmentStorage.js';
 export class OAuth2Plugin {
     name;
@@ -181,14 +182,10 @@ export class OAuth2Plugin {
         return this.getClient().getToken();
     }
     request(...args) {
-        const [url, method, body, headers, dPoPOptions] = args;
-        Log.debug({ request: { method, url, headers, body, dPoPOptions } });
         return this.getClient().request(...args);
     }
     requestJSON(...args) {
-        const response = this.getClient().requestJSON(...args);
-        Log.debug({ response });
-        return response;
+        return this.getClient().requestJSON(...args);
     }
     fetch(...args) {
         return this.getClient().fetch(...args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oauth2-cli/qui-cli",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "description": "@qui-cli/plugin wrapper for oauth2-cli",
   "homepage": "https://github.com/battis/oauth2-cli/tree/main/packages/qui-cli#readme",
   "repository": {