fix: check for ParseError first after server response (#332)

* fix: check for ParseError first after server response * nits
parse-community · Jan 24, 2022 · a9dd890 · a9dd890
1 parent 96232f3
commit a9dd890
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/Sources/ParseSwift/Extensions/URLSession.swift b/Sources/ParseSwift/Extensions/URLSession.swift
@@ -54,17 +54,18 @@ internal extension URLSession {
             return .failure(parseError)
         }
         if let responseData = responseData {
+            if let error = try? ParseCoding.jsonDecoder().decode(ParseError.self, from: responseData) {
+                return .failure(error)
+            }
+            if URLSession.parse.configuration.urlCache?.cachedResponse(for: request) == nil {
+                URLSession.parse.configuration.urlCache?
+                    .storeCachedResponse(.init(response: response,
+                                               data: responseData),
+                                         for: request)
+            }
             do {
-                if URLSession.parse.configuration.urlCache?.cachedResponse(for: request) == nil {
-                    URLSession.parse.configuration.urlCache?.storeCachedResponse(.init(response: response,
-                                                              data: responseData),
-                                                        for: request)
-                }
                 return try .success(mapper(responseData))
             } catch {
-                if let error = try? ParseCoding.jsonDecoder().decode(ParseError.self, from: responseData) {
-                    return .failure(error)
-                }
                 guard let parseError = error as? ParseError else {
                     guard JSONSerialization.isValidJSONObject(responseData),
                           let json = try? JSONSerialization
@@ -255,7 +256,8 @@ internal extension URLSession {
         completion: @escaping(Result<U, ParseError>) -> Void
     ) {
         downloadTask(with: request) { (location, urlResponse, responseError) in
-            completion(self.makeResult(request: request, location: location,
+            completion(self.makeResult(request: request,
+                                       location: location,
                                        urlResponse: urlResponse,
                                        responseError: responseError,
                                        mapper: mapper))