Unpack the JSON RPC errors

1 files changed, 9 insertions, 7 deletions

diff --git a/ios/MullvadVPN/JsonRpc.swift b/ios/MullvadVPN/JsonRpc.swift
index a2e29fea19..ac1d44660c 100644
--- a/ios/MullvadVPN/JsonRpc.swift
+++ b/ios/MullvadVPN/JsonRpc.swift
@@ -29,20 +29,22 @@ extension JsonRpcRequest where T == NoData {
 struct NoData: Encodable {}
 
 class JsonRpcResponseError: Error, Decodable {
-    let serverErrorMessage: String
+    let code: Int
+    let message: String
 
-    init(serverErrorMessage: String) {
-        self.serverErrorMessage = serverErrorMessage
+    var localizedDescription: String? {
+        return message
     }
 
-    var localizedDescription: String? {
-        return serverErrorMessage
+    private enum CodingKeys: String, CodingKey {
+        case code, message
     }
 
     required init(from decoder: Decoder) throws {
-        let container = try decoder.singleValueContainer()
+        let container = try decoder.container(keyedBy: CodingKeys.self)
 
-        serverErrorMessage = try container.decode(String.self)
+        code = try container.decode(Int.self, forKey: .code)
+        message = try container.decode(String.self, forKey: .message)
     }
 }