oauth2-cli 2.0.1 → 2.0.2

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.
 
+## [2.0.2](https://github.com/battis/oauth2-cli/compare/oauth2-cli/2.0.1...oauth2-cli/2.0.2) (2026-03-27)
+
+
+### Bug Fixes
+
+* catch bad response earlier ([a47d977](https://github.com/battis/oauth2-cli/commit/a47d9774194c5cdda1c03972c7183837c88d20c1))
+
 ## [2.0.1](https://github.com/battis/oauth2-cli/compare/oauth2-cli/2.0.0...oauth2-cli/2.0.1) (2026-03-27)
 
 

package/dist/Client.d.ts

@@ -124,6 +124,7 @@ export declare class Client<C extends Credentials = Credentials> extends EventEm
      * server
      */
     protected prepareRequest(...args: PreparedRequest): Promise<PreparedRequest>;
+    private throwNotOkResponse;
     /**
      * Available hook to manipulate the complete response from the server before
      * processing it

package/dist/Client.js

@@ -256,17 +256,31 @@ export class Client extends EventEmitter {
     async requestRaw(url, method = 'GET', body, headers = {}, dPoPOptions) {
         url = new URL(url, this.base_url || this.credentials.issuer);
         url = requestish.URL.from(requestish.URLSearchParams.appendTo(url, requestish.URLSearchParams.merge(this.inject?.search, url.searchParams)));
-        const request = async () => await OpenIDClient.fetchProtectedResource(...(await this.prepareRequest(await this.getConfiguration(), (await this.getToken()).access_token, url, method, await requestish.Body.from(body), requestish.Headers.merge(this.inject?.headers, headers), dPoPOptions)));
+        headers = requestish.Headers.merge(this.inject?.headers, headers);
+        body = await requestish.Body.from(body);
+        const request = async () => await OpenIDClient.fetchProtectedResource(...(await this.prepareRequest(await this.getConfiguration(), (await this.getToken()).access_token, url, method, body, headers, dPoPOptions)));
         try {
             return this.prepareResponse(await request());
         }
-        catch (cause) {
-            if (Error.isError(cause) && 'status' in cause && cause.status === 401) {
+        catch (error) {
+            if (Error.isError(error) && 'status' in error && error.status === 401) {
                 await this.authorize();
                 return this.prepareResponse(await request());
             }
             else {
-                throw new Error(`${this.name} request failed`, { cause });
+                throw new Error(`${this.name} request failed`, {
+                    cause: {
+                        request: {
+                            method,
+                            url,
+                            headers: headers
+                                ? Object.fromEntries(headers.entries())
+                                : undefined,
+                            body
+                        },
+                        error
+                    }
+                });
             }
         }
     }
@@ -277,11 +291,27 @@ export class Client extends EventEmitter {
     async prepareRequest(...args) {
         return args;
     }
+    async throwNotOkResponse(response) {
+        throw new Error(`${this.name} response status not ok`, {
+            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
+                }
+            }
+        });
+    }
     /**
      * Available hook to manipulate the complete response from the server before
      * processing it
      */
     async prepareResponse(response) {
+        if (!response.ok) {
+            await this.throwNotOkResponse(response);
+        }
         return response;
     }
     /**
@@ -310,17 +340,7 @@ export class Client extends EventEmitter {
             }
         }
         else {
-            throw new Error(`${this.name} response status not ok`, {
-                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
-                    }
-                }
-            });
+            await this.throwNotOkResponse(response);
         }
     }
     /**
@@ -331,23 +351,8 @@ export class Client extends EventEmitter {
      *   `PaginatedCollection<T>`
      */
     async request(url, method = 'GET', body, headers = {}, dPoPOptions) {
-        try {
-            const response = await this.requestRaw(url, method, body, headers, dPoPOptions);
-            return await this.processResponse(response);
-        }
-        catch (error) {
-            throw new Error(`Bad response from ${this.name}`, {
-                cause: {
-                    request: {
-                        method,
-                        url: requestish.URL.toString(url),
-                        headers: Object.fromEntries(requestish.Headers.from(headers).entries()),
-                        body
-                    },
-                    error
-                }
-            });
-        }
+        const response = await this.requestRaw(url, method, body, headers, dPoPOptions);
+        return await this.processResponse(response);
     }
     /**
      * Request a protected resource using the client's access token.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oauth2-cli",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "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",
-    "gcrtl": "0.1.12",
-    "requestish": "0.1.12"
+    "requestish": "0.1.12",
+    "gcrtl": "0.1.12"
   },
   "devDependencies": {
     "@battis/typescript-tricks": "^0.8.1",