SPHEREON-1157: include presentationSubmission in auth response, inclu…

…de nonce in AuthorizationResponsePayload
Sphereon-Opensource · Feb 28, 2024 · c73f4f7 · c73f4f7
1 parent 1a699a3
commit c73f4f7
Show file tree

Hide file tree

Showing 112 changed files with 6 additions and 1 deletion.
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
diff --git a/.gitignore b/.gitignore
diff --git a/.prettierignore b/.prettierignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/docs/auth-flow.md b/docs/auth-flow.md
diff --git a/docs/auth-flow.puml b/docs/auth-flow.puml
diff --git a/docs/didjwt-class-diagram.md b/docs/didjwt-class-diagram.md
diff --git a/docs/eosio-dids-testnet.md b/docs/eosio-dids-testnet.md
diff --git a/docs/gimly-logo.png b/docs/gimly-logo.png
diff --git a/docs/presentation-exchange.puml b/docs/presentation-exchange.puml
diff --git a/docs/services-class-diagram.md b/docs/services-class-diagram.md
diff --git a/docs/services-class-diagram.svg b/docs/services-class-diagram.svg
diff --git a/docs/walk-through.md b/docs/walk-through.md
diff --git a/generator/schemaGenerator.ts b/generator/schemaGenerator.ts
diff --git a/jest.config.cjs b/jest.config.cjs
diff --git a/package.json b/package.json
diff --git a/src/authorization-request/AuthorizationRequest.ts b/src/authorization-request/AuthorizationRequest.ts
diff --git a/src/authorization-request/Opts.ts b/src/authorization-request/Opts.ts
diff --git a/src/authorization-request/Payload.ts b/src/authorization-request/Payload.ts
diff --git a/src/authorization-request/RequestRegistration.ts b/src/authorization-request/RequestRegistration.ts
diff --git a/src/authorization-request/URI.ts b/src/authorization-request/URI.ts
diff --git a/src/authorization-request/index.ts b/src/authorization-request/index.ts
diff --git a/src/authorization-request/types.ts b/src/authorization-request/types.ts
diff --git a/src/authorization-response/AuthorizationResponse.ts b/src/authorization-response/AuthorizationResponse.ts
@@ -120,7 +120,9 @@ export class AuthorizationResponse {
         presentationDefinitions,
         presentations: wrappedPresentations,
         verificationCallback: verifyOpts.verification.presentationVerificationCallback,
-        opts: { ...responseOpts.presentationExchange, hasher: verifyOpts.hasher },
+        opts: { ...responseOpts.presentationExchange,
+          presentationSubmission: (responseOpts.presentationExchange.presentationSubmission ?? authorizationResponsePayload.presentation_submission),
+          hasher: verifyOpts.hasher },
       });
     }
 

