diff --git a/NevisExampleApp/Configuration/Model/AppConfiguration.swift b/NevisExampleApp/Configuration/Model/AppConfiguration.swift index 429b041..ace3288 100644 --- a/NevisExampleApp/Configuration/Model/AppConfiguration.swift +++ b/NevisExampleApp/Configuration/Model/AppConfiguration.swift @@ -18,7 +18,7 @@ struct AppConfiguration: Codable { let sdkConfiguration: Configuration /// The allowed authenticators. - let authenticatorWhitelist: [AuthenticatorAaid] + let authenticatorAllowlist: [AuthenticatorAaid] // MARK: - CodingKey @@ -28,8 +28,8 @@ struct AppConfiguration: Codable { case loginConfiguration = "login" /// Key for the SDK configuration. case sdkConfiguration = "sdk" - /// Key for the authenticator whitelist. - case authenticatorWhitelist + /// Key for the authenticator allowlist. + case authenticatorAllowlist /// Enumeration for the nested SDK configuration keys used during coding. enum NestedCodingKeys: String, CodingKey { @@ -78,6 +78,6 @@ struct AppConfiguration: Codable { else { self.sdkConfiguration = try container.decode(Configuration.self, forKey: .sdkConfiguration) } - self.authenticatorWhitelist = try container.decode([AuthenticatorAaid].self, forKey: .authenticatorWhitelist) + self.authenticatorAllowlist = try container.decode([AuthenticatorAaid].self, forKey: .authenticatorAllowlist) } } diff --git a/NevisExampleApp/Interaction/AccountSelectorImpl.swift b/NevisExampleApp/Interaction/AccountSelectorImpl.swift index fc331b8..8559e4c 100644 --- a/NevisExampleApp/Interaction/AccountSelectorImpl.swift +++ b/NevisExampleApp/Interaction/AccountSelectorImpl.swift @@ -80,7 +80,7 @@ extension AccountSelectorImpl: AccountSelector { message: transactionConfirmationDataString) appCoordinator.navigateToAccountSelection(with: parameter) } - case let .failure(error): + case .failure: handler.cancel() } } diff --git a/NevisExampleApp/Interaction/AuthenticatorSelectorImpl.swift b/NevisExampleApp/Interaction/AuthenticatorSelectorImpl.swift index e0dad94..400d4fc 100644 --- a/NevisExampleApp/Interaction/AuthenticatorSelectorImpl.swift +++ b/NevisExampleApp/Interaction/AuthenticatorSelectorImpl.swift @@ -69,8 +69,8 @@ extension AuthenticatorSelectorImpl: AuthenticatorSelector { let validator = AuthenticatorValidator() let validationResult = switch operation { - case .registration: validator.validateForRegistration(context: context, whitelistedAuthenticators: configuration.authenticatorWhitelist) - case .authentication: validator.validateForAuthentication(context: context, whitelistedAuthenticators: configuration.authenticatorWhitelist) + case .registration: validator.validateForRegistration(context: context, allowlistedAuthenticators: configuration.authenticatorAllowlist) + case .authentication: validator.validateForAuthentication(context: context, allowlistedAuthenticators: configuration.authenticatorAllowlist) } switch validationResult { diff --git a/NevisExampleApp/Resources/ConfigAuthenticationCloud.plist b/NevisExampleApp/Resources/ConfigAuthenticationCloud.plist index f6bfc90..f003288 100644 --- a/NevisExampleApp/Resources/ConfigAuthenticationCloud.plist +++ b/NevisExampleApp/Resources/ConfigAuthenticationCloud.plist @@ -12,7 +12,7 @@ hostName myinstance.mauth.nevis.cloud - authenticatorWhitelist + authenticatorAllowlist F1D0#1001 F1D0#1002 diff --git a/NevisExampleApp/Resources/ConfigIdentitySuite.plist b/NevisExampleApp/Resources/ConfigIdentitySuite.plist index 7229c08..915fb63 100644 --- a/NevisExampleApp/Resources/ConfigIdentitySuite.plist +++ b/NevisExampleApp/Resources/ConfigIdentitySuite.plist @@ -35,12 +35,12 @@ userInteractionTimeoutInSeconds 240 - authenticatorWhitelist - - F1D0#1001 - F1D0#1002 - F1D0#1003 - F1D0#1004 - + authenticatorAllowlist + + F1D0#1001 + F1D0#1002 + F1D0#1003 + F1D0#1004 + diff --git a/NevisExampleApp/Utility/Validation/AuthenticatorValidator.swift b/NevisExampleApp/Utility/Validation/AuthenticatorValidator.swift index a59e2bc..dd51e77 100644 --- a/NevisExampleApp/Utility/Validation/AuthenticatorValidator.swift +++ b/NevisExampleApp/Utility/Validation/AuthenticatorValidator.swift @@ -15,10 +15,10 @@ extension AuthenticatorValidator { /// Validates authenticators for registration. /// /// - Parameter context: The context holding the accounts to validate. - /// - Parameter whitelistedAuthenticators: The array holding the whitelisted authenticators. + /// - Parameter allowlistedAuthenticators: The array holding the allowlisted authenticators. /// - Returns: The result of the validation - func validateForRegistration(context: AuthenticatorSelectionContext, whitelistedAuthenticators: [AuthenticatorAaid]) -> ValidationResult<[any Authenticator]> { - let allowedAuthenticators = allowedAuthenticators(context: context, whitelistedAuthenticators: whitelistedAuthenticators).filter { authenticator in + func validateForRegistration(context: AuthenticatorSelectionContext, allowlistedAuthenticators: [AuthenticatorAaid]) -> ValidationResult<[any Authenticator]> { + let allowedAuthenticators = allowedAuthenticators(context: context, allowlistedAuthenticators: allowlistedAuthenticators).filter { authenticator in // Do not display: // - policy non-compliant authenticators (this includes already registered authenticators) // - not hardware supported authenticators. @@ -35,10 +35,10 @@ extension AuthenticatorValidator { /// Validates authenticators for authentication. /// /// - Parameter context: The context holding the accounts to validate. - /// - Parameter whitelistedAuthenticators: The array holding the whitelisted authenticators. + /// - Parameter allowlistedAuthenticators: The array holding the allowlisted authenticators. /// - Returns: The result of the validation - func validateForAuthentication(context: AuthenticatorSelectionContext, whitelistedAuthenticators: [AuthenticatorAaid]) -> ValidationResult<[any Authenticator]> { - let allowedAuthenticators = allowedAuthenticators(context: context, whitelistedAuthenticators: whitelistedAuthenticators).filter { authenticator in + func validateForAuthentication(context: AuthenticatorSelectionContext, allowlistedAuthenticators: [AuthenticatorAaid]) -> ValidationResult<[any Authenticator]> { + let allowedAuthenticators = allowedAuthenticators(context: context, allowlistedAuthenticators: allowlistedAuthenticators).filter { authenticator in guard let registration = authenticator.registration else { return false } // Do not display: @@ -55,18 +55,18 @@ extension AuthenticatorValidator { } } -// MARK: Filtering based on the authenticator whitelist +// MARK: Filtering based on the authenticator allowlist private extension AuthenticatorValidator { - /// Filters out non-whitelisted authenticators. + /// Filters out non-allowlisted authenticators. /// /// - Parameter context: The context holding the accounts to validate. - /// - Parameter whitelistedAuthenticators: The array holding the whitelisted authenticators. + /// - Parameter allowlistedAuthenticators: The array holding the allowlisted authenticators. /// - Returns: The list of allowed authenticators. - func allowedAuthenticators(context: AuthenticatorSelectionContext, whitelistedAuthenticators: [AuthenticatorAaid]) -> [any Authenticator] { + func allowedAuthenticators(context: AuthenticatorSelectionContext, allowlistedAuthenticators: [AuthenticatorAaid]) -> [any Authenticator] { context.authenticators.filter { authenticator in guard let authenticatorAaid = AuthenticatorAaid(rawValue: authenticator.aaid) else { return false } - return whitelistedAuthenticators.contains(authenticatorAaid) + return allowlistedAuthenticators.contains(authenticatorAaid) } } }