Merge pull request #63 from Iterable/feature/ITBL-6230-call-createUserForUserId

Feature/itbl 6230 call create user for user

Author: vbabenkoru

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

@@ -525,11 +525,27 @@ public void registerDeviceToken(final String applicationName, final String token
         }
 
         if (token != null) {
-            new Thread(new Runnable() {
+            final Thread registrationThread = new Thread(new Runnable() {
                 public void run() {
                     registerDeviceToken(applicationName, token, IterableConstants.MESSAGING_PLATFORM_FIREBASE, null);
                 }
-            }).start();
+            });
+
+            if (getUserId() != null) {
+                createUserForUserId(new IterableHelper.SuccessHandler() {
+                    @Override
+                    public void onSuccess(JSONObject data) {
+                        registrationThread.start();
+                    }
+                }, new IterableHelper.FailureHandler() {
+                    @Override
+                    public void onFailure(String reason, JSONObject data) {
+                        IterableLogger.e(TAG, "Could not create user: " + reason);
+                    }
+                });
+            } else {
+                registrationThread.start();
+            }
         }
     }
 
@@ -1378,6 +1394,25 @@ private void handleDDL(JSONObject response) {
         setDDLChecked(true);
     }
 
+    /**
+     * Creates a user profile for a userId if it does not yet exist.
+     */
+    private void createUserForUserId(IterableHelper.SuccessHandler onSuccess, IterableHelper.FailureHandler onFailure) {
+        if (!checkSDKInitialization() || _userId == null) {
+            return;
+        }
+
+        JSONObject requestJSON = new JSONObject();
+        try {
+            requestJSON.put(IterableConstants.KEY_USER_ID, _userId);
+
+            sendPostRequest(IterableConstants.ENDPOINT_CREATE_USERID, requestJSON, onSuccess, onFailure);
+        }
+        catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
 //---------------------------------------------------------------------------------------
 //endregion
 

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

@@ -40,6 +40,7 @@ public final class IterableConstants {
     public static final String KEY_USER_TEXT            = "userText";
 
     //API Endpoint Key Constants
+    public static final String ENDPOINT_CREATE_USERID           = "users/createUserForUserId";
     public static final String ENDPOINT_DISABLE_DEVICE          = "users/disableDevice";
     public static final String ENDPOINT_GET_INAPP_MESSAGES      = "inApp/getMessages";
     public static final String ENDPOINT_INAPP_CONSUME           = "events/inAppConsume";

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

@@ -118,7 +118,7 @@ protected String doInBackground(IterableApiRequest... params) {
                     in.close();
                     requestResult = response.toString();
                 } catch (IOException e) {
-                    IterableLogger.e(TAG, e.getMessage());
+                    IterableLogger.e(TAG, e.getMessage(), e);
                     error = e.getMessage();
                 }
 
@@ -128,7 +128,7 @@ protected String doInBackground(IterableApiRequest... params) {
                 try {
                     jsonResponse = new JSONObject(requestResult);
                 } catch (Exception e) {
-                    IterableLogger.e(TAG, e.getMessage());
+                    IterableLogger.e(TAG, e.getMessage(), e);
                     jsonError = e.getMessage();
                 }
 
@@ -164,10 +164,10 @@ protected String doInBackground(IterableApiRequest... params) {
                     handleFailure("Received non-200 response: " + responseCode, jsonResponse);
                 }
             } catch (JSONException e) {
-                IterableLogger.e(TAG, e.getMessage());
+                IterableLogger.e(TAG, e.getMessage(), e);
                 handleFailure(e.getMessage(), null);
             } catch (IOException e) {
-                IterableLogger.e(TAG, e.getMessage());
+                IterableLogger.e(TAG, e.getMessage(), e);
                 handleFailure(e.getMessage(), null);
             } finally {
                 if (urlConnection != null) {

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

@@ -240,4 +240,23 @@ public void testPushRegistrationDeviceFields() throws Exception {
         assertEquals(IterableConstants.ITBL_KEY_SDK_VERSION_NUMBER, dataFields.getString("iterableSdkVersion"));
     }
 
+    @Test
+    public void testPushRegistrationWithUserId() throws Exception {
+        server.enqueue(new MockResponse().setResponseCode(200).setBody("{}"));
+        server.enqueue(new MockResponse().setResponseCode(200).setBody("{}"));
+
+        IterableApi.initialize(RuntimeEnvironment.application, "apiKey", new IterableConfig.Builder().setAutoPushRegistration(false).build());
+        IterableApi.getInstance().setUserId("testUserId");
+        IterableApi.getInstance().registerDeviceToken("pushIntegration", "token", IterableConstants.MESSAGING_PLATFORM_FIREBASE);
+        Thread.sleep(1000);  // Since the network request is queued from a background thread, we need to wait
+        Robolectric.flushBackgroundThreadScheduler();
+        RecordedRequest createUserRequest = server.takeRequest(1, TimeUnit.SECONDS);
+        assertNotNull(createUserRequest);
+        assertEquals("/" + IterableConstants.ENDPOINT_CREATE_USERID, createUserRequest.getPath());
+
+        RecordedRequest registerDeviceRequest = server.takeRequest(1, TimeUnit.SECONDS);
+        assertNotNull(registerDeviceRequest);
+        assertEquals("/" + IterableConstants.ENDPOINT_REGISTER_DEVICE_TOKEN, registerDeviceRequest.getPath());
+    }
+
 }