cordova-plugin-ymchat 2.2.0 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-ymchat",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Cordova plugin to integrate yellow.ai chatbot",
   "cordova": {
     "id": "cordova-plugin-ymchat",

package/src/android/com/yellow/ai/ymchat/YmChatCordova.java

@@ -56,6 +56,12 @@ public class YmChatCordova extends CordovaPlugin {
       case "unlinkDeviceToken":
         unlinkDeviceToken(args, callbackContext);
         return true;
+      case "registerDevice":
+        registerDevice(args, callbackContext);
+        return true;
+      case "getUnreadMessagesCount":
+        getUnreadMessagesCount(callbackContext);
+        return true;
       case "setVersion":
         setVersion(args,callbackContext);
         return  true;
@@ -205,10 +211,25 @@ public class YmChatCordova extends CordovaPlugin {
 
   private void unlinkDeviceToken(JSONArray args, CallbackContext callbackContext) {
     try {
-      String botId = args.getString(0);
-      String apiKey = args.getString(1);
-      String deviceToken = args.getString(2);
-      ymChatService.unlinkDeviceToken(botId, apiKey, deviceToken, callbackContext);
+      String apiKey = args.getString(0);
+      ymChatService.unlinkDeviceToken(apiKey, callbackContext);
+    } catch (Exception e) {
+      Utils.genericErrorHelper(e, callbackContext);
+    }
+  }
+
+  private void registerDevice(JSONArray args, CallbackContext callbackContext) {
+    try {
+      String apiKey = args.getString(0);
+      ymChatService.registerDevice(apiKey, result);
+    } catch (Exception e) {
+      Utils.genericErrorHelper(e, callbackContext);
+    }
+  }
+
+  private void getUnreadMessagesCount(CallbackContext callbackContext) {
+    try {
+      ymChatService.getUnreadMessagesCount(result);
     } catch (Exception e) {
       Utils.genericErrorHelper(e, callbackContext);
     }

package/src/android/com/yellow/ai/ymchat/YmChatService.java

@@ -105,9 +105,9 @@ public class YmChatService {
     });
   }
 
-  public void unlinkDeviceToken(String botId, String apiKey, String deviceToken,CallbackContext callbackContext) {
+  public void unlinkDeviceToken(String apiKey, CallbackContext callbackContext) {
     try{
-      ymChat.unlinkDeviceToken(botId, apiKey, deviceToken, new YellowCallback() {
+      ymChat.unlinkDeviceToken(apiKey, ymChat.config, new YellowCallback() {
         @Override
         public void success() {
           callbackContext.success();
@@ -125,6 +125,47 @@ public class YmChatService {
     }
   }
 
+  public void registerDevice(String apiKey, CallbackContext callbackContext) {
+    try{
+      ymChat.registerDevice(apiKey, ymChat.config, new YellowCallback() {
+        @Override
+        public void success() {
+          callbackContext.success();
+        }
+
+        @Override
+        public void failure(String message) {
+          Utils.genericErrorHelper(new Exception(),callbackContext);
+        }
+      });
+    }
+    catch (Exception e)
+    {
+      Utils.genericErrorHelper(e, callbackContext);
+    }
+  }
+
+  public void getUnreadMessagesCount(CallbackContext callbackContext) {
+    try{
+      ymChat.getUnreadMessagesCount(ymChat.config, new YellowCallback() {
+        @Override
+        public <T> void success(T data) {
+        YellowUnreadMessageResponse response = (YellowUnreadMessageResponse) data;
+          callbackContext.success(response.getUnreadCount());
+        }
+
+        @Override
+        public void failure(String message) {
+          Utils.genericErrorHelper(new Exception(),callbackContext);
+        }
+      });
+    }
+    catch (Exception e)
+    {
+      Utils.genericErrorHelper(e, callbackContext);
+    }
+  }
+
   public void setVersion(int version, CallbackContext callbackContext) {
     ymChat.config.version = version;
   }

package/src/ios/ymchat.m

@@ -95,7 +95,11 @@
 
 - (void)onEventFromBotWithResponse:(YMBotEventResponse *)response {
     CDVPluginResult* pluginResult = nil;
-    NSDictionary* event = @{ @"code":response.code,@"data": response.data};
+    NSMutableDictionary *event = [[NSMutableDictionary alloc]initWithCapacity:10];
+    [event setObject:response.code forKey:@"code"];
+    if(response.data){
+        [event setObject:response.data forKey:@"data"];
+    }
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:event];
     [pluginResult setKeepCallbackAsBool:YES];
     [self.commandDelegate sendPluginResult:pluginResult callbackId:onEvent.callbackId];
@@ -116,18 +120,59 @@
 }
 
 - (void) unlinkDeviceToken:(CDVInvokedUrlCommand*)command {
-    NSString* botId = [command.arguments objectAtIndex:0];
-    NSString* apiKey = [command.arguments objectAtIndex:1];
-    NSString* deviceToken = [command.arguments objectAtIndex:2];
-    [[YMChat shared] unlinkDeviceTokenWithBotId:botId apiKey:apiKey deviceToken:deviceToken success:^{
+    if(YMChat.shared.config) {
+        NSString* apiKey = [command.arguments objectAtIndex:0];
+        [[YMChat shared] unlinkDeviceTokenWithApiKey:apiKey ymConfig:YMChat.shared.config success:^{
+            CDVPluginResult* pluginResult = nil;
+            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        } failure:^(NSString * _Nonnull failureMessage) {
+            CDVPluginResult* pluginResult = nil;
+            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:failureMessage];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        }];
+    } else {
+        CDVPluginResult* pluginResult = nil;
+        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Bot id not found"];
+        [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    }
+}
+
+- (void) registerDevice:(CDVInvokedUrlCommand*)command {
+    NSString* apiKey = [command.arguments objectAtIndex:0];
+    if(YMChat.shared.config) {
+        [[YMChat shared] registerDeviceWithApiKey:apiKey ymConfig:YMChat.shared.config success:^{
+            CDVPluginResult* pluginResult = nil;
+            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        } failure:^(NSString * _Nonnull failureMessage) {
+            CDVPluginResult* pluginResult = nil;
+            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:failureMessage];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        }];
+    } else {
         CDVPluginResult* pluginResult = nil;
-        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Bot id not found"];
         [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    } failure:^(NSString * _Nonnull failureMessage) {
+    }
+}
+
+- (void) getUnreadMessagesCount:(CDVInvokedUrlCommand*)command {
+    if(YMChat.shared.config) {
+        [[YMChat shared] getUnreadMessagesCountWithYmConfig:YMChat.shared.config success:^(NSString * _Nonnull unreadCount) {
+            CDVPluginResult* pluginResult = nil;
+            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:unreadCount];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        } failure:^(NSString * _Nonnull failureMessage) {
+            CDVPluginResult* pluginResult = nil;
+            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:failureMessage];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        }];
+    } else {
         CDVPluginResult* pluginResult = nil;
-        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:failureMessage];
+        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Bot id not found"];
         [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    }];
+    }
 }
 
 - (void)setCustomLoaderURL:(CDVInvokedUrlCommand*)command

package/www/ymchat.js

@@ -35,8 +35,14 @@ const YmChatAPI = {
   closeBot: () => {
     exec(null, null, "ymchat", "closeBot", []);
   },
-  unlinkDeviceToken: (botId, apiKey, deviceToken, success, failure) => {
-    exec(success, failure, "ymchat", "unlinkDeviceToken", [botId, apiKey, deviceToken])
+  unlinkDeviceToken: (apiKey, success, failure) => {
+    exec(success, failure, "ymchat", "unlinkDeviceToken", [apiKey])
+  },
+  registerDevice: (apiKey, success, failure) => {
+    exec(success, failure, "ymchat", "registerDevice", [apiKey])
+  },
+  getUnreadMessagesCount: (success, failure) => {
+    exec(success, failure, "ymchat", "getUnreadMessagesCount", [])
   },
   setVersion: (version) => {
     exec(null, null, "ymchat", "setVersion", [version])