Merge pull request #8649 from woocommerce/feat/8648-ipp-migration

itsmeichigo · web-flow · commit 6ef1b05ee4cd · 2023-01-20T07:13:38.000+07:00
diff --git a/Networking/Networking.xcodeproj/project.pbxproj b/Networking/Networking.xcodeproj/project.pbxproj
@@ -717,6 +717,7 @@
 		DE50296328C609DE00551736 /* jetpack-user-not-connected.json in Resources */ = {isa = PBXBuildFile; fileRef = DE50296228C609DE00551736 /* jetpack-user-not-connected.json */; };
 		DE50296528C60A8000551736 /* JetpackUserMapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE50296428C60A8000551736 /* JetpackUserMapperTests.swift */; };
 		DE5CA111288A3E080077BEF9 /* product-malformed-variations-and-image-alt.json in Resources */ = {isa = PBXBuildFile; fileRef = DE5CA110288A3E080077BEF9 /* product-malformed-variations-and-image-alt.json */; };
+		DE66C5572976913C00DAA978 /* wcpay-charge-card-present-without-data.json in Resources */ = {isa = PBXBuildFile; fileRef = DE66C5562976913C00DAA978 /* wcpay-charge-card-present-without-data.json */; };
 		DE66C5532976508300DAA978 /* CookieNonceAuthenticator.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE66C5522976508300DAA978 /* CookieNonceAuthenticator.swift */; };
 		DE6F308727966FEF004E1C9A /* CouponReportListMapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE6F308627966FEF004E1C9A /* CouponReportListMapperTests.swift */; };
 		DE74F29A27E08F5A0002FE59 /* SiteSettingMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE74F29927E08F5A0002FE59 /* SiteSettingMapper.swift */; };
