Update CustomNSError to contain underlyingError for connection errors

kean · kean · commit 44309e7813d6 · 2024-03-11T11:40:28.000-04:00
diff --git a/WordPressKit/PostServiceRemoteREST.m b/WordPressKit/PostServiceRemoteREST.m
@@ -477,7 +477,7 @@ + (RemotePost *)remotePostFromJSONDictionary:(NSDictionary *)jsonPost {
 
     post.isStickyPost = [jsonPost numberForKeyPath:@"sticky"];
     
-    // FIXME: remove conversion once API is fixed #38-;
+    // FIXME: remove conversion once API is fixed #38-io
     // metadata should always be an array but it's returning false when there are no custom fields
     post.metadata = [jsonPost arrayForKey:@"metadata"];
     // Or even worse, in some cases (Jetpack sites?) is an array containing false
diff --git a/WordPressKit/WordPressAPIError+NSErrorBrdige.swift b/WordPressKit/WordPressAPIError+NSErrorBrdige.swift
@@ -37,13 +37,13 @@ extension WordPressAPIError: CustomNSError {
         switch self {
         case let .endpointError(endpointError):
             return (endpointError as NSError).userInfo
-        case .requestEncodingFailure, .connection, .unacceptableStatusCode, .unparsableResponse,
+        case .connection(let error):
+            return [NSUnderlyingErrorKey: error]
+        case .requestEncodingFailure, .unacceptableStatusCode, .unparsableResponse,
                 .unknown:
             return [:]
         }
-
     }
-
 }
 
 // MARK: - Bridge WordPressComRestApiEndpointError to NSError

Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,13 @@ extension WordPressAPIError: CustomNSError {`
`37`	`37`	`switch self {`
`38`	`38`	`case let .endpointError(endpointError):`
`39`	`39`	`return (endpointError as NSError).userInfo`
`40`		`- case .requestEncodingFailure, .connection, .unacceptableStatusCode, .unparsableResponse,`
	`40`	`+ case .connection(let error):`
	`41`	`+ return [NSUnderlyingErrorKey: error]`
	`42`	`+ case .requestEncodingFailure, .unacceptableStatusCode, .unparsableResponse,`
`41`	`43`	`.unknown:`
`42`	`44`	`return [:]`
`43`	`45`	`}`
`44`		`-`
`45`	`46`	`}`
`46`		`-`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`// MARK: - Bridge WordPressComRestApiEndpointError to NSError`