rename NetworkingClientError-> NetworkingError, minor fix

paypal · Nov 22, 2024 · c4e1dd6 · c4e1dd6
1 parent 13a7e24
commit c4e1dd6
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 39 deletions.
diff --git a/Demo/Demo/ViewModels/CardPaymentViewModel.swift b/Demo/Demo/ViewModels/CardPaymentViewModel.swift
@@ -123,7 +123,7 @@ class CardPaymentViewModel: ObservableObject {
                     if error == CardError.threeDSecureCanceledError {
                         self.setApprovalCancelResult()
                     } else {
-                        self.setApprovalFailureResult(vaultError: error)
+                        self.setApprovalFailureResult(error: error)
                     }
                 } else if let result {
                     self.setApprovalSuccessResult(
@@ -136,7 +136,7 @@ class CardPaymentViewModel: ObservableObject {
                 }
             }
         } catch {
-            setApprovalFailureResult(vaultError: error)
+            setApprovalFailureResult(error: error)
             print("failed in checkout with card. \(error.localizedDescription)")
         }
     }
@@ -149,9 +149,9 @@ class CardPaymentViewModel: ObservableObject {
         }
     }
 
-    func setApprovalFailureResult(vaultError: Error) {
+    func setApprovalFailureResult(error: Error) {
         DispatchQueue.main.async {
-            self.state.approveResultResponse = .error(message: vaultError.localizedDescription)
+            self.state.approveResultResponse = .error(message: error.localizedDescription)
         }
     }
 

diff --git a/PayPal.xcodeproj/project.pbxproj b/PayPal.xcodeproj/project.pbxproj
@@ -110,7 +110,7 @@
 		BEA100E726EF9EDA0036A6A5 /* NetworkingClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEA100E626EF9EDA0036A6A5 /* NetworkingClient.swift */; };
 		BEA100EC26EFA7790036A6A5 /* HTTPMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEA100EB26EFA7790036A6A5 /* HTTPMethod.swift */; };
 		BEA100EE26EFA7990036A6A5 /* HTTPHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEA100ED26EFA7990036A6A5 /* HTTPHeader.swift */; };
-		BEA100F026EFA7C20036A6A5 /* NetworkingClientError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEA100EF26EFA7C20036A6A5 /* NetworkingClientError.swift */; };
+		BEA100F026EFA7C20036A6A5 /* NetworkingError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEA100EF26EFA7C20036A6A5 /* NetworkingError.swift */; };
 		BEA100F226EFA7DE0036A6A5 /* Environment.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEA100F126EFA7DE0036A6A5 /* Environment.swift */; };
 		CB16E6D8285B7A2B00FD6F52 /* FakeConfirmPaymentResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB16E6D7285B7A2B00FD6F52 /* FakeConfirmPaymentResponse.swift */; };
 		CB1A47F22820AFED00BD8184 /* PayPalPayLaterButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB1A47F12820AFED00BD8184 /* PayPalPayLaterButton.swift */; };
@@ -275,7 +275,7 @@
 		BEA100E626EF9EDA0036A6A5 /* NetworkingClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkingClient.swift; sourceTree = "<group>"; };
 		BEA100EB26EFA7790036A6A5 /* HTTPMethod.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPMethod.swift; sourceTree = "<group>"; };
 		BEA100ED26EFA7990036A6A5 /* HTTPHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPHeader.swift; sourceTree = "<group>"; };
-		BEA100EF26EFA7C20036A6A5 /* NetworkingClientError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkingClientError.swift; sourceTree = "<group>"; };
+		BEA100EF26EFA7C20036A6A5 /* NetworkingError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkingError.swift; sourceTree = "<group>"; };
 		BEA100F126EFA7DE0036A6A5 /* Environment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Environment.swift; sourceTree = "<group>"; };
 		BEDB7FE32788AB8E00CEA554 /* Coordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Coordinator.swift; sourceTree = "<group>"; };
 		BEF3FF1627AC5DF3006B4B69 /* Coordinator_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Coordinator_Tests.swift; sourceTree = "<group>"; };
@@ -663,7 +663,7 @@
 				80E643822A1EBBD2008FD705 /* HTTPResponse.swift */,
 				80E2FDC22A8354AD0045593D /* RESTRequest.swift */,
 				807BF58E2A2A5D19002F32B3 /* HTTPResponseParser.swift */,
