NEVISACCESSAPP-5981: Added Password authenticator capabilities

nevissecurity · Jul 9, 2024 · af41297 · af41297
1 parent 8f89920
commit af41297
Show file tree

Hide file tree

Showing 52 changed files with 1,785 additions and 787 deletions.
diff --git a/NevisExampleApp.xcodeproj/project.pbxproj b/NevisExampleApp.xcodeproj/project.pbxproj
diff --git a/NevisExampleApp.xcodeproj/xcshareddata/xcschemes/NevisExampleApp.xcscheme b/NevisExampleApp.xcodeproj/xcshareddata/xcschemes/NevisExampleApp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1540"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/NevisExampleApp/Application/Dependency Provider/AppAssembly.swift b/NevisExampleApp/Application/Dependency Provider/AppAssembly.swift
@@ -30,6 +30,8 @@ extension AppAssembly: Assembly {
 
 private extension AppAssembly {
 
+	// MARK: Screens
+
 	/// Registers the screens.
 	///
 	/// - Parameter container: The container provided by the `Assembler`.
@@ -69,8 +71,8 @@ private extension AppAssembly {
 			                                             argument: arg))
 		}.inObjectScope(.weak)
 
-		container.register(PinScreen.self) { (res: Resolver, arg: NavigationParameterizable) in
-			PinScreen(viewModel: res ~> (PinViewModel.self, argument: arg))
+		container.register(CredentialScreen.self) { (res: Resolver, arg: NavigationParameterizable) in
+			CredentialScreen(viewModel: res ~> (CredentialViewModel.self, argument: arg))
 		}.inObjectScope(.weak)
 
 		container.register(TransactionConfirmationScreen.self) { (res: Resolver, arg: NavigationParameterizable) in
@@ -93,6 +95,8 @@ private extension AppAssembly {
 			.inObjectScope(.container)
 	}
 
+	// MARK: Coordinators
+
 	/// Registers the coordinators.
 	///
 	/// - Parameter container: The container provided by the `Assembler`.
@@ -102,6 +106,8 @@ private extension AppAssembly {
 			.inObjectScope(.container)
 	}
 
+	// MARK: View models
+
 	/// Registers the view models.
 	///
 	/// - Parameter container: The container provided by the `Assembler`.
@@ -141,9 +147,9 @@ private extension AppAssembly {
 		                       initializer: SelectAuthenticatorViewModel.init)
 			.inObjectScope(.transient)
 
-		container.autoregister(PinViewModel.self,
+		container.autoregister(CredentialViewModel.self,
 		                       argument: NavigationParameterizable.self,
-		                       initializer: PinViewModel.init)
+		                       initializer: CredentialViewModel.init)
 			.inObjectScope(.transient)
 
 		container.autoregister(TransactionConfirmationViewModel.self,
@@ -166,6 +172,8 @@ private extension AppAssembly {
 			.inObjectScope(.transient)
 	}
 
+	// MARK: Use-cases
+
 	/// Registers the use cases.
 	///
 	/// - Parameter container: The container provided by the `Assembler`.
@@ -188,6 +196,8 @@ private extension AppAssembly {
 			                                     authenticationAuthenticatorSelector: authSelectorForAuth,
 			                                     pinEnroller: res~>,
 			                                     pinUserVerifier: res~>,
+			                                     passwordEnroller: res~>,
+			                                     passwordUserVerifier: res~>,
 			                                     biometricUserVerifier: res~>,
 			                                     devicePasscodeUserVerifier: res~>,
 			                                     logger: res~>)
@@ -200,6 +210,7 @@ private extension AppAssembly {
 			                               createDeviceInformationUseCase: res~>,
 			                               authenticatorSelector: authenticatorSelector,
 			                               pinEnroller: res~>,
+			                               passwordEnroller: res~>,
 			                               biometricUserVerifier: res~>,
 			                               devicePasscodeUserVerifier: res~>,
 			                               logger: res~>)
@@ -211,6 +222,7 @@ private extension AppAssembly {
 			return InBandAuthenticationUseCaseImpl(clientProvider: res~>,
 			                                       authenticatorSelector: authenticatorSelector,
 			                                       pinUserVerifier: res~>,
+			                                       passwordUserVerifier: res~>,
 			                                       biometricUserVerifier: res~>,
 			                                       devicePasscodeUserVerifier: res~>,
 			                                       logger: res~>)
@@ -222,13 +234,17 @@ private extension AppAssembly {
 		container.autoregister(ChangePinUseCase.self,
 		                       initializer: ChangePinUseCaseImpl.init)
 
+		container.autoregister(ChangePasswordUseCase.self,
+		                       initializer: ChangePasswordUseCaseImpl.init)
+
 		container.register(AuthCloudApiRegistrationUseCase.self) { res in
 			let authenticatorSelector = res ~> (AuthenticatorSelector.self,
 			                                    name: RegistrationAuthenticatorSelectorName)
 			return AuthCloudApiRegistrationUseCaseImpl(clientProvider: res~>,
 			                                           createDeviceInformationUseCase: res~>,
 			                                           authenticatorSelector: authenticatorSelector,
 			                                           pinEnroller: res~>,
+			                                           passwordEnroller: res~>,
 			                                           biometricUserVerifier: res~>,
 			                                           devicePasscodeUserVerifier: res~>,
 			                                           logger: res~>)
@@ -256,6 +272,8 @@ private extension AppAssembly {
 		                       initializer: LoginUseCaseImpl.init)
 	}
 
+	// MARK: Repositories
+
 	/// Registers the repositories.
 	///
 	/// - Parameter container: The container provided by the `Assembler`.
@@ -264,6 +282,8 @@ private extension AppAssembly {
 		                       initializer: LoginRepositoryImpl.init)
 	}
 
+	// MARK: Data sources
+
 	/// Registers the data sources.
 	///
 	/// - Parameter container: The container provided by the `Assembler`.
@@ -272,6 +292,8 @@ private extension AppAssembly {
 		                       initializer: LoginDataSourceImpl.init)
 	}
 
+	// MARK: Components
+
 	/// Registers the components.
 	///
 	/// - Parameter container: The container provided by the `Assembler`.
@@ -287,13 +309,21 @@ private extension AppAssembly {
 		container.autoregister(AccountSelector.self,
 		                       initializer: AccountSelectorImpl.init)
 
-		container.autoregister(AuthenticatorSelector.self,
-		                       name: AuthenticationAuthenticatorSelectorName,
-		                       initializer: AuthenticationAuthenticatorSelectorImpl.init)
+		container.register(AuthenticatorSelector.self,
+		                   name: AuthenticationAuthenticatorSelectorName) { res in
+			AuthenticatorSelectorImpl(authenticatorValidator: res~>,
+			                          operation: .authentication,
+			                          responseEmitter: res~>,
+			                          logger: res~>)
+		}
 
-		container.autoregister(AuthenticatorSelector.self,
-		                       name: RegistrationAuthenticatorSelectorName,
-		                       initializer: RegistrationAuthenticatorSelectorImpl.init)
+		container.register(AuthenticatorSelector.self,
+		                   name: RegistrationAuthenticatorSelectorName) { res in
+			AuthenticatorSelectorImpl(authenticatorValidator: res~>,
+			                          operation: .registration,
+			                          responseEmitter: res~>,
+			                          logger: res~>)
+		}
 
 		container.autoregister(PinEnroller.self,
 		                       initializer: PinEnrollerImpl.init)
@@ -304,6 +334,15 @@ private extension AppAssembly {
 		container.autoregister(PinUserVerifier.self,
 		                       initializer: PinUserVerifierImpl.init)
 
+		container.autoregister(PasswordEnroller.self,
+		                       initializer: PasswordEnrollerImpl.init)
+
+		container.autoregister(PasswordChanger.self,
+		                       initializer: PasswordChangerImpl.init)
+
+		container.autoregister(PasswordUserVerifier.self,
+		                       initializer: PasswordUserVerifierImpl.init)
+
 		container.autoregister(BiometricUserVerifier.self,
 		                       initializer: BiometricUserVerifierImpl.init)
 
@@ -321,6 +360,9 @@ private extension AppAssembly {
 		container.autoregister(AccountValidator.self,
 		                       initializer: AccountValidatorImpl.init)
 
+		container.autoregister(AuthenticatorValidator.self,
+		                       initializer: AuthenticatorValidatorImpl.init)
+
 		container.autoregister(SDKLogger.self,
 		                       initializer: SDKLoggerImpl.init)
 			.inObjectScope(.container)

diff --git a/NevisExampleApp/Common/Configuration/Model/AppConfiguration.swift b/NevisExampleApp/Common/Configuration/Model/AppConfiguration.swift
@@ -17,6 +17,9 @@ struct AppConfiguration: Codable {
 	/// The Nevis Mobile Authentication SDK configuration.
 	let sdkConfiguration: Configuration
 
+	/// The allowed authenticators.	/// The allowed authenticators.
+	let authenticatorWhitelist: [AuthenticatorAaid]
+
 	// MARK: - CodingKey
 
 	/// Enumeration for keys used during coding.
@@ -25,6 +28,8 @@ struct AppConfiguration: Codable {
 		case loginConfiguration = "login"
 		/// Key for the SDK configuration.
 		case sdkConfiguration = "sdk"
+		/// Key for the authenticator whitelist.
+		case authenticatorWhitelist
 
 		/// Enumeration for the nested SDK configuration keys used during coding.
 		enum NestedCodingKeys: String, CodingKey {
@@ -73,5 +78,6 @@ struct AppConfiguration: Codable {
 		else {
 			self.sdkConfiguration = try container.decode(Configuration.self, forKey: .sdkConfiguration)
 		}
+		self.authenticatorWhitelist = try container.decode([AuthenticatorAaid].self, forKey: .authenticatorWhitelist)
 	}
 }
diff --git a/NevisExampleApp/Common/Configuration/Model/Environment.swift b/NevisExampleApp/Common/Configuration/Model/Environment.swift
@@ -16,8 +16,8 @@ enum Environment {
 	/// The configuration file name for an environment.
 	var configFileName: String {
 		switch self {
-		case .authenticationCloud: return "ConfigAuthenticationCloud"
-		case .identitySuite: return "ConfigIdentitySuite"
+		case .authenticationCloud: "ConfigAuthenticationCloud"
+		case .identitySuite: "ConfigIdentitySuite"
 		}
 	}
 }
diff --git a/NevisExampleApp/Common/Error/AppError.swift b/NevisExampleApp/Common/Error/AppError.swift
@@ -16,6 +16,10 @@ enum AppError: Error {
 	case cookieNotFound
 	/// No PIN authenticator found in the list of registered authenticators.
 	case pinAuthenticatorNotFound
+	/// No Password authenticator found in the list of registered authenticators.
+	case passwordAuthenticatorNotFound
+	/// Unknown error.
+	case unknown
 }
 
 // MARK: - LocalizedError
@@ -24,13 +28,17 @@ extension AppError: LocalizedError {
 	public var errorDescription: String? {
 		switch self {
 		case .loadAppConfigurationError:
-			return L10n.Error.App.loadAppConfigurationError
+			L10n.Error.App.loadAppConfigurationError
 		case .readLoginConfigurationError:
-			return L10n.Error.App.readLoginConfigurationError
+			L10n.Error.App.readLoginConfigurationError
 		case .cookieNotFound:
-			return L10n.Error.App.cookieNotFound
+			L10n.Error.App.cookieNotFound
 		case .pinAuthenticatorNotFound:
-			return L10n.Error.App.pinAuthenticatorNotFound
+			L10n.Error.App.pinAuthenticatorNotFound
+		case .passwordAuthenticatorNotFound:
+			L10n.Error.App.passwordAuthenticatorNotFound
+		case .unknown:
+			L10n.Error.App.Generic.message
 		}
 	}
 }
diff --git a/NevisExampleApp/Common/Extensions/Authenticator+Extension.swift b/NevisExampleApp/Common/Extensions/Authenticator+Extension.swift
@@ -16,11 +16,11 @@ extension Authenticator {
 	func isEnrolled(username: Username) -> Bool {
 		switch userEnrollment {
 		case let enrollment as SdkUserEnrollment:
-			return enrollment.isEnrolled(username)
+			enrollment.isEnrolled(username)
 		case let enrollment as OsUserEnrollment:
-			return enrollment.isEnrolled()
+			enrollment.isEnrolled()
 		default:
-			return false
+			false
 		}
 	}
 }
diff --git a/NevisExampleApp/Domain/Interaction/AccountSelectorImpl.swift b/NevisExampleApp/Domain/Interaction/AccountSelectorImpl.swift
@@ -23,9 +23,6 @@ class AccountSelectorImpl {
 	/// The response emitter.
 	private let responseEmitter: ResponseEmitter
 
-	/// The error handler chain.
-	private let errorHandlerChain: ErrorHandlerChain
-
 	/// The logger.
 	private let logger: SDKLogger
 
@@ -36,15 +33,13 @@ class AccountSelectorImpl {
 	/// - Parameters:
 	///   - accountValidator: The account validator.
 	///   - responseEmitter: The response emitter.
-	///   - errorHandlerChain: The error handler chain.
-	///   - responseEmitter: The response emitter.
+	///   - logger: The logger.
 	init(accountValidator: AccountValidator,
 	     responseEmitter: ResponseEmitter,
-	     errorHandlerChain: ErrorHandlerChain,
+	     errorHandlerChain _: ErrorHandlerChain,
 	     logger: SDKLogger) {
 		self.accountValidator = accountValidator
 		self.responseEmitter = responseEmitter
-		self.errorHandlerChain = errorHandlerChain
 		self.logger = logger
 	}
 }
@@ -90,7 +85,8 @@ extension AccountSelectorImpl: AccountSelector {
 			}
 		}
 		catch {
-			errorHandlerChain.handle(error: error)
+			logger.log("Authenticator selection failed due to \(error.localizedDescription)", color: .red)
+			handler.cancel()
 		}
 	}
 }
diff --git a/NevisExampleApp/Domain/Interaction/AuthenticationAuthenticatorSelectorImpl.swift b/NevisExampleApp/Domain/Interaction/AuthenticationAuthenticatorSelectorImpl.swift