Skip to content

feat: Handle hashed email for rokt #599

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
Mansi-mParticle merged 8 commits into from
Aug 1, 2025
Merged

feat: Handle hashed email for rokt #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f680534
feat: Handle hashed email for rokt
Mansi-mParticle Jul 28, 2025
403da66
fix existing test cases and added new test cases
Mansi-mParticle Jul 28, 2025
98b68b9
Fix case sensitivity issues in attribute key
Mansi-mParticle Jul 29, 2025
3e32b35
remove other formatting code
Mansi-mParticle Jul 29, 2025
f3cf44d
added test cases for utility method
Mansi-mParticle Jul 29, 2025
ccfbf66
updated logic accoring to requirement update
Mansi-mParticle Jul 30, 2025
c2f7341
fix the lint issue
Mansi-mParticle Jul 30, 2025
dd6b61e
Clean up and simplify method logic
Mansi-mParticle Jul 31, 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
144 changes: 87 additions & 57 deletions android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1364,50 +1364,51 @@ public void execute(@NonNull String viewName,
}
MParticle instance = MParticle.getInstance();
MParticleUser user = instance.Identity().getCurrentUser();
String email = attributes.get("email");
String email = getValueIgnoreCase(attributes, "email");
String hashedEmail = getValueIgnoreCase(attributes, "emailsha256");
Map<String, String> finalAttributes = attributes;
confirmEmail(email,user,instance.Identity(), () -> {
JSONArray jsonArray = new JSONArray();

KitConfiguration kitConfig = provider.getConfiguration();
if (kitConfig != null) {
try {
jsonArray = kitConfig.getPlacementAttributesMapping();
} catch (JSONException e) {
Logger.warning("Invalid placementAttributes for kit: " + provider.getName() + " JSON: " + e.getMessage());
confirmEmail(email, hashedEmail, user, instance.Identity(), () -> {
JSONArray jsonArray = new JSONArray();

KitConfiguration kitConfig = provider.getConfiguration();
if (kitConfig != null) {
try {
jsonArray = kitConfig.getPlacementAttributesMapping();
} catch (JSONException e) {
Logger.warning("Invalid placementAttributes for kit: " + provider.getName() + " JSON: " + e.getMessage());
}
}
}
for (int i = 0; i < jsonArray.length(); i++) {
JSONObject obj = jsonArray.optJSONObject(i);
if (obj == null) continue;
String mapFrom = obj.optString("map");
String mapTo = obj.optString("value");
if (finalAttributes.containsKey(mapFrom)) {
String value = finalAttributes.remove(mapFrom);
finalAttributes.put(mapTo, value);
for (int i = 0; i < jsonArray.length(); i++) {
JSONObject obj = jsonArray.optJSONObject(i);
if (obj == null) continue;
String mapFrom = obj.optString("map");
String mapTo = obj.optString("value");
if (finalAttributes.containsKey(mapFrom)) {
String value = finalAttributes.remove(mapFrom);
finalAttributes.put(mapTo, value);
}
}
}
Map<String, Object> objectAttributes = new HashMap<>();
for (Map.Entry<String, String> entry : finalAttributes.entrySet()) {
if(!entry.getKey().equals(Constants.MessageKey.SANDBOX_MODE_ROKT)) {
objectAttributes.put(entry.getKey(), entry.getValue());
Map<String, Object> objectAttributes = new HashMap<>();
for (Map.Entry<String, String> entry : finalAttributes.entrySet()) {
if (!entry.getKey().equals(Constants.MessageKey.SANDBOX_MODE_ROKT)) {
objectAttributes.put(entry.getKey(), entry.getValue());
}
}
if (user != null) {
user.setUserAttributes(objectAttributes);
}
}
if (user != null) {
user.setUserAttributes(objectAttributes);
}

if (!finalAttributes.containsKey(Constants.MessageKey.SANDBOX_MODE_ROKT)) {
finalAttributes.put(Constants.MessageKey.SANDBOX_MODE_ROKT, String.valueOf(Objects.toString(MPUtility.isDevEnv(), "false"))); // Default value is "false" if null
}
if (!finalAttributes.containsKey(Constants.MessageKey.SANDBOX_MODE_ROKT)) {
finalAttributes.put(Constants.MessageKey.SANDBOX_MODE_ROKT, Objects.toString(MPUtility.isDevEnv(), "false")); // Default value is "false" if null
}

((KitIntegration.RoktListener) provider).execute(viewName,
finalAttributes,
mpRoktEventCallback,
placeHolders,
fontTypefaces,
FilteredMParticleUser.getInstance(user.getId(), provider),
config);
((KitIntegration.RoktListener) provider).execute(viewName,
finalAttributes,
mpRoktEventCallback,
placeHolders,
fontTypefaces,
FilteredMParticleUser.getInstance(user.getId(), provider),
config);
});
}
} catch (Exception e) {
Expand All @@ -1416,6 +1417,15 @@ public void execute(@NonNull String viewName,
}
}

private String getValueIgnoreCase(Map<String, String> map, String searchKey) {
for (Map.Entry<String, String> entry : map.entrySet()) {
if (entry.getKey().equalsIgnoreCase(searchKey)) {
return entry.getValue();
Comment thread
rmi22186 marked this conversation as resolved.
}
}
return null;
}

@Override
public Flow<RoktEvent> events(@NonNull String identifier) {
for (KitIntegration provider : providers.values()) {
Expand Down Expand Up @@ -1473,43 +1483,63 @@ public void close() {

private void confirmEmail(
@Nullable String email,
@Nullable String hashedEmail,
@Nullable MParticleUser user,
IdentityApi identityApi,
Runnable runnable
) {
if (email != null && user != null) {
boolean hasEmail = email != null && !email.isEmpty();
boolean hasHashedEmail = hashedEmail != null && !hashedEmail.isEmpty();

if ((hasEmail || hasHashedEmail) && user != null) {
String existingEmail = user.getUserIdentities().get(MParticle.IdentityType.Email);
String existingHashedEmail = user.getUserIdentities().get(MParticle.IdentityType.Other);

boolean emailMismatch = hasEmail && !email.equalsIgnoreCase(existingEmail);
boolean hashedEmailMismatch = hasHashedEmail && !hashedEmail.equalsIgnoreCase(existingHashedEmail);

if (!email.equals(existingEmail)) {
if (emailMismatch || hashedEmailMismatch) {
// If there's an existing email but it doesn't match the passed-in email, log a warning
if (existingEmail != null) {
Logger.warning( String.format(
if (emailMismatch && existingEmail != null) {
Logger.warning(String.format(
"The existing email on the user (%s) does not match the email passed to selectPlacements (%s). " +
"Please make sure to sync the email identity to mParticle as soon as it's available. " +
"Identifying user with the provided email before continuing to selectPlacements.",
existingEmail, email
));
}
// If there's an existing other but it doesn't match the passed-in hashed email, log a warning
else if (hashedEmailMismatch && existingHashedEmail != null) {
Logger.warning(String.format(
"The existing hashed email on the user (%s) does not match the hashed email passed to selectPlacements (%s). " +
"Please make sure to sync the hashed email identity to mParticle as soon as it's available. " +
"Identifying user with the provided hashed email before continuing to selectPlacements.",
existingHashedEmail, hashedEmail
));
}

IdentityApiRequest identityRequest = IdentityApiRequest.withUser(user)
.email(email)
.build();
IdentityApiRequest.Builder identityBuilder = IdentityApiRequest.withUser(user);
if (emailMismatch) {
identityBuilder.email(email);
}
if (hashedEmailMismatch) {
identityBuilder.userIdentity(MParticle.IdentityType.Other, hashedEmail);
}

IdentityApiRequest identityRequest = identityBuilder.build();
MParticleTask<IdentityApiResult> task = identityApi.identify(identityRequest);
task.addFailureListener(new TaskFailureListener() {
@Override
public void onFailure(IdentityHttpResponse result) {
Logger.error( "Failed to sync email from selectPlacement to user: " + result.getErrors().toString());

runnable.run();
}
task.addFailureListener(result -> {
Logger.error("Failed to sync email from selectPlacement to user: " + result.getErrors());
runnable.run();
});
task.addSuccessListener(new TaskSuccessListener() {
@Override
public void onSuccess(IdentityApiResult result) {
Logger.debug("Updated email identity based on selectPlacement's attributes: " + result.getUser().getUserIdentities().get(MParticle.IdentityType.Email));
runnable.run();
}

task.addSuccessListener(result -> {
Logger.debug("Updated email identity based on selectPlacement's attributes: " +
result.getUser().getUserIdentities().get(MParticle.IdentityType.Email));
runnable.run();
});

} else {
runnable.run();
}
Expand Down
Loading
Loading