diff --git a/src/authorization-response/OpenID4VP.ts b/src/authorization-response/OpenID4VP.ts
diff --git a/src/authorization-response/Opts.ts b/src/authorization-response/Opts.ts
diff --git a/src/authorization-response/Payload.ts b/src/authorization-response/Payload.ts
@@ -19,11 +19,13 @@ export const createResponsePayload = async (
 
   // If state was in request, it must be in response
   const state: string | undefined = await authorizationRequest.getMergedProperty('state');
+  const payload = await authorizationRequest.requestObject.getPayload();
 
   const responsePayload: AuthorizationResponsePayload = {
     ...(responseOpts.accessToken && { access_token: responseOpts.accessToken }),
     ...(responseOpts.tokenType && { token_type: responseOpts.tokenType }),
     ...(responseOpts.refreshToken && { refresh_token: responseOpts.refreshToken }),
+    ...(payload?.nonce && { nonce: payload.nonce}),
     expires_in: responseOpts.expiresIn || 3600,
     state,
   };

diff --git a/src/authorization-response/PresentationExchange.ts b/src/authorization-response/PresentationExchange.ts
diff --git a/src/authorization-response/ResponseRegistration.ts b/src/authorization-response/ResponseRegistration.ts
diff --git a/src/authorization-response/index.ts b/src/authorization-response/index.ts
diff --git a/src/authorization-response/types.ts b/src/authorization-response/types.ts
diff --git a/src/did/DIDResolution.ts b/src/did/DIDResolution.ts
diff --git a/src/did/DidJWT.ts b/src/did/DidJWT.ts
diff --git a/src/did/LinkedDomainValidations.ts b/src/did/LinkedDomainValidations.ts
diff --git a/src/did/index.ts b/src/did/index.ts
diff --git a/src/helpers/Encodings.ts b/src/helpers/Encodings.ts
diff --git a/src/helpers/HttpUtils.ts b/src/helpers/HttpUtils.ts
diff --git a/src/helpers/Keys.ts b/src/helpers/Keys.ts
diff --git a/src/helpers/LanguageTagUtils.ts b/src/helpers/LanguageTagUtils.ts
diff --git a/src/helpers/Metadata.ts b/src/helpers/Metadata.ts
diff --git a/src/helpers/ObjectUtils.ts b/src/helpers/ObjectUtils.ts
diff --git a/src/helpers/Revocation.ts b/src/helpers/Revocation.ts
diff --git a/src/helpers/SIOPSpecVersion.ts b/src/helpers/SIOPSpecVersion.ts
diff --git a/src/helpers/State.ts b/src/helpers/State.ts
diff --git a/src/helpers/index.ts b/src/helpers/index.ts
diff --git a/src/id-token/IDToken.ts b/src/id-token/IDToken.ts
diff --git a/src/id-token/Payload.ts b/src/id-token/Payload.ts
diff --git a/src/id-token/index.ts b/src/id-token/index.ts
diff --git a/src/index.ts b/src/index.ts
diff --git a/src/op/OP.ts b/src/op/OP.ts
diff --git a/src/op/OPBuilder.ts b/src/op/OPBuilder.ts
diff --git a/src/op/Opts.ts b/src/op/Opts.ts
diff --git a/src/op/index.ts b/src/op/index.ts
diff --git a/src/request-object/Opts.ts b/src/request-object/Opts.ts
diff --git a/src/request-object/Payload.ts b/src/request-object/Payload.ts
diff --git a/src/request-object/RequestObject.ts b/src/request-object/RequestObject.ts
diff --git a/src/request-object/index.ts b/src/request-object/index.ts
diff --git a/src/request-object/types.ts b/src/request-object/types.ts
diff --git a/src/rp/InMemoryRPSessionManager.ts b/src/rp/InMemoryRPSessionManager.ts
diff --git a/src/rp/Opts.ts b/src/rp/Opts.ts
diff --git a/src/rp/RP.ts b/src/rp/RP.ts
diff --git a/src/rp/RPBuilder.ts b/src/rp/RPBuilder.ts
diff --git a/src/rp/index.ts b/src/rp/index.ts
diff --git a/src/rp/types.ts b/src/rp/types.ts
diff --git a/src/schemas/AuthorizationRequestPayloadVD11.schema.ts b/src/schemas/AuthorizationRequestPayloadVD11.schema.ts
diff --git a/src/schemas/AuthorizationRequestPayloadVD12OID4VPD18.schema.ts b/src/schemas/AuthorizationRequestPayloadVD12OID4VPD18.schema.ts
diff --git a/src/schemas/AuthorizationRequestPayloadVID1.schema.ts b/src/schemas/AuthorizationRequestPayloadVID1.schema.ts
diff --git a/src/schemas/AuthorizationResponseOpts.schema.ts b/src/schemas/AuthorizationResponseOpts.schema.ts
diff --git a/src/schemas/DiscoveryMetadataPayload.schema.ts b/src/schemas/DiscoveryMetadataPayload.schema.ts
diff --git a/src/schemas/RPRegistrationMetadataPayload.schema.ts b/src/schemas/RPRegistrationMetadataPayload.schema.ts
diff --git a/src/schemas/index.ts b/src/schemas/index.ts
diff --git a/src/schemas/validation/index.ts b/src/schemas/validation/index.ts
diff --git a/src/types/Errors.ts b/src/types/Errors.ts
diff --git a/src/types/Events.ts b/src/types/Events.ts
diff --git a/src/types/JWT.types.ts b/src/types/JWT.types.ts
diff --git a/src/types/SIOP.types.ts b/src/types/SIOP.types.ts
@@ -155,6 +155,7 @@ export interface AuthorizationResponsePayload {
   refresh_token?: string;
   expires_in?: number;
   state?: string;
+  nonce?: string;
   id_token?: string;
   vp_token?: Array<W3CVerifiablePresentation | CompactSdJwtVc> | W3CVerifiablePresentation | CompactSdJwtVc;
   presentation_submission?: PresentationSubmission;

diff --git a/src/types/SSI.types.ts b/src/types/SSI.types.ts
diff --git a/src/types/SessionManager.ts b/src/types/SessionManager.ts
diff --git a/src/types/index.ts b/src/types/index.ts
diff --git a/test/AuthenticationRequest.request.spec.ts b/test/AuthenticationRequest.request.spec.ts
diff --git a/test/AuthenticationRequest.verify.spec.ts b/test/AuthenticationRequest.verify.spec.ts
diff --git a/test/AuthenticationResponse.response.spec.ts b/test/AuthenticationResponse.response.spec.ts
diff --git a/test/AuthenticationResponse.verify.spec.ts b/test/AuthenticationResponse.verify.spec.ts
diff --git a/test/DocumentLoader.ts b/test/DocumentLoader.ts
diff --git a/test/HttpUtils.fetch.spec.ts b/test/HttpUtils.fetch.spec.ts
diff --git a/test/IT.spec.ts b/test/IT.spec.ts
diff --git a/test/OP.request.spec.ts b/test/OP.request.spec.ts
diff --git a/test/PresentationExchange.spec.ts b/test/PresentationExchange.spec.ts
diff --git a/test/RP.request.spec.ts b/test/RP.request.spec.ts
diff --git a/test/SdJwt.spec.ts b/test/SdJwt.spec.ts
diff --git a/test/TestUtils.ts b/test/TestUtils.ts
diff --git a/test/data/mockedData.ts b/test/data/mockedData.ts
diff --git a/test/e2e/EBSI.spec.ts b/test/e2e/EBSI.spec.ts
diff --git a/test/e2e/mattr.launchpad.spec.ts b/test/e2e/mattr.launchpad.spec.ts
diff --git a/test/functions/DidJWT.spec.ts b/test/functions/DidJWT.spec.ts
diff --git a/test/functions/DidSiopMetadata.spec.ts b/test/functions/DidSiopMetadata.spec.ts
diff --git a/test/functions/Encodings.spec.ts b/test/functions/Encodings.spec.ts
diff --git a/test/functions/LanguageTagUtils.spec.ts b/test/functions/LanguageTagUtils.spec.ts
diff --git a/test/functions/LinkedDomainValidations.spec.ts b/test/functions/LinkedDomainValidations.spec.ts
diff --git a/test/interop/EBSI/EBSI.spec.ts b/test/interop/EBSI/EBSI.spec.ts
diff --git a/test/interop/auth0/auth0.spec.ts b/test/interop/auth0/auth0.spec.ts
diff --git a/test/interop/auth0/fixtures.ts b/test/interop/auth0/fixtures.ts
diff --git a/test/interop/mattr/fixtures.ts b/test/interop/mattr/fixtures.ts
diff --git a/test/modules.d.ts b/test/modules.d.ts
diff --git a/test/regressions/ClientIdIsObject.spec.ts b/test/regressions/ClientIdIsObject.spec.ts
diff --git a/test/spec-compliance/jwtVCPresentationProfile.spec.ts b/test/spec-compliance/jwtVCPresentationProfile.spec.ts
diff --git a/tsconfig.build.json b/tsconfig.build.json
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/yarn.lock b/yarn.lock