Merge pull request #29 from nevissecurity/feature/NEVISACCESSAPP-6056-…

…renaming

NEVISACCESSAPP-5973: Renamed `whiteList` to `allowList`

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)
 	}
 }

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()
 		}
 	}

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 {

NevisExampleApp/Resources/ConfigAuthenticationCloud.plist

@@ -12,7 +12,7 @@
 		<key>hostName</key>
 		<string>myinstance.mauth.nevis.cloud</string>
 	</dict>
-	<key>authenticatorWhitelist</key>
+	<key>authenticatorAllowlist</key>
 	<array>
 		<string>F1D0#1001</string>
 		<string>F1D0#1002</string>

NevisExampleApp/Resources/ConfigIdentitySuite.plist

@@ -35,12 +35,12 @@
 		<key>userInteractionTimeoutInSeconds</key>
 		<integer>240</integer>
 	</dict>
-    <key>authenticatorWhitelist</key>
-    <array>
-        <string>F1D0#1001</string>
-        <string>F1D0#1002</string>
-        <string>F1D0#1003</string>
-        <string>F1D0#1004</string>
-    </array>
+	<key>authenticatorAllowlist</key>
+	<array>
+		<string>F1D0#1001</string>
+		<string>F1D0#1002</string>
+		<string>F1D0#1003</string>
+		<string>F1D0#1004</string>
+	</array>
 </dict>
 </plist>

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)
 		}
 	}
 }