Merge pull request #161 from Sphereon-Opensource/feature/SPRIND-76

feat/SPRIND-76
Sphereon-Opensource · Oct 21, 2024 · 71e72e8 · 71e72e8
2 parents f4f0362 + 2d3b5b7
commit 71e72e8
Show file tree

Hide file tree

Showing 14 changed files with 406 additions and 134 deletions.
diff --git a/packages/common/lib/index.ts b/packages/common/lib/index.ts
@@ -5,6 +5,7 @@ export const VCI_LOG_COMMON = VCI_LOGGERS.get('sphereon:oid4vci:common');
 
 export * from './jwt';
 export * from './dpop';
+export * from './oauth';
 
 export { v4 as uuidv4 } from 'uuid';
 export { defaultHasher } from './hasher';
diff --git a/packages/common/lib/jwt/Jwk.types.ts b/packages/common/lib/jwt/Jwk.types.ts
@@ -32,3 +32,7 @@ export interface JWK extends BaseJWK {
 
   [propName: string]: unknown;
 }
+
+export type JWKS = {
+  keys: JWK[]
+}
diff --git a/packages/common/lib/oauth/DynamicClientRegistration.types.ts b/packages/common/lib/oauth/DynamicClientRegistration.types.ts
@@ -0,0 +1,20 @@
+import { JWKS } from '../jwt'
+
+// https://www.rfc-editor.org/rfc/rfc7591.html#section-2
+export interface DynamicRegistrationClientMetadata {
+  redirect_uris?: string[]
+  token_endpoint_auth_method?: string
+  grant_types?: string
+  response_types?: string
+  client_name?: string
+  client_uri?: string
+  logo_uri?: string
+  scope?: string
+  contacts?: string[]
+  tos_uri?: string
+  policy_uri?: string
+  jwks_uri?: string
+  jwks?: JWKS
+  software_id?: string
+  software_version?: string
+}
diff --git a/packages/common/lib/oauth/index.ts b/packages/common/lib/oauth/index.ts
@@ -0,0 +1 @@
+export * from './DynamicClientRegistration.types';
diff --git a/packages/oid4vci-common/lib/types/ServerMetadata.ts b/packages/oid4vci-common/lib/types/ServerMetadata.ts
@@ -1,13 +1,12 @@
-import { SigningAlgo } from '@sphereon/oid4vc-common';
+import { DynamicRegistrationClientMetadata, SigningAlgo } from '@sphereon/oid4vc-common';
 
-export interface AuthorizationServerMetadata {
+export interface AuthorizationServerMetadata extends DynamicRegistrationClientMetadata {
   issuer: string;
   authorization_endpoint?: string;
   token_endpoint?: string;
   token_endpoint_auth_methods_supported?: string[];
   token_endpoint_auth_signing_alg_values_supported?: string[];
 
-  jwks_uri?: string;
   registration_endpoint?: string;
   scopes_supported?: string[];
   response_types_supported: string[];

diff --git a/packages/siop-oid4vp/lib/authorization-response/ResponseRegistration.ts b/packages/siop-oid4vp/lib/authorization-response/ResponseRegistration.ts
@@ -16,6 +16,14 @@ export const createDiscoveryMetadataPayload = (opts: DiscoveryMetadataOpts): Dis
     client_id: opts.client_id,
     redirect_uris: opts.redirectUris,
     client_name: opts.clientName,
+    client_uri: opts.clientUri,
+    scope: opts.scope,
+    contacts: opts.contacts,
+    tos_uri: opts.tosUri,
+    policy_uri: opts.policyUri,
+    jwks: opts.jwks,
+    software_id: opts.softwareId,
+    software_version: opts.softwareVersion,
     token_endpoint_auth_method: opts.tokenEndpointAuthMethod,
     application_type: opts.applicationType,
     response_types: opts.responseTypes,

diff --git a/packages/siop-oid4vp/lib/schemas/AuthorizationRequestPayloadVD11.schema.ts b/packages/siop-oid4vp/lib/schemas/AuthorizationRequestPayloadVD11.schema.ts
@@ -219,10 +219,10 @@ export const AuthorizationRequestPayloadVD11SchemaObj = {
         },
         "logo_uri": {
           "anyOf": [
-            {},
             {
               "type": "string"
-            }
+            },
+            {}
           ]
         },
         "client_purpose": {

diff --git a/packages/siop-oid4vp/lib/schemas/AuthorizationRequestPayloadVD12OID4VPD18.schema.ts b/packages/siop-oid4vp/lib/schemas/AuthorizationRequestPayloadVD12OID4VPD18.schema.ts
@@ -225,10 +225,10 @@ export const AuthorizationRequestPayloadVD12OID4VPD18SchemaObj = {
         },
         "logo_uri": {
           "anyOf": [
-            {},
             {
               "type": "string"
-            }
+            },
+            {}
           ]
         },
         "client_purpose": {

diff --git a/packages/siop-oid4vp/lib/schemas/AuthorizationRequestPayloadVD12OID4VPD20.schema.ts b/packages/siop-oid4vp/lib/schemas/AuthorizationRequestPayloadVD12OID4VPD20.schema.ts
@@ -225,10 +225,10 @@ export const AuthorizationRequestPayloadVD12OID4VPD20SchemaObj = {
         },
         "logo_uri": {
           "anyOf": [
-            {},
             {
               "type": "string"
-            }
+            },
+            {}
           ]
         },
         "client_purpose": {

diff --git a/packages/siop-oid4vp/lib/schemas/AuthorizationRequestPayloadVID1.schema.ts b/packages/siop-oid4vp/lib/schemas/AuthorizationRequestPayloadVID1.schema.ts
@@ -191,10 +191,10 @@ export const AuthorizationRequestPayloadVID1SchemaObj = {
         },
         "logo_uri": {
           "anyOf": [
-            {},
             {
               "type": "string"
-            }
+            },
+            {}
           ]
         },
         "client_purpose": {