From ecd90629fa520c85adbd68785b25ccae00a3b3d8 Mon Sep 17 00:00:00 2001 From: Isaiah Inuwa Date: Tue, 27 Jan 2026 14:01:02 -0600 Subject: [PATCH] Rename authenticator to vaultAuthenticator --- .../Auth/Services/ClientFido2Service.swift | 34 +++++++++---------- .../TestHelpers/MockClientFido2Service.swift | 2 +- .../Services/AutofillCredentialService.swift | 6 ++-- .../VaultAutofillListProcessor.swift | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/BitwardenShared/Core/Auth/Services/ClientFido2Service.swift b/BitwardenShared/Core/Auth/Services/ClientFido2Service.swift index e5135de96..4c327877e 100644 --- a/BitwardenShared/Core/Auth/Services/ClientFido2Service.swift +++ b/BitwardenShared/Core/Auth/Services/ClientFido2Service.swift @@ -5,16 +5,6 @@ import Foundation /// `ClientFido2Protocol` but returns the protocols so they can be mocked for testing. /// protocol ClientFido2Service: AnyObject { - /// Returns the `ClientFido2Authenticator` to perform Fido2 authenticator tasks. - /// - Parameters: - /// - userInterface: `Fido2UserInterface` with necessary platform side logic related to UI. - /// - credentialStore: `Fido2CredentialStore` with necessary platform side logic related to credential storage. - /// - Returns: Returns the `ClientFido2Authenticator` to perform Fido2 authenticator tasks - func authenticator( - userInterface: Fido2UserInterface, - credentialStore: Fido2CredentialStore, - ) -> ClientFido2AuthenticatorProtocol - /// Returns the `ClientFido2Client` to perform Fido2 client tasks. /// - Parameters: /// - userInterface: `Fido2UserInterface` with necessary platform side logic related to UI. @@ -29,18 +19,21 @@ protocol ClientFido2Service: AnyObject { /// - Parameter cipherView: `CipherView` containing the Fido2 credentials to decrypt. /// - Returns: An array of decrypted Fido2 credentials of type `Fido2CredentialAutofillView`. func decryptFido2AutofillCredentials(cipherView: CipherView) throws -> [Fido2CredentialAutofillView] + + /// Returns the `ClientFido2Authenticator` to perform Fido2 authenticator tasks. + /// - Parameters: + /// - userInterface: `Fido2UserInterface` with necessary platform side logic related to UI. + /// - credentialStore: `Fido2CredentialStore` with necessary platform side logic related to credential storage. + /// - Returns: Returns the `ClientFido2Authenticator` to perform Fido2 authenticator tasks + func vaultAuthenticator( + userInterface: Fido2UserInterface, + credentialStore: Fido2CredentialStore, + ) -> ClientFido2AuthenticatorProtocol } // MARK: ClientFido2 extension ClientFido2: ClientFido2Service { - func authenticator( - userInterface: Fido2UserInterface, - credentialStore: Fido2CredentialStore, - ) -> ClientFido2AuthenticatorProtocol { - authenticator(userInterface: userInterface, credentialStore: credentialStore) as ClientFido2Authenticator - } - func client( userInterface: Fido2UserInterface, credentialStore: Fido2CredentialStore, @@ -51,4 +44,11 @@ extension ClientFido2: ClientFido2Service { func decryptFido2AutofillCredentials(cipher cipherView: CipherView) throws -> [Fido2CredentialAutofillView] { try decryptFido2AutofillCredentials(cipherView: cipherView) } + + func vaultAuthenticator( + userInterface: Fido2UserInterface, + credentialStore: Fido2CredentialStore, + ) -> ClientFido2AuthenticatorProtocol { + authenticator(userInterface: userInterface, credentialStore: credentialStore) as ClientFido2Authenticator + } } diff --git a/BitwardenShared/Core/Auth/Services/TestHelpers/MockClientFido2Service.swift b/BitwardenShared/Core/Auth/Services/TestHelpers/MockClientFido2Service.swift index 223c59a8d..d6f725cef 100644 --- a/BitwardenShared/Core/Auth/Services/TestHelpers/MockClientFido2Service.swift +++ b/BitwardenShared/Core/Auth/Services/TestHelpers/MockClientFido2Service.swift @@ -10,7 +10,7 @@ class MockClientFido2Service: ClientFido2Service { InvocationMockerWithThrowingResult() .withResult([.fixture()]) - func authenticator( + func vaultAuthenticator( userInterface: any BitwardenSdk.Fido2UserInterface, credentialStore: any BitwardenSdk.Fido2CredentialStore, ) -> BitwardenSdk.ClientFido2AuthenticatorProtocol { diff --git a/BitwardenShared/Core/Autofill/Services/AutofillCredentialService.swift b/BitwardenShared/Core/Autofill/Services/AutofillCredentialService.swift index 3f0092f0e..80afefa98 100644 --- a/BitwardenShared/Core/Autofill/Services/AutofillCredentialService.swift +++ b/BitwardenShared/Core/Autofill/Services/AutofillCredentialService.swift @@ -333,7 +333,7 @@ class DefaultAutofillCredentialService { } let fido2Identities = try await clientService.platform().fido2() - .authenticator( + .vaultAuthenticator( userInterface: fido2UserInterfaceHelper, credentialStore: fido2CredentialStore, ) @@ -548,7 +548,7 @@ extension DefaultAutofillCredentialService: AutofillCredentialService { identities.append(contentsOf: newIdentities) let fido2Identities = try await clientService.platform().fido2() - .authenticator( + .vaultAuthenticator( userInterface: fido2UserInterfaceHelper, credentialStore: fido2CredentialStore, ) @@ -587,7 +587,7 @@ extension DefaultAutofillCredentialService: AutofillCredentialService { do { let assertionResult = try await clientService.platform().fido2() - .authenticator( + .vaultAuthenticator( userInterface: fido2UserInterfaceHelper, credentialStore: fido2CredentialStore, ) diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/VaultAutofillListProcessor.swift b/BitwardenShared/UI/Vault/Vault/AutofillList/VaultAutofillListProcessor.swift index 6495332e9..82503b427 100644 --- a/BitwardenShared/UI/Vault/Vault/AutofillList/VaultAutofillListProcessor.swift +++ b/BitwardenShared/UI/Vault/Vault/AutofillList/VaultAutofillListProcessor.swift @@ -674,7 +674,7 @@ extension VaultAutofillListProcessor { userVerificationPreference: userVerificationPreference, ) let createdCredential = try await services.clientService.platform().fido2() - .authenticator( + .vaultAuthenticator( userInterface: services.fido2UserInterfaceHelper, credentialStore: services.fido2CredentialStore, )