refactor: more descriptive "not a conform" message

panva · Nov 15, 2024 · 0295887 · 0295887
1 parent ec7a309
commit 0295887
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 18 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -1301,7 +1301,7 @@ export async function processDiscoveryResponse(
 
   if (response.status !== 200) {
     throw OPE(
-      '"response" is not a conform Authorization Server Metadata response',
+      '"response" is not a conform Authorization Server Metadata response (unexpected HTTP status code)',
       RESPONSE_IS_NOT_CONFORM,
       response,
     )
@@ -2572,7 +2572,7 @@ export async function processPushedAuthorizationResponse(
       })
     }
     throw OPE(
-      '"response" is not a conform Pushed Authorization Request Endpoint response',
+      '"response" is not a conform Pushed Authorization Request Endpoint response (unexpected HTTP status code)',
       RESPONSE_IS_NOT_CONFORM,
       response,
     )
@@ -3015,7 +3015,7 @@ export async function processUserInfoResponse(
 
   if (response.status !== 200) {
     throw OPE(
-      '"response" is not a conform UserInfo Endpoint response',
+      '"response" is not a conform UserInfo Endpoint response (unexpected HTTP status code)',
       RESPONSE_IS_NOT_CONFORM,
       response,
     )
@@ -3301,7 +3301,7 @@ async function processGenericAccessTokenResponse(
       })
     }
     throw OPE(
-      '"response" is not a conform Token Endpoint response',
+      '"response" is not a conform Token Endpoint response (unexpected HTTP status code)',
       RESPONSE_IS_NOT_CONFORM,
       response,
     )
@@ -4215,7 +4215,7 @@ export async function processRevocationResponse(response: Response): Promise<und
       })
     }
     throw OPE(
-      '"response" is not a conform Revocation Endpoint response',
+      '"response" is not a conform Revocation Endpoint response (unexpected HTTP status code)',
       RESPONSE_IS_NOT_CONFORM,
       response,
     )
@@ -4368,7 +4368,7 @@ export async function processIntrospectionResponse(
       })
     }
     throw OPE(
-      '"response" is not a conform Introspection Endpoint response',
+      '"response" is not a conform Introspection Endpoint response (unexpected HTTP status code)',
       RESPONSE_IS_NOT_CONFORM,
       response,
     )
@@ -4455,7 +4455,7 @@ async function processJwksResponse(response: Response): Promise<JWKS> {
 
   if (response.status !== 200) {
     throw OPE(
-      '"response" is not a conform JSON Web Key Set response',
+      '"response" is not a conform JSON Web Key Set response (unexpected HTTP status code)',
       RESPONSE_IS_NOT_CONFORM,
       response,
     )
@@ -5490,7 +5490,7 @@ export async function processDeviceAuthorizationResponse(
       })
     }
     throw OPE(
-      '"response" is not a conform Device Authorization Endpoint response',
+      '"response" is not a conform Device Authorization Endpoint response (unexpected HTTP status code)',
       RESPONSE_IS_NOT_CONFORM,
       response,
     )

