cordova-plugin-ymchat 2.7.0 → 2.8.0

package/package.json

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

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-ymchat" version="2.7.0"
+<plugin id="cordova-plugin-ymchat" version="2.8.0"
     xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <name>ymchat</name>
@@ -34,7 +34,7 @@
                 <source url="https://github.com/CocoaPods/Specs.git" branch="master"/>
             </config>
             <pods use-frameworks="true">
-                <pod name="YMChat" spec="~> 1.12" swift-version="5.0"/>
+                <pod name="YMChat" spec="~> 1.13" swift-version="5.0"/>
             </pods>
         </podspec>
         <config-file parent="/*" target="config.xml">

package/src/android/build.gradle

@@ -24,5 +24,5 @@ repositories {
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.annotation:annotation:1.0.2'
-    implementation 'com.github.yellowmessenger:YMChatbot-Android:v2.7.+'
+    implementation 'com.github.yellowmessenger:YMChatbot-Android:v2.8.+'
 }

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

@@ -89,6 +89,12 @@ public class YmChatCordova extends CordovaPlugin {
       case "setMicBackgroundColor":
         setMicBackgroundColor(args, callbackContext);
         return true;  
+      case "useSecureYmAuth":
+        useSecureYmAuth(args,callbackContext);
+        return true;
+      case "revalidateToken":
+        revalidateToken(args,callbackContext);
+        return true;
     }
     return false;
   }
@@ -284,4 +290,23 @@ public class YmChatCordova extends CordovaPlugin {
       Utils.genericErrorHelper(e, callbackContext);
     }
   }
+
+  private void useSecureYmAuth(JSONArray args, CallbackContext callbackContext) {
+    try {
+      boolean shouldUseSecureYmAuth = args.getBoolean(0);
+      ymChatService.useSecureYmAuth(shouldUseSecureYmAuth, callbackContext);
+    } catch (Exception e) {
+      Utils.genericErrorHelper(e, callbackContext);
+    }
+  }
+
+  private void revalidateToken(JSONArray args, CallbackContext callbackContext) {
+    try {
+      String token = args.getString(0);
+      boolean refreshSession = args.getBoolean(1);
+      ymChatService.revalidateToken(token, refreshSession, callbackContext);
+    } catch (Exception e) {
+      Utils.genericErrorHelper(e, callbackContext);
+    }
+  }
 }

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

@@ -23,7 +23,7 @@ public class YmChatService {
   final String Tag = "YmChat";
   final String ExceptionString = "Exception";
   final String code = "code";
-  final String data = "date";
+  final String data = "data";
 
   HashMap<String, Object> payloadData = new HashMap<>();
 
@@ -88,7 +88,15 @@ public class YmChatService {
       JSONObject jsonObject = new JSONObject();
       try {
         jsonObject.put(code, botEvent.getCode());
-        jsonObject.put(data, new JSONObject(botEvent.getData()));
+        JSONObject dataJsonObject = new JSONObject();
+        if (botEvent.getData() != null) {
+          try {
+            dataJsonObject = new JSONObject(botEvent.getData());
+          }catch(Exception e) {
+            Log.e(Tag, ExceptionString, e);
+          }
+        }
+        jsonObject.put(data, dataJsonObject);
         PluginResult result = new PluginResult(PluginResult.Status.OK, jsonObject);
         result.setKeepCallback(true);
         callback.sendPluginResult(result);
@@ -203,4 +211,16 @@ public class YmChatService {
   public void setMicBackgroundColor(String color, CallbackContext callbackContext) {
     ymChat.config.enableSpeechConfig.fabBackgroundColor = color;
   }
+
+  public void useSecureYmAuth(boolean shouldUseSecureYmAuth, CallbackContext callbackContext) {
+    ymChat.config.useSecureYmAuth = shouldUseSecureYmAuth;
+  }
+
+  public void revalidateToken(String token, boolean refreshSession, CallbackContext callbackContext) {
+    try {
+      ymChat.revalidateToken(token, refreshSession);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
 }

package/src/ios/ymchat.m

@@ -94,7 +94,7 @@
 
 - (void)reloadBot:(CDVInvokedUrlCommand*)command
 {
-    [[YMChat shared] reloadBot];
+    [[YMChat shared] reloadBotAndReturnError:nil];
 }
 
 - (void)onEventFromBotWithResponse:(YMBotEventResponse *)response {
@@ -228,6 +228,20 @@
     YMChat.shared.config.enableSpeechConfig.fabBackgroundColor = [self getColorFromHexString:color];
 }
 
+- (void)useSecureYmAuth:(CDVInvokedUrlCommand*)command
+{
+    BOOL shouldUseSecureYmAuth = [command.arguments objectAtIndex:0];
+    assert(YMChat.shared.config != nil);
+    YMChat.shared.config.useSecureYmAuth = shouldUseSecureYmAuth;
+}
+
+- (void)revalidateToken:(CDVInvokedUrlCommand*)command
+{
+    NSString* token = [command.arguments objectAtIndex:0];
+    BOOL refreshSession = [command.arguments objectAtIndex:1];
+    [[YMChat shared] revalidateTokenWithToken:token refreshSession:refreshSession error:nil];
+}
+
 - (UIColor *)getColorFromHexString:(NSString *)hexString {
     unsigned rgbValue = 0;
     NSScanner *scanner = [NSScanner scannerWithString:hexString];

package/www/ymchat.js

@@ -71,6 +71,12 @@ const YmChatAPI = {
   setMicBackgroundColor: (color) => {
     exec(null, null, "ymchat", "setMicBackgroundColor", [color]);
   },
+  useSecureYmAuth: (shouldUseSecureYmAuth) => {
+    exec(null, null, "ymchat", "useSecureYmAuth", [shouldUseSecureYmAuth]);
+  },
+  revalidateToken: (token, refreshSession) => {
+    exec(null, null, "ymchat", "revalidateToken", [token, refreshSession]);
+  }
 };
 
 module.exports = YmChatAPI;