Merge pull request #788 from wordpress-mobile/ec/add-passkeys-support

Add Security Keys support

Author: Ecarrion

CHANGELOG.md

@@ -30,6 +30,16 @@ _None._
 
 -->
 
+## 7.2.0
+
+### New Features
+
+- Added security keys support as a two-factor authentication method.
+
+### Internal Changes
+
+- Bump WordPressKit dependency to `~> 8.7-beta`
+
 ## 7.0.0
 
 ### Breaking Changes

Podfile

@@ -28,7 +28,7 @@ def wordpress_authenticator_pods
   ## These should match the version requirement from the podspec.
   pod 'Gridicons', '~> 1.0'
   pod 'WordPressUI', '~> 1.7-beta'
-  pod 'WordPressKit', '~> 8.0-beta'
+  pod 'WordPressKit', '~> 8.7-beta'
   pod 'WordPressShared', '~> 2.1-beta'
 
   third_party_pods

Podfile.lock

@@ -8,15 +8,15 @@ PODS:
   - Specta (1.0.7)
   - SVProgressHUD (2.2.5)
   - SwiftLint (0.49.1)
-  - UIDeviceIdentifier (2.2.0)
-  - WordPressAuthenticator (7.1.0):
+  - UIDeviceIdentifier (2.3.0)
+  - WordPressAuthenticator (7.2.0):
     - Gridicons (~> 1.0)
     - "NSURL+IDN (= 0.4)"
     - SVProgressHUD (~> 2.2.5)
-    - WordPressKit (~> 8.0-beta)
+    - WordPressKit (~> 8.7-beta)
     - WordPressShared (~> 2.1-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (8.0.0):
+  - WordPressKit (8.7.0):
     - Alamofire (~> 4.8.0)
     - NSObject-SafeExpectations (~> 0.0.4)
     - UIDeviceIdentifier (~> 2.0)
@@ -35,7 +35,7 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - SwiftLint (~> 0.49)
   - WordPressAuthenticator (from `.`)
-  - WordPressKit (~> 8.0-beta)
+  - WordPressKit (~> 8.7-beta)
   - WordPressShared (~> 2.1-beta)
   - WordPressUI (~> 1.7-beta)
 
@@ -70,13 +70,13 @@ SPEC CHECKSUMS:
   Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5
-  UIDeviceIdentifier: f33af270ba9045ea18b31d9aab88e42a0082ea67
-  WordPressAuthenticator: f73ba530531bb14eedd2f2b69c9b2d387004026c
-  WordPressKit: 8e1c5a64645a59493a7316f38468ac036de9c79b
+  UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17
+  WordPressAuthenticator: 1990484092eef67843515a5ed90f3e7db41caf35
+  WordPressKit: a5432c2e3c2247c2b83b3ebf0acec75ae00782ef
   WordPressShared: 0aa459e5257a77184db87805a998f447443c9706
   WordPressUI: 1cf47a3b78154faf69caa18569ee7ece1e510fa0
   wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
 
-PODFILE CHECKSUM: 39d49f77667f2645b9a7575b7288487421a70c5d
+PODFILE CHECKSUM: 537f0cb26852aae6d94a89c678a95bc8bd640a01
 
 COCOAPODS: 1.11.3

WordPressAuthenticator.podspec

@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |s|
   s.name          = 'WordPressAuthenticator'
-  s.version       = '7.1.0'
+  s.version       = '7.2.0'
 
   s.summary       = 'WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps.'
   s.description   = <<-DESC
@@ -40,6 +40,6 @@ Pod::Spec.new do |s|
   # Use a loose restriction that allows both production and beta versions, up to the next major version.
   # If you want to update which of these is used, specify it in the host app.
   s.dependency 'WordPressUI', '~> 1.7-beta'
-  s.dependency 'WordPressKit', '~> 8.0-beta'
+  s.dependency 'WordPressKit', '~> 8.7-beta'
   s.dependency 'WordPressShared', '~> 2.1-beta'
 end

WordPressAuthenticator.xcodeproj/project.pbxproj

@@ -16,6 +16,7 @@
 		02A526CF28A3A35D00FD1812 /* PasswordCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A526CE28A3A35D00FD1812 /* PasswordCoordinator.swift */; };
 		1A21EE9822832BC300C940C6 /* WordPressComOAuthClientFacade+Swift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A21EE9722832BC200C940C6 /* WordPressComOAuthClientFacade+Swift.swift */; };
 		1A4095182271AEFC009AA86D /* WPAuthenticator-Swift.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4095152271AEFC009AA86D /* WPAuthenticator-Swift.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		264E09BF2AD39606004B5A5F /* AuthenticationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 264E09BE2AD39606004B5A5F /* AuthenticationServices.framework */; };
 		3108613125AFA4830022F75E /* PasteboardTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3108613025AFA4830022F75E /* PasteboardTests.swift */; };
 		3F0B192C2A8DBE180012C731 /* LoginFieldsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F0B192B2A8DBE180012C731 /* LoginFieldsTests.swift */; };
 		3F107B0529A87AF0009B3658 /* CodeVerifier+Fixture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F107B0429A87AF0009B3658 /* CodeVerifier+Fixture.swift */; };
