Merge pull request #20 from alvinjohnsonso/fix-widget-selection-issue

Fixed on how the parentDomain's protocol was being provided to the widget selection iframe. Used an API from Magento that does the checking if the request is HTTPS or not. Also, added tawk.to to style-src CSP whitelist.

Block/Adminhtml/SelectWidgetBlock.php

@@ -38,11 +38,9 @@ public function __construct(Template\Context $context, WidgetFactory $modelFacto
 
     public function mainurl()
     {
-        $httpsServer = $this->request->getServer('HTTPS');
-        if (isset($httpsServer) && $httpsServer != 'off') {
-            $protocol = "https";
-        } else {
-            $protocol = 'http';
+        $protocol = 'http';
+        if ($this->request->isSecure()) {
+            $protocol = 'https';
         }
         return $protocol . "://" . $this->request->getServer('HTTP_HOST');
     }

composer.json

@@ -18,7 +18,7 @@
     "email": "[email protected]",
     "issues": "https://github.com/tawk/tawk-magento-2/issues"
   },
-  "version": "1.5.1",
+  "version": "1.5.2",
   "license": [
     "OSL-3.0"
   ],

etc/csp_whitelist.xml

@@ -22,6 +22,7 @@
     <policies>
         <policy id="style-src">
             <values>
+                <value id="tawkto" type="host">*.tawk.to</value>
                 <value id="googleapis-font" type="host">fonts.googleapis.com</value>
                 <value id="jsdelivr-cdn" type="host">cdn.jsdelivr.net</value>
             </values>

etc/module.xml

@@ -20,5 +20,5 @@
 -->
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-	<module name="Tawk_Widget" setup_version="1.5.1"/>
+	<module name="Tawk_Widget" setup_version="1.5.2"/>
 </config>