-				BEA100EF26EFA7C20036A6A5 /* NetworkingClientError.swift */,
+				BEA100EF26EFA7C20036A6A5 /* NetworkingError.swift */,
 				BC04836E27B2FB3600FA7B46 /* URLSessionProtocol.swift */,
 				BC04837327B2FC7300FA7B46 /* URLSession+URLSessionProtocol.swift */,
 				BEA100EA26EFA7670036A6A5 /* Enums */,
@@ -1165,7 +1165,7 @@
 				CB4BE27E2847EA7D00EA2DD1 /* WebAuthenticationSession.swift in Sources */,
 				80E2FDC12A83535A0045593D /* TrackingEventsAPI.swift in Sources */,
 				BEA100F226EFA7DE0036A6A5 /* Environment.swift in Sources */,
-				BEA100F026EFA7C20036A6A5 /* NetworkingClientError.swift in Sources */,
+				BEA100F026EFA7C20036A6A5 /* NetworkingError.swift in Sources */,
 				804E628629380B04004B9FEF /* AnalyticsService.swift in Sources */,
 				BC04837427B2FC7300FA7B46 /* URLSession+URLSessionProtocol.swift in Sources */,
 				80E2FDC32A8354AD0045593D /* RESTRequest.swift in Sources */,

diff --git a/Sources/CardPayments/CardError.swift b/Sources/CardPayments/CardError.swift
@@ -86,7 +86,7 @@ public enum CardError {
         errorDescription: "An error occurred while vaulting a card."
     )
 
