Merge pull request #62 from wordpress-mobile/issues/wpcom-credentials-change

Issues/wpcom credentials change

Author: aerych

WordPressAuthenticator.podspec

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

WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift

@@ -247,10 +247,7 @@ import WordPressUI
             return false
         }
 
-        guard let loginFields = retrieveLoginInfoForTokenAuth() else {
-            DDLogInfo("App opened with authentication link but info wasn't found for token.")
-            return false
-        }
+        let loginFields = retrieveLoginInfoForTokenAuth()
 
         // The only time we should expect a magic link login when there is already a default wpcom account
         // is when a user is logging into Jetpack.
@@ -265,7 +262,6 @@ import WordPressUI
             return false
         }
         loginController.loginFields = loginFields
-        loginController.email = loginFields.username
         loginController.token = token
         let controller = loginController
 
@@ -370,13 +366,14 @@ import WordPressUI
     ///
     /// - Returns: A loginFields instance or nil.
     ///
-    class func retrieveLoginInfoForTokenAuth() -> LoginFields? {
+    class func retrieveLoginInfoForTokenAuth() -> LoginFields {
+
+        let loginFields = LoginFields()
 
         guard let dict = UserDefaults.standard.dictionary(forKey: Constants.authenticationInfoKey) else {
-            return nil
+            return loginFields
         }
 
-        let loginFields = LoginFields()
         if let username = dict[Constants.username] as? String {
             loginFields.username = username
         }

WordPressAuthenticator/Credentials/WordPressCredentials.swift

@@ -9,5 +9,5 @@ public enum WordPressCredentials {
 
     /// WordPress.com Site Credentials.
     ///
-    case wpcom(username: String, authToken: String, isJetpackLogin: Bool, multifactor: Bool)
+    case wpcom(authToken: String, isJetpackLogin: Bool, multifactor: Bool)
 }

WordPressAuthenticator/NUX/NUXLinkAuthViewController.swift

@@ -9,15 +9,13 @@ import WordPressShared
 ///
 class NUXLinkAuthViewController: LoginViewController {
     @IBOutlet weak var statusLabel: UILabel?
-    @objc var email: String = ""
     @objc var token: String = ""
     @objc var didSync: Bool = false
 
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
 
-        // Gotta have email and token to use this vc
-        assert(!email.isEmpty, "Email cannot be nil")
+        // Gotta have a token to use this vc
         assert(!token.isEmpty, "Email token cannot be nil")
 
         if didSync {
@@ -26,7 +24,7 @@ class NUXLinkAuthViewController: LoginViewController {
 
         didSync = true // Make sure we don't call this twice by accident
 
-        let credentials = WordPressCredentials.wpcom(username: email, authToken: token, isJetpackLogin: isJetpackLogin, multifactor: false)
+        let credentials = WordPressCredentials.wpcom(authToken: token, isJetpackLogin: isJetpackLogin, multifactor: false)
         syncWPComAndPresentEpilogue(credentials: credentials)
 
         // Count this as success since we're authed. Even if there is a glitch

WordPressAuthenticator/Services/LoginFacade.h

@@ -150,11 +150,10 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  *  Called when finished logging in to a WordPress.com site
  *
- *  @param username                 username of the site
  *  @param authToken                authToken to be used to access the site
  *  @param requiredMultifactorCode  whether the login required a 2fa code
  */
-- (void)finishedLoginWithUsername:(NSString *)username authToken:(NSString *)authToken requiredMultifactorCode:(BOOL)requiredMultifactorCode;
+- (void)finishedLoginWithAuthToken:(NSString *)authToken requiredMultifactorCode:(BOOL)requiredMultifactorCode;
 
 
 /**

WordPressAuthenticator/Services/LoginFacade.m

@@ -122,8 +122,8 @@ - (void)signInToWordpressDotCom:(LoginFields *)loginFields
     }
 
     [self.wordpressComOAuthClientFacade authenticateWithUsername:loginFields.username password:loginFields.password multifactorCode:loginFields.multifactorCode success:^(NSString *authToken) {
-        if ([self.delegate respondsToSelector:@selector(finishedLoginWithUsername:authToken:requiredMultifactorCode:)]) {
-            [self.delegate finishedLoginWithUsername:loginFields.username authToken:authToken requiredMultifactorCode:loginFields.meta.requiredMultifactor];
+        if ([self.delegate respondsToSelector:@selector(finishedLoginWithAuthToken:requiredMultifactorCode:)]) {
+            [self.delegate finishedLoginWithAuthToken:authToken requiredMultifactorCode:loginFields.meta.requiredMultifactor];
         }
     } needsMultiFactor:^{
         if ([self.delegate respondsToSelector:@selector(needsMultifactorCode)]) {

WordPressAuthenticator/Signin/Login2FAViewController.swift

@@ -172,7 +172,7 @@ class Login2FAViewController: LoginViewController, NUXKeyboardResponder, UITextF
     }
 
     func finishedLogin(withNonceAuthToken authToken: String) {
-        let credentials = WordPressCredentials.wpcom(username: loginFields.username, authToken: authToken, isJetpackLogin: isJetpackLogin, multifactor: true)
+        let credentials = WordPressCredentials.wpcom(authToken: authToken, isJetpackLogin: isJetpackLogin, multifactor: true)
         syncWPComAndPresentEpilogue(credentials: credentials)
 
         // Disconnect now that we're done with Google.

WordPressAuthenticator/Signin/LoginEmailViewController.swift

@@ -538,7 +538,7 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder {
 // LoginFacadeDelegate methods for Google Google Sign In
 extension LoginEmailViewController {
     func finishedLogin(withGoogleIDToken googleIDToken: String, authToken: String) {
-        let credentials = WordPressCredentials.wpcom(username: loginFields.username, authToken: authToken, isJetpackLogin: isJetpackLogin, multifactor: false)
+        let credentials = WordPressCredentials.wpcom(authToken: authToken, isJetpackLogin: isJetpackLogin, multifactor: false)
         syncWPComAndPresentEpilogue(credentials: credentials)
 
         // Disconnect now that we're done with Google.

WordPressAuthenticator/Signin/LoginViewController.swift

@@ -155,8 +155,8 @@ open class LoginViewController: NUXViewController, LoginFacadeDelegate {
     }
 
     // MARK: SigninWPComSyncHandler methods
-    dynamic open func finishedLogin(withUsername username: String, authToken: String, requiredMultifactorCode: Bool) {
-        let credentials = WordPressCredentials.wpcom(username: username, authToken: authToken, isJetpackLogin: isJetpackLogin, multifactor: requiredMultifactorCode)
+    dynamic open func finishedLogin(withAuthToken authToken: String, requiredMultifactorCode: Bool) {
+        let credentials = WordPressCredentials.wpcom(authToken: authToken, isJetpackLogin: isJetpackLogin, multifactor: requiredMultifactorCode)
 
         syncWPComAndPresentEpilogue(credentials: credentials)
 
@@ -247,7 +247,7 @@ extension LoginViewController {
         switch credentials {
         case .wporg:
             break
-        case .wpcom(_, _, _, let multifactor):
+        case .wpcom(_, _, let multifactor):
             properties = [
                 "multifactor": multifactor.description,
                 "dotcom_user": true.description

WordPressAuthenticator/Signup/SignupGoogleViewController.swift

@@ -100,7 +100,7 @@ private extension SignupGoogleViewController {
 
         service.createWPComUserWithGoogle(token: googleToken, success: { [weak self] accountCreated, wpcomUsername, wpcomToken in
 
-            let credentials = WordPressCredentials.wpcom(username: wpcomUsername, authToken: wpcomToken, isJetpackLogin: false, multifactor: false)
+            let credentials = WordPressCredentials.wpcom(authToken: wpcomToken, isJetpackLogin: false, multifactor: false)
 
             /// New Account: We'll signal the host app right away!
             ///