Merge pull request #96 from wordpress-mobile/upate-rest-api-usage

Use wpcomAPIBaseURL in all WordPressComRestApi instances

Author: jtreanor

WordPressAuthenticator/Services/SignupService.swift

@@ -47,7 +47,9 @@ class SignupService {
 private extension SignupService {
 
     var anonymousAPI: WordPressComRestApi {
-        return WordPressComRestApi(oAuthToken: nil, userAgent: configuration.userAgent)
+        return WordPressComRestApi(oAuthToken: nil,
+                                   userAgent: configuration.userAgent,
+                                   baseUrlString: configuration.wpcomAPIBaseURL)
     }
 
     var configuration: WordPressAuthenticatorConfiguration {

WordPressAuthenticator/Services/WordPressComAccountService.swift

@@ -22,7 +22,9 @@ class WordPressComAccountService {
     /// Connects a WordPress.com account with the specified Social Service.
     ///
     func connect(wpcomAuthToken: String, serviceName: SocialServiceName, serviceToken: String, success: @escaping () -> Void, failure: @escaping (Error) -> Void) {
-        let loggedAPI  = WordPressComRestApi(oAuthToken: wpcomAuthToken, userAgent: configuration.userAgent)
+        let loggedAPI  = WordPressComRestApi(oAuthToken: wpcomAuthToken,
+                                             userAgent: configuration.userAgent,
+                                             baseUrlString: configuration.wpcomAPIBaseURL)
         let remote = AccountServiceRemoteREST(wordPressComRestApi: loggedAPI)
 
         remote.connectToSocialService(serviceName,
@@ -70,7 +72,9 @@ class WordPressComAccountService {
     /// Returns an anonymous WordPressComRestApi Instance.
     ///
     private var anonymousAPI: WordPressComRestApi {
-        return WordPressComRestApi(oAuthToken: nil, userAgent: configuration.userAgent)
+        return WordPressComRestApi(oAuthToken: nil,
+                                   userAgent: configuration.userAgent,
+                                   baseUrlString: configuration.wpcomAPIBaseURL)
     }
 
     /// Returns the current WordPressAuthenticatorConfiguration Instance.

WordPressAuthenticator/Services/WordPressComBlogService.swift

@@ -10,7 +10,8 @@ class WordPressComBlogService {
     ///
     private var anonymousAPI: WordPressComRestApi {
         let userAgent = WordPressAuthenticator.shared.configuration.userAgent
-        return WordPressComRestApi(oAuthToken: nil, userAgent: userAgent)
+        let baseUrl = WordPressAuthenticator.shared.configuration.wpcomAPIBaseURL
+        return WordPressComRestApi(oAuthToken: nil, userAgent: userAgent, baseUrlString: baseUrl)
     }
 
 

WordPressAuthenticator/Signup/SignupEmailViewController.swift

@@ -140,7 +140,8 @@ class SignupEmailViewController: LoginViewController, NUXKeyboardResponder {
 
     private func checkEmailAvailability(completion:@escaping (Bool) -> ()) {
 
-        let remote = AccountServiceRemoteREST(wordPressComRestApi: WordPressComRestApi())
+        let remote = AccountServiceRemoteREST(
+            wordPressComRestApi: WordPressComRestApi(baseUrlString: WordPressAuthenticator.shared.configuration.wpcomAPIBaseURL))
 
         remote.isEmailAvailable(loginFields.emailAddress, success: { available in
             if !available {