Merge pull request #45 from wordpress-mobile/issue/5166-login_with_site

Prompt user to logout before connecting to WPCom site

Author: yaelirub

Podfile.lock

@@ -121,6 +121,6 @@ SPEC CHECKSUMS:
   WordPressUI: af141587ec444f9af753a00605bd0d3f14d8d8a3
   wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2
 
-PODFILE CHECKSUM: f32a09c9b495b518f6426d0baad6f5c28cc22545
+PODFILE CHECKSUM: cd63cfaba8f70b78fe639f5db17d4efa2049df04
 
 COCOAPODS: 1.5.3

WordPressAuthenticator.podspec

@@ -34,6 +34,6 @@ Pod::Spec.new do |s|
   s.dependency 'Gridicons', '~> 0.15'
   s.dependency 'GoogleSignInRepacked', '4.1.2'
   s.dependency 'WordPressUI', '~> 1.0'
-  s.dependency 'WordPressKit', '~> 1.7'
+  s.dependency 'WordPressKit', '~> 1.7.0-beta'
   s.dependency 'WordPressShared', '~> 1.4'
 end

WordPressAuthenticator/Authenticator/WordPressAuthenticatorDelegateProtocol.swift

@@ -20,6 +20,9 @@ public protocol WordPressAuthenticatorDelegate: class {
     ///
     var supportEnabled: Bool { get }
 
+    /// Returns true if there isn't a default WordPress.com account connected in the app.
+    var allowWPComLogin: Bool { get }
+
     /// Signals the Host App that a new WordPress.com account has just been created.
     ///
     /// - Parameters:

WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift

@@ -187,7 +187,13 @@ class LoginSiteAddressViewController: LoginViewController, NUXKeyboardResponder
             let service = WordPressComBlogService()
             service.fetchSiteInfo(for: siteAddress, success: { [weak self] siteInfo in
                 self?.loginFields.meta.siteInfo = siteInfo
-                self?.showSelfHostedUsernamePassword()
+                if WordPressAuthenticator.shared.delegate?.allowWPComLogin == false {
+                    self?.promptUserToLogoutBeforeConnectingWPComSite()
+                    self?.configureViewLoading(false)
+                } else {
+                    self?.showSelfHostedUsernamePassword()
+                }
+                
             }, failure: { [weak self] (error) in
                 self?.showSelfHostedUsernamePassword()
             })
@@ -227,6 +233,13 @@ class LoginSiteAddressViewController: LoginViewController, NUXKeyboardResponder
         return loginFields.validateSiteForSignin()
     }
 
+    @objc private func promptUserToLogoutBeforeConnectingWPComSite() {
+        let acceptActionTitle = NSLocalizedString("OK", comment: "Alert dismissal title")
+        let message = NSLocalizedString("Please log out before connecting to a different wordpress.com site", comment: "Message for alert to prompt user to logout before connecting to a different wordpress.com site.")
+        let alertController = UIAlertController(title: nil, message: message, preferredStyle: .alert)
+        alertController.addDefaultActionWithTitle(acceptActionTitle)
+        present(alertController, animated: true)
+    }
 
     // MARK: - Actions