-    static let nilGraphQLClientError = CoreSDKError(
+    public static let nilGraphQLClientError = CoreSDKError(
         code: Code.nilGraphQLClientError.rawValue,
         domain: domain,
         errorDescription: "GraphQLClient is unexpectedly nil."

diff --git a/Sources/CorePayments/Networking/HTTP.swift b/Sources/CorePayments/Networking/HTTP.swift
@@ -27,13 +27,13 @@ class HTTP {
         do {
             (data, response) = try await urlSession.performRequest(with: urlRequest)
         } catch _ as URLError {
-            throw NetworkingClientError.urlSessionError
+            throw NetworkingError.urlSessionError
         } catch {
-            throw NetworkingClientError.unknownError
+            throw NetworkingError.unknownError
         }
 
         guard let response = response as? HTTPURLResponse else {
-            throw NetworkingClientError.invalidURLResponseError
+            throw NetworkingError.invalidURLResponseError
         }
 
         return HTTPResponse(status: response.statusCode, body: data)

diff --git a/Sources/CorePayments/Networking/HTTPResponseParser.swift b/Sources/CorePayments/Networking/HTTPResponseParser.swift
@@ -16,7 +16,7 @@ public class HTTPResponseParser {
 
     public func parseREST<T: Decodable>(_ httpResponse: HTTPResponse, as type: T.Type) throws -> T {
         guard let data = httpResponse.body else {
-            throw NetworkingClientError.noResponseDataError
+            throw NetworkingError.noResponseDataError
         }
 
         if httpResponse.isSuccessful {
@@ -28,7 +28,7 @@ public class HTTPResponseParser {
 
     public func parseGraphQL<T: Decodable>(_ httpResponse: HTTPResponse, as type: T.Type) throws -> T {
         guard let data = httpResponse.body else {
-            throw NetworkingClientError.noResponseDataError
+            throw NetworkingError.noResponseDataError
         }
 
         if httpResponse.isSuccessful {
@@ -44,28 +44,28 @@ public class HTTPResponseParser {
         do {
             if isGraphQL {
                 guard let data = try decoder.decode(GraphQLHTTPResponse<T>.self, from: data).data else {
-                    throw NetworkingClientError.noGraphQLDataKey
+                    throw NetworkingError.noGraphQLDataKey
                 }
                 return data
             } else {
                 return try decoder.decode(T.self, from: data)
             }
         } catch {
-            throw NetworkingClientError.jsonDecodingError(error.localizedDescription)
+            throw NetworkingError.jsonDecodingError(error.localizedDescription)
         }
     }
 
     private func parseErrorResult<T: Decodable>(_ data: Data, as type: T.Type, isGraphQL: Bool = false) throws -> T {
         do {
             if isGraphQL {
                 let errorData = try decoder.decode(GraphQLErrorResponse.self, from: data)
-                throw NetworkingClientError.serverResponseError(errorData.error)
+                throw NetworkingError.serverResponseError(errorData.error)
             } else {
                 let errorData = try decoder.decode(ErrorResponse.self, from: data)
-                throw NetworkingClientError.serverResponseError(errorData.readableDescription)
+                throw NetworkingError.serverResponseError(errorData.readableDescription)
             }
         } catch {
-            throw NetworkingClientError.jsonDecodingError(error.localizedDescription)
+            throw NetworkingError.jsonDecodingError(error.localizedDescription)
         }
     }
 }
diff --git a/...ts/Networking/NetworkingClientError.swift → ...Payments/Networking/NetworkingError.swift b/...ts/Networking/NetworkingClientError.swift → ...Payments/Networking/NetworkingError.swift
@@ -1,9 +1,8 @@
 import Foundation
 
-enum NetworkingClientError {
+public enum NetworkingError {
 
-    // NEXT_MAJOR_VERSION: - Change to "NetworkingClientErrorDomain"
-    static let domain = "APIClientErrorDomain"
+    static let domain = "NetworkingClientErrorDomain"
 
     enum Code: Int {
         /// 0. An unknown error occured.
@@ -31,53 +30,53 @@ enum NetworkingClientError {
         case noGraphQLDataKey
     }
 
-    static let unknownError = CoreSDKError(
+    public static let unknownError = CoreSDKError(
         code: Code.unknown.rawValue,
         domain: domain,
         errorDescription: "An unknown error occured. Contact developer.paypal.com/support."
     )
 
-    static let urlSessionError = CoreSDKError(
+    public static let urlSessionError = CoreSDKError(
         code: Code.urlSessionError.rawValue,
         domain: domain,
         errorDescription: "An error occured during network call. Contact developer.paypal.com/support."
     )
 
-    static let jsonDecodingError: (String) -> CoreSDKError = { description in
+    public static let jsonDecodingError: (String) -> CoreSDKError = { description in
         CoreSDKError(
             code: Code.jsonDecodingError.rawValue,
             domain: domain,
             errorDescription: description
         )
     }
 
-    static let invalidURLResponseError = CoreSDKError(
+    public static let invalidURLResponseError = CoreSDKError(
         code: Code.invalidURLResponse.rawValue,
         domain: domain,
         errorDescription: "An error occured due to an invalid HTTP response. Contact developer.paypal.com/support."
     )
 
-    static let noResponseDataError = CoreSDKError(
+    public static let noResponseDataError = CoreSDKError(
         code: Code.noResponseData.rawValue,
         domain: domain,
         errorDescription: "An error occured due to missing HTTP response data. Contact developer.paypal.com/support."
     )
 
-    static let invalidURLRequestError = CoreSDKError(
+    public static let invalidURLRequestError = CoreSDKError(
         code: Code.invalidURLRequest.rawValue,
         domain: domain,
         errorDescription: "An error occured constructing an HTTP request. Contact developer.paypal.com/support."
     )
 
-    static let serverResponseError: (String) -> CoreSDKError = { description in
+    public static let serverResponseError: (String) -> CoreSDKError = { description in
         CoreSDKError(
             code: Code.serverResponseError.rawValue,
             domain: domain,
             errorDescription: description
         )
     }
 
-    static let noGraphQLDataKey = CoreSDKError(
+    public static let noGraphQLDataKey = CoreSDKError(
         code: Code.noGraphQLDataKey.rawValue,
         domain: domain,
         errorDescription: "An error occured due to missing `data` key in GraphQL query response. Contact developer.paypal.com/support."

diff --git a/UnitTests/PaymentsCoreTests/HTTPResponseParser_Tests.swift b/UnitTests/PaymentsCoreTests/HTTPResponseParser_Tests.swift
@@ -19,7 +19,7 @@ class HTTPResponseParser_Tests: XCTestCase {
         } catch {
             let error = error as! CoreSDKError
             XCTAssertEqual(error.localizedDescription, "An error occured due to missing HTTP response data. Contact developer.paypal.com/support.")
-            XCTAssertEqual(error.domain, NetworkingClientError.domain)
+            XCTAssertEqual(error.domain, NetworkingError.domain)
         }
     }
 
@@ -64,7 +64,7 @@ class HTTPResponseParser_Tests: XCTestCase {
         } catch {
             let error = error as! CoreSDKError
             XCTAssertEqual(error.localizedDescription, "fake-error-name: fake-message")
-            XCTAssertEqual(error.domain, NetworkingClientError.domain)
+            XCTAssertEqual(error.domain, NetworkingError.domain)
         }
     }
 
@@ -79,7 +79,7 @@ class HTTPResponseParser_Tests: XCTestCase {
         } catch {
             let error = error as! CoreSDKError
             XCTAssertEqual(error.localizedDescription, "An error occured due to missing HTTP response data. Contact developer.paypal.com/support.")
-            XCTAssertEqual(error.domain, NetworkingClientError.domain)
+            XCTAssertEqual(error.domain, NetworkingError.domain)
         }
     }
 
@@ -105,7 +105,7 @@ class HTTPResponseParser_Tests: XCTestCase {
         } catch {
             let error = error as! CoreSDKError
             XCTAssertEqual(error.localizedDescription, "An error occured due to missing `data` key in GraphQL query response. Contact developer.paypal.com/support.")
-            XCTAssertEqual(error.domain, NetworkingClientError.domain)
+            XCTAssertEqual(error.domain, NetworkingError.domain)
         }
     }
 
@@ -138,7 +138,7 @@ class HTTPResponseParser_Tests: XCTestCase {
         } catch {
             let error = error as! CoreSDKError
             XCTAssertEqual(error.localizedDescription, "fake-error-description")
-            XCTAssertEqual(error.domain, NetworkingClientError.domain)
+            XCTAssertEqual(error.domain, NetworkingError.domain)
         }
     }
 }
diff --git a/UnitTests/PaymentsCoreTests/HTTP_Tests.swift b/UnitTests/PaymentsCoreTests/HTTP_Tests.swift
@@ -58,8 +58,8 @@ class HTTP_Tests: XCTestCase {
             _ = try await sut.performRequest(fakeHTTPRequest)
             XCTFail("Request succeeded. Expected error.")
         } catch let error as CoreSDKError {
-            XCTAssertEqual(error.domain, NetworkingClientError.domain)
-            XCTAssertEqual(error.code, NetworkingClientError.Code.urlSessionError.rawValue)
+            XCTAssertEqual(error.domain, NetworkingError.domain)
+            XCTAssertEqual(error.code, NetworkingError.Code.urlSessionError.rawValue)
             XCTAssertEqual(error.localizedDescription, "An error occured during network call. Contact developer.paypal.com/support.")
         } catch {
             XCTFail("Unexpected error type")
@@ -73,8 +73,8 @@ class HTTP_Tests: XCTestCase {
             _ = try await sut.performRequest(fakeHTTPRequest)
             XCTFail("Request succeeded. Expected error.")
         } catch let error as CoreSDKError {
-            XCTAssertEqual(error.domain, NetworkingClientError.domain)
-            XCTAssertEqual(error.code, NetworkingClientError.Code.invalidURLResponse.rawValue)
+            XCTAssertEqual(error.domain, NetworkingError.domain)
+            XCTAssertEqual(error.code, NetworkingError.Code.invalidURLResponse.rawValue)
             XCTAssertEqual(error.localizedDescription, "An error occured due to an invalid HTTP response. Contact developer.paypal.com/support.")
         } catch {
             XCTFail("Unexpected error type")