Skip to content

Commit

Permalink
Merge branch 'feature/branched-off-develop-20240918' into feature/fro…
Browse files Browse the repository at this point in the history 
…m-funke

# Conflicts:
#	package.json
#	packages/did-auth-siop-adapter/lib/did/DidJWT.ts
#	packages/siop-oid4vp/lib/__tests__/AuthenticationRequest.request.spec.ts
#	packages/siop-oid4vp/lib/__tests__/functions/LanguageTagUtils.spec.ts
#	packages/siop-oid4vp/lib/__tests__/spec-compliance/jwtVCPresentationProfile.spec.ts
#	packages/siop-oid4vp/lib/authorization-request/AuthorizationRequest.ts
#	packages/siop-oid4vp/lib/helpers/LanguageTagUtils.ts
#	packages/siop-oid4vp/lib/helpers/Metadata.ts
#	packages/siop-oid4vp/lib/op/OP.ts
#	packages/siop-oid4vp/lib/rp/Opts.ts
#	packages/siop-oid4vp/package.json
#	pnpm-lock.yaml
  • Loading branch information
@sanderPostma
sanderPostma committed Sep 27, 2024
2 parents 304c131 + 6af9026 commit 78339f3
Show file tree
Hide file tree
Showing 14 changed files with 220 additions and 101 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"resolutions": {
"node-fetch": "2.6.12",
"@sphereon/ssi-types": "0.29.1-unstable.121",
"@sphereon/pex": "5.0.0-unstable.7"
"@sphereon/pex": "5.0.0-unstable.8"
},
"prettier": {
"endOfLine": "auto",
Expand Down
1 change: 1 addition & 0 deletions packages/client/lib/__tests__/SphereonE2E.spec.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,3 +170,4 @@ describe('ismapolis bug report #63, https://github.com/Sphereon-Opensource/OID4V
console.log(JSON.stringify(credentialResponse.credential));
});
});

6 changes: 3 additions & 3 deletions packages/did-auth-siop-adapter/lib/did/DidJWT.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ function assertIssSelfIssuedOrDid(payload: JWTPayload) {
}
}

