Depend on WordPressKit 11.0 and declare some URL properties as URL (#827)

crazytonyli · web-flow · commit ae4c5a09e81a · 2024-01-19T11:42:34.000+13:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,7 +34,7 @@ _None._
 
 ### Breaking Changes
 
-_None._
+- Declare URL properties in `WordPressAuthenticatorConfiguration` as `URL`, instead of `String`. [#827]
 
 ### New Features
 
@@ -46,8 +46,7 @@ _None._
 
 ### Internal Changes
 
-- Relax WordPressKit dependency to `~> 9.0` [#824]
-- Depend on WordPressKit 10.0.0 [#826]
+- Change WordPressKit dependency version [#824, #826, #827]
 
 ## 8.0.1
 
diff --git a/Demo/AuthenticatorDemo/ViewController+WordPressAuthenticator.swift b/Demo/AuthenticatorDemo/ViewController+WordPressAuthenticator.swift
@@ -12,9 +12,9 @@ extension ViewController {
                 wpcomClientId: APICredentials.client,
                 wpcomSecret: APICredentials.secret,
                 wpcomScheme: "wordpress-authenticator-ios-demo",
-                wpcomTermsOfServiceURL: "https://wordpress.com/tos/",
-                wpcomBaseURL: "https://wordpress.com",
-                wpcomAPIBaseURL: "https://public-api.wordpress.com/",
+                wpcomTermsOfServiceURL: URL(string: "https://wordpress.com/tos/")!,
+                wpcomBaseURL: URL(string: "https://wordpress.com")!,
+                wpcomAPIBaseURL: URL(string: "https://public-api.wordpress.com/")!,
                 googleLoginClientId: APICredentials.googleLoginClientId,
                 googleLoginServerClientId: APICredentials.googleLoginServerClientId,
                 googleLoginScheme: APICredentials.googleLoginSchemeId,
diff --git a/Podfile b/Podfile
@@ -28,7 +28,7 @@ def wordpress_authenticator_pods
   ## These should match the version requirement from the podspec.
   pod 'Gridicons', '~> 1.0'
   pod 'WordPressUI', '~> 1.7-beta'
-  pod 'WordPressKit', '~> 10.0'
+  pod 'WordPressKit', '~> 11.0'
   pod 'WordPressShared', '~> 2.1-beta'
 
   third_party_pods
diff --git a/Podfile.lock b/Podfile.lock
@@ -13,10 +13,10 @@ PODS:
     - Gridicons (~> 1.0)
     - "NSURL+IDN (= 0.4)"
     - SVProgressHUD (~> 2.2.5)
-    - WordPressKit (~> 10.0)
+    - WordPressKit (~> 11.0)
     - WordPressShared (~> 2.1-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (10.0.0):
+  - WordPressKit (11.0.0):
     - Alamofire (~> 4.8.0)
     - NSObject-SafeExpectations (~> 0.0.4)
     - UIDeviceIdentifier (~> 2.0)
@@ -35,7 +35,7 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - SwiftLint (~> 0.49)
   - WordPressAuthenticator (from `.`)
-  - WordPressKit (~> 10.0)
+  - WordPressKit (~> 11.0)
   - WordPressShared (~> 2.1-beta)
   - WordPressUI (~> 1.7-beta)
 
@@ -71,12 +71,12 @@ SPEC CHECKSUMS:
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
   UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17
-  WordPressAuthenticator: 34fd67adc5569963af1cfd71b5ad7446d7b79b09
-  WordPressKit: dec055e14413d6674c3f44e86391015da6d0e754
+  WordPressAuthenticator: fc248b29f4070e5de3520702532eeb0c390476ff
+  WordPressKit: c9ec8dd6ea731af5a2d7cadb9944b67be716d63e
   WordPressShared: 87f3ee89b0a3e83106106f13a8b71605fb8eb6d2
   WordPressUI: a491454affda3b0fb812812e637dc5e8f8f6bd06
   wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
 
-PODFILE CHECKSUM: 415362dc6847c42b46cb67776a65fddd8c091cd1
+PODFILE CHECKSUM: 9dc67ad3b7985a633faef0b6b516c80f41513c7c
 
 COCOAPODS: 1.14.3
diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec
@@ -40,6 +40,6 @@ Pod::Spec.new do |s|
   # Use a loose restriction that allows both production and beta versions, up to the next major version.
   # If you want to update which of these is used, specify it in the host app.
   s.dependency 'WordPressUI', '~> 1.7-beta'
-  s.dependency 'WordPressKit', '~> 10.0'
+  s.dependency 'WordPressKit', '~> 11.0'
   s.dependency 'WordPressShared', '~> 2.1-beta'
 end
diff --git a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorConfiguration.swift b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorConfiguration.swift
@@ -18,21 +18,21 @@ public struct WordPressAuthenticatorConfiguration {
 
     /// WordPress.com Terms of Service URL
     ///
-    let wpcomTermsOfServiceURL: String
+    let wpcomTermsOfServiceURL: URL
 
     /// WordPress.com Base URL for OAuth
     ///
-    let wpcomBaseURL: String
+    let wpcomBaseURL: URL
 
     /// WordPress.com API Base URL
     ///
-    let wpcomAPIBaseURL: String
+    let wpcomAPIBaseURL: URL
 
     /// The URL of a webpage which has details about What is WordPress.com?.
     ///
     /// Displayed in the WordPress.com login page. The button/link will not be displayed if this value is nil.
     ///
-    let whatIsWPComURL: String?
+    let whatIsWPComURL: URL?
 
     /// GoogleLogin Client ID
     ///
@@ -179,10 +179,10 @@ public struct WordPressAuthenticatorConfiguration {
     public init (wpcomClientId: String,
                  wpcomSecret: String,
                  wpcomScheme: String,
-                 wpcomTermsOfServiceURL: String,
-                 wpcomBaseURL: String = WordPressComOAuthClient.WordPressComOAuthDefaultBaseUrl,
-                 wpcomAPIBaseURL: String = WordPressComOAuthClient.WordPressComOAuthDefaultApiBaseUrl,
-                 whatIsWPComURL: String? = nil,
+                 wpcomTermsOfServiceURL: URL,
+                 wpcomBaseURL: URL = WordPressComOAuthClient.WordPressComOAuthDefaultBaseURL,
+                 wpcomAPIBaseURL: URL = WordPressComOAuthClient.WordPressComOAuthDefaultApiBaseURL,
+                 whatIsWPComURL: URL? = nil,
                  googleLoginClientId: String,
                  googleLoginServerClientId: String,
                  googleLoginScheme: String,
diff --git a/WordPressAuthenticator/Services/SignupService.swift b/WordPressAuthenticator/Services/SignupService.swift
@@ -108,7 +108,7 @@ private extension SignupService {
     var anonymousAPI: WordPressComRestApi {
         return WordPressComRestApi(oAuthToken: nil,
                                    userAgent: configuration.userAgent,
-                                   baseUrlString: configuration.wpcomAPIBaseURL)
+                                   baseURL: configuration.wpcomAPIBaseURL)
     }
 
     var configuration: WordPressAuthenticatorConfiguration {
diff --git a/WordPressAuthenticator/Services/WordPressComAccountService.swift b/WordPressAuthenticator/Services/WordPressComAccountService.swift
@@ -31,7 +31,7 @@ public class WordPressComAccountService {
                  failure: @escaping (Error) -> Void) {
         let loggedAPI  = WordPressComRestApi(oAuthToken: wpcomAuthToken,
                                              userAgent: configuration.userAgent,
-                                             baseUrlString: configuration.wpcomAPIBaseURL)
+                                             baseURL: configuration.wpcomAPIBaseURL)
         let remote = AccountServiceRemoteREST(wordPressComRestApi: loggedAPI)
 
         remote.connectToSocialService(serviceName,
@@ -83,7 +83,7 @@ public class WordPressComAccountService {
     private var anonymousAPI: WordPressComRestApi {
         return WordPressComRestApi(oAuthToken: nil,
                                    userAgent: configuration.userAgent,
-                                   baseUrlString: configuration.wpcomAPIBaseURL)
+                                   baseURL: configuration.wpcomAPIBaseURL)
     }
 
     /// Returns the current WordPressAuthenticatorConfiguration Instance.
diff --git a/WordPressAuthenticator/Services/WordPressComBlogService.swift b/WordPressAuthenticator/Services/WordPressComBlogService.swift
@@ -10,7 +10,7 @@ class WordPressComBlogService {
     private var anonymousAPI: WordPressComRestApi {
         let userAgent = WordPressAuthenticator.shared.configuration.userAgent
         let baseUrl = WordPressAuthenticator.shared.configuration.wpcomAPIBaseURL
-        return WordPressComRestApi(oAuthToken: nil, userAgent: userAgent, baseUrlString: baseUrl)
+        return WordPressComRestApi(oAuthToken: nil, userAgent: userAgent, baseURL: baseUrl)
     }
 
     /// Retrieves the WordPressComSiteInfo instance associated to a WordPress.com Site Address.
diff --git a/WordPressAuthenticator/Services/WordPressComOAuthClientFacade.swift b/WordPressAuthenticator/Services/WordPressComOAuthClientFacade.swift
@@ -6,10 +6,12 @@ import WordPressKit
     private let client: WordPressComOAuthClient
 
     @objc required public init(client: String, secret: String) {
-        self.client = WordPressComOAuthClient(clientID: client,
-                                         secret: secret,
-                                         wordPressComBaseUrl: WordPressAuthenticator.shared.configuration.wpcomBaseURL,
-                                         wordPressComApiBaseUrl: WordPressAuthenticator.shared.configuration.wpcomAPIBaseURL)
+        self.client = WordPressComOAuthClient(
+            clientID: client,
+            secret: secret,
+            wordPressComBaseURL: WordPressAuthenticator.shared.configuration.wpcomBaseURL,
+            wordPressComApiBaseURL: WordPressAuthenticator.shared.configuration.wpcomAPIBaseURL
+        )
     }
 
     public func authenticate(
diff --git a/WordPressAuthenticator/Signin/LoginPrologueSignupMethodViewController.swift b/WordPressAuthenticator/Signin/LoginPrologueSignupMethodViewController.swift
@@ -67,11 +67,8 @@ class LoginPrologueSignupMethodViewController: NUXViewController {
                     WordPressAuthenticator.track(.signupTermsButtonTapped)
                 })
             }
-            guard let url = URL(string: WordPressAuthenticator.shared.configuration.wpcomTermsOfServiceURL) else {
-                return
-            }
 
-            let safariViewController = SFSafariViewController(url: url)
+            let safariViewController = SFSafariViewController(url: WordPressAuthenticator.shared.configuration.wpcomTermsOfServiceURL)
             safariViewController.modalPresentationStyle = .pageSheet
             self?.present(safariViewController, animated: true, completion: nil)
         }
diff --git a/WordPressAuthenticator/Signup/SignupEmailViewController.swift b/WordPressAuthenticator/Signup/SignupEmailViewController.swift
@@ -139,7 +139,7 @@ class SignupEmailViewController: LoginViewController, NUXKeyboardResponder {
     private func checkEmailAvailability(completion: @escaping (Bool) -> Void) {
 
         let remote = AccountServiceRemoteREST(
-            wordPressComRestApi: WordPressComRestApi(baseUrlString: WordPressAuthenticator.shared.configuration.wpcomAPIBaseURL))
+            wordPressComRestApi: WordPressComRestApi(baseURL: WordPressAuthenticator.shared.configuration.wpcomAPIBaseURL))
 
         remote.isEmailAvailable(loginFields.emailAddress, success: { [weak self] available in
             if !available {
diff --git a/WordPressAuthenticator/Unified Auth/View Related/Get Started/GetStartedViewController.swift b/WordPressAuthenticator/Unified Auth/View Related/Get Started/GetStartedViewController.swift
@@ -320,11 +320,10 @@ private extension GetStartedViewController {
 
     @IBAction func whatIsWPComButtonTapped(_ sender: UIButton) {
         tracker.track(click: .whatIsWPCom)
-        guard let whatIsWPCom = configuration.whatIsWPComURL,
-              let url = URL(string: whatIsWPCom) else {
+        guard let whatIsWPCom = configuration.whatIsWPComURL else {
             return
         }
-        UIApplication.shared.open(url)
+        UIApplication.shared.open(whatIsWPCom)
     }
 
     // MARK: - Hidden Password Field Action
@@ -860,12 +859,7 @@ private extension GetStartedViewController {
     @objc func termsTapped() {
         tracker.track(click: .termsOfService)
 
-        guard let url = URL(string: configuration.wpcomTermsOfServiceURL) else {
-            WPAuthenticatorLogError("GetStartedViewController: wpcomTermsOfServiceURL unavailable.")
-            return
-        }
-
-        UIApplication.shared.open(url)
+        UIApplication.shared.open(configuration.wpcomTermsOfServiceURL)
     }
 }
 
diff --git a/WordPressAuthenticatorTests/Authenticator/WordPressAuthenticator+TestsUtils.swift b/WordPressAuthenticatorTests/Authenticator/WordPressAuthenticator+TestsUtils.swift
@@ -8,7 +8,7 @@ extension WordPressAuthenticator {
                 wpcomClientId: "a",
                 wpcomSecret: "b",
                 wpcomScheme: "c",
-                wpcomTermsOfServiceURL: "d",
+                wpcomTermsOfServiceURL: URL(string: "https://w.org")!,
                 googleLoginClientId: "e",
                 googleLoginServerClientId: "f",
                 googleLoginScheme: "g",
diff --git a/WordPressAuthenticatorTests/Mocks/WordpressAuthenticatorProvider.swift b/WordPressAuthenticatorTests/Mocks/WordpressAuthenticatorProvider.swift
@@ -6,7 +6,7 @@ public class WordpressAuthenticatorProvider: NSObject {
         return WordPressAuthenticatorConfiguration(wpcomClientId: "23456",
                                                    wpcomSecret: "arfv35dj57l3g2323",
                                                    wpcomScheme: "https",
-                                                   wpcomTermsOfServiceURL: "https://wordpress.com/tos/",
+                                                   wpcomTermsOfServiceURL: URL(string: "https://wordpress.com/tos/")!,
                                                    googleLoginClientId: "",
                                                    googleLoginServerClientId: "",
                                                    googleLoginScheme: "com.googleuserconsent.apps",

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ private extension SignupService {`
`108`	`108`	`var anonymousAPI: WordPressComRestApi {`
`109`	`109`	`return WordPressComRestApi(oAuthToken: nil,`
`110`	`110`	`userAgent: configuration.userAgent,`
`111`		`- baseUrlString: configuration.wpcomAPIBaseURL)`
	`111`	`+ baseURL: configuration.wpcomAPIBaseURL)`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`var configuration: WordPressAuthenticatorConfiguration {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class WordPressComBlogService {`
`10`	`10`	`private var anonymousAPI: WordPressComRestApi {`
`11`	`11`	`let userAgent = WordPressAuthenticator.shared.configuration.userAgent`
`12`	`12`	`let baseUrl = WordPressAuthenticator.shared.configuration.wpcomAPIBaseURL`
`13`		`- return WordPressComRestApi(oAuthToken: nil, userAgent: userAgent, baseUrlString: baseUrl)`
	`13`	`+ return WordPressComRestApi(oAuthToken: nil, userAgent: userAgent, baseURL: baseUrl)`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`/// Retrieves the WordPressComSiteInfo instance associated to a WordPress.com Site Address.`