feature/SPRIND-137 #295

zoemaas · 2024-12-06T23:09:55Z

No description provided.

# Conflicts: # packages/oid4vci-holder/package.json # packages/oid4vci-issuer-store/package.json # packages/oid4vci-issuer/package.json # pnpm-lock.yaml

into feature/SPRIND-137 # Conflicts: # packages/ebsi-support/package.json # packages/mdl-mdoc/package.json # packages/oid4vci-holder/package.json # packages/oid4vci-issuer-rest-api/package.json # packages/oid4vci-issuer-rest-client/package.json # packages/oid4vci-issuer-store/package.json # packages/oid4vci-issuer/package.json # packages/siopv2-oid4vp-common/package.json # packages/siopv2-oid4vp-op-auth/package.json # packages/siopv2-oid4vp-rp-auth/package.json # packages/siopv2-oid4vp-rp-rest-api/package.json # packages/w3c-vc-api/package.json # pnpm-lock.yaml

ronal2do · 2025-01-07T12:45:05Z

packages/siopv2-oid4vp-op-auth/src/agent/DidAuthSiopOpAuthenticator.ts

+
+        if (areRequiredCredentialsPresent !== Status.ERROR && verifiableCredentials) {
+          const uniqueDigitalCredentials: UniqueDigitalCredential[] = verifiableCredentials.map((vc) => {
+            // @ts-ignore FIXME Funke


Suggested change

// @ts-ignore FIXME Funke

// @ts-expect-error: Funke needs to be fixed in XYZ-1234

Do we have a ticket for that? Because it's not my implementation and I have no idea what is it about.

nklomp

siop response should never become undefined. Also several unneeded casts to any.

nklomp · 2025-01-07T12:49:38Z

packages/siopv2-oid4vp-op-auth/src/agent/DidAuthSiopOpAuthenticator.ts

@@ -344,32 +357,62 @@ export class DidAuthSiopOpAuthenticator implements IAgentPlugin {

    const pex = new PEX()
    const verifiableCredentialsWithDefinition: Array<VerifiableCredentialsWithDefinition> = []
+    const dcqlCredentialsWithCredentials: Map<DcqlCredentialRepresentation, UniqueDigitalCredential> = new Map()
+
+    if (authorizationRequestData.presentationDefinitions !== undefined && authorizationRequestData.presentationDefinitions !== null) {


if Array.isArray()

Added if Array.isArray() check

I didn't mean add. Just replace. Those "if undefined and null" are not the way we check elsewhere anyway. Just do an if on the object. Array.isArray will never be true for null or undefined

Using only Array.isArray() now

nklomp · 2025-01-07T12:52:07Z

packages/siopv2-oid4vp-op-auth/src/agent/DidAuthSiopOpAuthenticator.ts

+            const udc = selectedCredentials.find((udc) => udc.hash == hash)
+
+            if (!udc) {
+              throw Error('UniqueDigitalCredential could not be found')


throw error vs Promise.reject(Error) below (which is prefered)

Refactored to use Promise.reject(Error)

nklomp · 2025-01-07T12:52:46Z

packages/siopv2-oid4vp-op-auth/src/agent/DidAuthSiopOpAuthenticator.ts

+        return Promise.reject(Error('None of the selected credentials match any of the presentation definitions.'))
+      }
+
+    } else if (authorizationRequestData.dcqlQuery !== undefined && authorizationRequestData.dcqlQuery !== null) {


else if (authorizationRequestData.dclQuery)

using else if (authorizationRequestData.dclQuery) now

nklomp · 2025-01-07T12:53:21Z

packages/siopv2-oid4vp-op-auth/src/agent/DidAuthSiopOpAuthenticator.ts

+    } else if (authorizationRequestData.dcqlQuery !== undefined && authorizationRequestData.dcqlQuery !== null) {
+      //TODO Only SD-JWT and MSO MDOC are supported at the moment
+      if (this.hasMDocCredentials(selectedCredentials) || this.hasSdJwtCredentials(selectedCredentials)) {
+        selectedCredentials.forEach((vc: any) => {


Why is this an any?

Added type assertion

nklomp · 2025-01-07T12:56:21Z

packages/siopv2-oid4vp-op-auth/src/services/Siopv2MachineService.ts

-    // todo: Change issuer value in case we do not use identifier. Use key.meta.jwkThumbprint then
-    responseSignerOpts: idOpts!,
-  })
+  return undefined


A SIOP response cannot be undefined that is an error case

Throwing an error

nklomp · 2025-01-07T12:57:24Z

packages/siopv2-oid4vp-op-auth/src/agent/DidAuthSiopOpAuthenticator.ts

+  };
+
+  private retrieveEncodedCredential = (credential: UniqueDigitalCredential) => {
+    // FIXME Remove any


Why change to any to begin with. Check of original is present or not

Removed "any"

nklomp · 2025-01-07T12:59:14Z

packages/siopv2-oid4vp-op-auth/src/agent/DidAuthSiopOpAuthenticator.ts

@@ -382,21 +425,40 @@ export class DidAuthSiopOpAuthenticator implements IAgentPlugin {
      context,
    )

-    const contentType = response.headers.get('content-type') || ''
+    const contentType = response?.headers.get('content-type') || ''


Do not allow response to be undefined

Removed '?'

nklomp · 2025-01-07T12:59:21Z

packages/siopv2-oid4vp-op-auth/src/agent/DidAuthSiopOpAuthenticator.ts

-      url: response.url,
-      queryParams: decodeUriAsJson(response.url),
+      url: response?.url,
+      queryParams: response && decodeUriAsJson(response?.url),


Do not allow response to be undefined

Already throwing an error from the siopSendAuthorizationResponse(...) method if there are nor PDs neither DCQL query, thus the response is not undefined anymore. Removed the 'response &&' at line 439

nklomp · 2025-01-07T12:59:30Z

packages/siopv2-oid4vp-op-auth/src/agent/DidAuthSiopOpAuthenticator.ts

    let responseBody: any = null

-    const text = await response.text()
+    const text = await response?.text()


Do not allow response to be undefined

Removed '?'

…or case sending authentication response

fix: Updated dependencies and fixed broken code

4982faa

zoemaas self-assigned this Dec 6, 2024

zoemaas added 5 commits December 8, 2024 00:46

Merge branch 'develop' into feature/SPRIND-137

d5ccb83

# Conflicts: # packages/oid4vci-holder/package.json # packages/oid4vci-issuer-store/package.json # packages/oid4vci-issuer/package.json # pnpm-lock.yaml

fix: Updated pnpm-lock.yaml

d2c23db

fix: Updated dependencies

2b871d5

chore: Added dcqlQuery to the siop request

f7eb79c

fix: Removed local dependencies

a50eb33

zoemaas marked this pull request as ready for review December 11, 2024 15:49

zoemaas added 8 commits December 18, 2024 10:37

fix: Fixed type issues

c3754e6

fix: Fixed type issues and updated oid4vc dependency

f919a29

fix: Fixed the encoded presentation creation

f8a8c17

fix: Fixed merging issue

6fc5099

chore: updated dependencies on oid4vc

e4b9a78

chore: updated rest test ports

39cf3aa

ronal2do reviewed Jan 7, 2025

View reviewed changes

nklomp requested changes Jan 7, 2025

View reviewed changes

zoemaas added 10 commits January 8, 2025 17:42

refactor: updated dependencies, improved DCQL vc PD xor and added Err…

59736ac

…or case sending authentication response

refactor: Added Array.isArray() check

525c412

refactor: returning Promise.reject instead of throwing error

0cd9c04

refactor: Using only Array.isArray() now

29bb78c

refactor: Using only if(authorizationRequestData.dcqlQuery) now

702a276

refactor: Removed any

0991b4c

refactor: Removed any from retrieveEncodedCredential

a133247

refactor: Removed response &&

9bebc10

refactor: Removed ? from response.text()

1217bb2

refactor: Removed ? from response.headers.get('content_type') | ''

cd9d985

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature/SPRIND-137 #295

feature/SPRIND-137 #295

zoemaas commented Dec 6, 2024

ronal2do Jan 7, 2025

zoemaas Jan 8, 2025

nklomp left a comment

nklomp Jan 7, 2025

zoemaas Jan 8, 2025

nklomp Jan 8, 2025

zoemaas Jan 9, 2025

nklomp Jan 7, 2025

zoemaas Jan 9, 2025

nklomp Jan 7, 2025

zoemaas Jan 9, 2025

nklomp Jan 7, 2025

zoemaas Jan 9, 2025

nklomp Jan 7, 2025

zoemaas Jan 8, 2025

nklomp Jan 7, 2025

zoemaas Jan 9, 2025

nklomp Jan 7, 2025

zoemaas Jan 9, 2025

nklomp Jan 7, 2025

zoemaas Jan 9, 2025

nklomp Jan 7, 2025

zoemaas Jan 9, 2025 •

edited

Loading

	// @ts-ignore FIXME Funke
	// @ts-expect-error: Funke needs to be fixed in XYZ-1234

feature/SPRIND-137 #295

Are you sure you want to change the base?

feature/SPRIND-137 #295

Conversation

zoemaas commented Dec 6, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nklomp left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zoemaas Jan 9, 2025 • edited Loading

Choose a reason for hiding this comment

zoemaas Jan 9, 2025 •

edited

Loading