Adopt WordPressKit breaking changes (#829)

Author: crazytonyli

CHANGELOG.md

@@ -46,7 +46,7 @@ _None._
 
 ### Internal Changes
 
-_None._
+- Depend on WordPressKit 12.0. [#829]
 
 ## 9.0.0
 

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', '~> 11.0'
+  pod 'WordPressKit', '~> 12.0'
   pod 'WordPressShared', '~> 2.1-beta'
 
   third_party_pods

Podfile.lock

@@ -13,10 +13,10 @@ PODS:
     - Gridicons (~> 1.0)
     - "NSURL+IDN (= 0.4)"
     - SVProgressHUD (~> 2.2.5)
-    - WordPressKit (~> 11.0)
+    - WordPressKit (~> 12.0)
     - WordPressShared (~> 2.1-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (11.0.0):
+  - WordPressKit (12.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 (~> 11.0)
+  - WordPressKit (~> 12.0)
   - WordPressShared (~> 2.1-beta)
   - WordPressUI (~> 1.7-beta)
 
@@ -71,12 +71,12 @@ SPEC CHECKSUMS:
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
   UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17
-  WordPressAuthenticator: 5a6c02f010a7c2c6a9ca17b15233b25f74b3ad33
-  WordPressKit: c9ec8dd6ea731af5a2d7cadb9944b67be716d63e
+  WordPressAuthenticator: ce9688b78d71e296ea54159c4eef3a1ea5cc1838
+  WordPressKit: 25452ae322f6fcb605f816caec2ff8ac707c7d9d
   WordPressShared: 87f3ee89b0a3e83106106f13a8b71605fb8eb6d2
   WordPressUI: a491454affda3b0fb812812e637dc5e8f8f6bd06
   wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
 
-PODFILE CHECKSUM: 9dc67ad3b7985a633faef0b6b516c80f41513c7c
+PODFILE CHECKSUM: 133f1b432d72077ba5e993fac2fe6831d9d0ff1d
 
 COCOAPODS: 1.14.3

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', '~> 11.0'
+  s.dependency 'WordPressKit', '~> 12.0'
   s.dependency 'WordPressShared', '~> 2.1-beta'
 end

WordPressAuthenticator/Unified Auth/View Related/Get Started/GetStartedViewController.swift

@@ -18,19 +18,25 @@ public enum SignInError: Error {
     case invalidWPComPassword(source: SignInSource)
 
     init?(error: Error, source: SignInSource?) {
-        let error = error as NSError
+        // `WordPressComRestApi` currently may return an WordPressComRestApiEndpointError, but it will later be changed
+        // to return `WordPressAPIError<WordPressComRestApiEndpointError>`. We'll handle both cases for now.
+        var restApiError = error as? WordPressComRestApiEndpointError
 
-        switch error.code {
-        case WordPressComRestApiError.unknown.rawValue:
-            let restAPIErrorCode = error.userInfo[WordPressComRestApi.ErrorKeyErrorCode] as? String
-            if let source = source, restAPIErrorCode == "unknown_user" {
+        if restApiError == nil,
+            let apiError = error as? WordPressAPIError<WordPressComRestApiEndpointError>,
+            case let .endpointError(endpointError) = apiError {
+            restApiError = endpointError
+        }
+
+        if let restApiError, restApiError.code == .unknown {
+            if let source = source, restApiError.apiErrorCode == "unknown_user" {
                 self = .invalidWPComEmail(source: source)
             } else {
                 return nil
             }
-        default:
-            return nil
         }
+
+        return nil
     }
 }