Merge remote-tracking branch 'origin/develop'

Author: jkmassel

WordPressAuthenticator.podspec

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

WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift

@@ -57,6 +57,8 @@ public struct WordPressAuthenticatorStyle {
     ///
     public let viewControllerBackgroundColor: UIColor
 
+    public let textFieldBackgroundColor: UIColor
+
     /// Style: nav bar
     ///
     public let navBarImage: UIImage
@@ -77,7 +79,7 @@ public struct WordPressAuthenticatorStyle {
 
     /// Designated initializer
     ///
-    public init(primaryNormalBackgroundColor: UIColor, primaryNormalBorderColor: UIColor, primaryHighlightBackgroundColor: UIColor, primaryHighlightBorderColor: UIColor, secondaryNormalBackgroundColor: UIColor, secondaryNormalBorderColor: UIColor, secondaryHighlightBackgroundColor: UIColor, secondaryHighlightBorderColor: UIColor, disabledBackgroundColor: UIColor, disabledBorderColor: UIColor, primaryTitleColor: UIColor, secondaryTitleColor: UIColor, disabledTitleColor: UIColor, textButtonColor: UIColor, textButtonHighlightColor: UIColor, instructionColor: UIColor, subheadlineColor: UIColor, placeholderColor: UIColor, viewControllerBackgroundColor: UIColor, navBarImage: UIImage, navBarBadgeColor: UIColor, prologueBackgroundColor: UIColor = WPStyleGuide.wordPressBlue(), prologueTitleColor: UIColor = .white, statusBarStyle: UIStatusBarStyle = .lightContent) {
+    public init(primaryNormalBackgroundColor: UIColor, primaryNormalBorderColor: UIColor, primaryHighlightBackgroundColor: UIColor, primaryHighlightBorderColor: UIColor, secondaryNormalBackgroundColor: UIColor, secondaryNormalBorderColor: UIColor, secondaryHighlightBackgroundColor: UIColor, secondaryHighlightBorderColor: UIColor, disabledBackgroundColor: UIColor, disabledBorderColor: UIColor, primaryTitleColor: UIColor, secondaryTitleColor: UIColor, disabledTitleColor: UIColor, textButtonColor: UIColor, textButtonHighlightColor: UIColor, instructionColor: UIColor, subheadlineColor: UIColor, placeholderColor: UIColor, viewControllerBackgroundColor: UIColor, textFieldBackgroundColor: UIColor, navBarImage: UIImage, navBarBadgeColor: UIColor, prologueBackgroundColor: UIColor = WPStyleGuide.wordPressBlue(), prologueTitleColor: UIColor = .white, statusBarStyle: UIStatusBarStyle = .lightContent) {
         self.primaryNormalBackgroundColor = primaryNormalBackgroundColor
         self.primaryNormalBorderColor = primaryNormalBorderColor
         self.primaryHighlightBackgroundColor = primaryHighlightBackgroundColor
@@ -97,6 +99,7 @@ public struct WordPressAuthenticatorStyle {
         self.subheadlineColor = subheadlineColor
         self.placeholderColor = placeholderColor
         self.viewControllerBackgroundColor = viewControllerBackgroundColor
+        self.textFieldBackgroundColor = textFieldBackgroundColor
         self.navBarImage = navBarImage
         self.navBarBadgeColor = navBarBadgeColor
         self.prologueBackgroundColor = prologueBackgroundColor

WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift

@@ -124,7 +124,10 @@ extension WPStyleGuide {
     class func appleLoginButton() -> UIControl {
         #if XCODE11
         if #available(iOS 13.0, *) {
-            let appleButton = ASAuthorizationAppleIDButton(authorizationButtonType: .continue, authorizationButtonStyle: .black)
+            let traits = UITraitCollection.current
+            let buttonStyle: ASAuthorizationAppleIDButton.Style = (traits.userInterfaceStyle == .dark) ? .white : .black
+
+            let appleButton = ASAuthorizationAppleIDButton(authorizationButtonType: .continue, authorizationButtonStyle: buttonStyle)
             appleButton.translatesAutoresizingMaskIntoConstraints = false
             appleButton.heightAnchor.constraint(greaterThanOrEqualToConstant: Constants.buttonMinHeight).isActive = true
             return appleButton

WordPressAuthenticator/NUX/WPWalkthroughTextField.m

@@ -95,6 +95,10 @@ - (void)commonInit
                                      };
         self.attributedPlaceholder = [[NSAttributedString alloc] initWithString:self.placeholder attributes:attributes];
     }
+
+    if (@available(iOS 13.0, *)) {
+        self.leadingViewInsets = UIEdgeInsetsMake(0, 0, 0, LeftImageSpacing);
+    }
 }
 
 - (void)awakeFromNib {

WordPressAuthenticator/Services/SignupService.swift

@@ -51,7 +51,7 @@ class SignupService {
     func createWPComUserWithApple(token: String,
                                   email: String,
                                   fullName: String?,
-                                  success: @escaping (_ newAccount: Bool, _ username: String, _ wpcomToken: String) -> Void,
+                                  success: @escaping (_ newAccount: Bool, _ existingNonSocialAccount: Bool, _ username: String, _ wpcomToken: String) -> Void,
                                   failure: @escaping (_ error: Error) -> Void) {
         let remote = WordPressComServiceRemote(wordPressComRestApi: anonymousAPI)
 
@@ -68,8 +68,16 @@ class SignupService {
                                     }
 
                                     let createdAccount = (response?[ResponseKeys.createdAccount] as? Int ?? 0) == 1
-                                    success(createdAccount, username, bearer_token)
+                                    success(createdAccount, false, username, bearer_token)
         }, failure: { error in
+            if let error = (error as NSError?) {
+                let existingNonSocialAccount = (error.userInfo[ErrorKeys.errorCode] as? String ?? "") == ErrorKeys.existingNonSocialUser
+                if existingNonSocialAccount {
+                    success(false, true, "", "")
+                    return
+                }
+            }
+
             failure(error ?? SignupError.unknown)
         })
     }
@@ -96,6 +104,11 @@ private extension SignupService {
         static let username = "username"
         static let createdAccount = "created_account"
     }
+
+    struct ErrorKeys {
+        static let errorCode = "WordPressComRestApiErrorCodeKey"
+        static let existingNonSocialUser = "user_exists"
+    }
 }
 
 

WordPressAuthenticator/Signin/AppleAuthenticator.swift

@@ -1,6 +1,7 @@
 import Foundation
 import AuthenticationServices
 import WordPressKit
+import SVProgressHUD
 
 #if XCODE11
 
@@ -57,19 +58,27 @@ 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 {
+            let token = String(data: identityToken, encoding: .utf8) else {
                 DDLogError("Apple Authenticator: invalid Apple credentials.")
                 return
         }
 
+        SVProgressHUD.show(withStatus: NSLocalizedString("Continuing with Apple", comment: "Shown while logging in with Apple and the app waits for the site creation process to complete."))
+        
+        let email = appleCredentials.email ?? ""
         let name = fullName(from: appleCredentials.fullName)
 
         updateLoginFields(email: email, fullName: name, token: token)
 
         let service = SignupService()
         service.createWPComUserWithApple(token: token, email: email, fullName: name,
-                                         success: { [weak self] accountCreated, wpcomUsername, wpcomToken in
+                                         success: { [weak self] accountCreated, existingNonSocialAccount, wpcomUsername, wpcomToken in
+                                            SVProgressHUD.dismiss()
+
+                                            guard !existingNonSocialAccount else {
+                                                self?.logInInstead()
+                                                return
+                                            }
 
                                             let wpcom = WordPressComCredentials(authToken: wpcomToken, isJetpackLogin: false, multifactor: false, siteURL: self?.loginFields.siteAddress ?? "")
                                             let credentials = AuthenticatorCredentials(wpcom: wpcom)
@@ -79,12 +88,15 @@ private extension AppleAuthenticator {
                                                 self?.authenticationDelegate.createdWordPressComAccount(username: wpcomUsername, authToken: wpcomToken)
                                                 self?.signupSuccessful(with: credentials)
                                                 return
+                                            } else {
+                                                self?.authenticationDelegate.createdWordPressComAccount(username: wpcomUsername, authToken: wpcomToken)
+                                                self?.signinSuccessful(with: credentials)
+                                                return
                                             }
-
-                                            // Existing WP Account
-                                            self?.logInInstead()
 
             }, failure: { [weak self] error in
+                SVProgressHUD.dismiss()
+                
                 self?.signupFailed(with: error)
         })
     }
@@ -95,6 +107,11 @@ private extension AppleAuthenticator {
         showSignupEpilogue(for: credentials)
     }
 
+    func signinSuccessful(with credentials: AuthenticatorCredentials) {
+        // TODO: Tracks events for login
+        showSigninEpilogue(for: credentials)
+    }
+    
     func showSignupEpilogue(for credentials: AuthenticatorCredentials) {
         guard let navigationController = showFromViewController?.navigationController else {
             fatalError()
@@ -107,6 +124,14 @@ private extension AppleAuthenticator {
         authenticationDelegate.presentSignupEpilogue(in: navigationController, for: credentials, service: service)
     }
 
+    func showSigninEpilogue(for credentials: AuthenticatorCredentials) {
+        guard let navigationController = showFromViewController?.navigationController else {
+            fatalError()
+        }
+
+        authenticationDelegate.presentLoginEpilogue(in: navigationController, for: credentials) {}
+    }
+    
     func signupFailed(with error: Error) {
         WPAnalytics.track(.signupSocialFailure)
         DDLogError("Apple Authenticator: signup failed. error: \(error)")

WordPressAuthenticator/UI/LoginTextField.swift

@@ -3,6 +3,12 @@ import WordPressShared
 
 open class LoginTextField: WPWalkthroughTextField {
 
+    open override func awakeFromNib() {
+        super.awakeFromNib()
+
+        backgroundColor = WordPressAuthenticator.shared.style.textFieldBackgroundColor
+    }
+
     override open func draw(_ rect: CGRect) {
         if showTopLineSeparator {
             guard let context = UIGraphicsGetCurrentContext() else {