MOB-4031 fix Client app not running on device and failing test login …

…request (#212)

* rename Client target to distinguish from the UI SDK Client, fix test login request for token exchange

* rename target

* update test host for test targets

* fix encoding issue from ios 17

* remove extra protocol

.gitignore

@@ -22,6 +22,7 @@ fastlane/.env
 
 # access keys
 Client/Keys.swift
+NSDKClient/Keys.swift
 Package.resolved
 .idea
 .bitrise.secrets.yml

KarhooSDK.xcodeproj/xcshareddata/xcschemes/Client.xcscheme

@@ -15,8 +15,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "09A9B28A2405901900823FB0"
-               BuildableName = "Client.app"
-               BlueprintName = "Client"
+               BuildableName = "NSDKClient.app"
+               BlueprintName = "NSDKClient"
                ReferencedContainer = "container:KarhooSDK.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -45,8 +45,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "09A9B28A2405901900823FB0"
-            BuildableName = "Client.app"
-            BlueprintName = "Client"
+            BuildableName = "NSDKClient.app"
+            BlueprintName = "NSDKClient"
             ReferencedContainer = "container:KarhooSDK.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
@@ -62,8 +62,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "09A9B28A2405901900823FB0"
-            BuildableName = "Client.app"
-            BlueprintName = "Client"
+            BuildableName = "NSDKClient.app"
+            BlueprintName = "NSDKClient"
             ReferencedContainer = "container:KarhooSDK.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>

KarhooSDK/Network/Common/KarhooCodableModel.swift

@@ -21,7 +21,9 @@ public protocol KarhooRequestModel: Encodable {
 extension KarhooRequestModel {
     public func encode() -> Data? {
         do {
-            return try JSONEncoder().encode(self)
+            let encoder = JSONEncoder()
+            encoder.outputFormatting = .sortedKeys
+            return try encoder.encode(self)
         } catch let error {
             print("----Error Encoding model: \(self) | Reason: \(error.localizedDescription)")
             return nil
@@ -33,7 +35,9 @@ extension KarhooCodableModel {
 
     public func encode() -> Data? {
         do {
-            return try JSONEncoder().encode(self)
+            let encoder = JSONEncoder()
+            encoder.outputFormatting = .sortedKeys
+            return try encoder.encode(self)
         } catch let error {
             print("----Error Encoding model: \(self) | Reason: \(error.localizedDescription)")
             return nil

Client/AppDelegate.swift → NSDKClient/AppDelegate.swift

@@ -26,6 +26,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 }
 
 struct SDKConfig: KarhooSDKConfiguration {
+    static var auth: AuthenticationMethod?
+
     func requireSDKAuthentication(callback: @escaping () -> Void) {
         callback()
     }
@@ -35,10 +37,13 @@ struct SDKConfig: KarhooSDKConfiguration {
     }
 
     func authenticationMethod() -> AuthenticationMethod {
-        let guestSettings = GuestSettings(identifier: Keys.identifier,
-                                          referer: Keys.referer,
-                                          organisationId: Keys.organisationId)
-        return .guest(settings: guestSettings)
+        guard let auth = SDKConfig.auth else {
+            let guestSettings = GuestSettings(identifier: Keys.identifier,
+                                              referer: Keys.referer,
+                                              organisationId: Keys.organisationId)
+            return .guest(settings: guestSettings)
+        }
+         return auth
     }
 }
 

Client/AuthRequestsTesterViewController.swift → NSDKClient/AuthRequestsTesterViewController.swift

@@ -70,7 +70,14 @@ class AuthRequestsTesterViewController: UIViewController {
     }
 
     private func login() {
-        Karhoo.getAuthService().login(token: "").execute(callback: { [weak self] result in
+        SDKConfig.auth = .tokenExchange(
+            settings: TokenExchangeSettings(
+                clientId: Keys.tokenClientId,
+                scope: Keys.tokenScope
+            )
+        )
+
+        Karhoo.getAuthService().login(token: Keys.authToken).execute(callback: { [weak self] result in
             if result.isSuccess() {
                 self?.responseLabel.textColor = .green
                 let output = """