Merge pull request #59 from wordpress-mobile/release/1.1.10

Merge Release/1.1.10 into Master

Author: loremattei

Podfile

@@ -17,7 +17,7 @@ target 'WordPressAuthenticator' do
   ##
   pod 'Gridicons', '~> 0.15'
   pod 'WordPressUI', '~> 1.0'
-  pod 'WordPressKit', '~> 2.0-beta'
+  pod 'WordPressKit', '~> 3.0.0-beta.1'
   pod 'WordPressShared', '~> 1.4'
 
   ## Third party libraries

Podfile.lock

@@ -45,14 +45,14 @@ PODS:
   - Specta (1.0.7)
   - SVProgressHUD (2.2.5)
   - UIDeviceIdentifier (1.1.4)
-  - WordPressKit (2.0.0-beta.1):
+  - WordPressKit (3.0.0-beta.1):
     - Alamofire (~> 4.7.3)
     - CocoaLumberjack (= 3.4.2)
     - NSObject-SafeExpectations (= 0.0.3)
     - UIDeviceIdentifier (~> 1.1.4)
     - WordPressShared (~> 1.4)
     - wpxmlrpc (= 0.8.4)
-  - WordPressShared (1.6.0):
+  - WordPressShared (1.7.0):
     - CocoaLumberjack (~> 3.4)
     - FormatterKit/TimeIntervalFormatter (= 1.8.2)
   - WordPressUI (1.2.0)
@@ -72,7 +72,7 @@ DEPENDENCIES:
   - OHHTTPStubs/Swift (= 6.1.0)
   - Specta (= 1.0.7)
   - SVProgressHUD (= 2.2.5)
-  - WordPressKit (~> 2.0-beta)
+  - WordPressKit (~> 3.0.0-beta.1)
   - WordPressShared (~> 1.4)
   - WordPressUI (~> 1.0)
 
@@ -116,11 +116,11 @@ SPEC CHECKSUMS:
   Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   UIDeviceIdentifier: 8f8a24b257a4d978c8d40ad1e7355b944ffbfa8c
-  WordPressKit: 2b6f01a7459d358b8cf6d825348c6cf7174107b2
-  WordPressShared: a2fc2db66c210a05d317ae9678b5823dd6a4d708
+  WordPressKit: 843906cb26fb8a92dddefd9a324a821555bf2b94
+  WordPressShared: cfbda56868419842dd7a106a4e807069a0c17aa9
   WordPressUI: 44fe43a9c5c504dfd534286e39e1ce6ebcd69ff5
   wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2
 
-PODFILE CHECKSUM: 82ea8bb53494ef9ee71085384656b7fd8edc69b8
+PODFILE CHECKSUM: bba3fa5287f208435d83f079ef7069a51a5c090a
 
 COCOAPODS: 1.5.3

WordPressAuthenticator.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.1.9"
+  s.version       = "1.1.10"
   s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
 
   s.description   = <<-DESC
@@ -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', '~> 2.0-beta'
+  s.dependency 'WordPressKit', '~> 3.0.0-beta.1'
   s.dependency 'WordPressShared', '~> 1.4'
 end

WordPressAuthenticator/Services/SignupService.swift

@@ -21,10 +21,8 @@ class SignupService {
                                    failure: @escaping (_ error: Error) -> Void) {
 
         let remote = WordPressComServiceRemote(wordPressComRestApi: anonymousAPI)
-        let locale = WordPressComLanguageDatabase().deviceLanguage.slug
 
         remote.createWPComAccount(withGoogle: token,
-                                  andLocale: locale,
                                   andClientID: configuration.wpcomClientId,
                                   andClientSecret: configuration.wpcomSecret,
                                   success: { response in

WordPressAuthenticator/Services/WordPressComBlogService.swift

@@ -33,6 +33,22 @@ class WordPressComBlogService {
             failure(result)
         })
     }
+    
+     func fetchUnauthenticatedSiteInfoForAddress(for address: String, success: @escaping (WordPressComSiteInfo) -> Void, failure: @escaping (Error) -> Void) {
+        let remote = BlogServiceRemoteREST(wordPressComRestApi: anonymousAPI, siteID: 0)
+        remote.fetchUnauthenticatedSiteInfo(forAddress: address, success: { response in
+            guard let response = response else {
+                failure(ServiceError.unknown)
+                return
+            }
+            
+            let site = WordPressComSiteInfo(remote: response)
+            success(site)
+        }, failure: { error in
+            let result = error ?? ServiceError.unknown
+            failure(result)
+        }) 
+    }
 }
 
 

WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift

@@ -181,21 +181,29 @@ class LoginSiteAddressViewController: LoginViewController, NUXKeyboardResponder
 
 
     @objc func fetchSiteInfo() {
-        let baseSiteUrl = WordPressAuthenticator.baseSiteURL(string: loginFields.siteAddress) as NSString
+        let baseSiteUrl = WordPressAuthenticator.baseSiteURL(string: loginFields.siteAddress)
+        let successBlock: (WordPressComSiteInfo) -> Void = { [weak self] siteInfo in
+            self?.loginFields.meta.siteInfo = siteInfo
+            if WordPressAuthenticator.shared.delegate?.allowWPComLogin == false {
+                self?.promptUserToLogoutBeforeConnectingWPComSite()
+                self?.configureViewLoading(false)
+            } else {
+                self?.showSelfHostedUsernamePassword()
+            }
+        }
         if let siteAddress = baseSiteUrl.components(separatedBy: "://").last {
-
             let service = WordPressComBlogService()
-            service.fetchSiteInfo(for: siteAddress, success: { [weak self] siteInfo in
-                self?.loginFields.meta.siteInfo = siteInfo
-                if WordPressAuthenticator.shared.delegate?.allowWPComLogin == false {
-                    self?.promptUserToLogoutBeforeConnectingWPComSite()
-                    self?.configureViewLoading(false)
+            service.fetchSiteInfo(for: siteAddress, success: successBlock, failure: { [weak self] (error) in
+                // If fetchSiteInfo failed due to the site is being private (errorCode == .authorizationRequired) we try to fetch the site info with a call to connect/site-info endpoint. If this call succeeds we check if login allowed
+                let originalError = error as NSError
+                let errorCode = WordPressComRestApiError(rawValue: originalError.code)
+                if errorCode == .authorizationRequired {
+                    service.fetchUnauthenticatedSiteInfoForAddress(for: baseSiteUrl, success: successBlock, failure: { error in
+                        self?.showSelfHostedUsernamePassword()
+                    })
                 } else {
                     self?.showSelfHostedUsernamePassword()
                 }
-                
-            }, failure: { [weak self] (error) in
-                self?.showSelfHostedUsernamePassword()
             })
 
         } else {