Add device type

ingresse · Jun 1, 2023 · 1bc6195 · 1bc6195
1 parent 8cd909a
commit 1bc6195
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/IngresseSDK/Model/UserDevice.swift b/IngresseSDK/Model/UserDevice.swift
@@ -9,12 +9,21 @@
 public struct UserDevice: Encodable {
     public let id: String
     public let name: String
+    public let type: String
 
     public init(
         id: String,
-        name: String
+        name: String,
+        type: String
     ) {
         self.id = id
         self.name = name
+        self.type = type
+    }
+
+    func toJsonString() -> String? {
+        guard let data = try? JSONEncoder().encode(self) else { return nil }
+        let jsonString = String(decoding: data, as: UTF8.self)
+        return jsonString
     }
 }
diff --git a/IngresseSDK/Services/AuthService.swift b/IngresseSDK/Services/AuthService.swift
@@ -76,9 +76,8 @@ public class AuthService: BaseService {
                       "password": pass]
 
         var header: [String: Any] = [:]
-        if let data = try? JSONEncoder().encode(device) {
-            let jsonString = String(decoding: data, as: UTF8.self)
-            header["X-INGRESSE-DEVICE"] = jsonString
+        if let jsonDevice = device.toJsonString() {
+            header["X-INGRESSE-DEVICE"] = jsonDevice
         }
 
         client.restClient.POST(request: request,
@@ -133,9 +132,8 @@ public class AuthService: BaseService {
                       "fbUserId": fbUserId]
 
         var header: [String: Any] = [:]
-        if let data = try? JSONEncoder().encode(device) {
-            let jsonString = String(decoding: data, as: UTF8.self)
-            header["X-INGRESSE-DEVICE"] = jsonString
+        if let jsonDevice = device.toJsonString() {
+            header["X-INGRESSE-DEVICE"] = jsonDevice
         }
 
         client.restClient.POST(request: request,
@@ -191,9 +189,8 @@ public class AuthService: BaseService {
                       "authorizationCode": authorizationCode]
 
         var header: [String: Any] = [:]
-        if let data = try? JSONEncoder().encode(device) {
-            let jsonString = String(decoding: data, as: UTF8.self)
-            header["X-INGRESSE-DEVICE"] = jsonString
+        if let jsonDevice = device.toJsonString() {
+            header["X-INGRESSE-DEVICE"] = jsonDevice
         }
 
         client.restClient.POST(request: request,
@@ -243,9 +240,8 @@ public class AuthService: BaseService {
                       "redirectUri": "ingresse://facebank"]
 
         var header: [String: Any] = [:]
-        if let data = try? JSONEncoder().encode(device) {
-            let jsonString = String(decoding: data, as: UTF8.self)
-            header["X-INGRESSE-DEVICE"] = jsonString
+        if let jsonDevice = device.toJsonString() {
+            header["X-INGRESSE-DEVICE"] = jsonDevice
         }
 
         client.restClient.POST(request: request,