🤝 Merge pull request #36 from Instabug/feature/missing_apis

Feature/missing apis

Author: salmatarzi

src/android/IBGPlugin.java

@@ -3,6 +3,7 @@
 import android.content.Intent;
 import android.graphics.Color;
 import android.net.Uri;
+import android.util.Log;
 
 import com.instabug.library.Instabug;
 import com.instabug.library.invocation.InstabugInvocationEvent;
@@ -18,6 +19,7 @@
 
 import java.io.File;
 import java.lang.Integer;
+import java.util.HashMap;
 
 /**
  * This plugin initializes Instabug.  
@@ -133,7 +135,19 @@ public boolean execute(final String action, JSONArray args, final CallbackContex
         } else if ("removeUserAttribute".equals(action)) {
             removeUserAttribute(callbackContext, args.optString(0));
 
-        }  else {
+        }  else if ("identifyUserWithEmail".equals(action)) {
+            identifyUserWithEmail(callbackContext, args.optString(0), args.optString(1));
+            
+        }  else if ("logOut".equals(action)) {
+            logOut(callbackContext);
+            
+        }  else if ("getAllUserAttributes".equals(action)) {
+            getAllUserAttributes(callbackContext);
+            
+        } else if ("getUserAttribute".equals(action)) {
+            getUserAttribute(callbackContext, args.optString(0));
+            
+        } else {
             // Method not found.
             return false;
         }
@@ -234,6 +248,7 @@ private void setPrimaryColor(final CallbackContext callbackContext, String color
      * @param email
      *        User's default email
      */
+    @Deprecated
     private void setUserEmail(final CallbackContext callbackContext, String email) {
         if (email != null && email.length() > 0) {
             try {
@@ -253,6 +268,7 @@ private void setUserEmail(final CallbackContext callbackContext, String email) {
      * @param name
      *        User's name
      */
+    @Deprecated
     private void setUserName(final CallbackContext callbackContext, String name) {
         if (name != null && name.length() > 0) {
             try {
@@ -264,6 +280,45 @@ private void setUserName(final CallbackContext callbackContext, String name) {
         } else callbackContext.error("A name must be provided.");
     }
 
+    /**
+     * Set the user identity.
+     * Instabug will pre-fill the user email in reports.
+     *
+     * @param callbackContext 
+     *        Used when calling back into JavaScript
+     * @param email    
+     *        User's default email
+     * @param name     
+     *        Username
+     *
+     */
+    private void identifyUserWithEmail(final CallbackContext callbackContext, String email, String name) {
+        if (name != null && name.length() > 0 && email != null && email.length() > 0) {
+            try {
+                Instabug.identifyUser(name, email);
+                callbackContext.success();
+            } catch (IllegalStateException e) {
+                callbackContext.error(errorMsg);
+            }
+        } else callbackContext.error("A name and email must be provided.");
+    }
+
+
+    /**
+     * Logout User
+     * 
+     * @param callbackContext 
+     *        Used when calling back into JavaScript
+     */
+    private void logOut(final CallbackContext callbackContext) {
+        try {
+            Instabug.logoutUser();
+            callbackContext.success();
+        } catch (IllegalStateException e) {
+            callbackContext.error(errorMsg);
+        }
+    }
+
     /**
      * Adds specific user data that you need to reports.
      * 
@@ -454,11 +509,9 @@ private void setDebugEnabled(final CallbackContext callbackContext, boolean isDe
      *        Used when calling back into JavaScript
      * @param key   the attribute
      * @param value the value
-     * @throws IllegalStateException if Instabug object wasn't built using {@link Builder#build()} before this method was called
      * 
      */
-
-     private void setUserAttribute(final CallbackContext callbackContext, String key, String value) {
+    private void setUserAttribute(final CallbackContext callbackContext, String key, String value) {
         try {
             Instabug.setUserAttribute(key,value);
             callbackContext.success();
@@ -473,10 +526,8 @@ private void setUserAttribute(final CallbackContext callbackContext, String key,
      * @param callbackContext 
      *        Used when calling back into JavaScript
      * @param key the attribute key as string
-     * @throws IllegalStateException if Instabug object wasn't built using {@link Builder#build()} before this method was called
      * 
      */
-
     private void removeUserAttribute(final CallbackContext callbackContext, String key) {
         try {
             Instabug.removeUserAttribute(key);
@@ -486,6 +537,41 @@ private void removeUserAttribute(final CallbackContext callbackContext, String k
         }
     }
 
+
+    /**
+     * Gets all saved user attributes.
+     *
+     * @param callbackContext 
+     *        Used when calling back into JavaScript
+     */
+    private void getAllUserAttributes(final CallbackContext callbackContext) {
+        try {
+            HashMap userAttributes = Instabug.getAllUserAttributes();
+            JSONObject jsonUserAttributes = new JSONObject(userAttributes);
+            callbackContext.success(jsonUserAttributes);
+        } catch (IllegalStateException e) {
+            callbackContext.error(errorMsg);
+        }
+    }
+
+    /**
+     * Gets specific user attribute.
+     *
+     * @param callbackContext 
+     *        Used when calling back into JavaScript
+     * @param key 
+     *        the attribute key as string
+     *
+     */
+    private void getUserAttribute(final CallbackContext callbackContext, String key) {
+        try {
+            String userAttribute = Instabug.getUserAttribute(key);
+            callbackContext.success(userAttribute);
+        } catch (IllegalStateException e) {
+            callbackContext.error(errorMsg);
+        }
+    }
+
     /**
      * Adds intent extras for all options passed to activate().
      */

www/instabug.js

@@ -127,6 +127,22 @@ Instabug.removeUserAttribute = function (key, success, error) {
     exec(success, error, 'IBGPlugin', 'removeUserAttribute', [key]);
 };
 
+Instabug.getAllUserAttributes = function (success, error) {
+    exec(success, error, 'IBGPlugin', 'getAllUserAttributes', []);
+};
+
+Instabug.getUserAttribute = function (key, success, error) {
+    exec(success, error, 'IBGPlugin', 'getUserAttribute', [key]);
+};
+
+Instabug.identifyUserWithEmail = function (email, name, success, error) {
+    exec(success, error, 'IBGPlugin', 'identifyUserWithEmail', [email, name]);
+};
+
+Instabug.logOut = function (success, error) {
+    exec(success, error, 'IBGPlugin', 'logOut', []);
+};
+
 Instabug.setDebugEnabled = function (isDebugEnabled, success, error) {
     exec(success, error, 'IBGPlugin', 'setDebugEnabled', [isDebugEnabled]);
     if(success) {