@oauth2-cli/qui-cli 1.1.2 → 1.2.0

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.2.0](https://github.com/battis/oauth2-cli/compare/qui-cli-plugin/1.1.3...qui-cli-plugin/1.2.0) (2026-03-05)
+
+
+### Features
+
+* added prepareRequest hook ([3deaaaa](https://github.com/battis/oauth2-cli/commit/3deaaaa1ec8939b507953f436f0cd500f01736e8))
+* make URLSearchParams even more 'ish', accepting all JSON primitives ([b1c2a25](https://github.com/battis/oauth2-cli/commit/b1c2a25c29267c070070f7cd304bb31f854485e4))
+
+## [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)
 
 

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,7 @@ 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>;
+    protected prepareRequest(config: OpenIDClient.Configuration, accessToken: string, url: URL, method: string, body?: OpenIDClient.FetchBody, headers?: Headers | undefined, options?: OpenIDClient.DPoPOptions | undefined): Promise<Parameters<(typeof OpenIDClient)['fetchProtectedResource']>>;
+    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

@@ -53,10 +53,18 @@ 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) {
+    async prepareRequest(config, accessToken, url, method, body, headers, options) {
+        Log.debug(`Prepared request to ${this.name}:\n${Log.syntaxColor({ method, url, headers: Object.fromEntries(headers?.entries() || []), body })}`);
+        return [config, accessToken, url, method, body, headers, options];
+    }
+    async request(url, method = 'GET', body, headers = {}, dPoPOptions) {
         Log.debug(`Sending request to ${this.name}:\n${Log.syntaxColor({
-            request: { method, url, headers, body, dPoPOptions }
-        })}`);
+            request: {
+                method,
+                url,
+                dPoPOptions
+            }
+        })}${body || headers ? ` injecting: ${Log.syntaxColor({ headers, body })}` : ''}`);
         const response = await super.request(url, method, body, headers, dPoPOptions);
         Log.debug(`Received response from ${this.name}:\n${Log.syntaxColor({
             ok: response.ok,
@@ -66,7 +74,7 @@ export class Client extends OAuth2CLI.Client {
         })}`);
         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${typeof json === 'object' && json
             ? Log.syntaxColor(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,7 @@ 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>;
+    protected prepareRequest(config: OpenIDClient.Configuration, accessToken: string, url: URL, method: string, body?: OpenIDClient.FetchBody, headers?: Headers | undefined, options?: OpenIDClient.DPoPOptions | undefined): Promise<Parameters<(typeof OpenIDClient)['fetchProtectedResource']>>;
+    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

@@ -53,10 +53,18 @@ 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) {
+    async prepareRequest(config, accessToken, url, method, body, headers, options) {
+        Log.debug(`Prepared request to ${this.name}:\n${Log.syntaxColor({ method, url, headers: Object.fromEntries(headers?.entries() || []), body })}`);
+        return [config, accessToken, url, method, body, headers, options];
+    }
+    async request(url, method = 'GET', body, headers = {}, dPoPOptions) {
         Log.debug(`Sending request to ${this.name}:\n${Log.syntaxColor({
-            request: { method, url, headers, body, dPoPOptions }
-        })}`);
+            request: {
+                method,
+                url,
+                dPoPOptions
+            }
+        })}${body || headers ? ` injecting: ${Log.syntaxColor({ headers, body })}` : ''}`);
         const response = await super.request(url, method, body, headers, dPoPOptions);
         Log.debug(`Received response from ${this.name}:\n${Log.syntaxColor({
             ok: response.ok,
@@ -66,7 +74,7 @@ export class Client extends OAuth2CLI.Client {
         })}`);
         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${typeof json === 'object' && json
             ? Log.syntaxColor(json)

package/package.json

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