Merge branch 'tim/new_verif_method_oidc' into 'master'

feat: Upgrade verif method with new OIDC provider fields (BREAKING) See merge request TankerHQ/sdk-js!986
TankerHQ · Sep 19, 2023 · 0d8cfd5 · 0d8cfd5
2 parents a74318b + 3c03e61
commit 0d8cfd5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/packages/core/src/LocalUser/Manager.ts b/packages/core/src/LocalUser/Manager.ts
@@ -108,7 +108,9 @@ export class LocalUserManager extends EventEmitter {
           return { type: 'passphrase' };
         }
         case 'oidc_id_token': {
-          return { type: 'oidcIdToken' };
+          const providerId = method.provider_id;
+          const providerDisplayName = method.provider_display_name;
+          return { type: 'oidcIdToken', providerId, providerDisplayName };
         }
         case 'phone_number': {
           const encryptedPhoneNumber = utils.fromBase64(method.encrypted_phone_number);

diff --git a/packages/core/src/LocalUser/SessionCertificate.ts b/packages/core/src/LocalUser/SessionCertificate.ts
@@ -63,6 +63,9 @@ function verificationToVerificationMethod(verification: VerificationWithToken):
   if ('oidcIdToken' in verification)
     return {
       type: 'oidcIdToken',
+      // NOTE: We can't know these here, but we also don't need them for session certificates
+      providerId: '',
+      providerDisplayName: '',
     };
   if ('e2ePassphrase' in verification)
     return {

diff --git a/packages/core/src/LocalUser/types.ts b/packages/core/src/LocalUser/types.ts
@@ -6,7 +6,7 @@ export type EmailVerificationMethod = { type: 'email'; email: string; };
 export type PassphraseVerificationMethod = { type: 'passphrase'; };
 export type E2ePassphraseVerificationMethod = { type: 'e2ePassphrase'; };
 export type KeyVerificationMethod = { type: 'verificationKey'; };
-export type OidcVerificationMethod = { type: 'oidcIdToken'; };
+export type OidcVerificationMethod = { type: 'oidcIdToken'; providerId: string; providerDisplayName: string; };
 export type PhoneNumberVerificationMethod = { type: 'phoneNumber'; phoneNumber: string; };
 export type PreverifiedEmailVerificationMethod = { type: 'preverifiedEmail'; preverifiedEmail: string; };
 export type PreverifiedPhoneNumberVerificationMethod = { type: 'preverifiedPhoneNumber'; preverifiedPhoneNumber: string; };

diff --git a/packages/core/src/Network/types.ts b/packages/core/src/Network/types.ts
@@ -25,7 +25,7 @@ export type VerificationMethodResponse = Array<(
   | { type: 'phone_number'; encrypted_phone_number: string; is_preverified: boolean; }
   | { type: 'passphrase'; }
   | { type: 'e2e_passphrase'; }
-  | { type: 'oidc_id_token'; }
+  | { type: 'oidc_id_token'; provider_id: string; provider_display_name: string; }
 )>;
 
 export type E2eVerificationKeyResponse = {