@@ -272,6 +273,7 @@
 		02A526CE28A3A35D00FD1812 /* PasswordCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasswordCoordinator.swift; sourceTree = "<group>"; };
 		1A21EE9722832BC200C940C6 /* WordPressComOAuthClientFacade+Swift.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "WordPressComOAuthClientFacade+Swift.swift"; sourceTree = "<group>"; };
 		1A4095152271AEFC009AA86D /* WPAuthenticator-Swift.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WPAuthenticator-Swift.h"; sourceTree = "<group>"; };
+		264E09BE2AD39606004B5A5F /* AuthenticationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AuthenticationServices.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.0.sdk/System/iOSSupport/System/Library/Frameworks/AuthenticationServices.framework; sourceTree = DEVELOPER_DIR; };
 		276354F054C34AD36CA32AB6 /* Pods-WordPressAuthenticator.release-alpha.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressAuthenticator.release-alpha.xcconfig"; path = "Pods/Target Support Files/Pods-WordPressAuthenticator/Pods-WordPressAuthenticator.release-alpha.xcconfig"; sourceTree = "<group>"; };
 		3108613025AFA4830022F75E /* PasteboardTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasteboardTests.swift; sourceTree = "<group>"; };
 		33FEF45B466FF8EAAE5F3923 /* Pods-WordPressAuthenticator.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressAuthenticator.release.xcconfig"; path = "Pods/Target Support Files/Pods-WordPressAuthenticator/Pods-WordPressAuthenticator.release.xcconfig"; sourceTree = "<group>"; };
@@ -510,6 +512,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				264E09BF2AD39606004B5A5F /* AuthenticationServices.framework in Frameworks */,
 				7A7A9B9CD2D81959F9AB9AF6 /* Pods_WordPressAuthenticator.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -969,6 +972,7 @@
 		B5ED7910207E981400A8FD8C /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				264E09BE2AD39606004B5A5F /* AuthenticationServices.framework */,
 				B5ED7911207E981400A8FD8C /* WordPressKit.framework */,
 				B5ED7913207E981400A8FD8C /* WordPressShared.framework */,
 				B5ED7915207E981400A8FD8C /* WordPressUI.framework */,

