Skip to content

Commit 0d8cfd5

Browse files
committed
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
2 parents a74318b + 3c03e61 commit 0d8cfd5

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

packages/core/src/LocalUser/Manager.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,9 @@ export class LocalUserManager extends EventEmitter {
108108
return { type: 'passphrase' };
109109
}
110110
case 'oidc_id_token': {
111-
return { type: 'oidcIdToken' };
111+
const providerId = method.provider_id;
112+
const providerDisplayName = method.provider_display_name;
113+
return { type: 'oidcIdToken', providerId, providerDisplayName };
112114
}
113115
case 'phone_number': {
114116
const encryptedPhoneNumber = utils.fromBase64(method.encrypted_phone_number);

packages/core/src/LocalUser/SessionCertificate.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ function verificationToVerificationMethod(verification: VerificationWithToken):
6363
if ('oidcIdToken' in verification)
6464
return {
6565
type: 'oidcIdToken',
66+
// NOTE: We can't know these here, but we also don't need them for session certificates
67+
providerId: '',
68+
providerDisplayName: '',
6669
};
6770
if ('e2ePassphrase' in verification)
6871
return {

packages/core/src/LocalUser/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export type EmailVerificationMethod = { type: 'email'; email: string; };
66
export type PassphraseVerificationMethod = { type: 'passphrase'; };
77
export type E2ePassphraseVerificationMethod = { type: 'e2ePassphrase'; };
88
export type KeyVerificationMethod = { type: 'verificationKey'; };
9-
export type OidcVerificationMethod = { type: 'oidcIdToken'; };
9+
export type OidcVerificationMethod = { type: 'oidcIdToken'; providerId: string; providerDisplayName: string; };
1010
export type PhoneNumberVerificationMethod = { type: 'phoneNumber'; phoneNumber: string; };
1111
export type PreverifiedEmailVerificationMethod = { type: 'preverifiedEmail'; preverifiedEmail: string; };
1212
export type PreverifiedPhoneNumberVerificationMethod = { type: 'preverifiedPhoneNumber'; preverifiedPhoneNumber: string; };

packages/core/src/Network/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export type VerificationMethodResponse = Array<(
2525
| { type: 'phone_number'; encrypted_phone_number: string; is_preverified: boolean; }
2626
| { type: 'passphrase'; }
2727
| { type: 'e2e_passphrase'; }
28-
| { type: 'oidc_id_token'; }
28+
| { type: 'oidc_id_token'; provider_id: string; provider_display_name: string; }
2929
)>;
3030

3131
export type E2eVerificationKeyResponse = {

0 commit comments

Comments
 (0)