[F] Fix trying to parse string values as jsons

This commit is contained in:
Hykilpikonna
2021-01-22 16:14:02 -05:00
parent 1aeb6fb666
commit 6cb4b75f82
+4 -1
View File
@@ -7,7 +7,7 @@
import Foundation import Foundation
/// Base URL of the HTTP server /// Base URL of the HTTP server
let baseUrl = "http://localhost:8080/api" // TODO: Production settings let baseUrl = "http://localhost:8080" // TODO: Production settings
/// Json class /// Json class
class JSON class JSON
@@ -212,6 +212,9 @@ func send<T: Decodable>(_ api: API<T>, _ params: [String: String]? = [:], _ succ
// If success // If success
if (200...299).contains(response.statusCode) if (200...299).contains(response.statusCode)
{ {
// If the desired type is string, it doesn't have to parse json.
if T.self == String.self, let msg = String(data: raw, encoding: .utf8) { success(msg as! T); return }
// Parse JSON // Parse JSON
guard let obj = try? JSON.decoder.decode(T.self, from: raw) else { err("JSON cannot be parsed"); return } guard let obj = try? JSON.decoder.decode(T.self, from: raw) else { err("JSON cannot be parsed"); return }