Merge branch 'develop' into fix/140-nux-button-indicator-color

# Conflicts:
#	WordPressAuthenticator.podspec

Author: danielebogo

WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift

@@ -4,7 +4,7 @@ import NSURL_IDN
 import GoogleSignIn
 import WordPressShared
 import WordPressUI
-
+import AuthenticationServices
 
 // MARK: - WordPressAuthenticator: Public API to deal with WordPress.com and WordPress.org authentication.
 //
@@ -469,11 +469,11 @@ import WordPressUI
 
 @available(iOS 13.0, *)
 public extension WordPressAuthenticator {
-    
-    func checkAppleIDCredentialState(for userID: String, completion:  @escaping (Bool, Error?) -> Void) {
-        AppleAuthenticator.sharedInstance.checkAppleIDCredentialState(for: userID) { (state, error) in
+
+    func getAppleIDCredentialState(for userID: String, completion:  @escaping (ASAuthorizationAppleIDProvider.CredentialState, Error?) -> Void) {
+        AppleAuthenticator.sharedInstance.getAppleIDCredentialState(for: userID) { (state, error) in
             // If credentialState == .notFound, error will have a value.
-            completion(state != .revoked, error)
+            completion(state, error)
         }
     }
 

WordPressAuthenticator/Signin/AppleAuthenticator.swift

@@ -77,6 +77,9 @@ private extension AppleAuthenticator {
                                          success: { [weak self] accountCreated, existingNonSocialAccount, wpcomUsername, wpcomToken in
                                             SVProgressHUD.dismiss()
 
+                                            // Notify host app of successful Apple authentication
+                                            self?.authenticationDelegate.userAuthenticatedWithAppleUserID(appleCredentials.user)
+                                            
                                             guard !existingNonSocialAccount else {
                                                 self?.logInInstead()
                                                 return
@@ -168,7 +171,6 @@ extension AppleAuthenticator: ASAuthorizationControllerDelegate {
     func authorizationController(controller: ASAuthorizationController, didCompleteWithAuthorization authorization: ASAuthorization) {
         switch authorization.credential {
         case let credentials as ASAuthorizationAppleIDCredential:
-            authenticationDelegate.userAuthenticatedWithAppleUserID(credentials.user)
             createWordPressComUser(appleCredentials: credentials)
         default:
             break
@@ -199,8 +201,8 @@ extension AppleAuthenticator: ASAuthorizationControllerPresentationContextProvid
 
 @available(iOS 13.0, *)
 extension AppleAuthenticator {
-    func checkAppleIDCredentialState(for userID: String,
-                                     completion: @escaping (ASAuthorizationAppleIDProvider.CredentialState, Error?) -> Void) {
+    func getAppleIDCredentialState(for userID: String,
+                                   completion: @escaping (ASAuthorizationAppleIDProvider.CredentialState, Error?) -> Void) {
         ASAuthorizationAppleIDProvider().getCredentialState(forUserID: userID, completion: completion)
     }
 }