From 1bc619574b50ed0de38af9a04dbafeb0e00338d5 Mon Sep 17 00:00:00 2001 From: PhillipiLino Date: Thu, 1 Jun 2023 08:23:54 -0300 Subject: [PATCH] Add device type --- IngresseSDK/Model/UserDevice.swift | 11 ++++++++++- IngresseSDK/Services/AuthService.swift | 20 ++++++++------------ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/IngresseSDK/Model/UserDevice.swift b/IngresseSDK/Model/UserDevice.swift index 6b1c529..cef14ef 100644 --- 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 index 27c17c0..d03d9b4 100644 --- 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,