fix: Linter check on data decoding

spotify · Nov 4, 2024 · f831167 · f831167
1 parent 3bc9a04
commit f831167
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/Sources/Confidence/ConfidenceScreenTracker.swift b/Sources/Confidence/ConfidenceScreenTracker.swift
@@ -78,7 +78,7 @@ extension UIViewController {
                 let encoder = JSONEncoder()
                 do {
                     let data = try encoder.encode(trackableWithMessage.trackMessage())
-                    let messageString = String(decoding: data, as: UTF8.self)
+                    let messageString = String(data: data, encoding: .utf8) ?? "internal_error"
                     message.updateValue(messageString, forKey: ConfidenceScreenTracker.messageKey)
                 } catch {
                 }

diff --git a/Sources/Confidence/EventStorage.swift b/Sources/Confidence/EventStorage.swift
@@ -75,17 +75,20 @@ internal class EventStorageImpl: EventStorage {
             let decoder = JSONDecoder()
             let fileUrl = folderURL.appendingPathComponent(id)
             let data = try Data(contentsOf: fileUrl)
-            let dataString = String(decoding: data, as: UTF8.self)
-            return try dataString.components(separatedBy: "\n")
-                .filter { events in
-                    !events.isEmpty
-                }
-                .compactMap { eventString in
-                    guard let stringData = eventString.data(using: .utf8) else {
-                        return nil
+            if let dataString = String(data: data, encoding: .utf8) {
+                return try dataString.components(separatedBy: "\n")
+                    .filter { events in
+                        !events.isEmpty
                     }
-                    return try decoder.decode(ConfidenceEvent.self, from: stringData)
-                }
+                    .compactMap { eventString in
+                        guard let stringData = eventString.data(using: .utf8) else {
+                            return nil
+                        }
+                        return try decoder.decode(ConfidenceEvent.self, from: stringData)
+                    }
+            } else {
+                throw ConfidenceError.corruptedCache(message: "Error decoding events cache file")
+            }
         }
     }
 

diff --git a/Sources/Confidence/Http/NetworkClient.swift b/Sources/Confidence/Http/NetworkClient.swift
@@ -134,10 +134,10 @@ extension NetworkClient {
                 do {
                     response.decodedError = try decoder.decode(HttpError.self, from: responseData)
                 } catch {
-                    let message = String(decoding: responseData, as: UTF8.self)
+                    let message = String(data: responseData, encoding: .utf8)
                     response.decodedError = HttpError(
                         code: httpURLResponse.statusCode,
-                        message: message,
+                        message: message ?? "{Error when decoding error message}",
                         details: []
                     )
                 }

diff --git a/Tests/ConfidenceProviderTests/ConfidenceProviderTest.swift b/Tests/ConfidenceProviderTests/ConfidenceProviderTest.swift
@@ -139,7 +139,7 @@ private class StorageMock: Storage {
     func save(data: Encodable) throws {
         try storageQueue.sync {
             let dataB = try JSONEncoder().encode(data)
-            self.data = String(decoding: dataB, as: UTF8.self)
+            self.data = try XCTUnwrap(String(data: dataB, encoding: .utf8)!)
 
             saveExpectation?.fulfill()
         }

diff --git a/Tests/ConfidenceTests/ConfidenceValueTests.swift b/Tests/ConfidenceTests/ConfidenceValueTests.swift
@@ -125,7 +125,7 @@ final class ConfidenceConfidenceValueTests: XCTestCase {
         let encoder = JSONEncoder()
         encoder.outputFormatting = .sortedKeys
         let data = try encoder.encode(value)
-        let resultString = try XCTUnwrap(String(decoding: data, as: UTF8.self))
+        let resultString = try XCTUnwrap(String(data: data, encoding: .utf8)!)
         let resultData = try XCTUnwrap(resultString.data(using: .utf8))
         let decodedValue = try JSONDecoder().decode(ConfidenceValue.self, from: resultData)
 

diff --git a/Tests/ConfidenceTests/Helpers/StorageMock.swift b/Tests/ConfidenceTests/Helpers/StorageMock.swift
@@ -17,7 +17,7 @@ class StorageMock: Storage {
     func save(data: Encodable) throws {
         try storageQueue.sync {
             let dataB = try JSONEncoder().encode(data)
-            self.data = String(decoding: dataB, as: UTF8.self)
+            self.data = try XCTUnwrap(String(data: dataB, encoding: .utf8)!)
 
             saveExpectation?.fulfill()
         }