feat: map selected identity 'emailsha256'

Author: Mansi-mParticle

android-kit-base/src/main/java/com/mparticle/kits/KitConfiguration.java

@@ -62,6 +62,7 @@ public class KitConfiguration {
     private final static String KEY_CONSENT_FORWARDING_RULES_VALUE_HASH = "h";
     private final static String KEY_EXCLUDE_ANONYMOUS_USERS = "eau";
     private final static String KEY_PLACEMENT_ATTRIBUTES_MAPPING = "placementAttributesMapping";
+    private final static String KEY_HASHED_EMAIL_IDENTITY_TYPE= "hashedEmailUserIdentityType";
 
     //If set to true, our sdk honor user's optout wish. If false, we still collect data on opt-ed out users, but only for reporting.
     private final static String HONOR_OPT_OUT = "honorOptOut";
@@ -995,6 +996,10 @@ public JSONArray getPlacementAttributesMapping() throws JSONException {
         return new JSONArray(jsonArrayStr);
     }
 
+    public String getHashedEmailUserIdentityType() {
+        return settings.get(KEY_HASHED_EMAIL_IDENTITY_TYPE);
+    }
+
     boolean shouldSetIdentity(MParticle.IdentityType identityType) {
         SparseBooleanArray userIdentityFilters = getUserIdentityFilters();
         return userIdentityFilters == null ||

android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java

@@ -1367,10 +1367,11 @@ public void execute(@NonNull String viewName,
                     String email = getValueIgnoreCase(attributes, "email");
                     String hashedEmail = getValueIgnoreCase(attributes, "emailsha256");
                     Map<String, String> finalAttributes = attributes;
-                    confirmEmail(email, hashedEmail, user, instance.Identity(), () -> {
+                    KitConfiguration kitConfig = provider.getConfiguration();
+                    confirmEmail(email, hashedEmail, user, instance.Identity(),kitConfig, () -> {
                         JSONArray jsonArray = new JSONArray();
 
-                        KitConfiguration kitConfig = provider.getConfiguration();
+
                         if (kitConfig != null) {
                             try {
                                 jsonArray = kitConfig.getPlacementAttributesMapping();
@@ -1486,6 +1487,7 @@ private void confirmEmail(
             @Nullable String hashedEmail,
             @Nullable MParticleUser user,
             IdentityApi identityApi,
+            KitConfiguration kitConfiguration,
             Runnable runnable
     ) {
         boolean hasEmail = email != null && !email.isEmpty();
@@ -1522,8 +1524,14 @@ else if (hashedEmailMismatch && existingHashedEmail != null) {
                 if (emailMismatch) {
                     identityBuilder.email(email);
                 }
-                if (hashedEmailMismatch) {
-                    identityBuilder.userIdentity(MParticle.IdentityType.Other, hashedEmail);
+                if (hashedEmailMismatch && kitConfiguration != null && kitConfiguration.getHashedEmailUserIdentityType() != null) {
+                    MParticle.IdentityType type;
+                    try {
+                        type = MParticle.IdentityType.valueOf(kitConfiguration.getHashedEmailUserIdentityType());
+                    } catch (IllegalArgumentException e) {
+                        type = MParticle.IdentityType.Other; // fallback
+                    }
+                    identityBuilder.userIdentity(type, hashedEmail);
                 }
 
                 IdentityApiRequest identityRequest = identityBuilder.build();

android-kit-base/src/test/kotlin/com/mparticle/kits/KitManagerImplTest.kt

@@ -1105,10 +1105,11 @@ class KitManagerImplTest {
             String::class.java,
             MParticleUser::class.java,
             IdentityApi::class.java,
+            KitConfiguration::class.java,
             Runnable::class.java
         )
         method.isAccessible = true
-        val result = method.invoke(manager, "Test@gmail.com", "", user, identityApi, runnable)
+        val result = method.invoke(manager, "Test@gmail.com", "", user, identityApi, mockedKitConfig, runnable)
         verify(mockTask).addSuccessListener(any())
     }
 
@@ -1153,10 +1154,11 @@ class KitManagerImplTest {
             String::class.java,
             MParticleUser::class.java,
             IdentityApi::class.java,
+            KitConfiguration::class.java,
             Runnable::class.java
         )
         method.isAccessible = true
-        val result = method.invoke(manager, "Test@gmail.com", null, user, identityApi, runnable)
+        val result = method.invoke(manager, "Test@gmail.com", null, user, identityApi, mockedKitConfig, runnable)
         verify(runnable).run()
     }
 
@@ -1201,10 +1203,11 @@ class KitManagerImplTest {
             String::class.java,
             MParticleUser::class.java,
             IdentityApi::class.java,
+            KitConfiguration::class.java,
             Runnable::class.java
         )
         method.isAccessible = true
-        val result = method.invoke(manager, null, null, user, identityApi, runnable)
+        val result = method.invoke(manager, null, null, user, identityApi, mockedKitConfig, runnable)
         verify(runnable).run()
     }
 
@@ -1249,10 +1252,11 @@ class KitManagerImplTest {
             String::class.java,
             MParticleUser::class.java,
             IdentityApi::class.java,
+            KitConfiguration::class.java,
             Runnable::class.java
         )
         method.isAccessible = true
-        val result = method.invoke(manager, "", "", user, identityApi, runnable)
+        val result = method.invoke(manager, "", "", user, identityApi, mockedKitConfig, runnable)
         verify(runnable).run()
     }
 
@@ -1297,10 +1301,11 @@ class KitManagerImplTest {
             String::class.java,
             MParticleUser::class.java,
             IdentityApi::class.java,
+            KitConfiguration::class.java,
             Runnable::class.java
         )
         method.isAccessible = true
-        val result = method.invoke(manager, "", "hashed_Test@gmail.com", user, identityApi, runnable)
+        val result = method.invoke(manager, "", "hashed_Test@gmail.com", user, identityApi, mockedKitConfig, runnable)
         verify(mockTask).addSuccessListener(any())
     }
 
@@ -1345,10 +1350,11 @@ class KitManagerImplTest {
             String::class.java,
             MParticleUser::class.java,
             IdentityApi::class.java,
+            KitConfiguration::class.java,
             Runnable::class.java
         )
         method.isAccessible = true
-        val result = method.invoke(manager, null, "hashed_Test@gmail.com", user, identityApi, runnable)
+        val result = method.invoke(manager, null, "hashed_Test@gmail.com", user, identityApi, mockedKitConfig, runnable)
         verify(runnable).run()
     }
 
@@ -1393,10 +1399,11 @@ class KitManagerImplTest {
             String::class.java,
             MParticleUser::class.java,
             IdentityApi::class.java,
+            KitConfiguration::class.java,
             Runnable::class.java
         )
         method.isAccessible = true
-        val result = method.invoke(manager, null, null, user, identityApi, runnable)
+        val result = method.invoke(manager, null, null, user, identityApi, mockedKitConfig, runnable)
         verify(runnable).run()
     }