yelda-webchat 1.1.23 → 1.1.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yelda-webchat",
-  "version": "1.1.23",
+  "version": "1.1.25",
   "description": "Website Chat Plugin",
   "main": "./dist/js/yeldaWebchatInjector.min.js",
   "license": "MIT",
@@ -15,12 +15,16 @@
     "type": "git",
     "url": "https://github.com/Yeldaai/chat-plugin.git"
   },
+  "engines": {
+    "node": ">=18"
+  },
   "scripts": {
     "build": "rimraf dist && webpack -p",
-    "prepack": "npm run build && npm run test",
+    "prepack": "npm test",
+    "pretest": "npm run build",
     "lint:check": "eslint --ext .js src",
     "lint:fix": "eslint --fix --ext .js src",
-    "test": "mocha --require esm ./test/*.js",
+    "test": "mocha ./test/*.js",
     "uploadBuildToS3": "npm run prepack && node uploadBuildToS3 build -s $npm_config_semver -d $npm_config_destinationPath -o $otp"
   },
   "devDependencies": {
@@ -40,8 +44,6 @@
     "css-loader": "^1.0.0",
     "dotenv": "^8.2.0",
     "eslint": "^5.16.0",
-    "esm": "^3.2.25",
-    "extract-text-webpack-plugin": "^3.0.2",
     "file-loader": "^1.1.11",
     "inject-loader": "^4.0.1",
     "jsdom": "^16.5.0",
@@ -49,7 +51,7 @@
     "less-loader": "^4.1.0",
     "mime": "^2.4.6",
     "mini-css-extract-plugin": "^0.4.1",
-    "mocha": "^8.3.0",
+    "mocha": "^12.0.1",
     "optimize-css-assets-webpack-plugin": "^5.0.8",
     "postcss-import": "^12.0.0",
     "postcss-loader": "^3.0.0",
@@ -58,7 +60,7 @@
     "style-loader": "^0.22.1",
     "uglifyjs-webpack-plugin": "^2.2.0",
     "url-loader": "^1.1.1",
-    "webpack": "^4.41.5",
+    "webpack": "^4.47.0",
     "webpack-cli": "^3.3.10",
     "xhr-mock": "^2.5.1",
     "yargs": "^15.4.1"

package/src/config/index.js

@@ -4,6 +4,8 @@ module.exports = {
   YELDA_PARAMETER: 'yparam',
   DEFAULT_PUBLICATION_STATUS: true,
   ALWAYS_ALLOWED_SITES_REGEX : /^([a-z-]*.yelda.ai|localhost|0.0.0.0|127.0.0.1)$/,
+  // Prefix of an allowed domain that allows all its subdomains, but not the domain itself
+  ALLOWED_DOMAIN_WILDCARD_PREFIX: '*.',
   REGEX_HOST: {
     STAGING: /staging.yelda.ai/,
     YELDA: /.yelda.ai/

package/src/js/yeldaWebchatInjector.js

@@ -334,28 +334,9 @@ class YeldaChat {
       return
     }
 
-    const isVoiceFirstUI = this.webchatSettings.hasOwnProperty('isVoiceFirstUI')
-      ? this.webchatSettings.isVoiceFirstUI
-      : false
     const customImage = this.webchatSettings.image && this.webchatSettings.image.url
     const hasCustomStyle = this.webchatSettings.hasOwnProperty('isDefaultStyle') && !this.webchatSettings.isDefaultStyle
 
-    /**
-     * in isVoiceFirstUI mode
-     * - the assistant should be opened directly and will never be closed
-     * => we call directly openChat and do not add the assistant image
-     * - we don't want the box-shadow css style
-     *    => we add voiceFirstUI to iframeContainer
-     * - /chat vue render the voice first UI
-     *   => nothing more to do here
-     */
-    if (isVoiceFirstUI) {
-      this.iframeContainer.classList.add('voiceFirstUI')
-      this.openChat()
-      this.assistantImage = null
-      return
-    }
-
     if (!hasCustomStyle || !customImage) {
       this.addAssistantImageToWebChatContainer()
       return
@@ -1155,9 +1136,27 @@ class YeldaChat {
       return false
     }
 
+    // allowedDomains is only sent when the admins restricted the webchat to some websites
+    if (webchatSettings.allowedDomains && !this.isHostAllowed(currentHost, webchatSettings.allowedDomains)) {
+      return false
+    }
+
     return true
   }
 
+  /**
+   * Check the current website is in the webchat allowed domains
+   * @param {String} host - hostname of the current website, e.g. 'www.site.com'
+   * @param {Array<String>} allowedDomains - e.g. ['www.site.com', '*.site.com'], '*.site.com' allows the subdomains only
+   * @returns {Boolean}
+   */
+  isHostAllowed(host, allowedDomains) {
+    return allowedDomains.some(domain => domain.startsWith(config.ALLOWED_DOMAIN_WILDCARD_PREFIX)
+      // '*.site.com' gives '.site.com', matched by 'www.site.com' but not by 'site.com' or 'mysite.com'
+      ? host.endsWith(domain.slice(config.ALLOWED_DOMAIN_WILDCARD_PREFIX.length - 1))
+      : host === domain)
+  }
+
   /**
    * Return if the webchat loadChat settings are different from the yeldaChat global assistant settings
    *