Fixed missing email_auth_hash from email_logout

Author: jkasten2

OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignalStateSynchronizer.java

@@ -94,7 +94,7 @@ static void syncHashedEmail(String email) {
    }
 
    static void setEmail(String email, String emailAuthHash) {
-      getPushStateSynchronizer().setEmail(email);
+      getPushStateSynchronizer().setEmail(email, emailAuthHash);
       getEmailStateSynchronizer().setEmail(email, emailAuthHash);
    }
 

OneSignalSDK/onesignal/src/main/java/com/onesignal/UserStatePushSynchronizer.java

@@ -88,14 +88,14 @@ void updateState(JSONObject pushState) {
         }
     }
 
-    void setEmail(String email) {
+    void setEmail(String email, String emailAuthHash) {
         try {
-            JSONObject emailJSON = new JSONObject();
-            emailJSON.put("email", email);
+            UserState userState = getUserStateForModification();
 
+            userState.dependValues.put("email_auth_hash", emailAuthHash);
 
-            JSONObject syncValues = getUserStateForModification().syncValues;
-            generateJsonDiff(syncValues, emailJSON, syncValues, null);
+            JSONObject syncValues = userState.syncValues;
+            generateJsonDiff(syncValues, new JSONObject().put("email", email), syncValues, null);
         }
         catch (JSONException e) {
             e.printStackTrace();

OneSignalSDK/onesignal/src/main/java/com/onesignal/UserStateSynchronizer.java

@@ -189,10 +189,11 @@ private void doEmailLogout(String userId) {
         String urlStr = "players/" + userId + "/email_logout";
         JSONObject jsonBody = new JSONObject();
         try {
-            JSONObject syncValues = currentUserState.syncValues;
+            JSONObject dependValues = currentUserState.dependValues;
+            if (dependValues.has("email_auth_hash"))
+                jsonBody.put("email_auth_hash", dependValues.optString("email_auth_hash"));
 
-            if (syncValues.has("email_auth_hash"))
-                jsonBody.put("email_auth_hash", syncValues.optString("email_auth_hash"));
+            JSONObject syncValues = currentUserState.syncValues;
             if (syncValues.has("parent_player_id"))
                 jsonBody.put("parent_player_id", syncValues.optString("parent_player_id"));
 
@@ -226,9 +227,11 @@ void onSuccess(String response) {
 
     private void logoutEmailSyncSuccess() {
         toSyncUserState.dependValues.remove("logoutEmail");
+        toSyncUserState.dependValues.remove("email_auth_hash");
         toSyncUserState.syncValues.remove("parent_player_id");
         toSyncUserState.persistState();
 
+        currentUserState.dependValues.remove("email_auth_hash");
         currentUserState.syncValues.remove("parent_player_id");
         String emailLoggedOut = currentUserState.syncValues.optString("email");
         currentUserState.syncValues.remove("email");

OneSignalSDK/unittest/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java

@@ -1084,6 +1084,21 @@ public void shouldUpdateEmailWhenAuthHashIsUsed() throws Exception {
       assertEquals("different@email.com", emailPut.payload.get("identifier"));
    }
 
+   @Test
+   public void shouldSendEmailAuthHashWithLogout() throws Exception {
+      OneSignalInit();
+      String mockEmailHash = new String(new char[64]).replace('\0', '0');
+      OneSignal.setEmail("josh@onesignal.com", mockEmailHash);
+      threadAndTaskWait();
+
+      OneSignal.logoutEmail();
+      threadAndTaskWait();
+
+      ShadowOneSignalRestClient.Request emailPut = ShadowOneSignalRestClient.requests.get(4);
+      assertEquals("players/a2f7f967-e8cc-11e4-bed1-118f05be4511/email_logout", emailPut.url);
+      assertEquals(mockEmailHash, emailPut.payload.get("email_auth_hash"));
+   }
+
    private void emailSetThenLogout() throws Exception {
       OneSignal.setEmail("josh@onesignal.com");
       threadAndTaskWait();