WordPressAuthenticator.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -211,6 +211,10 @@ public class AuthenticatorAnalyticsTracker {
         ///
         case sendCodeWithText = "send_code_with_text"
 
+        /// Used on the 2FA screen to use a security key  instead of using the authenticator app
+        ///
+        case enterSecurityKey = "enter_security_key"
+
         /// Used on the 2FA screen to submit authentication code
         ///
         case submitTwoFactorCode = "submit_2fa_code"

WordPressAuthenticator/Analytics/AuthenticatorAnalyticsTracker.swift

@@ -12,6 +12,7 @@ public struct WordPressAuthenticatorDisplayStrings {
 	public let siteCredentialInstructions: String
     public let usernamePasswordInstructions: String
     public let twoFactorInstructions: String
+    public let twoFactorOtherFormsInstructions: String
     public let magicLinkSignupInstructions: String
     public let openMailSignupInstructions: String
     public let openMailLoginInstructions: String
@@ -48,6 +49,7 @@ public struct WordPressAuthenticatorDisplayStrings {
     public let resetPasswordButtonTitle: String
     public let getLoginLinkButtonTitle: String
     public let textCodeButtonTitle: String
+    public let securityKeyButtonTitle: String
     public let loginTermsOfService: String
     public let signupTermsOfService: String
     public let whatIsWPComLinkTitle: String
@@ -70,6 +72,7 @@ public struct WordPressAuthenticatorDisplayStrings {
                 siteCredentialInstructions: String = defaultStrings.siteCredentialInstructions,
                 usernamePasswordInstructions: String = defaultStrings.usernamePasswordInstructions,
                 twoFactorInstructions: String = defaultStrings.twoFactorInstructions,
+                twoFactorOtherFormsInstructions: String = defaultStrings.twoFactorOtherFormsInstructions,
                 magicLinkSignupInstructions: String = defaultStrings.magicLinkSignupInstructions,
                 openMailSignupInstructions: String = defaultStrings.openMailSignupInstructions,
                 openMailLoginInstructions: String = defaultStrings.openMailLoginInstructions,
@@ -93,6 +96,7 @@ public struct WordPressAuthenticatorDisplayStrings {
                 resetPasswordButtonTitle: String = defaultStrings.resetPasswordButtonTitle,
                 getLoginLinkButtonTitle: String = defaultStrings.getLoginLinkButtonTitle,
                 textCodeButtonTitle: String = defaultStrings.textCodeButtonTitle,
+                securityKeyButtonTitle: String = defaultStrings.securityKeyButtonTitle,
                 loginTermsOfService: String = defaultStrings.loginTermsOfService,
                 signupTermsOfService: String = defaultStrings.signupTermsOfService,
                 whatIsWPComLinkTitle: String = defaultStrings.whatIsWPComLinkTitle,
@@ -113,6 +117,7 @@ public struct WordPressAuthenticatorDisplayStrings {
 		self.siteCredentialInstructions = siteCredentialInstructions
         self.usernamePasswordInstructions = usernamePasswordInstructions
         self.twoFactorInstructions = twoFactorInstructions
+        self.twoFactorOtherFormsInstructions = twoFactorOtherFormsInstructions
         self.magicLinkSignupInstructions = magicLinkSignupInstructions
         self.openMailSignupInstructions = openMailSignupInstructions
         self.openMailLoginInstructions = openMailLoginInstructions
@@ -136,6 +141,7 @@ public struct WordPressAuthenticatorDisplayStrings {
         self.resetPasswordButtonTitle = resetPasswordButtonTitle
         self.getLoginLinkButtonTitle = getLoginLinkButtonTitle
         self.textCodeButtonTitle = textCodeButtonTitle
+        self.securityKeyButtonTitle = securityKeyButtonTitle
         self.loginTermsOfService = loginTermsOfService
         self.signupTermsOfService = signupTermsOfService
         self.whatIsWPComLinkTitle = whatIsWPComLinkTitle
@@ -167,8 +173,10 @@ public extension WordPressAuthenticatorDisplayStrings {
                                                           comment: "Enter your account information for {site url}. Asks the user to enter a username and password for their self-hosted site."),
             usernamePasswordInstructions: NSLocalizedString("Log in with your WordPress.com username and password.",
                                                             comment: "Instructions on the WordPress.com username / password log in form."),
-            twoFactorInstructions: NSLocalizedString("Please enter the verification code from your authenticator app, or tap the link below to receive a code via SMS.",
+            twoFactorInstructions: NSLocalizedString("Please enter the verification code from your authenticator app.",
                                                      comment: "Instruction text on the two-factor screen."),
+            twoFactorOtherFormsInstructions: NSLocalizedString("Or choose another form of authentication.",
+                                                               comment: "Instruction text for other forms of two-factor auth methods."),
             magicLinkSignupInstructions: NSLocalizedString("We'll email you a signup link to create your new WordPress.com account.",
                                                            comment: "Instruction text on the Sign Up screen."),
             openMailSignupInstructions: NSLocalizedString("We've emailed you a signup link to create your new WordPress.com account. Check your email on this device, and tap the link in the email you receive from WordPress.com.",
@@ -210,8 +218,10 @@ public extension WordPressAuthenticatorDisplayStrings {
                                                         comment: "The button title for a secondary call-to-action button. When the user can't remember their password."),
             getLoginLinkButtonTitle: NSLocalizedString("Get a login link by email",
                                                        comment: "The button title for a secondary call-to-action button. When the user wants to try sending a magic link instead of entering a password."),
-            textCodeButtonTitle: NSLocalizedString("Text me a code instead",
+            textCodeButtonTitle: NSLocalizedString("Text me a code via SMS",
                                                    comment: "The button's title text to send a 2FA code via SMS text message."),
+            securityKeyButtonTitle: NSLocalizedString("Use a security key",
+                                                      comment: "The button's title text to use a security key."),
             loginTermsOfService: NSLocalizedString("By continuing, you agree to our _Terms of Service_.", comment: "Legal disclaimer for logging in. The underscores _..._ denote underline."),
             signupTermsOfService: NSLocalizedString("If you continue with Apple or Google and don't already have a WordPress.com account, you are creating an account and you agree to our _Terms of Service_.", comment: "Legal disclaimer for signing up. The underscores _..._ denote underline."),
             whatIsWPComLinkTitle: NSLocalizedString("What is WordPress.com?",

WordPressAuthenticator/Authenticator/WordPressAuthenticatorDisplayStrings.swift

@@ -32,6 +32,9 @@ extension WordPressSupportSourceTag {
     public static var login2FA: WordPressSupportSourceTag {
         return WordPressSupportSourceTag(name: "login2FA", origin: "origin:login-2fa")
     }
+    public static var loginWebauthn: WordPressSupportSourceTag {
+        return WordPressSupportSourceTag(name: "loginWebauthn", origin: "origin:login-webauthn")
+    }
     public static var loginMagicLink: WordPressSupportSourceTag {
         return WordPressSupportSourceTag(name: "loginMagicLink", origin: "origin:login-magic-link")
     }

WordPressAuthenticator/Authenticator/WordPressSupportSourceTag.swift

@@ -13,9 +13,11 @@ extension FancyAlertViewController {
 
     typealias ButtonConfig = FancyAlertViewController.Config.ButtonConfig
 
-    private static func defaultButton() -> ButtonConfig {
+    private static func defaultButton(onTap: (() -> ())? = nil) -> ButtonConfig {
         return ButtonConfig(Strings.OK) { controller, _ in
-            controller.dismiss(animated: true, completion: nil)
+            controller.dismiss(animated: true, completion: {
+                onTap?()
+            })
         }
     }
 
@@ -144,7 +146,7 @@ extension FancyAlertViewController {
     /// - Parameter message: The error message to show.
     /// - Parameter sourceTag: tag of the source of the error
     ///
-    static func alertForGenericErrorMessageWithHelpButton(_ message: String, loginFields: LoginFields, sourceTag: WordPressSupportSourceTag) -> FancyAlertViewController {
+    static func alertForGenericErrorMessageWithHelpButton(_ message: String, loginFields: LoginFields, sourceTag: WordPressSupportSourceTag, onDismiss: (() -> ())? = nil) -> FancyAlertViewController {
 
         // If support is not enabled, don't add a Help Button since it won't do anything.
         var moreHelpButton: ButtonConfig?
@@ -172,7 +174,7 @@ extension FancyAlertViewController {
                                                      bodyText: message,
                                                      headerImage: nil,
                                                      dividerPosition: .top,
-                                                     defaultButton: defaultButton(),
+                                                     defaultButton: defaultButton(onTap: onDismiss),
                                                      cancelButton: nil,
                                                      moreInfoButton: moreHelpButton,
                                                      titleAccessoryButton: nil,