@oauth2-cli/qui-cli 1.1.1 → 1.1.3

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.
 
+## [1.1.3](https://github.com/battis/oauth2-cli/compare/qui-cli-plugin/1.1.2...qui-cli-plugin/1.1.3) (2026-03-04)
+
+
+### Bug Fixes
+
+* allow requestish.Body.ish request bodies as intended ([f12a2ce](https://github.com/battis/oauth2-cli/commit/f12a2ceb1c517f6fd90b33c8c71da7f987af640d))
+
+## [1.1.2](https://github.com/battis/oauth2-cli/compare/qui-cli-plugin/1.1.1...qui-cli-plugin/1.1.2) (2026-03-04)
+
+
+### Bug Fixes
+
+* improve JSOn debugging output ([a197307](https://github.com/battis/oauth2-cli/commit/a19730721ac53666a2c4e4e4982abf85353386e3))
+* improved response debugging output ([2c63583](https://github.com/battis/oauth2-cli/commit/2c635834e2e2a21c519b3d3bcec8ac26b1d70bbf))
+
 ## [1.1.1](https://github.com/battis/oauth2-cli/compare/qui-cli-plugin/1.1.0...qui-cli-plugin/1.1.1) (2026-03-04)
 
 

package/dist/Client.d.ts

@@ -2,7 +2,7 @@ import { JSONValue } from '@battis/typescript-tricks';
 import { Request } from 'express';
 import * as OAuth2CLI from 'oauth2-cli';
 import type * as OpenIDClient from 'openid-client';
-import * as requestish from 'requestish';
+import { Body, Headers, URL } from 'requestish';
 /**
  * Wrap {@link https://www.npmjs.com/package/openid-client openid-client} in a
  * class instance specific to a particular OAuth/OpenID server credential-set,
@@ -19,6 +19,6 @@ export declare class Client<C extends OAuth2CLI.Credentials = OAuth2CLI.Credenti
     handleAuthorizationCodeRedirect(request: Request, session: OAuth2CLI.Localhost.Server): Promise<OAuth2CLI.Token.Response>;
     protected refreshTokenGrant({ refresh_token, inject }?: Parameters<OAuth2CLI.Client['refreshTokenGrant']>[0]): Promise<OAuth2CLI.Token.Response | undefined>;
     protected save(response: OAuth2CLI.Token.Response): Promise<OAuth2CLI.Token.Response>;
-    request(url: requestish.URL.ish, method?: string, body?: OpenIDClient.FetchBody, headers?: requestish.Headers.ish, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<Response>;
-    requestJSON<J extends JSONValue = JSONValue>(url: requestish.URL.ish, method?: string, body?: OpenIDClient.FetchBody, headers?: requestish.Headers.ish, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<J>;
+    request(url: URL.ish, method?: string, body?: Body.ish, headers?: Headers.ish, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<Response>;
+    requestJSON<J extends JSONValue = JSONValue>(url: URL.ish, method?: string, body?: Body.ish, headers?: Headers.ish, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<J>;
 }

package/dist/Client.js

@@ -1,3 +1,4 @@
+import { Colors } from '@qui-cli/colors';
 import { Log } from '@qui-cli/log';
 import * as OAuth2CLI from 'oauth2-cli';
 /**
@@ -52,17 +53,26 @@ export class Client extends OAuth2CLI.Client {
         Log.debug(`Persisting ${this.name} refresh token (if present and storage configured):\n${Log.syntaxColor(response)}`);
         return await super.save(response);
     }
-    async request(url, method, body, headers, dPoPOptions) {
-        Log.debug(`Sending request to ${this.name}`, {
+    async request(url, method = 'GET', body, headers = {}, dPoPOptions) {
+        Log.debug(`Sending request to ${this.name}:\n${Log.syntaxColor({
             request: { method, url, headers, body, dPoPOptions }
-        });
+        })}`);
         const response = await super.request(url, method, body, headers, dPoPOptions);
-        Log.debug(`Received response from ${this.name}:\n${Log.syntaxColor(response)}`);
+        Log.debug(`Received response from ${this.name}:\n${Log.syntaxColor({
+            ok: response.ok,
+            status: response.status,
+            headers: Object.fromEntries(response.headers.entries()),
+            body: response.body ? '<not yet parsed>' : null
+        })}`);
         return response;
     }
-    async requestJSON(url, method, body, headers, dPoPOptions) {
+    async requestJSON(url, method = 'GET', body, headers = {}, dPoPOptions) {
         const json = await super.requestJSON(url, method, body, headers, dPoPOptions);
-        Log.debug(`Parsed JSON from ${this.name} response:\n${Log.syntaxColor({ json })}`);
+        Log.debug(`Parsed JSON from ${this.name} response:\n${typeof json === 'object' && json
+            ? Log.syntaxColor(json)
+            : typeof json === 'string'
+                ? Colors.quotedValue(`"${json}"`)
+                : Colors.value(json)}`);
         return json;
     }
 }

package/dist/OAuth2.d.ts

@@ -27,13 +27,13 @@ export declare const client: () => import("./Client.js").Client<import("oauth2-c
  *
  * @see {@link OAuth2Plugin.request}
  */
-export declare const request: (url: import("requestish/dist/URL.js").ish, method?: string | undefined, body?: import("openid-client").FetchBody, headers?: import("requestish/dist/Headers.js").ish | undefined, dPoPOptions?: import("openid-client").DPoPOptions | undefined) => Promise<Response>;
+export declare const request: (url: import("requestish/dist/URL.js").ish, method?: string | undefined, body?: import("requestish/dist/Body.js").ish, headers?: import("requestish/dist/Headers.js").ish | undefined, dPoPOptions?: import("openid-client").DPoPOptions | undefined) => Promise<Response>;
 /**
  * Convenience method
  *
  * @see {@link OAuth2Plugin.requestJSON}
  */
-export declare const requestJSON: <T extends import("@battis/typescript-tricks").JSONValue>(url: import("requestish/dist/URL.js").ish, method?: string | undefined, body?: import("openid-client").FetchBody, headers?: import("requestish/dist/Headers.js").ish | undefined, dPoPOptions?: import("openid-client").DPoPOptions | undefined) => Promise<T>;
+export declare const requestJSON: <T extends import("@battis/typescript-tricks").JSONValue>(url: import("requestish/dist/URL.js").ish, method?: string | undefined, body?: import("requestish/dist/Body.js").ish, headers?: import("requestish/dist/Headers.js").ish | undefined, dPoPOptions?: import("openid-client").DPoPOptions | undefined) => Promise<T>;
 /**
  * Convenience method
  *

package/extendable/Client.d.ts

@@ -2,7 +2,7 @@ import { JSONValue } from '@battis/typescript-tricks';
 import { Request } from 'express';
 import * as OAuth2CLI from 'oauth2-cli';
 import type * as OpenIDClient from 'openid-client';
-import * as requestish from 'requestish';
+import { Body, Headers, URL } from 'requestish';
 /**
  * Wrap {@link https://www.npmjs.com/package/openid-client openid-client} in a
  * class instance specific to a particular OAuth/OpenID server credential-set,
@@ -19,6 +19,6 @@ export declare class Client<C extends OAuth2CLI.Credentials = OAuth2CLI.Credenti
     handleAuthorizationCodeRedirect(request: Request, session: OAuth2CLI.Localhost.Server): Promise<OAuth2CLI.Token.Response>;
     protected refreshTokenGrant({ refresh_token, inject }?: Parameters<OAuth2CLI.Client['refreshTokenGrant']>[0]): Promise<OAuth2CLI.Token.Response | undefined>;
     protected save(response: OAuth2CLI.Token.Response): Promise<OAuth2CLI.Token.Response>;
-    request(url: requestish.URL.ish, method?: string, body?: OpenIDClient.FetchBody, headers?: requestish.Headers.ish, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<Response>;
-    requestJSON<J extends JSONValue = JSONValue>(url: requestish.URL.ish, method?: string, body?: OpenIDClient.FetchBody, headers?: requestish.Headers.ish, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<J>;
+    request(url: URL.ish, method?: string, body?: Body.ish, headers?: Headers.ish, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<Response>;
+    requestJSON<J extends JSONValue = JSONValue>(url: URL.ish, method?: string, body?: Body.ish, headers?: Headers.ish, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<J>;
 }

package/extendable/Client.js

@@ -1,3 +1,4 @@
+import { Colors } from '@qui-cli/colors';
 import { Log } from '@qui-cli/log';
 import * as OAuth2CLI from 'oauth2-cli';
 /**
@@ -52,17 +53,26 @@ export class Client extends OAuth2CLI.Client {
         Log.debug(`Persisting ${this.name} refresh token (if present and storage configured):\n${Log.syntaxColor(response)}`);
         return await super.save(response);
     }
-    async request(url, method, body, headers, dPoPOptions) {
-        Log.debug(`Sending request to ${this.name}`, {
+    async request(url, method = 'GET', body, headers = {}, dPoPOptions) {
+        Log.debug(`Sending request to ${this.name}:\n${Log.syntaxColor({
             request: { method, url, headers, body, dPoPOptions }
-        });
+        })}`);
         const response = await super.request(url, method, body, headers, dPoPOptions);
-        Log.debug(`Received response from ${this.name}:\n${Log.syntaxColor(response)}`);
+        Log.debug(`Received response from ${this.name}:\n${Log.syntaxColor({
+            ok: response.ok,
+            status: response.status,
+            headers: Object.fromEntries(response.headers.entries()),
+            body: response.body ? '<not yet parsed>' : null
+        })}`);
         return response;
     }
-    async requestJSON(url, method, body, headers, dPoPOptions) {
+    async requestJSON(url, method = 'GET', body, headers = {}, dPoPOptions) {
         const json = await super.requestJSON(url, method, body, headers, dPoPOptions);
-        Log.debug(`Parsed JSON from ${this.name} response:\n${Log.syntaxColor({ json })}`);
+        Log.debug(`Parsed JSON from ${this.name} response:\n${typeof json === 'object' && json
+            ? Log.syntaxColor(json)
+            : typeof json === 'string'
+                ? Colors.quotedValue(`"${json}"`)
+                : Colors.value(json)}`);
         return json;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oauth2-cli/qui-cli",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "@qui-cli/plugin wrapper for oauth2-cli",
   "homepage": "https://github.com/battis/oauth2-cli/tree/main/packages/qui-cli#readme",
   "repository": {
@@ -17,7 +17,7 @@
   "types": "./dist/index.d.ts",
   "dependencies": {
     "@qui-cli/colors": "^3.2.3",
-    "oauth2-cli": "1.0.2",
+    "oauth2-cli": "1.0.3",
     "requestish": "0.1.3"
   },
   "devDependencies": {