Skip to content

fix: user attributes missing when calling execute call #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 28, 2025
Merged

fix: user attributes missing when calling execute call #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ef24f9c
fix: user attributes missing when calling execute call
Mansi-mParticle Oct 23, 2025
27bab02
Revert the code to use existing attributes instead of callback
Mansi-mParticle Oct 23, 2025
d3e018e
remove the log
Mansi-mParticle Oct 23, 2025
d12fa73
add filter attributes code
Mansi-mParticle Oct 23, 2025
ba25adb
fix formatting issue
Mansi-mParticle Oct 23, 2025
71d8bc6
Removed Unused import
Mansi-mParticle Oct 24, 2025
a93e978
Use userattributes filter instead of event attributes filter
Mansi-mParticle Oct 27, 2025
0b08d76
apply formatting
Mansi-mParticle Oct 27, 2025
28a8739
address review comments
Mansi-mParticle Oct 27, 2025
761b8ec
rename test method name
Mansi-mParticle Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/main/kotlin/com/mparticle/kits/RoktKit.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ class RoktKit :
filterUser: FilteredMParticleUser?,
attributes: Map<String, String>,
): Map<String, String> {
val finalAttributes = mutableMapOf<String, String>()
val finalAttributes = filterAttributes(attributes, configuration)

filterUser?.userAttributes?.let { userAttrs ->
for ((key, value) in userAttrs) {
if (value != null) {
Expand All @@ -227,13 +228,21 @@ class RoktKit :

addIdentityAttributes(finalAttributes, filterUser)

attributes[ROKT_ATTRIBUTE_SANDBOX_MODE]?.let { value ->
finalAttributes.put(ROKT_ATTRIBUTE_SANDBOX_MODE, value)
}
verifyHashedEmail(finalAttributes)
return finalAttributes
}

private fun filterAttributes(attributes: Map<String, String>, kitConfiguration: KitConfiguration): MutableMap<String, String> {
val userAttributes = mutableMapOf<String, String>()
for ((key, value) in attributes) {
val hashKey = KitUtils.hashForFiltering(key)
if (!kitConfiguration.mUserAttributeFilters.get(hashKey)) {
userAttributes[key] = value
}
}
return userAttributes
}

override fun events(identifier: String): Flow<com.mparticle.RoktEvent> = Rokt.events(identifier).map { event ->
when (event) {
is RoktEvent.HideLoadingIndicator -> com.mparticle.RoktEvent.HideLoadingIndicator
Expand Down
179 changes: 177 additions & 2 deletions src/test/kotlin/com/mparticle/kits/RoktKitTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import com.mparticle.WrapperSdkVersion
import com.mparticle.identity.IdentityApi
import com.mparticle.internal.CoreCallbacks
import com.mparticle.internal.CoreCallbacks.KitListener
import com.mparticle.kits.mocks.MockKitConfiguration
import com.rokt.roktsdk.FulfillmentAttributes
import com.rokt.roktsdk.Rokt
import com.rokt.roktsdk.RoktEvent
Expand All @@ -31,6 +32,7 @@ import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.toList
import kotlinx.coroutines.test.runTest
import org.json.JSONArray
import org.json.JSONObject
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
Expand Down Expand Up @@ -85,7 +87,21 @@ class RoktKitTests {
userAttributes["attr_null"] = null
userAttributes["attr_non_string"] = 123
Mockito.`when`(mockFilterUser.userAttributes).thenReturn(userAttributes)
// Set up the configuration with our test filters
val jsonObject = JSONObject()
try {
val filteredKey: String = KitUtils.hashForFiltering("ShouldFilter").toString()
val filteredKey2: String = KitUtils.hashForFiltering("ShouldFilter_key_2").toString()
jsonObject.put(filteredKey, 0)
jsonObject.put(filteredKey2, 1)
} catch (e: Exception) {
println("Exception occurred: ${e.message}")
}
val json = JSONObject()
json.put("ua", jsonObject)


roktKit.configuration = MockKitConfiguration.createKitConfiguration(JSONObject().put("hs", json))
val method: Method = RoktKit::class.java.getDeclaredMethod(
"prepareFinalAttributes",
FilteredMParticleUser::class.java,
Expand All @@ -111,9 +127,9 @@ class RoktKitTests {
var attributes = HashMap<String, String>()
var result: AttributionResult? = null
private var error: AttributionError? = null
public override fun getIntegrationAttributes(kitIntegration: KitIntegration): Map<String, String> = attributes
override fun getIntegrationAttributes(kitIntegration: KitIntegration): Map<String, String> = attributes

public override fun setIntegrationAttributes(
override fun setIntegrationAttributes(
kitIntegration: KitIntegration,
integrationAttributes: Map<String, String>,
) {
Expand Down Expand Up @@ -693,6 +709,165 @@ class RoktKitTests {
assertFalse(attributes.containsKey("emailsha256"))
}

@Test
fun testFilterAttributes() {
// Create test attributes
val attributes: Map<String, String> = mapOf(
"ShouldFilter" to "shoudl_filter_value",
"ShouldFilter_key_2" to "ShouldFilter_value",
"allowed_key" to "allowed_value",
)

// Get the private filterAttributes method using reflection
val method: Method = RoktKit::class.java.getDeclaredMethod(
"filterAttributes",
Map::class.java,
KitConfiguration::class.java,
)
method.isAccessible = true

// Set up the configuration with our test filters
val jsonObject = JSONObject()
try {
val filteredKey: String = KitUtils.hashForFiltering("ShouldFilter").toString()
val filteredKey2: String = KitUtils.hashForFiltering("ShouldFilter_key_2").toString()
jsonObject.put(filteredKey, 0)
jsonObject.put(filteredKey2, 1)
} catch (e: Exception) {
println("Exception occurred: ${e.message}")
}

val json = JSONObject()
json.put("ua", jsonObject)

roktKit.configuration = MockKitConfiguration.createKitConfiguration(JSONObject().put("hs", json))

// Invoke the method and get the result
val result = method.invoke(roktKit, attributes, roktKit.configuration) as Map<String, String>

// Verify the results
assertEquals(1, result.size)

assertFalse(result.containsKey("ShouldFilter"))
assertFalse(result.containsKey("ShouldFilter_key_2"))
assertTrue(result.containsKey("allowed_key"))
assertEquals("allowed_value", result["allowed_key"])
}

@Test
fun testFilterAttributes_When_kitConfig_User_Attributes_Filtering_IS_NULL() {
// Create test attributes
val attributes: Map<String, String> = mapOf(
"filtered_key" to "filtered_value",
"allowed_key" to "allowed_value",
"another_allowed_key" to "another_allowed_value",
)

// Get the private filterAttributes method using reflection
val method: Method = RoktKit::class.java.getDeclaredMethod(
"filterAttributes",
Map::class.java,
KitConfiguration::class.java,
)
method.isAccessible = true

val json = JSONObject()

roktKit.configuration = MockKitConfiguration.createKitConfiguration(JSONObject().put("hs", json))

// Invoke the method and get the result
val result = method.invoke(roktKit, attributes, roktKit.configuration) as Map<String, String>

assertEquals(3, result.size)

assertTrue(result.containsKey("allowed_key"))
assertTrue(result.containsKey("filtered_key"))
assertTrue(result.containsKey("another_allowed_key"))
assertEquals("another_allowed_value", result["another_allowed_key"])
}

@Test
fun testFilterAttributes_When_Attributes_IS_Empty() {
// Create test attributes
val emptyAttributes: Map<String, String> = emptyMap()

// Get the private filterAttributes method using reflection
val method: Method = RoktKit::class.java.getDeclaredMethod(
"filterAttributes",
Map::class.java,
KitConfiguration::class.java,
)
method.isAccessible = true

// Set up the configuration with our test filters
val jsonObject = JSONObject()
try {
val filteredKey: String = KitUtils.hashForFiltering("filtered_key").toString()
val filteredKey2: String = KitUtils.hashForFiltering("allowed_key").toString()
jsonObject.put(filteredKey, 0)
jsonObject.put(filteredKey2, 1)
} catch (e: Exception) {
println("Exception occurred: ${e.message}")
}

val json = JSONObject()
json.put("aaa", jsonObject)

roktKit.configuration = MockKitConfiguration.createKitConfiguration(JSONObject().put("hs", json))

// Invoke the method and get the result
val result = method.invoke(roktKit, emptyAttributes, roktKit.configuration) as Map<String, String>

assertEquals(0, result.size)
}

@Test
fun testFilterAttributes_Allows_Attributes_To_Be_Set_When_When_Filtered_User_Attributes_Differ() {
// Create test attributes
val attributes: Map<String, String> = mapOf(
"filtered_key" to "filtered_value",
"allowed_key" to "allowed_value",
"another_allowed_key" to "another_allowed_value",
)

// Get the private filterAttributes method using reflection
val method: Method = RoktKit::class.java.getDeclaredMethod(
"filterAttributes",
Map::class.java,
KitConfiguration::class.java,
)
method.isAccessible = true

// Set up the configuration with our test filters
val jsonObject = JSONObject()
try {
val filteredKey: String = KitUtils.hashForFiltering("Test1").toString()
val filteredKey2: String = KitUtils.hashForFiltering("Test2").toString()
jsonObject.put(filteredKey, 0)
jsonObject.put(filteredKey2, 1)
} catch (e: Exception) {
println("Exception occurred: ${e.message}")
}

val json = JSONObject()
json.put("us", jsonObject)

roktKit.configuration = MockKitConfiguration.createKitConfiguration(JSONObject().put("hs", json))

// Invoke the method and get the result
val result = method.invoke(roktKit, attributes, roktKit.configuration) as Map<String, String>

// Verify the results
assertEquals(3, result.size)

assertTrue(result.containsKey("filtered_key"))
assertTrue(result.containsKey("allowed_key"))
assertTrue(result.containsKey("another_allowed_key"))
assertEquals("another_allowed_value", result["another_allowed_key"])
assertEquals("filtered_value", result["filtered_key"])
assertEquals("allowed_value", result["allowed_key"])
}

internal inner class TestCoreCallbacks : CoreCallbacks {
override fun isBackgrounded(): Boolean = false
override fun getUserBucket(): Int = 0
Expand Down
Loading