Merge branch 'develop'

Author: ScoutHarris

Podfile

@@ -12,7 +12,7 @@ def wordpress_authenticator_pods
   ##
   pod 'Gridicons', '~> 0.15'
   pod 'WordPressUI', '~> 1.3'
-  pod 'WordPressKit', '~> 4.5.0-beta.2'
+  pod 'WordPressKit', '~> 4.5.1-beta.1'
   pod 'WordPressShared', '~> 1.8'
 
   ## Third party libraries

Podfile.lock

@@ -44,7 +44,7 @@ PODS:
   - Specta (1.0.7)
   - SVProgressHUD (2.2.5)
   - UIDeviceIdentifier (1.1.4)
-  - WordPressKit (4.5.0-beta.2):
+  - WordPressKit (4.5.1-beta.1):
     - Alamofire (~> 4.7.3)
     - CocoaLumberjack (~> 3.4)
     - NSObject-SafeExpectations (= 0.0.3)
@@ -71,7 +71,7 @@ DEPENDENCIES:
   - OHHTTPStubs/Swift (= 8.0.0)
   - Specta (= 1.0.7)
   - SVProgressHUD (= 2.2.5)
-  - WordPressKit (~> 4.5.0-beta.2)
+  - WordPressKit (~> 4.5.1-beta.1)
   - WordPressShared (~> 1.8)
   - WordPressUI (~> 1.3)
 
@@ -117,11 +117,11 @@ SPEC CHECKSUMS:
   Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   UIDeviceIdentifier: 8f8a24b257a4d978c8d40ad1e7355b944ffbfa8c
-  WordPressKit: 6fb3101e9542398c895517d64ac435d3a4e83e25
+  WordPressKit: bab738886bfd6efe52e1d9d0d82d7fb46e30fa58
   WordPressShared: 34f7a1386d28d7e4650c1a225c554ee024401ca3
   WordPressUI: 0ea6df25bf6e63f0619376fa23870177cb37646f
   wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2
 
-PODFILE CHECKSUM: 066779a8741fbd6f8205a5d3469e19c8c80682b7
+PODFILE CHECKSUM: 54eac1537fd4ae3b816f763cc2d73e9d3189bf05
 
 COCOAPODS: 1.7.5

WordPressAuthenticator.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.10.0-beta.3"
+  s.version       = "1.10.0-beta.6"
   s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
 
   s.description   = <<-DESC
@@ -39,6 +39,6 @@ Pod::Spec.new do |s|
   s.dependency 'Gridicons', '~> 0.15'
   s.dependency 'GoogleSignIn', '~> 4.4'
   s.dependency 'WordPressUI', '~> 1.3'
-  s.dependency 'WordPressKit', '~> 4.5.0'
+  s.dependency 'WordPressKit', '~> 4.5.1-beta.1'
   s.dependency 'WordPressShared', '~> 1.8'
 end

WordPressAuthenticator/NUX/NUXButton.swift

@@ -8,8 +8,21 @@ import WordPressUI
         return activityIndicator.isAnimating
     }
 
+    open override var isEnabled: Bool {
+        didSet {
+            if #available(iOS 13, *) {
+                activityIndicator.color = isEnabled ? style.primaryTitleColor : style.secondaryTitleColor
+            }
+        }
+    }
+
     @objc let activityIndicator: UIActivityIndicatorView = {
-        let indicator = UIActivityIndicatorView(style: .white)
+        let indicator: UIActivityIndicatorView
+        if #available(iOS 13, *) {
+            indicator = UIActivityIndicatorView(style: .medium)
+        } else {
+            indicator = UIActivityIndicatorView(style: .white)
+        }
         indicator.color = WordPressAuthenticator.shared.style.primaryTitleColor
         indicator.hidesWhenStopped = true
         return indicator
@@ -69,7 +82,10 @@ import WordPressUI
     open override func awakeFromNib() {
         super.awakeFromNib()
         configureAppearance()
-        activityIndicator.style = .gray
+        guard #available(iOS 13, *) else {
+            activityIndicator.style = .gray
+            return
+        }
     }
 
     /// Setup: shorter reference for style

WordPressAuthenticator/Services/SignupService.swift

@@ -71,9 +71,19 @@ class SignupService {
                                     success(createdAccount, false, username, bearer_token)
         }, failure: { error in
             if let error = (error as NSError?) {
+
+                // If an account already exists, the account email should be returned in the Error response.
+                // Extract it and return it.
+                var existingEmail = ""
+                if let errorData = error.userInfo[WordPressComRestApi.ErrorKeyErrorData] as? [String: String] {
+                    let emailDict = errorData.first { $0.key == WordPressComRestApi.ErrorKeyErrorDataEmail }
+                    let email = emailDict?.value ?? ""
+                    existingEmail = email
+                }
+
                 let existingNonSocialAccount = (error.userInfo[ErrorKeys.errorCode] as? String ?? "") == ErrorKeys.existingNonSocialUser
                 if existingNonSocialAccount {
-                    success(false, true, "", "")
+                    success(false, true, existingEmail, "")
                     return
                 }
             }

WordPressAuthenticator/Signin/AppleAuthenticator.swift

@@ -81,6 +81,7 @@ private extension AppleAuthenticator {
                                             self?.authenticationDelegate.userAuthenticatedWithAppleUserID(appleCredentials.user)
 
                                             guard !existingNonSocialAccount else {
+                                                self?.updateLoginEmail(wpcomUsername)
                                                 self?.logInInstead()
                                                 return
                                             }
@@ -157,12 +158,16 @@ private extension AppleAuthenticator {
     }
 
     func updateLoginFields(email: String, fullName: String, token: String) {
-        loginFields.emailAddress = email
-        loginFields.username = email
+        updateLoginEmail(email)
         loginFields.meta.socialServiceIDToken = token
         loginFields.meta.appleUser = AppleUser(email: email, fullName: fullName)
     }
 
+    func updateLoginEmail(_ email: String) {
+        loginFields.emailAddress = email
+        loginFields.username = email
+    }
+
 }
 
 @available(iOS 13.0, *)