feat: added dynamicRegistrationClientMetadata to issuer locale branding

Sphereon-Opensource · Nov 22, 2024 · aa98150 · aa98150
1 parent 3d1d370
commit aa98150
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 12 deletions.
diff --git a/packages/oid4vci-holder/package.json b/packages/oid4vci-holder/package.json
@@ -43,6 +43,7 @@
     "xstate": "^4.38.3"
   },
   "devDependencies": {
+    "@sphereon/oid4vc-common": "0.16.1-next.187",
     "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.25.0",
     "@types/i18n-js": "^3.8.9",
     "@types/lodash.memoize": "^4.1.9",

diff --git a/packages/oid4vci-holder/src/agent/OID4VCIHolder.ts b/packages/oid4vci-holder/src/agent/OID4VCIHolder.ts
@@ -752,6 +752,7 @@ export class OID4VCIHolder implements IAgentPlugin {
 
     return getBasicIssuerLocaleBranding({
       display: serverMetadata.credentialIssuerMetadata?.display ?? [],
+      dynamicRegistrationClientMetadata: serverMetadata.credentialIssuerMetadata,
       context,
     })
   }

diff --git a/packages/oid4vci-holder/src/agent/OID4VCIHolderService.ts b/packages/oid4vci-holder/src/agent/OID4VCIHolderService.ts
@@ -92,8 +92,8 @@ export const getCredentialBranding = async (args: GetCredentialBrandingArgs): Pr
 export const getBasicIssuerLocaleBranding = async (args: GetBasicIssuerLocaleBrandingArgs): Promise<Array<IBasicIssuerLocaleBranding>> => { //IBasicIssuerLocaleBranding
   const { display, context } = args
   return await Promise.all(
-    display.map(async (metadataDisplay: MetadataDisplay): Promise<IBasicIssuerLocaleBranding> => {
-      const branding = await issuerLocaleBrandingFrom({ issuerDisplay: metadataDisplay })
+    display.map(async (issuerDisplay: MetadataDisplay): Promise<IBasicIssuerLocaleBranding> => {
+      const branding = await issuerLocaleBrandingFrom({ issuerDisplay })
       return context.agent.ibIssuerLocaleBrandingFrom({ localeBranding: branding })
     }),
   )

diff --git a/packages/oid4vci-holder/src/agent/OIDC4VCIBrandingMapper.ts b/packages/oid4vci-holder/src/agent/OIDC4VCIBrandingMapper.ts
@@ -63,22 +63,29 @@ export const credentialLocaleBrandingFrom = async (args: CredentialLocaleBrandin
   }
 }
 
+// TODO since dynamicRegistrationClientMetadata can also be on a RP, we should start using this mapper in a more general way
 export const issuerLocaleBrandingFrom = async (args: IssuerLocaleBrandingFromArgs): Promise<IBasicIssuerLocaleBranding> => {
-  const { issuerDisplay } = args
+  const { issuerDisplay, dynamicRegistrationClientMetadata } = args
 
   return {
+    ...(dynamicRegistrationClientMetadata?.client_name && {
+      alias: dynamicRegistrationClientMetadata?.client_name
+    }),
     ...(issuerDisplay.name && {
       alias: issuerDisplay.name,
     }),
     ...(issuerDisplay.locale && {
       locale: issuerDisplay.locale,
     }),
-    ...(issuerDisplay.logo && {
+    ...((issuerDisplay.logo || dynamicRegistrationClientMetadata?.logo_uri) && {
       logo: {
-        ...((issuerDisplay.logo.url || <string>issuerDisplay.logo.uri) && {
-          uri: issuerDisplay.logo?.url ?? <string>issuerDisplay.logo.uri,
+        ...(dynamicRegistrationClientMetadata?.logo_uri && {
+          uri: dynamicRegistrationClientMetadata?.logo_uri
+        }),
+        ...((issuerDisplay.logo?.url || <string>issuerDisplay.logo?.uri) && {
+          uri: issuerDisplay.logo?.url ?? <string>issuerDisplay.logo?.uri,
         }),
-        ...(issuerDisplay.logo.alt_text && {
+        ...(issuerDisplay.logo?.alt_text && {
           alt: issuerDisplay.logo?.alt_text,
         }),
       },
@@ -91,6 +98,18 @@ export const issuerLocaleBrandingFrom = async (args: IssuerLocaleBrandingFromArg
         color: issuerDisplay.text_color,
       },
     }),
+    ...(dynamicRegistrationClientMetadata?.client_uri && {
+      clientUri: dynamicRegistrationClientMetadata?.client_uri
+    }),
+    ...(dynamicRegistrationClientMetadata?.tos_uri && {
+      tosUri: dynamicRegistrationClientMetadata?.tos_uri
+    }),
+    ...(dynamicRegistrationClientMetadata?.policy_uri && {
+      policyUri: dynamicRegistrationClientMetadata?.policy_uri
+    }),
+    ...(dynamicRegistrationClientMetadata?.contacts && {
+      contacts: dynamicRegistrationClientMetadata?.contacts
+    }),
   }
 }
 

diff --git a/packages/oid4vci-holder/src/types/IOID4VCIHolder.ts b/packages/oid4vci-holder/src/types/IOID4VCIHolder.ts
@@ -14,6 +14,7 @@ import {
   CredentialsSupportedDisplay,
   IssuerCredentialSubject,
 } from '@sphereon/oid4vci-common'
+import { DynamicRegistrationClientMetadata } from '@sphereon/oid4vc-common'
 import {
   CreateOrGetIdentifierOpts,
   IdentifierProviderOpts,
@@ -518,6 +519,7 @@ export type GetCredentialBrandingArgs = {
 
 export type GetBasicIssuerLocaleBrandingArgs = {
   display: MetadataDisplay[]
+  dynamicRegistrationClientMetadata?: DynamicRegistrationClientMetadataDisplay
   context: RequiredContext
 }
 
@@ -672,13 +674,9 @@ export type CredentialLocaleBrandingFromArgs = {
   credentialDisplay: CredentialsSupportedDisplay
 }
 
-export type IssuerCredentialSubjectLocaleBrandingFromArgs = {
-  issuerCredentialSubject: IssuerCredentialSubject
-  locale?: string
-}
-
 export type IssuerLocaleBrandingFromArgs = {
   issuerDisplay: MetadataDisplay
+  dynamicRegistrationClientMetadata?: DynamicRegistrationClientMetadataDisplay
 }
 
 export type CredentialBrandingFromArgs = {
@@ -699,4 +697,6 @@ export type CombineLocalesFromArgs = {
   issuerCredentialSubjectLocales?: Map<string, Array<IBasicCredentialClaim>>
 }
 
+export type DynamicRegistrationClientMetadataDisplay = Pick<DynamicRegistrationClientMetadata, 'client_name' | 'client_uri' | 'contacts' | 'tos_uri' | 'policy_uri' | 'logo_uri'>
+
 export type DidAgents = TAgent<IResolver & IDIDManager>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml