Merge branch 'develop'

Author: ScoutHarris

WordPressAuthenticator.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.8.0-beta.7"
+  s.version       = "1.8.0-beta.9"
   s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
 
   s.description   = <<-DESC

WordPressAuthenticator/Signin/AppleAuthenticator.swift

@@ -4,6 +4,10 @@ import WordPressKit
 
 #if XCODE11
 
+@objc protocol AppleAuthenticatorDelegate {
+    func showWPComLogin(loginFields: LoginFields)
+}
+
 class AppleAuthenticator: NSObject {
 
     // MARK: - Properties
@@ -12,6 +16,7 @@ class AppleAuthenticator: NSObject {
     private override init() {}
     private var showFromViewController: UIViewController?
     private let loginFields = LoginFields()
+    weak var delegate: AppleAuthenticatorDelegate?
 
     private var authenticationDelegate: WordPressAuthenticatorDelegate {
         guard let delegate = WordPressAuthenticator.shared.delegate else {
@@ -52,12 +57,12 @@ private extension AppleAuthenticator {
     @available(iOS 13.0, *)
     func createWordPressComUser(appleCredentials: ASAuthorizationAppleIDCredential) {
         guard let identityToken = appleCredentials.identityToken,
+            let token = String(data: identityToken, encoding: .utf8),
             let email = appleCredentials.email else {
                 DDLogError("Apple Authenticator: invalid Apple credentials.")
                 return
         }
 
-        let token = identityToken.base64EncodedString()
         let name = fullName(from: appleCredentials.fullName)
 
         updateLoginFields(email: email, fullName: name, token: token)
@@ -68,14 +73,16 @@ private extension AppleAuthenticator {
 
                                             let wpcom = WordPressComCredentials(authToken: wpcomToken, isJetpackLogin: false, multifactor: false, siteURL: self?.loginFields.siteAddress ?? "")
                                             let credentials = AuthenticatorCredentials(wpcom: wpcom)
-                                            
-                                            // New Account
+
+                                            // New WP Account
                                             if accountCreated {
                                                 self?.authenticationDelegate.createdWordPressComAccount(username: wpcomUsername, authToken: wpcomToken)
                                                 self?.signupSuccessful(with: credentials)
                                                 return
                                             }
-                                            // TODO: handle Existing Account.
+
+                                            // Existing WP Account
+                                            self?.logInInstead()
 
             }, failure: { [weak self] error in
                 self?.signupFailed(with: error)
@@ -105,6 +112,12 @@ private extension AppleAuthenticator {
         DDLogError("Apple Authenticator: signup failed. error: \(error)")
     }
 
+    func logInInstead() {
+        WordPressAuthenticator.track(.signupSocialToLogin)
+        WordPressAuthenticator.track(.loginSocialSuccess)
+        delegate?.showWPComLogin(loginFields: loginFields)
+    }
+    
     // MARK: - Helpers
 
     func fullName(from components: PersonNameComponents?) -> String {