oauth2-cli 1.0.2 → 1.1.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.1.0](https://github.com/battis/oauth2-cli/compare/oauth2-cli/1.0.3...oauth2-cli/1.1.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.0.3](https://github.com/battis/oauth2-cli/compare/oauth2-cli/1.0.2...oauth2-cli/1.0.3) (2026-03-04)
+
+
+### Bug Fixes
+
+* allow requestish.Body.ish request bodies as intended ([f12a2ce](https://github.com/battis/oauth2-cli/commit/f12a2ceb1c517f6fd90b33c8c71da7f987af640d))
+
 ## [1.0.2](https://github.com/battis/oauth2-cli/compare/oauth2-cli/1.0.1...oauth2-cli/1.0.2) (2026-03-03)
 
 

package/README.md

@@ -80,7 +80,7 @@ class Client {
   public async request(
     url: requestish.URL.ish,
     method = 'GET',
-    body?: OpenIDClient.FetchBody,
+    body?: requestish.Body.ish,
     headers: requestish.Headers.ish = {},
     dPoPOptions?: OpenIDClient.DPoPOptions
   ) {
@@ -108,7 +108,7 @@ class Client {
   >(
     url: requestish.URL.ish,
     method = 'GET',
-    body?: OpenIDClient.FetchBody,
+    body?: requestish.Body.ish,
     headers: requestish.Headers.ish = {},
     dPoPOptions?: OpenIDClient.DPoPOptions
   ) {

package/dist/Client.d.ts

@@ -2,7 +2,7 @@ import { JSONValue } from '@battis/typescript-tricks';
 import { Request } from 'express';
 import { EventEmitter } from 'node:events';
 import * as OpenIDClient from 'openid-client';
-import { Headers, URL } from 'requestish';
+import { Body, Headers, URL } from 'requestish';
 import { Credentials } from './Credentials.js';
 import { Injection } from './Injection.js';
 import * as Localhost from './Localhost/index.js';
@@ -114,17 +114,17 @@ export declare class Client<C extends Credentials = Credentials> extends EventEm
      *   paths relative to the `issuer` URL as well as absolute URLs
      * @param method Optional, defaults to `GET` unless otherwise specified
      * @param body Optional
-     * @param headers Optional
      * @param dPoPOptions Optional, see {@link OpenIDClient.DPoPOptions}
      */
-    request(url: URL.ish, method?: string, body?: OpenIDClient.FetchBody, headers?: Headers.ish, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<Response>;
+    request(url: URL.ish, method?: string, body?: Body.ish, headers?: Headers.ish, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<Response>;
+    protected prepareRequest(...args: Parameters<(typeof OpenIDClient)['fetchProtectedResource']>): Promise<Parameters<(typeof OpenIDClient)['fetchProtectedResource']>>;
     /** Parse a fetch response as JSON, typing it as J */
     private toJSON;
     /**
      * Returns the result of {@link request} as a parsed JSON object, optionally
      * typed as `J`
      */
-    requestJSON<J extends JSONValue = JSONValue>(url: URL.ish, method?: string, body?: OpenIDClient.FetchBody, headers?: Headers.ish, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<J>;
+    requestJSON<J extends JSONValue = JSONValue>(url: URL.ish, method?: string, body?: Body.ish, headers?: Headers.ish, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<J>;
     /**
      * Request a protected resource using the client's access token.
      *

package/dist/Client.js

@@ -251,7 +251,6 @@ export class Client extends EventEmitter {
      *   paths relative to the `issuer` URL as well as absolute URLs
      * @param method Optional, defaults to `GET` unless otherwise specified
      * @param body Optional
-     * @param headers Optional
      * @param dPoPOptions Optional, see {@link OpenIDClient.DPoPOptions}
      */
     async request(url, method = 'GET', body, headers = {}, dPoPOptions) {
@@ -274,7 +273,7 @@ export class Client extends EventEmitter {
                 });
             }
         }
-        const request = async () => await OpenIDClient.fetchProtectedResource(await this.getConfiguration(), (await this.getToken()).access_token, URL.from(URLSearchParams.appendTo(url, this.inject?.search || {})), method, body, Headers.merge(this.inject?.headers, headers), dPoPOptions);
+        const request = async () => await OpenIDClient.fetchProtectedResource(...(await this.prepareRequest(await this.getConfiguration(), (await this.getToken()).access_token, URL.from(URLSearchParams.appendTo(url, this.inject?.search || {})), method, await Body.from(body), Headers.merge(this.inject?.headers, headers), dPoPOptions)));
         try {
             return await request();
         }
@@ -288,6 +287,9 @@ export class Client extends EventEmitter {
             }
         }
     }
+    async prepareRequest(...args) {
+        return args;
+    }
     /** Parse a fetch response as JSON, typing it as J */
     async toJSON(response) {
         if (response.ok) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oauth2-cli",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Acquire API access tokens via OAuth 2.0 / OpenID Connect within CLI tools",
   "homepage": "https://github.com/battis/oauth2-cli/tree/main/packages/oauth2-cli#readme",
   "repository": {
@@ -23,8 +23,8 @@
     "open": "^11.0.0",
     "openid-client": "^6.8.2",
     "ora": "^9.3.0",
-    "requestish": "0.1.3",
-    "gcrtl": "0.1.7"
+    "gcrtl": "0.1.7",
+    "requestish": "0.1.5"
   },
   "devDependencies": {
     "@battis/descriptive-types": "^0.2.6",