diff --git a/test/authorization_code.test.ts b/test/authorization_code.test.ts
@@ -267,7 +267,7 @@ test('processAuthorizationCodeResponse()', async (t) => {
   await t.throwsAsync(
     lib.processAuthorizationCodeResponse(issuer, client, getResponse('', { status: 404 })),
     {
-      message: '"response" is not a conform Token Endpoint response',
+      message: '"response" is not a conform Token Endpoint response (unexpected HTTP status code)',
     },
   )
   await t.throwsAsync(lib.processAuthorizationCodeResponse(issuer, client, getResponse('{"')), {

diff --git a/test/client_credentials.test.ts b/test/client_credentials.test.ts
@@ -178,7 +178,7 @@ test('processClientCredentialsResponse()', async (t) => {
   await t.throwsAsync(
     lib.processClientCredentialsResponse(issuer, client, getResponse('', { status: 404 })),
     {
-      message: '"response" is not a conform Token Endpoint response',
+      message: '"response" is not a conform Token Endpoint response (unexpected HTTP status code)',
     },
   )
   await t.throwsAsync(lib.processClientCredentialsResponse(issuer, client, getResponse('{"')), {

diff --git a/test/device_flow.test.ts b/test/device_flow.test.ts
@@ -118,7 +118,8 @@ test('processDeviceAuthorizationResponse()', async (t) => {
   await t.throwsAsync(
     lib.processDeviceAuthorizationResponse(issuer, client, getResponse('', { status: 404 })),
     {
-      message: '"response" is not a conform Device Authorization Endpoint response',
+      message:
+        '"response" is not a conform Device Authorization Endpoint response (unexpected HTTP status code)',
     },
   )
   await t.throwsAsync(
@@ -384,7 +385,7 @@ test('processDeviceCodeResponse() without ID Tokens', async (t) => {
   await t.throwsAsync(
     lib.processDeviceCodeResponse(issuer, client, getResponse('', { status: 404 })),
     {
-      message: '"response" is not a conform Token Endpoint response',
+      message: '"response" is not a conform Token Endpoint response (unexpected HTTP status code)',
     },
   )
   await t.throwsAsync(lib.processDeviceCodeResponse(issuer, client, getResponse('{"')), {

diff --git a/test/discovery.test.ts b/test/discovery.test.ts
@@ -106,7 +106,8 @@ test('processDiscoveryResponse()', async (t) => {
     message: '"expectedIssuer" must be an instance of URL',
   })
   await t.throwsAsync(lib.processDiscoveryResponse(expected, getResponse('', { status: 404 })), {
-    message: '"response" is not a conform Authorization Server Metadata response',
+    message:
+      '"response" is not a conform Authorization Server Metadata response (unexpected HTTP status code)',
   })
   await t.throwsAsync(lib.processDiscoveryResponse(expected, getResponse('{"')), {
     message: 'failed to parse "response" body as JSON',

diff --git a/test/introspection.test.ts b/test/introspection.test.ts
@@ -215,7 +215,8 @@ test('processIntrospectionResponse()', async (t) => {
   await t.throwsAsync(
     lib.processIntrospectionResponse(issuer, client, getResponse('', { status: 404 })),
     {
-      message: '"response" is not a conform Introspection Endpoint response',
+      message:
+        '"response" is not a conform Introspection Endpoint response (unexpected HTTP status code)',
     },
   )
   await t.throwsAsync(lib.processIntrospectionResponse(issuer, client, getResponse('{"')), {

diff --git a/test/par.test.ts b/test/par.test.ts
@@ -161,7 +161,8 @@ test('processPushedAuthorizationResponse()', async (t) => {
   await t.throwsAsync(
     lib.processPushedAuthorizationResponse(issuer, client, getResponse('', { status: 404 })),
     {
-      message: '"response" is not a conform Pushed Authorization Request Endpoint response',
+      message:
+        '"response" is not a conform Pushed Authorization Request Endpoint response (unexpected HTTP status code)',
     },
   )
   await t.throwsAsync(

diff --git a/test/refresh_token.test.ts b/test/refresh_token.test.ts
@@ -162,7 +162,7 @@ test('processRefreshTokenResponse() without ID Tokens', async (t) => {
   await t.throwsAsync(
     lib.processRefreshTokenResponse(issuer, client, getResponse('', { status: 404 })),
     {
-      message: '"response" is not a conform Token Endpoint response',
+      message: '"response" is not a conform Token Endpoint response (unexpected HTTP status code)',
     },
   )
   await t.throwsAsync(lib.processRefreshTokenResponse(issuer, client, getResponse('{"')), {

diff --git a/test/revocation.test.ts b/test/revocation.test.ts
@@ -126,7 +126,8 @@ test('processRevocationResponse()', async (t) => {
     message: '"response" must be an instance of Response',
   })
   await t.throwsAsync(lib.processRevocationResponse(getResponse('', { status: 404 })), {
-    message: '"response" is not a conform Revocation Endpoint response',
+    message:
+      '"response" is not a conform Revocation Endpoint response (unexpected HTTP status code)',
   })
 
   t.is(await lib.processRevocationResponse(getResponse('')), undefined)

diff --git a/test/userinfo.test.ts b/test/userinfo.test.ts
@@ -113,7 +113,8 @@ test('processUserInfoResponse() - json', async (t) => {
       getResponse(JSON.stringify({ sub: 'urn:example:subject' }), { status: 404 }),
     ),
     {
-      message: '"response" is not a conform UserInfo Endpoint response',
+      message:
+        '"response" is not a conform UserInfo Endpoint response (unexpected HTTP status code)',
     },
   )
   await t.throwsAsync(