Merge pull request #79 from intercom/santhosh/handled_non_string_userid

Handled when userID is a Number or String

Author: prithivraj

android/src/main/java/com/intercom/reactnative/IntercomHelpers.java

@@ -222,4 +222,23 @@ public static UserAttributes buildUserAttributes(ReadableMap readableMap) {
     }
     return builder.build();
   }
+
+  public static String getValueAsStringForKey(ReadableMap map, String key) {
+    ReadableType type = map.getType(key);
+    String value = "";
+    switch (type) {
+      case Number: {
+        value = String.valueOf(map.getInt(key));
+        break;
+      }
+      case String: {
+        value = map.getString(key);
+        break;
+      }
+      default: {
+        throw new IllegalArgumentException("Value for Key: \""+key+"\" should be a String");
+      }
+    }
+    return value;
+  }
 }

android/src/main/java/com/intercom/reactnative/IntercomModule.java

@@ -133,34 +133,36 @@ public void onFailure(@NonNull IntercomError intercomError) {
 
   @ReactMethod
   public void loginUserWithUserAttributes(ReadableMap params, Promise promise) {
-      Boolean hasEmail = params.hasKey("email") && params.getString("email").length() > 0;
-      Boolean hasUserId = params.hasKey("userId") && params.getString("userId").length() > 0;
-      Registration registration = null;
-      if (hasEmail && hasUserId) {
-          registration = new Registration().withEmail(params.getString("email")).withUserId(params.getString("userId"));
-      } else if (hasEmail) {
-        registration = Registration.create().withEmail(params.getString("email"));
-      } else if (hasUserId) {
-        registration = Registration.create().withUserId(params.getString("userId"));
-      } else {
-        Log.e(NAME, "loginUserWithUserAttributes called with invalid userId or email");
-        Log.e(NAME, "You must provide userId or email");
-        promise.reject(IntercomErrorCodes.IDENTIFIED_REGISTRATION, "Invalid userId or email");
-      }
-      if (registration != null) {
-        Intercom.client().loginIdentifiedUser(registration, new IntercomStatusCallback() {
-          @Override
-          public void onSuccess() {
-            promise.resolve(true);
-          }
+    Boolean hasEmail = params.hasKey("email") && IntercomHelpers.getValueAsStringForKey(params, "email").length() > 0;
+    Boolean hasUserId = params.hasKey("userId") && IntercomHelpers.getValueAsStringForKey(params, "userId").length() > 0;
+    Registration registration = null;
+    String email = IntercomHelpers.getValueAsStringForKey(params, "email");
+    String userId = IntercomHelpers.getValueAsStringForKey(params, "userId");
+    if (hasEmail && hasUserId) {
+      registration = new Registration().withEmail(email).withUserId(userId);
+    } else if (hasEmail) {
+      registration = Registration.create().withEmail(email);
+    } else if (hasUserId) {
+      registration = Registration.create().withUserId(userId);
+    } else {
+      Log.e(NAME, "loginUserWithUserAttributes called with invalid userId or email");
+      Log.e(NAME, "You must provide userId or email");
+      promise.reject(IntercomErrorCodes.IDENTIFIED_REGISTRATION, "Invalid userId or email");
+    }
+    if (registration != null) {
+      Intercom.client().loginIdentifiedUser(registration, new IntercomStatusCallback() {
+        @Override
+        public void onSuccess() {
+          promise.resolve(true);
+        }
 
-          @Override
-          public void onFailure(@NonNull IntercomError intercomError) {
-            Log.e("ERROR", intercomError.getErrorMessage());
-            promise.reject(String.valueOf(intercomError.getErrorCode()), intercomError.getErrorMessage());
-          }
-        });
-      }
+        @Override
+        public void onFailure(@NonNull IntercomError intercomError) {
+          Log.e("ERROR", intercomError.getErrorMessage());
+          promise.reject(String.valueOf(intercomError.getErrorCode()), intercomError.getErrorMessage());
+        }
+      });
+    }
   }
 
   @ReactMethod