Merge pull request #86 from Iterable/feature/MOB-95-support-userId-in-updateEmail

[MOB-95] Add support for currentUserId in updateEmail

Author: vbabenkoru

iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java

@@ -731,30 +731,38 @@ public void updateEmail(final String newEmail) {
      * @param failureHandler Failure handler. Called when the server call failed.
      */
     public void updateEmail(final String newEmail, final IterableHelper.SuccessHandler successHandler, IterableHelper.FailureHandler failureHandler) {
-        if (_email != null) {
-            JSONObject requestJSON = new JSONObject();
+        if (!checkSDKInitialization()) {
+            IterableLogger.e(TAG, "The Iterable SDK must be initialized with email or userId before "+
+                    "calling updateEmail");
+            if (failureHandler != null) {
+                failureHandler.onFailure("The Iterable SDK must be initialized with email or "+
+                        "userId before calling updateEmail", null);
+            }
+            return;
+        }
+        JSONObject requestJSON = new JSONObject();
 
-            try {
+        try {
+            if (_email != null) {
                 requestJSON.put(IterableConstants.KEY_CURRENT_EMAIL, _email);
-                requestJSON.put(IterableConstants.KEY_NEW_EMAIL, newEmail);
-
-                sendPostRequest(IterableConstants.ENDPOINT_UPDATE_EMAIL, requestJSON, new IterableHelper.SuccessHandler() {
-                    @Override
-                    public void onSuccess(JSONObject data) {
-                        _email = newEmail;
-                        storeEmailAndUserId();
-                        if (successHandler != null) {
-                            successHandler.onSuccess(data);
-                        }
-                    }
-                }, failureHandler);
-            }
-            catch (JSONException e) {
-                e.printStackTrace();
+            } else {
+                requestJSON.put(IterableConstants.KEY_CURRENT_USERID, _userId);
             }
-        } else {
-            IterableLogger.w(TAG, "updateEmail should not be called with a userId. " +
-                "Make sure you call setEmail(String) before trying to update it");
+            requestJSON.put(IterableConstants.KEY_NEW_EMAIL, newEmail);
+
+            sendPostRequest(IterableConstants.ENDPOINT_UPDATE_EMAIL, requestJSON, new IterableHelper.SuccessHandler() {
+                @Override
+                public void onSuccess(JSONObject data) {
+                    _email = newEmail;
+                    storeEmailAndUserId();
+                    if (successHandler != null) {
+                        successHandler.onSuccess(data);
+                    }
+                }
+            }, failureHandler);
+        }
+        catch (JSONException e) {
+            e.printStackTrace();
         }
     }
 

iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java

@@ -19,6 +19,7 @@ public final class IterableConstants {
     public static final String KEY_APPLICATION_NAME     = "applicationName";
     public static final String KEY_CAMPAIGN_ID          = "campaignId";
     public static final String KEY_CURRENT_EMAIL        = "currentEmail";
+    public static final String KEY_CURRENT_USERID       = "currentUserId";
     public static final String KEY_DATA_FIELDS          = "dataFields";
     public static final String KEY_DEVICE               = "device";
     public static final String KEY_EMAIL                = "email";

iterableapi/src/test/java/com/iterable/iterableapi/IterableApiTest.java

@@ -140,6 +140,36 @@ public void testUpdateEmailPersistence() throws Exception {
         assertEquals("new@email.com", IterableApi.getInstance().getEmail());
     }
 
+    @Test
+    public void testUpdateEmailWithOldEmail() throws Exception {
+        server.enqueue(new MockResponse().setResponseCode(200).setBody("{}"));
+        IterableApi.initialize(RuntimeEnvironment.application, "apiKey");
+        IterableApi.getInstance().setEmail("test@email.com");
+        IterableApi.getInstance().updateEmail("new@email.com");
+
+        RecordedRequest updateEmailRequest = server.takeRequest(1, TimeUnit.SECONDS);
+        assertNotNull(updateEmailRequest);
+        assertEquals("/" + IterableConstants.ENDPOINT_UPDATE_EMAIL, updateEmailRequest.getPath());
+        JSONObject requestJson = new JSONObject(updateEmailRequest.getBody().readUtf8());
+        assertEquals("test@email.com", requestJson.getString(IterableConstants.KEY_CURRENT_EMAIL));
+        assertEquals("new@email.com", requestJson.getString(IterableConstants.KEY_NEW_EMAIL));
+    }
+
+    @Test
+    public void testUpdateEmailWithUserId() throws Exception {
+        server.enqueue(new MockResponse().setResponseCode(200).setBody("{}"));
+        IterableApi.initialize(RuntimeEnvironment.application, "apiKey");
+        IterableApi.getInstance().setUserId("testUserId");
+        IterableApi.getInstance().updateEmail("new@email.com");
+
+        RecordedRequest updateEmailRequest = server.takeRequest(1, TimeUnit.SECONDS);
+        assertNotNull(updateEmailRequest);
+        assertEquals("/" + IterableConstants.ENDPOINT_UPDATE_EMAIL, updateEmailRequest.getPath());
+        JSONObject requestJson = new JSONObject(updateEmailRequest.getBody().readUtf8());
+        assertEquals("testUserId", requestJson.getString(IterableConstants.KEY_CURRENT_USERID));
+        assertEquals("new@email.com", requestJson.getString(IterableConstants.KEY_NEW_EMAIL));
+    }
+
     @Test
     public void testHandleUniversalLinkRewrite() throws Exception {
         IterableUrlHandler urlHandlerMock = mock(IterableUrlHandler.class);