refactor: issuermetadata

openwallet-foundation · Oct 26, 2023 · eaa8e82 · eaa8e82
1 parent 1398555
commit eaa8e82
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 30 deletions.
diff --git a/packages/openid4vc-holder/src/issuance/utils/IssuerMetadataUtils.ts b/packages/openid4vc-holder/src/issuance/utils/IssuerMetadataUtils.ts
@@ -75,8 +75,6 @@ export function getOfferedCredentialsWithMetadata(
         )
       }
 
-      // TODO: use getUniFormat??
-
       for (const foundSupportedCredential of foundSupportedCredentials) {
         offeredCredentials.push({
           credentialSupported: foundSupportedCredential,
@@ -187,31 +185,19 @@ export function handleAuthorizationDetails(
   authorizationDetails: AuthDetails | AuthDetails[],
   metadata: EndpointMetadataResult
 ): AuthDetails | AuthDetails[] | undefined {
-  if (authorizationDetails) {
-    if (Array.isArray(authorizationDetails)) {
-      return authorizationDetails.map((value) => handleLocations({ ...value }, metadata))
-    } else {
-      return handleLocations({ ...authorizationDetails }, metadata)
-    }
+  if (Array.isArray(authorizationDetails)) {
+    return authorizationDetails.map((value) => handleLocations({ ...value }, metadata))
+  } else {
+    return handleLocations({ ...authorizationDetails }, metadata)
   }
-  return authorizationDetails
 }
 
 // copied from sphereon
 export function handleLocations(authorizationDetails: AuthDetails, metadata: EndpointMetadataResult) {
-  if (
-    authorizationDetails &&
-    (metadata.credentialIssuerMetadata?.authorization_server || metadata.authorization_endpoint)
-  ) {
-    if (authorizationDetails.locations) {
-      if (Array.isArray(authorizationDetails.locations)) {
-        ;(authorizationDetails.locations as string[]).push(metadata.issuer)
-      } else {
-        authorizationDetails.locations = [authorizationDetails.locations as string, metadata.issuer]
-      }
-    } else {
-      authorizationDetails.locations = metadata.issuer
-    }
+  if (metadata.credentialIssuerMetadata?.authorization_server || metadata.authorization_endpoint) {
+    if (!authorizationDetails.locations) authorizationDetails.locations = metadata.issuer
+    else if (Array.isArray(authorizationDetails.locations)) authorizationDetails.locations.push(metadata.issuer)
+    else authorizationDetails.locations = [authorizationDetails.locations as string, metadata.issuer]
   }
   return authorizationDetails
 }

diff --git a/packages/openid4vc-holder/tests/openid4vci-holder.e2e.test.ts b/packages/openid4vc-holder/tests/openid4vci-holder.e2e.test.ts
@@ -14,7 +14,8 @@ import { agentDependencies } from '@aries-framework/node'
 import { ariesAskar } from '@hyperledger/aries-askar-nodejs'
 import nock, { cleanAll, enableNetConnect } from 'nock'
 
-import { OpenId4VcHolderModule, OpenIdCredentialFormatProfile } from '../src'
+import { OpenIdCredentialFormatProfile } from '../src'
+import { OpenId4VcHolderModule } from '../src/issuance/OpenId4VciHolderModule'
 
 import {
   mattrLaunchpadJsonLd_draft_08,
@@ -632,16 +633,11 @@ describe('OpenId4VcHolder', () => {
 
       const resolved = await agent.modules.openId4VcHolder.resolveCredentialOffer(credentialOffer)
 
-      const authCodeFlowOptions = {
+      const resolvedAuthorizationRequest = await agent.modules.openId4VcHolder.resolveAuthorizationRequest(resolved, {
         clientId: 'test-client',
         redirectUri: 'http://blank',
         scope: ['openid', 'OpenBadgeCredential'],
-      }
-
-      const resolvedAuthorizationRequest = await agent.modules.openId4VcHolder.resolveAuthorizationRequest(
-        resolved,
-        authCodeFlowOptions
-      )
+      })
 
       const code =
         'eyJhbGciOiJFZERTQSJ9.eyJzdWIiOiJiMGUxNjc4NS1kNzIyLTQyYTUtYTA0Zi00YmVhYjI4ZTAzZWEiLCJpc3MiOiJodHRwczovL2lzc3Vlci5wb3J0YWwud2FsdC5pZCIsImF1ZCI6IlRPS0VOIn0.ibEpHFaHFBLWyhEf4SotDQZBeh_FMrfncWapNox1Iv1kdQWQ2cLQeS1VrCyVmPsbx0tN2MAyDFG7DnAaq8MiAA'