Refactor: Add universalDeviceIdentification property to callbacks and update tests

Author: vibhorgoswami

journey/src/test/kotlin/com/pingidentity/journey/callback/MetadataCallbackTest.kt

@@ -216,7 +216,7 @@ class MetadataCallbackTest {
                         "behavioralDataCollection" : true,
                         "disableHub" : true,
                         "deviceKeyRsyncIntervals" : 10,
-                        "enableTrust" : true,
+                        "universalDeviceIdentification" : true,
                         "disableTags" : true
                      }
                 }
@@ -235,6 +235,7 @@ class MetadataCallbackTest {
         assertTrue(actualCallback.behavioralDataCollection)
         assertEquals("", actualCallback.customHost)
         assertEquals(8089, actualCallback.agentPort)
+        assertTrue(actualCallback.universalDeviceIdentification)
     }
 
     @Test

protect/src/main/kotlin/com/pingidentity/protect/Protect.kt

@@ -8,7 +8,6 @@
 package com.pingidentity.protect
 
 import com.pingidentity.android.ContextProvider
-import com.pingidentity.orchestrate.Module
 import com.pingidentity.signalssdk.sdk.GetDataCallback
 import com.pingidentity.signalssdk.sdk.InitCallback
 import com.pingidentity.signalssdk.sdk.POInitParams
@@ -152,6 +151,7 @@ open class ProtectConfig {
     var agentIdentification: Boolean = false
     var agentTimeout: Int = 0
     var agentPort: Int = 0
+    var universalDeviceIdentification: Boolean = false
 }
 
 

protect/src/main/kotlin/com/pingidentity/protect/journey/PingOneProtectInitializeCallback.kt

@@ -10,14 +10,10 @@ package com.pingidentity.protect.journey
 import com.pingidentity.protect.Protect
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.ensureActive
-import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.boolean
 import kotlinx.serialization.json.int
-import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonPrimitive
-import java.util.Collections
-import kotlin.coroutines.coroutineContext
 
 /**
  * A callback class for initializing the PingOne Protect SDK.
@@ -43,6 +39,8 @@ class PingOneProtectInitializeCallback : AbstractProtectCallback() {
         private set
     var agentPort: Int = 0
         private set
+    var universalDeviceIdentification: Boolean = false
+        private set
 
     override fun init(name: String, value: JsonElement) {
         when (name) {
@@ -52,6 +50,7 @@ class PingOneProtectInitializeCallback : AbstractProtectCallback() {
             "agentIdentification" -> agentIdentification = value.jsonPrimitive.boolean
             "agentTimeout" -> agentTimeout = value.jsonPrimitive.jsonPrimitive.int
             "agentPort" -> agentPort = value.jsonPrimitive.jsonPrimitive.int
+            "universalDeviceIdentification" -> universalDeviceIdentification = value.jsonPrimitive.boolean
             else -> {}
         }
     }
@@ -69,6 +68,7 @@ class PingOneProtectInitializeCallback : AbstractProtectCallback() {
                 agentTimeout = this@PingOneProtectInitializeCallback.agentTimeout
                 agentPort = this@PingOneProtectInitializeCallback.agentPort
                 customHost = this@PingOneProtectInitializeCallback.customHost.nullIfEmpty()
+                universalDeviceIdentification = this@PingOneProtectInitializeCallback.universalDeviceIdentification
             }
             if (behavioralDataCollection) {
                 Protect.resumeBehavioralData()

protect/src/test/kotlin/com/pingidentity/protect/journey/PingOneProtectInitializeCallbackTest.kt

@@ -110,6 +110,7 @@ class PingOneProtectInitializeCallbackTest {
         assertEquals(200,callback.agentTimeout)
         assertEquals(8089, callback.agentPort)
         assertEquals("host.example.com", callback.customHost)
+        assertFalse(callback.universalDeviceIdentification)
 
         assertTrue(callback.start().isSuccess)
         verify(exactly = 1) { Protect.resumeBehavioralData() }
@@ -188,8 +189,8 @@ class PingOneProtectInitializeCallbackTest {
                         "consoleLogEnabled" : true,
                         "deviceAttributesToIgnore" : [],
                         "customHost" : "",
-                        "agentIdentification" : true,
                         "behavioralDataCollection" : true,
+                        "agentIdentification" : true,
                         "agentTimeout" : 200,
                         "agentPort" : 8089,
                         "universalDeviceIdentification" : true,
@@ -210,6 +211,7 @@ class PingOneProtectInitializeCallbackTest {
         assertTrue(actualCallback.behavioralDataCollection)
         assertEquals("", actualCallback.customHost)
         assertEquals(200, actualCallback.agentTimeout)
+        assertTrue(actualCallback.universalDeviceIdentification)
 
         val continueNode = mockk<ContinueNode>()
         val hiddenValueCallback = object : ValueCallback {
@@ -249,7 +251,10 @@ class PingOneProtectInitializeCallbackTest {
                         "behavioralDataCollection" : true,
                         "disableHub" : true,
                         "deviceKeyRsyncIntervals" : 10,
-                        "enableTrust" : true,
+                        "agentIdentification" : true,
+                        "agentTimeout" : 200,
+                        "agentPort" : 8089,
+                        "universalDeviceIdentification" : true,
                         "disableTags" : true
                      }
                 }