hanzoai/openid-client
2
0
Fork 0
mirror of https://github.com/hanzoai/openid-client.git synced 2026-09-24 17:01:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: refactor expected error names and causes

Browse Source
This commit is contained in:
Filip Skokan
2024-10-17 18:04:55 +02:00
parent a821075076
commit 941824c1d9
34 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conformance/modules/encrypted-idtoken-usingrsa15.ts
+1 -1
View File
@@ -3,5 +3,5 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_DECRYPTION_FAILED' },
{ code: 'ERR_JOSE_ALG_NOT_ALLOWED' },
{ code: 'ERR_JOSE_ALG_NOT_ALLOWED', name: 'JOSEAlgNotAllowed' },
)
conformance/modules/ensure-authorization-response-with-invalid-missing-state-fails.ts
+1 -1
View File
@@ -3,6 +3,6 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{ name: 'OperationProcessingError', message: /"state"/ },
{ message: /"state"/ },
{ useState: true },
)
conformance/modules/ensure-authorization-response-with-invalid-state-fails.ts
+1 -1
View File
@@ -3,5 +3,5 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{ name: 'OperationProcessingError', message: /"state"/ },
{ message: /"state"/ },
)
conformance/modules/ensure-jarm-signature-is-not-none.ts
-1
View File
@@ -4,7 +4,6 @@ rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{
name: 'OperationProcessingError',
message: 'unexpected JWT "alg" header parameter',
},
)
conformance/modules/ensure-jarm-with-expired-exp-fails.ts
-1
View File
@@ -4,7 +4,6 @@ rejects(
import.meta.url,
{ code: 'OAUTH_JWT_TIMESTAMP_CHECK_FAILED' },
{
name: 'OperationProcessingError',
message: /"exp"/,
},
)
conformance/modules/ensure-jarm-with-invalid-sig-fails.ts
-1
View File
@@ -6,7 +6,6 @@ rejects(
code: 'OAUTH_INVALID_RESPONSE',
},
{
name: 'OperationProcessingError',
message: /signature/,
},
)
conformance/modules/ensure-jarm-without-aud-fails.ts
-1
View File
@@ -4,7 +4,6 @@ rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{
name: 'OperationProcessingError',
message: /"aud"/,
},
)
conformance/modules/ensure-jarm-without-exp-fails.ts
-1
View File
@@ -4,7 +4,6 @@ rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{
name: 'OperationProcessingError',
message: /"exp"/,
},
)
conformance/modules/ensure-jarm-without-iss-fails.ts
-1
View File
@@ -4,7 +4,6 @@ rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{
name: 'OperationProcessingError',
message: /"iss"/,
},
)
conformance/modules/iat-is-week-in-past.ts
-1
View File
@@ -4,7 +4,6 @@ rejects(
import.meta.url,
{ code: 'OAUTH_JWT_TIMESTAMP_CHECK_FAILED' },
{
name: 'OperationProcessingError',
message: /"iat"/,
},
)
conformance/modules/invalid-alternate-alg.ts
-1
View File
@@ -4,7 +4,6 @@ rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{
name: 'OperationProcessingError',
message: 'unexpected JWT "alg" header parameter',
},
)
conformance/modules/invalid-authorization-response-iss.ts
+1 -1
View File
@@ -3,5 +3,5 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{ name: 'OperationProcessingError', message: /"iss"/ },
{ message: /"iss"/ },
)
conformance/modules/invalid-chash.ts
+1 -1
View File
@@ -3,5 +3,5 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_JWT_CLAIM_COMPARISON_FAILED' },
{ name: 'OperationProcessingError', message: /"c_hash"/ },
{ message: /"c_hash"/ },
)
conformance/modules/invalid-expired-exp.ts
-1
View File
@@ -4,7 +4,6 @@ rejects(
import.meta.url,
{ code: 'OAUTH_JWT_TIMESTAMP_CHECK_FAILED' },
{
name: 'OperationProcessingError',
message: /"exp"/,
},
)
conformance/modules/invalid-missing-aud.ts
+1 -1
View File
@@ -3,5 +3,5 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{ name: 'OperationProcessingError', message: /"aud"/ },
{ message: /"aud"/ },
)
conformance/modules/invalid-missing-exp.ts
+1 -1
View File
@@ -3,5 +3,5 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{ name: 'OperationProcessingError', message: /"exp"/ },
{ message: /"exp"/ },
)
conformance/modules/invalid-missing-iss.ts
+1 -1
View File
@@ -3,5 +3,5 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{ name: 'OperationProcessingError', message: /"iss"/ },
{ message: /"iss"/ },
)
conformance/modules/invalid-missing-nonce.ts
+1 -1
View File
@@ -3,6 +3,6 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{ name: 'OperationProcessingError', message: /"nonce"/ },
{ message: /"nonce"/ },
{ useNonce: true },
)
conformance/modules/invalid-missing-shash.ts
+1 -1
View File
@@ -3,6 +3,6 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{ name: 'OperationProcessingError', message: /"s_hash"/ },
{ message: /"s_hash"/ },
{ useState: true },
)
conformance/modules/invalid-nonce.ts
+1 -1
View File
@@ -3,5 +3,5 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_JWT_CLAIM_COMPARISON_FAILED' },
{ name: 'OperationProcessingError', message: /"nonce"/ },
{ message: /"nonce"/ },
)
conformance/modules/invalid-null-alg.ts
-1
View File
@@ -4,7 +4,6 @@ rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{
name: 'OperationProcessingError',
message: 'unexpected JWT "alg" header parameter',
},
)
conformance/modules/invalid-secondary-aud.ts
+1 -1
View File
@@ -3,5 +3,5 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_JWT_CLAIM_COMPARISON_FAILED' },
{ name: 'OperationProcessingError', message: /"aud"/ },
{ message: /"aud"/ },
)
conformance/modules/invalid-shash.ts
+1 -1
View File
@@ -3,6 +3,6 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_JWT_CLAIM_COMPARISON_FAILED' },
{ name: 'OperationProcessingError', message: /"s_hash"/ },
{ message: /"s_hash"/ },
{ useState: true },
)
conformance/modules/invalid-signature.ts
-1
View File
@@ -6,7 +6,6 @@ if (nonRepudiation(plan)) {
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{
name: 'OperationProcessingError',
message: /signature/,
},
)
conformance/modules/kid-absent-multiple-jwks.ts
+1 -6
View File
@@ -5,12 +5,7 @@ for (const module of modules(import.meta.url)) {
module.variant?.response_type?.includes('id_token') === true ||
variant.response_type?.includes('id_token') === true
) {
test.serial(
rejects(flow()),
module,
{ name: 'ClientError' },
{ name: 'OperationProcessingError' },
)
test.serial(rejects(flow()), module, { code: 'OAUTH_KEY_SELECTION_FAILED' })
} else {
test.serial(flow(), module)
}
conformance/modules/missing-aud.ts
+1 -1
View File
@@ -3,5 +3,5 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{ name: 'OperationProcessingError', message: /"aud"/ },
{ message: /"aud"/ },
)
conformance/modules/missing-chash.ts
+1 -1
View File
@@ -3,5 +3,5 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{ name: 'OperationProcessingError', message: /"c_hash"/ },
{ message: /"c_hash"/ },
)
conformance/modules/missing-iat.ts
+1 -1
View File
@@ -3,5 +3,5 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{ name: 'OperationProcessingError', message: /"iat"/ },
{ message: /"iat"/ },
)
conformance/modules/missing-sub.ts
+1 -1
View File
@@ -3,5 +3,5 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{ name: 'OperationProcessingError', message: /"sub"/ },
{ message: /"sub"/ },
)
conformance/modules/nonce-invalid.ts
+1 -1
View File
@@ -3,5 +3,5 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_JWT_CLAIM_COMPARISON_FAILED' },
{ name: 'OperationProcessingError', message: /"nonce"/ },
{ message: /"nonce"/ },
)
conformance/modules/remove-authorization-response-iss.ts
-1
View File
@@ -4,7 +4,6 @@ rejects(
import.meta.url,
{ code: 'OAUTH_INVALID_RESPONSE' },
{
name: 'OperationProcessingError',
message: /"iss"/,
},
)
conformance/modules/run.ts
+2 -2
View File
@@ -14,8 +14,8 @@ export function skippable(metaUrl: string, options?: runner.MacroOptions) {
export function rejects(
metaUrl: string,
expected: runner.CodeErrorAssertion | runner.NameErrorAssertion,
cause?: runner.CodeErrorAssertion | runner.NameErrorAssertion,
expected: runner.CodeErrorAssertion | runner.MessageErrorAssertion,
cause?: runner.CodeErrorAssertion | runner.MessageErrorAssertion,
options?: runner.MacroOptions,
) {
for (const module of runner.modules(metaUrl)) {
conformance/modules/userinfo-invalid-sub.ts
+1 -1
View File
@@ -3,5 +3,5 @@ import { rejects } from './run.js'
rejects(
import.meta.url,
{ code: 'OAUTH_JSON_ATTRIBUTE_COMPARISON_FAILED' },
{ name: 'OperationProcessingError', message: /"sub"/ },
{ message: /"sub"/ },
)
conformance/runner.ts
+6 -2
View File
@@ -491,6 +491,8 @@ export type CodeErrorAssertion = Partial<ErrorAssertion> &
Pick<ErrorAssertion, 'code'>
export type NameErrorAssertion = Partial<ErrorAssertion> &
Pick<ErrorAssertion, 'name'>
export type MessageErrorAssertion = Partial<ErrorAssertion> &
Pick<ErrorAssertion, 'message'>
function assertError(
t: ExecutionContext,
@@ -520,17 +522,19 @@ export const rejects = (
async exec(
t,
module: ModulePrescription,
expected: CodeErrorAssertion | NameErrorAssertion,
cause?: CodeErrorAssertion | NameErrorAssertion,
expected: CodeErrorAssertion | MessageErrorAssertion,
cause?: CodeErrorAssertion | MessageErrorAssertion,
) {
const err = await t.throwsAsync(
() => macro.exec(t, { ...module, skipLogTestFinished: true }) as any,
)
t.log('rejected with', inspect(err, { depth: Infinity }))
expected.name ||= 'ClientError'
assertError(t, err, expected)
if (cause) {
cause.name ||= 'OperationProcessingError'
if (!(err.cause instanceof Error)) {
t.fail('expected and Error instance')
}