oauth2-cli 1.1.5 → 1.2.1

package/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 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.1](https://github.com/battis/oauth2-cli/compare/oauth2-cli/1.2.0...oauth2-cli/1.2.1) (2026-03-08)
+
+
+### Bug Fixes
+
+* still more detail on JSON error ([d9d28ce](https://github.com/battis/oauth2-cli/commit/d9d28ce8145a5c29288f28317041e8545b232a1e))
+
+## [1.2.0](https://github.com/battis/oauth2-cli/compare/oauth2-cli/1.1.5...oauth2-cli/1.2.0) (2026-03-08)
+
+
+### Features
+
+* add prepareResponse hook ([c1ada04](https://github.com/battis/oauth2-cli/commit/c1ada04c20f08a5dac11414b44ea188f4aafe76d))
+
+
+### Bug Fixes
+
+* more detailed error response on JSON parse fail ([b8c414d](https://github.com/battis/oauth2-cli/commit/b8c414d650a7acfce8d2d297639fbecddd5f2382))
+
 ## [1.1.5](https://github.com/battis/oauth2-cli/compare/oauth2-cli/1.1.4...oauth2-cli/1.1.5) (2026-03-07)
 
 Bump to requestish@0.1.10

package/dist/Client.d.ts

@@ -8,6 +8,7 @@ import { Injection } from './Injection.js';
 import * as Localhost from './Localhost/index.js';
 import * as Options from './Options.js';
 import * as Token from './Token/index.js';
+export type PreparedRequest = Parameters<(typeof OpenIDClient)['fetchProtectedResource']>;
 /**
  * Wrap {@link https://www.npmjs.com/package/openid-client openid-client} in a
  * class instance specific to a particular OAuth/OpenID server credential-set,
@@ -117,7 +118,16 @@ export declare class Client<C extends Credentials = Credentials> extends EventEm
      * @param dPoPOptions Optional, see {@link OpenIDClient.DPoPOptions}
      */
     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']>>;
+    /**
+     * Available hook to manipulate a fully-prepared request before sending to the
+     * server
+     */
+    protected prepareRequest(...args: PreparedRequest): Promise<PreparedRequest>;
+    /**
+     * Available hook to manipulate the complete response from the server before
+     * processing it
+     */
+    protected prepareResponse(response: Response): Promise<Response>;
     /** Parse a fetch response as JSON, typing it as J */
     private toJSON;
     /**

package/dist/Client.js

@@ -2,6 +2,7 @@ import { Mutex } from 'async-mutex';
 import * as gcrtl from 'gcrtl';
 import { EventEmitter } from 'node:events';
 import path from 'node:path';
+import { text } from 'node:stream/consumers';
 import * as OpenIDClient from 'openid-client';
 import { Body, Headers, URL, URLSearchParams } from 'requestish';
 import * as Localhost from './Localhost/index.js';
@@ -275,21 +276,32 @@ export class Client extends EventEmitter {
         }
         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();
+            return this.prepareResponse(await request());
         }
         catch (cause) {
             if (Error.isError(cause) && 'status' in cause && cause.status === 401) {
                 await this.authorize();
-                return await request();
+                return this.prepareResponse(await request());
             }
             else {
                 throw new Error(`${this.name} request failed`, { cause });
             }
         }
     }
+    /**
+     * Available hook to manipulate a fully-prepared request before sending to the
+     * server
+     */
     async prepareRequest(...args) {
         return args;
     }
+    /**
+     * Available hook to manipulate the complete response from the server before
+     * processing it
+     */
+    async prepareResponse(response) {
+        return response;
+    }
     /** Parse a fetch response as JSON, typing it as J */
     async toJSON(response) {
         if (response.ok) {
@@ -304,7 +316,15 @@ export class Client extends EventEmitter {
         }
         else {
             throw new Error(`${this.name} response status not ok`, {
-                cause: { response }
+                cause: {
+                    response: {
+                        ok: response.ok,
+                        status: response.status,
+                        statusText: response.statusText,
+                        headers: Object.fromEntries(response.headers.entries()),
+                        body: response.body ? `${await text(response.body)}` : undefined
+                    }
+                }
             });
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oauth2-cli",
-  "version": "1.1.5",
+  "version": "1.2.1",
   "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.10",
-    "gcrtl": "0.1.11"
+    "gcrtl": "0.1.11",
+    "requestish": "0.1.10"
   },
   "devDependencies": {
     "@battis/descriptive-types": "^0.2.6",