fix: support user_id / userId in OF Context (#261)

* fix: support user_id / userId in OF Context

* chore: update user_id priority

Author: jonathannorris

android-client-sdk/src/main/java/com/devcycle/sdk/android/openfeature/DevCycleContextMapper.kt

@@ -11,18 +11,27 @@ object DevCycleContextMapper {
         if (context == null) return null
 
         val builder = DevCycleUser.builder()
-        var hasTargetingKey = false
+        var userId = ""
         var hasStandardAttributes = false
         var isAnonymousExplicitlySet = false
 
-        // Map targeting key to user ID if available
-        context.getTargetingKey()?.let { targetingKey ->
-            if (targetingKey.isNotBlank()) {
-                builder.withUserId(targetingKey)
-                hasTargetingKey = true
+        context.getTargetingKey()?.takeIf { it.isNotEmpty() }?.let {
+            userId = it
+        } ?: run {
+            context.getValue("user_id")?.takeIf { it is Value.String }?.asString()?.let {
+                userId = it
+            } ?: run {
+                context.getValue("userId")?.takeIf { it is Value.String }?.asString()?.let {
+                    userId = it
+                }
             }
         }
 
+        if (!userId.isEmpty()) {
+            builder.withUserId(userId)
+        }
+        
+        
         // Map standard attributes
         context.getValue("email")?.let { email ->
             if (email is Value.String) {
@@ -68,6 +77,9 @@ object DevCycleContextMapper {
         // Use direct asMap method call instead of reflection
         context.asMap().forEach { (key, value) ->
             when (key) {
+                "userId", "user_id" -> {
+                    // Skip these as they are always processed for user ID
+                }
                 "email" -> {
                     // Only skip if it was successfully processed as a string above
                     if (value !is Value.String) {
@@ -142,10 +154,10 @@ object DevCycleContextMapper {
         }
 
         // Only return a user if we have meaningful data
-        return if (hasTargetingKey || hasStandardAttributes || customData.isNotEmpty() || privateCustomData.isNotEmpty()) {
+        return if (!userId.isEmpty() || hasStandardAttributes || customData.isNotEmpty() || privateCustomData.isNotEmpty()) {
             // If user has a targeting key, they should be considered identified (not anonymous)
             // unless explicitly set to anonymous via a boolean value
-            if (hasTargetingKey && !isAnonymousExplicitlySet) {
+            if (!userId.isEmpty() && !isAnonymousExplicitlySet) {
                 builder.withIsAnonymous(false)
             }            
 

android-client-sdk/src/test/java/com/devcycle/sdk/android/openfeature/DevCycleContextMapperTest.kt

@@ -29,6 +29,83 @@ class DevCycleContextMapperTest {
         assertEquals("user-123", jsonMap["userId"])
     }
 
+    @Test
+    fun `maps userId attribute to user ID when no targeting key`() {
+        val context = ImmutableContext(
+            attributes = mutableMapOf(
+                "userId" to Value.String("user-from-userId")
+            )
+        )
+        
+        val result = DevCycleContextMapper.evaluationContextToDevCycleUser(context)
+        
+        assertNotNull(result)
+        val jsonMap = convertToJsonMap(result!!)
+        assertEquals("user-from-userId", jsonMap["userId"])
+        assertEquals(false, jsonMap["isAnonymous"]) // User should be identified
+    }
+
+    @Test
+    fun `maps user_id attribute to user ID when no targeting key or userId`() {
+        val context = ImmutableContext(
+            attributes = mutableMapOf(
+                "user_id" to Value.String("user-from-user_id")
+            )
+        )
+        
+        val result = DevCycleContextMapper.evaluationContextToDevCycleUser(context)
+        
+        assertNotNull(result)
+        val jsonMap = convertToJsonMap(result!!)
+        assertEquals("user-from-user_id", jsonMap["userId"])
+        assertEquals(false, jsonMap["isAnonymous"]) // User should be identified
+    }
+
+    @Test
+    fun `prioritizes targeting key over userId and user_id attributes`() {
+        val context = ImmutableContext(
+            targetingKey = "targeting-key-user",
+            attributes = mutableMapOf(
+                "userId" to Value.String("userId-attribute"),
+                "user_id" to Value.String("user_id-attribute")
+            )
+        )
+        
+        val result = DevCycleContextMapper.evaluationContextToDevCycleUser(context)
+        
+        assertNotNull(result)
+        val jsonMap = convertToJsonMap(result!!)
+        assertEquals("targeting-key-user", jsonMap["userId"])
+        
+        // userId and user_id should not appear in custom data when targeting key is used
+        val customData = jsonMap["customData"] as? Map<*, *>
+        assertNull(customData?.get("userId"))
+        assertNull(customData?.get("user_id"))
+    }
+
+    @Test
+    fun `prioritizes user_id over userId attribute when no targeting key`() {
+        val context = ImmutableContext(
+            attributes = mutableMapOf(
+                "userId" to Value.String("userId-attribute"),
+                "user_id" to Value.String("user_id-attribute")
+            )
+        )
+        
+        val result = DevCycleContextMapper.evaluationContextToDevCycleUser(context)
+        
+        assertNotNull(result)
+        val jsonMap = convertToJsonMap(result!!)
+        // Should use user_id value as it has higher priority than userId (matching Java SDK)
+        assertEquals("user_id-attribute", jsonMap["userId"])
+        assertEquals(false, jsonMap["isAnonymous"]) // User should be identified
+        
+        // Neither should appear in custom data when used for user ID
+        val customData = jsonMap["customData"] as? Map<*, *>
+        assertNull(customData?.get("userId"))
+        assertNull(customData?.get("user_id"))
+    }
+
     @Test
     fun `maps standard attributes correctly`() {
         val context = ImmutableContext(