@@ -1555,6 +1556,7 @@
 		DE50296228C609DE00551736 /* jetpack-user-not-connected.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "jetpack-user-not-connected.json"; sourceTree = "<group>"; };
 		DE50296428C60A8000551736 /* JetpackUserMapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JetpackUserMapperTests.swift; sourceTree = "<group>"; };
 		DE5CA110288A3E080077BEF9 /* product-malformed-variations-and-image-alt.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "product-malformed-variations-and-image-alt.json"; sourceTree = "<group>"; };
+		DE66C5562976913C00DAA978 /* wcpay-charge-card-present-without-data.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "wcpay-charge-card-present-without-data.json"; sourceTree = "<group>"; };
 		DE66C5522976508300DAA978 /* CookieNonceAuthenticator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CookieNonceAuthenticator.swift; sourceTree = "<group>"; };
 		DE6F308627966FEF004E1C9A /* CouponReportListMapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CouponReportListMapperTests.swift; sourceTree = "<group>"; };
 		DE74F29927E08F5A0002FE59 /* SiteSettingMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SiteSettingMapper.swift; sourceTree = "<group>"; };
@@ -2185,6 +2187,7 @@
 		B559EBA820A0B5B100836CD4 /* Responses */ = {
 			isa = PBXGroup;
 			children = (
+				DE66C5562976913C00DAA978 /* wcpay-charge-card-present-without-data.json */,
 				DE4F2A432975684900B0701C /* site-api-without-data.json */,
 				DE4F2A3D29750EF400B0701C /* inbox-note-list-without-data.json */,
 				DE4F2A3E29750EF400B0701C /* inbox-note-without-data.json */,
@@ -3079,6 +3082,7 @@
 				31A451CC27863A2E00FE81AA /* stripe-account-rejected-fraud.json in Resources */,
 				31A451D827863A2E00FE81AA /* stripe-account-restricted-overdue.json in Resources */,
 				D865CE69278CA245002C8520 /* stripe-payment-intent-unknown-status.json in Resources */,
+				DE66C5572976913C00DAA978 /* wcpay-charge-card-present-without-data.json in Resources */,
 				DE42F9652967F34400D514C2 /* refund-single-without-data.json in Resources */,
 				0205021C27C86B9700FB1C6B /* inbox-note-without-isRead.json in Resources */,
 				24F98C622502EFF600F49B68 /* feature-flags-load-all.json in Resources */,
diff --git a/Networking/Networking/Mapper/ReaderConnectionTokenMapper.swift b/Networking/Networking/Mapper/ReaderConnectionTokenMapper.swift
@@ -7,7 +7,11 @@ struct ReaderConnectionTokenMapper: Mapper {
     func map(response: Data) throws -> ReaderConnectionToken {
         let decoder = JSONDecoder()
 
-        return try decoder.decode(ReaderConnectionTokenEnvelope.self, from: response).token
+        do {
+            return try decoder.decode(ReaderConnectionTokenEnvelope.self, from: response).token
+        } catch {
+            return try decoder.decode(ReaderConnectionToken.self, from: response)
+        }
     }
 }
 
diff --git a/Networking/Networking/Mapper/RemotePaymentIntentMapper.swift b/Networking/Networking/Mapper/RemotePaymentIntentMapper.swift
@@ -9,7 +9,11 @@ struct RemotePaymentIntentMapper: Mapper {
     func map(response: Data) throws -> RemotePaymentIntent {
         let decoder = JSONDecoder()
 
-        return try decoder.decode(WCPayPaymentIntentEnvelope.self, from: response).paymentIntent
+        do {
+            return try decoder.decode(WCPayPaymentIntentEnvelope.self, from: response).paymentIntent
+        } catch {
+            return try decoder.decode(RemotePaymentIntent.self, from: response)
+        }
     }
 }
 
diff --git a/Networking/Networking/Mapper/RemoteReaderLocationMapper.swift b/Networking/Networking/Mapper/RemoteReaderLocationMapper.swift
@@ -9,7 +9,11 @@ struct RemoteReaderLocationMapper: Mapper {
     func map(response: Data) throws -> RemoteReaderLocation {
         let decoder = JSONDecoder()
 
-        return try decoder.decode(RemoteReaderLocationEnvelope.self, from: response).location
+        do {
+            return try decoder.decode(RemoteReaderLocationEnvelope.self, from: response).location
+        } catch {
+            return try decoder.decode(RemoteReaderLocation.self, from: response)
+        }
     }
 }
 
diff --git a/Networking/Networking/Mapper/StripeAccountMapper.swift b/Networking/Networking/Mapper/StripeAccountMapper.swift
@@ -14,7 +14,11 @@ struct StripeAccountMapper: Mapper {
         /// can cross that bridge when we need those decoded.
         decoder.dateDecodingStrategy = .secondsSince1970
 
-        return try decoder.decode(StripeAccountEnvelope.self, from: response).account
+        do {
+            return try decoder.decode(StripeAccountEnvelope.self, from: response).account
+        } catch {
+            return try decoder.decode(StripeAccount.self, from: response)
+        }
     }
 }
 
diff --git a/Networking/Networking/Mapper/WCPayAccountMapper.swift b/Networking/Networking/Mapper/WCPayAccountMapper.swift
@@ -18,9 +18,15 @@ struct WCPayAccountMapper: Mapper {
         /// indicating that the plugin was active but the merchant had not on-boarded (and therefore has no account.)
         if let _ = try? decoder.decode(WCPayNullAccountEnvelope.self, from: response) {
             return WCPayAccount.noAccount
+        } else if let _ = try? decoder.decode([String].self, from: response) {
+            return WCPayAccount.noAccount
         }
 
-        return try decoder.decode(WCPayAccountEnvelope.self, from: response).account
+        do {
+            return try decoder.decode(WCPayAccountEnvelope.self, from: response).account
+        } catch {
+            return try decoder.decode(WCPayAccount.self, from: response)
+        }
     }
 }
 
diff --git a/Networking/Networking/Mapper/WCPayChargeMapper.swift b/Networking/Networking/Mapper/WCPayChargeMapper.swift
@@ -16,7 +16,11 @@ struct WCPayChargeMapper: Mapper {
         /// can cross that bridge when we need those decoded.
         decoder.dateDecodingStrategy = .secondsSince1970
 
-        return try decoder.decode(WCPayChargeEnvelope.self, from: response).charge
+        do {
+            return try decoder.decode(WCPayChargeEnvelope.self, from: response).charge
+        } catch {
+            return try decoder.decode(WCPayCharge.self, from: response)
+        }
     }
 }
 
diff --git a/Networking/Networking/Model/WordPressSite.swift b/Networking/Networking/Model/WordPressSite.swift
@@ -42,6 +42,32 @@ public struct WordPressSite: Decodable, Equatable {
         self.gmtOffset = gmtOffset
         self.namespaces = namespaces
     }