export function getSubDidFromPayload(payload: JWTPayload, header?: JWTHeader): string {
export function getSubDidFromPayload(payload: JWTPayload, header?: JWTHeader): string | undefined {
assertIssSelfIssuedOrDid(payload)

if (isIssSelfIssued(payload)) {
Expand All @@ -258,9 +258,9 @@ export function getSubDidFromPayload(payload: JWTPayload, header?: JWTHeader): s

export function isIssSelfIssued(payload: JWTPayload): boolean {
return (
(payload.iss && payload.iss.includes(ResponseIss.SELF_ISSUED_V1)) ||
(payload.iss && (payload.iss.includes(ResponseIss.SELF_ISSUED_V1)) ||
(payload.iss && payload.iss.includes(ResponseIss.SELF_ISSUED_V2)) ||
payload.iss === payload.sub
payload.iss === payload.sub)
)
}

Expand Down
110 changes: 104 additions & 6 deletions packages/siop-oid4vp/lib/__tests__/AuthenticationRequest.request.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,26 @@ describe('create Request Uri should', () => {
response_type: 'id_token',
request_object_signing_alg_values_supported: [SigningAlgo.EDDSA, SigningAlgo.ES256],
redirect_uri: EXAMPLE_REDIRECT_URL,
claims: {
vp_token: {
presentation_definition: {
id: 'Ontario Health Insurance Plan',
name: 'Ontario',
purpose: 'purpose',
input_descriptors: [
{
id: 'Ontario Health Insurance Plan',
name: 'Ontario',
schema: [
{
uri: 'https://did.itsourweb.org:3000/smartcredential/Ontario-Health-Insurance-Plan',
},
],
},
],
} as IPresentationDefinition,
},
},
},
requestObject: {
jwtIssuer: {
Expand Down Expand Up @@ -167,6 +187,33 @@ describe('create Request Uri should', () => {
expect.assertions(4)
const opts: CreateAuthorizationRequestOpts = {
version: SupportedVersion.SIOPv2_ID1,
payload: {
client_id: WELL_KNOWN_OPENID_FEDERATION,
scope: 'test',
response_type: 'id_token',
request_object_signing_alg_values_supported: [SigningAlgo.ES256, SigningAlgo.EDDSA],
redirect_uri: EXAMPLE_REDIRECT_URL,
claims: {
vp_token: {
presentation_definition: {
id: 'Ontario Health Insurance Plan',
name: 'Ontario',
purpose: 'purpose',
input_descriptors: [
{
id: 'Ontario Health Insurance Plan',
name: 'Ontario',
schema: [
{
uri: 'https://did.itsourweb.org:3000/smartcredential/Ontario-Health-Insurance-Plan',
},
],
},
],
} as IPresentationDefinition,
},
},
},
requestObject: {
jwtIssuer: { method: 'did', didUrl: KID, alg: SigningAlgo.ES256 },
passBy: PassBy.REFERENCE,
Expand All @@ -184,6 +231,26 @@ describe('create Request Uri should', () => {
response_type: 'id_token',
request_object_signing_alg_values_supported: [SigningAlgo.ES256, SigningAlgo.EDDSA],
redirect_uri: EXAMPLE_REDIRECT_URL,
claims: {
vp_token: {
presentation_definition: {
id: 'Ontario Health Insurance Plan',
name: 'Ontario',
purpose: 'purpose',
input_descriptors: [
{
id: 'Ontario Health Insurance Plan',
name: 'Ontario',
schema: [
{
uri: 'https://did.itsourweb.org:3000/smartcredential/Ontario-Health-Insurance-Plan',
},
],
},
],
} as IPresentationDefinition,
},
},
},
},
clientMetadata: {
Expand Down Expand Up @@ -219,9 +286,37 @@ describe('create Request Uri should', () => {
})

it('return an url with an embedded token value', async () => {
expect.assertions(3)
//expect.assertions(3)
expect.assertions(2)
const opts: CreateAuthorizationRequestOpts = {
version: SupportedVersion.SIOPv2_ID1,
payload: {
client_id: WELL_KNOWN_OPENID_FEDERATION,
scope: 'test',
response_type: 'id_token',
request_object_signing_alg_values_supported: [SigningAlgo.ES256, SigningAlgo.EDDSA],
redirect_uri: EXAMPLE_REDIRECT_URL,
claims: {
vp_token: {
presentation_definition: {
id: 'Ontario Health Insurance Plan',
name: 'Ontario',
purpose: 'purpose',
input_descriptors: [
{
id: 'Ontario Health Insurance Plan',
name: 'Ontario',
schema: [
{
uri: 'https://did.itsourweb.org:3000/smartcredential/Ontario-Health-Insurance-Plan',
},
],
},
],
} as IPresentationDefinition,
},
},
},
requestObject: {
passBy: PassBy.VALUE,
jwtIssuer: {
Expand Down Expand Up @@ -511,30 +606,33 @@ describe('create Request JWT should', () => {
it('succeed when requesting with a valid PD', async () => {
const opts: CreateAuthorizationRequestOpts = {
version: SupportedVersion.SIOPv2_ID1,
/*payload: {
payload: {
client_id: WELL_KNOWN_OPENID_FEDERATION,
scope: 'test',
response_type: 'id_token',
request_object_signing_alg_values_supported: [SigningAlgo.ES256, SigningAlgo.EDDSA],
redirect_uri: EXAMPLE_REDIRECT_URL,
request_object_signing_alg_values_supported: [SigningAlgo.EDDSA, SigningAlgo.ES256],
claims: {
vp_token: {
presentation_definition: {
id: 'Insurance Plans',
id: 'Ontario Health Insurance Plan',
name: 'Ontario',
purpose: 'purpose',
input_descriptors: [
{
id: 'Ontario Health Insurance Plan',
name: 'Ontario',
schema: [
{
uri: 'https://did.itsourweb.org:3000/smartcredential/Ontario-Health-Insurance-Plan',
},
],
},
],
},
} as IPresentationDefinition,
},
},
},*/
},
requestObject: {
jwtIssuer: { method: 'did', didUrl: KID, alg: SigningAlgo.ES256K },
passBy: PassBy.REFERENCE,
Expand Down
23 changes: 3 additions & 20 deletions packages/siop-oid4vp/lib/__tests__/functions/LanguageTagUtils.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,24 +196,13 @@ describe('Language tag util should', () => {
const allLanguageTaggedProperties = LanguageTagUtils.getLanguageTaggedPropertiesMapped(source, languageTagEnabledFieldsNamesMapping)
expect(allLanguageTaggedProperties).toEqual(expectedTaggedFields)
})

it('throw error if source is null', async () => {
expect.assertions(1)
await expect(() => LanguageTagUtils.getAllLanguageTaggedProperties(null)).toThrowError()
})


it('throw error if list is null', async () => {
expect.assertions(1)
// eslint-disable-next-line @typescript-eslint/no-explicit-any
expect(() => LanguageTagUtils.getLanguageTaggedProperties({}, null as any)).toThrowError()
})

it('return empty if list is given but not effective', async () => {
expect.assertions(1)
const result = await LanguageTagUtils.getLanguageTaggedProperties({}, [])
expect(result).toEqual(new Map<string, string>)
})


it('throw error if list is given but no proper field names', async () => {
expect.assertions(1)
await expect(() => LanguageTagUtils.getLanguageTaggedProperties({}, [''])).toThrowError()
Expand All @@ -223,13 +212,7 @@ describe('Language tag util should', () => {
expect.assertions(1)
expect(LanguageTagUtils.getLanguageTaggedPropertiesMapped({}, null as any)).toEqual(new Map<string, string>())
})

it('return empty map if mapping is given but not effective', async () => {
expect.assertions(1)
const result = await LanguageTagUtils.getLanguageTaggedPropertiesMapped({}, new Map<string, string>())
expect(result).toEqual(new Map<string, string>)
})


it('throw error if mapping is given but no proper names', async () => {
expect.assertions(1)
const languageTagEnabledFieldsNamesMapping: Map<string, string> = new Map<string, string>()
Expand Down
2 changes: 1 addition & 1 deletion packages/siop-oid4vp/lib/__tests__/spec-compliance/jwtVCPresentationProfile.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ describe('RP using test vectors', () => {
).toBeTruthy()
})

it.skip('should decode auth response', async () => { // FIXME Skipped test because PEX is broken. It handles nested paths now which will have to be reverted
it.skip('should decode auth response', async () => { // FIXME pex is too lenient ATM
const authorizationResponse = await AuthorizationResponse.fromPayload(TestVectors.authorizationResponsePayload)
expect(authorizationResponse).toBeDefined()
expect(authorizationResponse.payload).toEqual(TestVectors.authorizationResponsePayload)
Expand Down
19 changes: 15 additions & 4 deletions packages/siop-oid4vp/lib/authorization-request/AuthorizationRequest.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import { CreateAuthorizationRequestOpts, VerifyAuthorizationRequestOpts } from '
export class AuthorizationRequest {
private readonly _requestObject?: RequestObject
private readonly _payload: AuthorizationRequestPayload
private readonly _options: CreateAuthorizationRequestOpts
private _uri: URI
private readonly _options: CreateAuthorizationRequestOpts | undefined
private _uri: URI | undefined

private constructor(payload: AuthorizationRequestPayload, requestObject?: RequestObject, opts?: CreateAuthorizationRequestOpts, uri?: URI) {
this._options = opts
Expand Down Expand Up @@ -66,6 +66,7 @@ export class AuthorizationRequest {

const requestObjectArg =
opts.requestObject.passBy !== PassBy.NONE ? (requestObject ? requestObject : await RequestObject.fromOpts(opts)) : undefined
// opts?.payload was removed before, but it's not clear atm why opts?.payload was removed
const requestPayload = opts?.payload ? await createAuthorizationRequestPayload(opts, requestObjectArg) : undefined
return new AuthorizationRequest(requestPayload, requestObjectArg, opts)
}
Expand Down Expand Up @@ -119,7 +120,10 @@ export class AuthorizationRequest {
let requestObjectPayload: RequestObjectPayload | undefined = undefined

const jwt = await this.requestObjectJwt()
const parsedJwt = jwt ? parseJWT(jwt) : undefined
let parsedJwt = undefined
if (jwt !== undefined) {
parsedJwt = parseJWT(jwt);
}

if (parsedJwt) {
requestObjectPayload = parsedJwt.payload as RequestObjectPayload
Expand Down Expand Up @@ -164,7 +168,10 @@ export class AuthorizationRequest {
)
assertValidRPRegistrationMedataPayload(registrationMetadataPayload)
// TODO: We need to do something with the metadata probably
} /*else { this makes test mattr.launchpad.spec.ts fail why was this check added?
return Promise.reject(Error(`could not fetch registrationMetadataPayload due to missing payload key ${registrationPropertyKey}`))
}
*/
// When the response_uri parameter is present, the redirect_uri Authorization Request parameter MUST NOT be present. If the redirect_uri Authorization Request parameter is present when the Response Mode is direct_post, the Wallet MUST return an invalid_request Authorization Response error.
let responseURIType: ResponseURIType
let responseURI: string
Expand Down Expand Up @@ -263,7 +270,11 @@ export class AuthorizationRequest {
}

public async mergedPayloads(): Promise<RequestObjectPayload> {
return { ...this.payload, ...(this.requestObject && (await this.requestObject.getPayload())) }
const requestObjectPayload = { ...this.payload, ...(this.requestObject && (await this.requestObject.getPayload())) }
if (requestObjectPayload.scope && typeof requestObjectPayload.scope !== 'string') { // test mattr.launchpad.spec.ts does not supply a scope value
throw new Error('Invalid scope value')
}
return requestObjectPayload as RequestObjectPayload
}

public async getPresentationDefinitions(version?: SupportedVersion): Promise<PresentationDefinitionWithLocation[] | undefined> {
Expand Down
2 changes: 1 addition & 1 deletion packages/siop-oid4vp/lib/authorization-response/PresentationExchange.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ export class PresentationExchange {
throw new Error(SIOPErrors.NO_PRESENTATION_SUBMISSION)
}

if (!evaluationResults.areRequiredCredentialsPresent || evaluationResults.errors || !evaluationResults.value) {
if (!evaluationResults.areRequiredCredentialsPresent || evaluationResults.errors.length > 0 || !evaluationResults.value) {
throw new Error(`message: ${SIOPErrors.COULD_NOT_FIND_VCS_MATCHING_PD}, details: ${JSON.stringify(evaluationResults.errors)}`)
}

Expand Down
Loading

0 comments on commit 78339f3

Please sign in to comment.