+
+    /// Decodable Conformance.
+    ///
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let name = try container.decode(String.self, forKey: .name)
+        let description = try container.decode(String.self, forKey: .description)
+        let url = try container.decode(String.self, forKey: .url)
+        let timezone = try container.decode(String.self, forKey: .timezone)
+        let gmtOffset: String = try {
+            do {
+                return try container.decode(String.self, forKey: .gmtOffset)
+            } catch {
+                let double = try container.decode(Double.self, forKey: .gmtOffset)
+                return double.description
+            }
+        }()
+        let namespaces = try container.decode([String].self, forKey: .namespaces)
+
+        self.init(name: name,
+                  description: description,
+                  url: url,
+                  timezone: timezone,
+                  gmtOffset: gmtOffset,
+                  namespaces: namespaces)
+    }
 }
 
 public extension WordPressSite {
@@ -79,7 +105,7 @@ private extension WordPressSite {
     }
 
     enum Constants {
-        static let adminPath = "/wp-admin"
+        static let adminPath = "/wp-admin/"
         static let loginPath = "/wp-login.php"
         static let wooNameSpace = "wc/"
     }
diff --git a/Networking/Networking/Remote/StripeRemote.swift b/Networking/Networking/Remote/StripeRemote.swift
@@ -12,7 +12,12 @@ public class StripeRemote: Remote {
                             completion: @escaping (Result<StripeAccount, Error>) -> Void) {
         let parameters = [AccountParameterKeys.fields: AccountParameterValues.fieldValues]
 
-        let request = JetpackRequest(wooApiVersion: .mark3, method: .get, siteID: siteID, path: Path.accounts, parameters: parameters)
+        let request = JetpackRequest(wooApiVersion: .mark3,
+                                     method: .get,
+                                     siteID: siteID,
+                                     path: Path.accounts,
+                                     parameters: parameters,
+                                     availableAsRESTRequest: true)
 
         let mapper = StripeAccountMapper()
 
@@ -36,7 +41,12 @@ public class StripeRemote: Remote {
             CaptureOrderPaymentKeys.paymentIntentID: paymentIntentID
         ]
 
-        let request = JetpackRequest(wooApiVersion: .mark3, method: .post, siteID: siteID, path: path, parameters: parameters)
+        let request = JetpackRequest(wooApiVersion: .mark3,
+                                     method: .post,
+                                     siteID: siteID,
+                                     path: path,
+                                     parameters: parameters,
+                                     availableAsRESTRequest: true)
 
         let mapper = RemotePaymentIntentMapper()
 
@@ -53,7 +63,11 @@ extension StripeRemote {
     ///   - completion: Closure to be executed upon completion.
     public func loadConnectionToken(for siteID: Int64,
                                     completion: @escaping(Result<ReaderConnectionToken, Error>) -> Void) {
-        let request = JetpackRequest(wooApiVersion: .mark3, method: .post, siteID: siteID, path: Path.connectionTokens)
+        let request = JetpackRequest(wooApiVersion: .mark3,
+                                     method: .post,
+                                     siteID: siteID,
+                                     path: Path.connectionTokens,
+                                     availableAsRESTRequest: true)
 
         let mapper = ReaderConnectionTokenMapper()
 
@@ -68,7 +82,12 @@ extension StripeRemote {
     ///
     public func loadDefaultReaderLocation(for siteID: Int64,
                                           onCompletion: @escaping (Result<RemoteReaderLocation, Error>) -> Void) {
-        let request = JetpackRequest(wooApiVersion: .mark3, method: .get, siteID: siteID, path: Path.locations, parameters: [:])
+        let request = JetpackRequest(wooApiVersion: .mark3,
+                                     method: .get,
+                                     siteID: siteID,
+                                     path: Path.locations,
+                                     parameters: [:],
+                                     availableAsRESTRequest: true)
 
         let mapper = RemoteReaderLocationMapper()
 
diff --git a/Networking/Networking/Remote/WCPayRemote.swift b/Networking/Networking/Remote/WCPayRemote.swift
@@ -12,7 +12,12 @@ public class WCPayRemote: Remote {
                             completion: @escaping (Result<WCPayAccount, Error>) -> Void) {
         let parameters = [AccountParameterKeys.fields: AccountParameterValues.fieldValues]
 
-        let request = JetpackRequest(wooApiVersion: .mark3, method: .get, siteID: siteID, path: Path.accounts, parameters: parameters)
+        let request = JetpackRequest(wooApiVersion: .mark3,
+                                     method: .get,
+                                     siteID: siteID,
+                                     path: Path.accounts,
+                                     parameters: parameters,
+                                     availableAsRESTRequest: true)
 
         let mapper = WCPayAccountMapper()
 
@@ -34,7 +39,12 @@ public class WCPayRemote: Remote {
             CaptureOrderPaymentKeys.paymentIntentID: paymentIntentID
         ]
 
-        let request = JetpackRequest(wooApiVersion: .mark3, method: .post, siteID: siteID, path: path, parameters: parameters)
+        let request = JetpackRequest(wooApiVersion: .mark3,
+                                     method: .post,
+                                     siteID: siteID,
+                                     path: path,
+                                     parameters: parameters,
+                                     availableAsRESTRequest: true)
 
         let mapper = RemotePaymentIntentMapper()
 
@@ -52,7 +62,12 @@ public class WCPayRemote: Remote {
                             completion: @escaping (Result<WCPayCharge, Error>) -> Void) {
         let path = "\(Path.charges)/\(chargeID)"
 
-        let request = JetpackRequest(wooApiVersion: .mark3, method: .get, siteID: siteID, path: path, parameters: [:])
+        let request = JetpackRequest(wooApiVersion: .mark3,
+                                     method: .get,
+                                     siteID: siteID,
+                                     path: path,
+                                     parameters: [:],
+                                     availableAsRESTRequest: true)
 
         let mapper = WCPayChargeMapper(siteID: siteID)
 
@@ -69,7 +84,11 @@ extension WCPayRemote {
     ///   - completion: Closure to be executed upon completion.
     public func loadConnectionToken(for siteID: Int64,
                                     completion: @escaping(Result<ReaderConnectionToken, Error>) -> Void) {
-        let request = JetpackRequest(wooApiVersion: .mark3, method: .post, siteID: siteID, path: Path.connectionTokens)
+        let request = JetpackRequest(wooApiVersion: .mark3,
+                                     method: .post,
+                                     siteID: siteID,
+                                     path: Path.connectionTokens,
+                                     availableAsRESTRequest: true)
 
         let mapper = ReaderConnectionTokenMapper()
 
@@ -84,7 +103,12 @@ extension WCPayRemote {
     ///
     public func loadDefaultReaderLocation(for siteID: Int64,
                                           onCompletion: @escaping (Result<RemoteReaderLocation, Error>) -> Void) {
-        let request = JetpackRequest(wooApiVersion: .mark3, method: .get, siteID: siteID, path: Path.locations, parameters: [:])
+        let request = JetpackRequest(wooApiVersion: .mark3,
+                                     method: .get,
+                                     siteID: siteID,
+                                     path: Path.locations,
+                                     parameters: [:],
+                                     availableAsRESTRequest: true)
 
         let mapper = RemoteReaderLocationMapper()
 
diff --git a/Networking/NetworkingTests/Mapper/WCPayChargeMapperTests.swift b/Networking/NetworkingTests/Mapper/WCPayChargeMapperTests.swift
@@ -8,11 +8,18 @@ class WCPayChargeMapperTests: XCTestCase {
 
     /// Verifies that the WCPayCharge is parsed.
     ///
-    func test_WCPayCharge_map_parses_all_coupons_in_response() throws {
+    func test_WCPayCharge_map_parses_data_in_response() throws {
         let wcpayCharge = try mapRetrieveWCPayChargeResponse()
         XCTAssertNotNil(wcpayCharge)
     }
 
+    /// Verifies that the WCPayCharge is parsed.
+    ///
+    func test_WCPayCharge_map_parses_data_in_response_without_data_envelope() throws {
+        let wcpayCharge = try mapRetrieveWCPayChargeResponse(responseName: .cardPresentWithoutDataEnvelope)
+        XCTAssertNotNil(wcpayCharge)
+    }
+
     /// Verifies that the `siteID` is added in the mapper, because it's not provided by the API endpoint
     ///
     func test_WCPayCharge_map_includes_siteID_in_parsed_results() throws {
@@ -173,6 +180,7 @@ private extension WCPayChargeMapperTests {
 
     enum ChargeResponse: String {
         case cardPresent = "wcpay-charge-card-present"
+        case cardPresentWithoutDataEnvelope = "wcpay-charge-card-present-without-data"
         case cardPresentMinimal = "wcpay-charge-card-present-minimal"
         case card = "wcpay-charge-card"
         case interacPresent = "wcpay-charge-interac-present"
diff --git a/Networking/NetworkingTests/Responses/wcpay-charge-card-present-without-data.json b/Networking/NetworkingTests/Responses/wcpay-charge-card-present-without-data.json
diff --git a/Yosemite/YosemiteTests/Stores/WordPressSiteStore.swift b/Yosemite/YosemiteTests/Stores/WordPressSiteStore.swift

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,11 @@ struct ReaderConnectionTokenMapper: Mapper {`
`7`	`7`	`func map(response: Data) throws -> ReaderConnectionToken {`
`8`	`8`	`let decoder = JSONDecoder()`
`9`	`9`
`10`		`- return try decoder.decode(ReaderConnectionTokenEnvelope.self, from: response).token`
	`10`	`+ do {`
	`11`	`+ return try decoder.decode(ReaderConnectionTokenEnvelope.self, from: response).token`
	`12`	`+ } catch {`
	`13`	`+ return try decoder.decode(ReaderConnectionToken.self, from: response)`
	`14`	`+ }`
`11`	`15`	`}`
`12`	`16`	`}`
`13`	`17`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,11 @@ struct RemotePaymentIntentMapper: Mapper {`
`9`	`9`	`func map(response: Data) throws -> RemotePaymentIntent {`
`10`	`10`	`let decoder = JSONDecoder()`
`11`	`11`
`12`		`- return try decoder.decode(WCPayPaymentIntentEnvelope.self, from: response).paymentIntent`
	`12`	`+ do {`
	`13`	`+ return try decoder.decode(WCPayPaymentIntentEnvelope.self, from: response).paymentIntent`
	`14`	`+ } catch {`
	`15`	`+ return try decoder.decode(RemotePaymentIntent.self, from: response)`
	`16`	`+ }`
`13`	`17`	`}`
`14`	`18`	`}`
`15`	`19`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,11 @@ struct RemoteReaderLocationMapper: Mapper {`
`9`	`9`	`func map(response: Data) throws -> RemoteReaderLocation {`
`10`	`10`	`let decoder = JSONDecoder()`
`11`	`11`
`12`		`- return try decoder.decode(RemoteReaderLocationEnvelope.self, from: response).location`
	`12`	`+ do {`
	`13`	`+ return try decoder.decode(RemoteReaderLocationEnvelope.self, from: response).location`
	`14`	`+ } catch {`
	`15`	`+ return try decoder.decode(RemoteReaderLocation.self, from: response)`
	`16`	`+ }`
`13`	`17`	`}`
`14`	`18`	`}`
`15`	`19`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,11 @@ struct StripeAccountMapper: Mapper {`
`14`	`14`	`/// can cross that bridge when we need those decoded.`
`15`	`15`	`decoder.dateDecodingStrategy = .secondsSince1970`
`16`	`16`
`17`		`- return try decoder.decode(StripeAccountEnvelope.self, from: response).account`
	`17`	`+ do {`
	`18`	`+ return try decoder.decode(StripeAccountEnvelope.self, from: response).account`
	`19`	`+ } catch {`
	`20`	`+ return try decoder.decode(StripeAccount.self, from: response)`
	`21`	`+ }`
`18`	`22`	`}`
`19`	`23`	`}`
`20`	`24`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,15 @@ struct WCPayAccountMapper: Mapper {`
`18`	`18`	`/// indicating that the plugin was active but the merchant had not on-boarded (and therefore has no account.)`
`19`	`19`	`if let _ = try? decoder.decode(WCPayNullAccountEnvelope.self, from: response) {`
`20`	`20`	`return WCPayAccount.noAccount`
	`21`	`+ } else if let _ = try? decoder.decode([String].self, from: response) {`
	`22`	`+ return WCPayAccount.noAccount`
`21`	`23`	`}`
`22`	`24`
`23`		`- return try decoder.decode(WCPayAccountEnvelope.self, from: response).account`
	`25`	`+ do {`
	`26`	`+ return try decoder.decode(WCPayAccountEnvelope.self, from: response).account`
	`27`	`+ } catch {`
	`28`	`+ return try decoder.decode(WCPayAccount.self, from: response)`
	`29`	`+ }`
`24`	`30`	`}`
`25`	`31`	`}`
`26`	`32`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,11 @@ struct WCPayChargeMapper: Mapper {`
`16`	`16`	`/// can cross that bridge when we need those decoded.`
`17`	`17`	`decoder.dateDecodingStrategy = .secondsSince1970`
`18`	`18`
`19`		`- return try decoder.decode(WCPayChargeEnvelope.self, from: response).charge`
	`19`	`+ do {`
	`20`	`+ return try decoder.decode(WCPayChargeEnvelope.self, from: response).charge`
	`21`	`+ } catch {`
	`22`	`+ return try decoder.decode(WCPayCharge.self, from: response)`
	`23`	`+ }`
`20`	`24`	`}`
`21`	`25`	`}`
`22`	`26`