From 5ebfa7f1c38612de218e1f3deed52caade6fc29c Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Thu, 23 Jan 2025 12:34:02 +0800
Subject: [PATCH 01/17] rename setVisibility to setOptions & add override
 current settings

---
 .gitignore                                    |  1 +
 .../admin/AdminTawktoController.php           | 86 ++++++++++++-------
 .../admin/tawkto/helpers/view/view.tpl        |  4 +-
 .../admin/AdminTawktoController.php           | 84 +++++++++++-------
 .../admin/tawkto/helpers/view/view.tpl        |  4 +-
 5 files changed, 115 insertions(+), 64 deletions(-)

diff --git a/.gitignore b/.gitignore
index a05346c..81b95e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ docker/bin
 .phpcs.cache
 node_modules/
 .php_cs_fixer.cache
+.aider*
diff --git a/prestashop1.7/controllers/admin/AdminTawktoController.php b/prestashop1.7/controllers/admin/AdminTawktoController.php
index e52b218..f028f41 100644
--- a/prestashop1.7/controllers/admin/AdminTawktoController.php
+++ b/prestashop1.7/controllers/admin/AdminTawktoController.php
@@ -221,8 +221,35 @@ public function ajaxProcessRemoveWidget()
      *
      * @return void
      */
-    public function ajaxProcessSetVisibility()
+    public function ajaxProcessSetOptions()
     {
+        $key = TawkTo::TAWKTO_WIDGET_OPTS;
+
+        // Apply selected options
+        $jsonOpts = $this->processSetOptions(Tools::getValue('options'));
+
+        // Override current options/fallback if not selected
+        $currentOpts = Configuration::get($key);
+        if (!empty($currentOpts)) {
+            $currentOpts = json_decode($currentOpts, true);
+            $jsonOpts = array_merge($currentOpts, $jsonOpts);
+        }
+
+        Configuration::updateValue($key, json_encode($jsonOpts));
+
+        die(json_encode(['success' => true]));
+    }
+
+    /**
+     * Process options
+     *
+     * @param string $options Selected options
+     *
+     * @return array
+     */
+    private function processSetOptions(string $options): array
+    {
+        // default options
         $jsonOpts = [
             'always_display' => false,
 
@@ -241,38 +268,35 @@ public function ajaxProcessSetVisibility()
             'enable_visitor_recognition' => false,
         ];
 
-        $options = Tools::getValue('options');
-        if (!empty($options)) {
-            $options = explode('&', $options);
-            foreach ($options as $post) {
-                [$column, $value] = explode('=', $post);
-                switch ($column) {
-                    case 'hide_oncustom':
-                    case 'show_oncustom':
-                        // replace newlines and returns with comma, and convert to array for
-                        // saving
-                        $value = urldecode($value);
-                        $value = str_ireplace(["\r\n", "\r", "\n"], ',', $value);
-                        if (!empty($value)) {
-                            $value = explode(',', $value);
-                            $jsonOpts[$column] = json_encode($value);
-                        }
-                        break;
-
-                    case 'show_onfrontpage':
-                    case 'show_oncategory':
-                    case 'show_onproduct':
-                    case 'always_display':
-                    case 'enable_visitor_recognition':
-                        $jsonOpts[$column] = ($value == 1);
-                        break;
-                }
-            }
+        if (empty($options)) {
+            return $jsonOpts;
         }
 
-        $key = TawkTo::TAWKTO_WIDGET_OPTS;
-        Configuration::updateValue($key, json_encode($jsonOpts));
+        $options = explode('&', $options);
+        foreach ($options as $post) {
+            [$column, $value] = explode('=', $post);
+            switch ($column) {
+                case 'hide_oncustom':
+                case 'show_oncustom':
+                    // replace newlines and returns with comma, and convert to array for saving
+                    $value = urldecode($value);
+                    $value = str_ireplace(["\r\n", "\r", "\n"], ',', $value);
+                    if (!empty($value)) {
+                        $value = explode(',', $value);
+                        $jsonOpts[$column] = json_encode($value);
+                    }
+                    break;
+
+                case 'show_onfrontpage':
+                case 'show_oncategory':
+                case 'show_onproduct':
+                case 'always_display':
+                case 'enable_visitor_recognition':
+                    $jsonOpts[$column] = ($value == 1);
+                    break;
+            }
+        }
 
-        die(Tools::jsonEncode(['success' => true]));
+        return $jsonOpts;
     }
 }
diff --git a/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl b/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl
index 981ca48..2b0d856 100644
--- a/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl
+++ b/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl
@@ -207,7 +207,7 @@
         </div>
     </div>
     <div class="panel" id="fieldset_1">
-        <div class="panel-heading"> <i class="icon-cogs"></i> Visibility Settings </div>
+        <div class="panel-heading"> <i class="icon-cogs"></i> Visibility Options </div>
         <div class="form-wrapper row">
             <div class="form-group row">
                 <label class="control-label col-lg-3" for="always_display">
@@ -421,7 +421,7 @@ jQuery(document).ready(function() {
             dataType : 'json',
             data : {
                 controller : 'AdminTawkto',
-                action : 'setVisibility',
+                action : 'setOptions',
                 ajax : true,
                 id_tab : current_id_tab,
                 pageId : $('input[name="page_id"]').val(),
diff --git a/prestashop8.x/controllers/admin/AdminTawktoController.php b/prestashop8.x/controllers/admin/AdminTawktoController.php
index c1c3208..3648f70 100644
--- a/prestashop8.x/controllers/admin/AdminTawktoController.php
+++ b/prestashop8.x/controllers/admin/AdminTawktoController.php
@@ -221,8 +221,35 @@ public function ajaxProcessRemoveWidget()
      *
      * @return void
      */
-    public function ajaxProcessSetVisibility()
+    public function ajaxProcessSetOptions()
     {
+        $key = TawkTo::TAWKTO_WIDGET_OPTS;
+
+        // Apply selected options
+        $jsonOpts = $this->processSetOptions(Tools::getValue('options'));
+
+        // Override current options/fallback if not selected
+        $currentOpts = Configuration::get($key);
+        if (!empty($currentOpts)) {
+            $currentOpts = json_decode($currentOpts, true);
+            $jsonOpts = array_merge($currentOpts, $jsonOpts);
+        }
+
+        Configuration::updateValue($key, json_encode($jsonOpts));
+
+        die(json_encode(['success' => true]));
+    }
+
+    /**
+     * Process options
+     *
+     * @param string $options Selected options
+     *
+     * @return array
+     */
+    private function processSetOptions(string $options): array
+    {
+        // default options
         $jsonOpts = [
             'always_display' => false,
 
@@ -241,36 +268,35 @@ public function ajaxProcessSetVisibility()
             'enable_visitor_recognition' => false,
         ];
 
-        $options = Tools::getValue('options');
-        if (!empty($options)) {
-            $options = explode('&', $options);
-            foreach ($options as $post) {
-                list($column, $value) = explode('=', $post);
-                switch ($column) {
-                    case 'hide_oncustom':
-                    case 'show_oncustom':
-                        // replace newlines and returns with comma, and convert to array for saving
-                        $value = urldecode($value);
-                        $value = str_ireplace(["\r\n", "\r", "\n"], ',', $value);
-                        if (!empty($value)) {
-                            $value = explode(',', $value);
-                            $jsonOpts[$column] = json_encode($value);
-                        }
-                        break;
-                    case 'show_onfrontpage':
-                    case 'show_oncategory':
-                    case 'show_onproduct':
-                    case 'always_display':
-                    case 'enable_visitor_recognition':
-                        $jsonOpts[$column] = ($value == 1);
-                        break;
-                }
-            }
+        if (empty($options)) {
+            return $jsonOpts;
         }
 
-        $key = TawkTo::TAWKTO_WIDGET_OPTS;
-        Configuration::updateValue($key, json_encode($jsonOpts));
+        $options = explode('&', $options);
+        foreach ($options as $post) {
+            [$column, $value] = explode('=', $post);
+            switch ($column) {
+                case 'hide_oncustom':
+                case 'show_oncustom':
+                    // replace newlines and returns with comma, and convert to array for saving
+                    $value = urldecode($value);
+                    $value = str_ireplace(["\r\n", "\r", "\n"], ',', $value);
+                    if (!empty($value)) {
+                        $value = explode(',', $value);
+                        $jsonOpts[$column] = json_encode($value);
+                    }
+                    break;
+
+                case 'show_onfrontpage':
+                case 'show_oncategory':
+                case 'show_onproduct':
+                case 'always_display':
+                case 'enable_visitor_recognition':
+                    $jsonOpts[$column] = ($value == 1);
+                    break;
+            }
+        }
 
-        die(json_encode(['success' => true]));
+        return $jsonOpts;
     }
 }
diff --git a/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl b/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl
index 981ca48..2b0d856 100644
--- a/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl
+++ b/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl
@@ -207,7 +207,7 @@
         </div>
     </div>
     <div class="panel" id="fieldset_1">
-        <div class="panel-heading"> <i class="icon-cogs"></i> Visibility Settings </div>
+        <div class="panel-heading"> <i class="icon-cogs"></i> Visibility Options </div>
         <div class="form-wrapper row">
             <div class="form-group row">
                 <label class="control-label col-lg-3" for="always_display">
@@ -421,7 +421,7 @@ jQuery(document).ready(function() {
             dataType : 'json',
             data : {
                 controller : 'AdminTawkto',
-                action : 'setVisibility',
+                action : 'setOptions',
                 ajax : true,
                 id_tab : current_id_tab,
                 pageId : $('input[name="page_id"]').val(),

From 1e0cca5004c62317913cfe8dfc7568ab4b4506d2 Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Thu, 23 Jan 2025 12:34:35 +0800
Subject: [PATCH 02/17] rename display options to widget options

---
 .../admin/AdminTawktoController.php            | 10 +++++-----
 .../admin/tawkto/helpers/view/view.tpl         | 18 +++++++++---------
 .../admin/AdminTawktoController.php            | 10 +++++-----
 .../admin/tawkto/helpers/view/view.tpl         | 18 +++++++++---------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/prestashop1.7/controllers/admin/AdminTawktoController.php b/prestashop1.7/controllers/admin/AdminTawktoController.php
index f028f41..3dae6ad 100644
--- a/prestashop1.7/controllers/admin/AdminTawktoController.php
+++ b/prestashop1.7/controllers/admin/AdminTawktoController.php
@@ -87,11 +87,11 @@ public function renderView()
         $optKey = TawkTo::TAWKTO_WIDGET_OPTS;
 
         // returns 'false' if retrieved none.
-        $displayOpts = Configuration::get($optKey);
-        if (!$displayOpts) {
-            $displayOpts = null;
+        $widgetOpts = Configuration::get($optKey);
+        if (!$widgetOpts) {
+            $widgetOpts = null;
         }
-        $displayOpts = Tools::jsonDecode($displayOpts);
+        $widgetOpts = Tools::jsonDecode($widgetOpts);
 
         $sameUser = true; // assuming there is only one admin by default
         $empId = Configuration::get(TawkTo::TAWKTO_WIDGET_USER);
@@ -113,7 +113,7 @@ public function renderView()
             'controller' => $this->context->link->getAdminLink('AdminTawkto'),
             'tab_id' => (int) $this->context->controller->id,
             'domain' => $domain,
-            'display_opts' => $displayOpts,
+            'widget_opts' => $widgetOpts,
             'page_id' => $pageId,
             'widget_id' => $widgetId,
             'same_user' => $sameUser,
diff --git a/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl b/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl
index 2b0d856..9585086 100644
--- a/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl
+++ b/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl
@@ -196,7 +196,7 @@
                         <label>
                             <input type="checkbox" name="enable_visitor_recognition"
                                 id="enable_visitor_recognition" value="1"
-                                {if is_null($display_opts) || is_null($display_opts->enable_visitor_recognition) || $display_opts->enable_visitor_recognition}
+                                {if is_null($widget_opts) || is_null($widget_opts->enable_visitor_recognition) || $widget_opts->enable_visitor_recognition}
                                     checked
                                 {/if}
                             />
@@ -221,7 +221,7 @@
                         <label>
                             <input type="checkbox" name="always_display"
                                 id="always_display" value="1"
-                                {if is_null($display_opts) || $display_opts->always_display}
+                                {if is_null($widget_opts) || $widget_opts->always_display}
                                     checked
                                 {/if}
                             />
@@ -239,8 +239,8 @@
                 </label>
                 <div class="col-lg-6 control-label">
                     <label>
-                    {if (!is_null($display_opts) && !empty($display_opts->hide_oncustom)) }
-                        {$whitelist = json_decode($display_opts->hide_oncustom)}
+                    {if (!is_null($widget_opts) && !empty($widget_opts->hide_oncustom)) }
+                        {$whitelist = json_decode($widget_opts->hide_oncustom)}
                         <textarea class="hide_specific" name="hide_oncustom" id="hide_oncustom" cols="30" rows="10">{foreach from=$whitelist item=page}{$page|escape:'htmlall':'UTF-8'|cat:"\r\n"}{/foreach}</textarea>
                     {else}
                         <textarea class="hide_specific" name="hide_oncustom" id="hide_oncustom" cols="30" rows="10"></textarea>
@@ -295,7 +295,7 @@
                         <label>
                             <input class="show_specific" type="checkbox" name="show_onfrontpage"
                                 id="show_onfrontpage" value="1"
-                                {if !is_null($display_opts) && $display_opts->show_onfrontpage}
+                                {if !is_null($widget_opts) && $widget_opts->show_onfrontpage}
                                     checked
                                 {/if}
                             />
@@ -316,7 +316,7 @@
                         <label>
                             <input class="show_specific" type="checkbox" name="show_oncategory"
                                 id="show_oncategory" value="1"
-                                {if !is_null($display_opts) && $display_opts->show_oncategory}
+                                {if !is_null($widget_opts) && $widget_opts->show_oncategory}
                                     checked
                                 {/if}
                             />
@@ -337,7 +337,7 @@
                         <label>
                             <input class="show_specific" type="checkbox" name="show_onproduct"
                                 id="show_onproduct" value="1"
-                                {if !is_null($display_opts) && $display_opts->show_onproduct}
+                                {if !is_null($widget_opts) && $widget_opts->show_onproduct}
                                     checked
                                 {/if}
                             />
@@ -356,8 +356,8 @@
                 <div class="col-lg-9">
                     <div class="text">
                         <label>
-                        {if (!is_null($display_opts) && !empty($display_opts->show_oncustom)) }
-                            {$whitelist = json_decode($display_opts->show_oncustom)}
+                        {if (!is_null($widget_opts) && !empty($widget_opts->show_oncustom)) }
+                            {$whitelist = json_decode($widget_opts->show_oncustom)}
                             <textarea class="show_specific" name="show_oncustom" id="show_oncustom" cols="30" rows="10">{foreach from=$whitelist item=page}{$page|escape:'htmlall':'UTF-8'|cat:"\r\n"}{/foreach}</textarea>
                         {else}
                             <textarea class="show_specific" name="show_oncustom" id="show_oncustom" cols="30" rows="10"></textarea>
diff --git a/prestashop8.x/controllers/admin/AdminTawktoController.php b/prestashop8.x/controllers/admin/AdminTawktoController.php
index 3648f70..85f112e 100644
--- a/prestashop8.x/controllers/admin/AdminTawktoController.php
+++ b/prestashop8.x/controllers/admin/AdminTawktoController.php
@@ -86,11 +86,11 @@ public function renderView()
         $optKey = TawkTo::TAWKTO_WIDGET_OPTS;
 
         // returns 'false' if retrieved none.
-        $displayOpts = Configuration::get($optKey);
-        if (!$displayOpts) {
-            $displayOpts = null;
+        $widgetOpts = Configuration::get($optKey);
+        if (!$widgetOpts) {
+            $widgetOpts = null;
         }
-        $displayOpts = json_decode($displayOpts);
+        $widgetOpts = json_decode($widgetOpts, false);
 
         $sameUser = true; // assuming there is only one admin by default
         $empId = Configuration::get(TawkTo::TAWKTO_WIDGET_USER);
@@ -112,7 +112,7 @@ public function renderView()
             'controller' => $this->context->link->getAdminLink('AdminTawkto'),
             'tab_id' => (int) $this->context->controller->id,
             'domain' => $domain,
-            'display_opts' => $displayOpts,
+            'widget_opts' => $widgetOpts,
             'page_id' => $pageId,
             'widget_id' => $widgetId,
             'same_user' => $sameUser,
diff --git a/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl b/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl
index 2b0d856..9585086 100644
--- a/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl
+++ b/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl
@@ -196,7 +196,7 @@
                         <label>
                             <input type="checkbox" name="enable_visitor_recognition"
                                 id="enable_visitor_recognition" value="1"
-                                {if is_null($display_opts) || is_null($display_opts->enable_visitor_recognition) || $display_opts->enable_visitor_recognition}
+                                {if is_null($widget_opts) || is_null($widget_opts->enable_visitor_recognition) || $widget_opts->enable_visitor_recognition}
                                     checked
                                 {/if}
                             />
@@ -221,7 +221,7 @@
                         <label>
                             <input type="checkbox" name="always_display"
                                 id="always_display" value="1"
-                                {if is_null($display_opts) || $display_opts->always_display}
+                                {if is_null($widget_opts) || $widget_opts->always_display}
                                     checked
                                 {/if}
                             />
@@ -239,8 +239,8 @@
                 </label>
                 <div class="col-lg-6 control-label">
                     <label>
-                    {if (!is_null($display_opts) && !empty($display_opts->hide_oncustom)) }
-                        {$whitelist = json_decode($display_opts->hide_oncustom)}
+                    {if (!is_null($widget_opts) && !empty($widget_opts->hide_oncustom)) }
+                        {$whitelist = json_decode($widget_opts->hide_oncustom)}
                         <textarea class="hide_specific" name="hide_oncustom" id="hide_oncustom" cols="30" rows="10">{foreach from=$whitelist item=page}{$page|escape:'htmlall':'UTF-8'|cat:"\r\n"}{/foreach}</textarea>
                     {else}
                         <textarea class="hide_specific" name="hide_oncustom" id="hide_oncustom" cols="30" rows="10"></textarea>
@@ -295,7 +295,7 @@
                         <label>
                             <input class="show_specific" type="checkbox" name="show_onfrontpage"
                                 id="show_onfrontpage" value="1"
-                                {if !is_null($display_opts) && $display_opts->show_onfrontpage}
+                                {if !is_null($widget_opts) && $widget_opts->show_onfrontpage}
                                     checked
                                 {/if}
                             />
@@ -316,7 +316,7 @@
                         <label>
                             <input class="show_specific" type="checkbox" name="show_oncategory"
                                 id="show_oncategory" value="1"
-                                {if !is_null($display_opts) && $display_opts->show_oncategory}
+                                {if !is_null($widget_opts) && $widget_opts->show_oncategory}
                                     checked
                                 {/if}
                             />
@@ -337,7 +337,7 @@
                         <label>
                             <input class="show_specific" type="checkbox" name="show_onproduct"
                                 id="show_onproduct" value="1"
-                                {if !is_null($display_opts) && $display_opts->show_onproduct}
+                                {if !is_null($widget_opts) && $widget_opts->show_onproduct}
                                     checked
                                 {/if}
                             />
@@ -356,8 +356,8 @@
                 <div class="col-lg-9">
                     <div class="text">
                         <label>
-                        {if (!is_null($display_opts) && !empty($display_opts->show_oncustom)) }
-                            {$whitelist = json_decode($display_opts->show_oncustom)}
+                        {if (!is_null($widget_opts) && !empty($widget_opts->show_oncustom)) }
+                            {$whitelist = json_decode($widget_opts->show_oncustom)}
                             <textarea class="show_specific" name="show_oncustom" id="show_oncustom" cols="30" rows="10">{foreach from=$whitelist item=page}{$page|escape:'htmlall':'UTF-8'|cat:"\r\n"}{/foreach}</textarea>
                         {else}
                             <textarea class="show_specific" name="show_oncustom" id="show_oncustom" cols="30" rows="10"></textarea>

From 1ce6a066ceb263030ef75143e170ccadb7f4ee90 Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Fri, 24 Jan 2025 11:27:36 +0800
Subject: [PATCH 03/17] add js api key field and visitor hash

---
 .phpcs.xml                                    |  2 +
 .../admin/AdminTawktoController.php           | 78 ++++++++++++++++++-
 prestashop1.7/tawkto.php                      | 61 ++++++++++++++-
 .../admin/tawkto/helpers/view/view.tpl        | 45 ++++++++++-
 prestashop1.7/views/templates/hook/widget.tpl |  5 +-
 .../admin/AdminTawktoController.php           | 78 ++++++++++++++++++-
 prestashop8.x/tawkto.php                      | 61 ++++++++++++++-
 .../admin/tawkto/helpers/view/view.tpl        | 45 ++++++++++-
 prestashop8.x/views/templates/hook/widget.tpl |  5 +-
 9 files changed, 364 insertions(+), 16 deletions(-)

diff --git a/.phpcs.xml b/.phpcs.xml
index 6ee615f..356faf3 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -17,6 +17,8 @@
 	<rule ref="Squiz.Commenting.FunctionComment">
 		<exclude name="Squiz.Commenting.FunctionComment.ParamCommentFullStop"/>
 		<exclude name="Squiz.Commenting.FunctionComment.ParamCommentNotCapital"/>
+		<exclude name="Squiz.Commenting.FunctionComment.ThrowsNoFullStop"/>
+		<exclude name="Squiz.Commenting.FunctionComment.ThrowsNotCapital"/>
 		<exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamName"/>
 		<exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamType"/>
 	</rule>
diff --git a/prestashop1.7/controllers/admin/AdminTawktoController.php b/prestashop1.7/controllers/admin/AdminTawktoController.php
index 3dae6ad..5854e7f 100644
--- a/prestashop1.7/controllers/admin/AdminTawktoController.php
+++ b/prestashop1.7/controllers/admin/AdminTawktoController.php
@@ -26,6 +26,8 @@
  */
 class AdminTawktoController extends ModuleAdminController
 {
+    public const NO_CHANGE = 'nochange';
+
     /**
      * __construct
      *
@@ -93,6 +95,10 @@ public function renderView()
         }
         $widgetOpts = Tools::jsonDecode($widgetOpts);
 
+        if (!empty($widgetOpts->js_api_key)) {
+            $widgetOpts->js_api_key = self::NO_CHANGE;
+        }
+
         $sameUser = true; // assuming there is only one admin by default
         $empId = Configuration::get(TawkTo::TAWKTO_WIDGET_USER);
         if ($this->context->employee->id != $empId && $empId) {
@@ -224,9 +230,14 @@ public function ajaxProcessRemoveWidget()
     public function ajaxProcessSetOptions()
     {
         $key = TawkTo::TAWKTO_WIDGET_OPTS;
+        $jsonOpts = [];
 
-        // Apply selected options
-        $jsonOpts = $this->processSetOptions(Tools::getValue('options'));
+        try {
+            // Process selected options
+            $jsonOpts = $this->processSetOptions(Tools::getValue('options'));
+        } catch (Exception $e) {
+            die(json_encode(['success' => false, 'message' => $e->getMessage()]));
+        }
 
         // Override current options/fallback if not selected
         $currentOpts = Configuration::get($key);
@@ -246,6 +257,8 @@ public function ajaxProcessSetOptions()
      * @param string $options Selected options
      *
      * @return array
+     *
+     * @throws Exception error processing options
      */
     private function processSetOptions(string $options): array
     {
@@ -266,6 +279,7 @@ private function processSetOptions(string $options): array
             'show_oncustom' => json_encode([]),
 
             'enable_visitor_recognition' => false,
+            'js_api_key' => '',
         ];
 
         if (empty($options)) {
@@ -294,9 +308,69 @@ private function processSetOptions(string $options): array
                 case 'enable_visitor_recognition':
                     $jsonOpts[$column] = ($value == 1);
                     break;
+
+                case 'js_api_key':
+                    if ($value === self::NO_CHANGE) {
+                        unset($jsonOpts['js_api_key']);
+                        break;
+                    }
+
+                    if ($value === '') {
+                        break;
+                    }
+
+                    try {
+                        if (strlen(trim($value)) !== 40) {
+                            throw new Exception('Invalid API key. Please provide value with 40 characters');
+                        }
+
+                        $jsonOpts['js_api_key'] = $this->encryptData($value);
+                    } catch (Exception $e) {
+                        unset($jsonOpts['js_api_key']);
+
+                        throw new Exception('Javascript API Key: ' . $e->getMessage());
+                    }
+
+                    break;
             }
         }
 
         return $jsonOpts;
     }
+
+    /**
+     * Encrypt data
+     *
+     * @param string $data Data to encrypt
+     *
+     * @return string Encrypted data
+     *
+     * @throws Exception error encrypting data
+     */
+    private function encryptData(string $data)
+    {
+        if (!defined('_COOKIE_KEY_')) {
+            throw new Exception('Cookie key not defined');
+        }
+
+        try {
+            $iv = random_bytes(16);
+        } catch (Exception $e) {
+            throw new Exception('Failed to generate IV');
+        }
+
+        $encrypted = openssl_encrypt($data, 'AES-256-CBC', _COOKIE_KEY_, 0, $iv);
+
+        if ($encrypted === false) {
+            throw new Exception('Failed to encrypt data');
+        }
+
+        $encrypted = base64_encode($iv . $encrypted);
+
+        if ($encrypted === false) {
+            throw new Exception('Failed to encode data');
+        }
+
+        return $encrypted;
+    }
 }
diff --git a/prestashop1.7/tawkto.php b/prestashop1.7/tawkto.php
index 6c93e88..ae42129 100644
--- a/prestashop1.7/tawkto.php
+++ b/prestashop1.7/tawkto.php
@@ -168,19 +168,29 @@ public function hookDisplayFooter()
         }
 
         // add customer details as visitor info
-        $customer_name = null;
-        $customer_email = null;
+        $customer_name = '';
+        $customer_email = '';
+        $hash = '';
         if ($enable_visitor_recognition && !is_null($this->context->customer->id)) {
             $customer = $this->context->customer;
             $customer_name = $customer->firstname . ' ' . $customer->lastname;
             $customer_email = $customer->email;
+
+            if (!empty($options->js_api_key)) {
+                $key = $this->getJsApiKey($options->js_api_key);
+
+                if (!empty($key)) {
+                    $hash = hash_hmac('sha256', $customer_email, $key);
+                }
+            }
         }
 
         $this->context->smarty->assign([
             'widget_id' => $widgetId,
             'page_id' => $pageId,
-            'customer_name' => (!is_null($customer_name)) ? $customer_name : '',
-            'customer_email' => (!is_null($customer_email)) ? $customer_email : '',
+            'customer_name' => $customer_name,
+            'customer_email' => $customer_email,
+            'hash' => $hash,
         ]);
 
         return $this->display(__FILE__, 'widget.tpl');
@@ -283,4 +293,47 @@ private function getArrayFromJson($data)
 
         return $arr;
     }
+
+    /**
+     * Retrieve JS API key
+     *
+     * @param string $js_api_key Encrypted JS API key
+     *
+     * @return string
+     */
+    private function getJsApiKey(string $js_api_key)
+    {
+        // Cache::store & Cache::retrieve are not persistent
+
+        $key = $this->getDecryptedData($js_api_key);
+
+        return $key;
+    }
+
+    /**
+     * Decrypt data
+     *
+     * @param string $data Data to decrypt
+     *
+     * @return string
+     */
+    private function getDecryptedData(string $data)
+    {
+        $decoded = base64_decode($data);
+
+        if ($decoded === false) {
+            return '';
+        }
+
+        $iv = substr($decoded, 0, 16);
+        $encrypted_data = substr($decoded, 16);
+
+        $decrypted_data = openssl_decrypt($encrypted_data, 'AES-256-CBC', _COOKIE_KEY_, 0, $iv);
+
+        if ($decrypted_data === false) {
+            return '';
+        }
+
+        return $decrypted_data;
+    }
 }
diff --git a/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl b/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl
index 9585086..8f34d33 100644
--- a/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl
+++ b/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl
@@ -67,6 +67,13 @@
 .tawk-tooltip:hover .tawk-tooltiptext {
   visibility: visible;
 }
+
+.options-alert {
+    width: 50%;
+    float: left;
+    font-weight: bold;
+    display: none;
+}
 </style>
 
 <iframe
@@ -204,6 +211,26 @@
                     </div>
                 </div>
             </div>
+            <p class='tawk-notice'>
+                Note: If Secure Mode is enabled on your property, please enter your Javascript API Key to ensure visitor recognition works correctly.
+            </p>
+            <div class="form-group row">
+                <label class="control-label col-lg-3">
+                    <span data-toggle="tooltip" data-html="true"
+                        title=""  data-original-title="Javascript API Key">
+                        Javascript API Key
+                    </span>
+                </label>
+                <div class="col-lg-9">
+                    <div class="radio ">
+                        <label>
+                            <input type="password" name="js_api_key" id="js_api_key"
+                                value="{if !is_null($widget_opts) && $widget_opts->js_api_key}{$widget_opts->js_api_key|escape:'html':'UTF-8'}{/if}"
+                            />
+                        </label>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
     <div class="panel" id="fieldset_1">
@@ -400,7 +427,8 @@
             </div>
         </div>
         <div class="panel-footer">
-            <div id="optionsSuccessMessage" style="width: 50%; float: left; background-color: #dff0d8; color: #3c763d; border-color: #d6e9c6; font-weight: bold; display: none;" class="alert alert-success">Successfully set widget options to your site</div>
+            <div id="optionsSuccessMessage" style="background-color: #dff0d8; color: #3c763d; border-color: #d6e9c6;" class="alert alert-success options-alert">Successfully set widget options to your site</div>
+            <div id="optionsFailureMessage" class="alert alert-danger options-alert"></div>
             <button type="submit" value="1" id="module_form_submit_btn" name="submitBlockCategories" class="btn btn-default pull-right">
             <i class="process-icon-save"></i> Save</button>
         </div>
@@ -433,6 +461,7 @@ jQuery(document).ready(function() {
                 if(r.success) {
                     $('#optionsSuccessMessage').toggle().delay(3000).fadeOut();
                 } else {
+                    $('#optionsFailureMessage').text(r.message).toggle().delay(3000).fadeOut();
                 }
             }
         });
@@ -456,6 +485,20 @@ jQuery(document).ready(function() {
             jQuery('.show_specific').prop('disabled', false);
         }
     });
+
+    if (jQuery('#enable_visitor_recognition').prop("checked")) {
+        jQuery('#js_api_key').prop('disabled', false);
+    } else {
+        jQuery('#js_api_key').prop('disabled', true);
+    }
+
+    jQuery('#enable_visitor_recognition').change(function() {
+        if (this.checked) {
+            jQuery('#js_api_key').prop('disabled', false);
+        } else {
+            jQuery('#js_api_key').prop('disabled', true);
+        }
+    });
     {/literal}
 });
 </script>
diff --git a/prestashop1.7/views/templates/hook/widget.tpl b/prestashop1.7/views/templates/hook/widget.tpl
index b863a0a..2330a28 100644
--- a/prestashop1.7/views/templates/hook/widget.tpl
+++ b/prestashop1.7/views/templates/hook/widget.tpl
@@ -22,7 +22,10 @@ var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();
 {if $customer_email != ''}
    Tawk_API.visitor = {
         name  : "{$customer_name|escape:'javascript':'UTF-8'}",
-        email : "{$customer_email|escape:'javascript':'UTF-8'}"
+        email : "{$customer_email|escape:'javascript':'UTF-8'}",
+        {if $hash != ''}
+            hash : "{$hash|escape:'javascript':'UTF-8'}"
+        {/if}
     };
 {/if}
 
diff --git a/prestashop8.x/controllers/admin/AdminTawktoController.php b/prestashop8.x/controllers/admin/AdminTawktoController.php
index 85f112e..26a63bf 100644
--- a/prestashop8.x/controllers/admin/AdminTawktoController.php
+++ b/prestashop8.x/controllers/admin/AdminTawktoController.php
@@ -25,6 +25,8 @@
  */
 class AdminTawktoController extends ModuleAdminController
 {
+    public const NO_CHANGE = 'nochange';
+
     /**
      * __construct
      *
@@ -92,6 +94,10 @@ public function renderView()
         }
         $widgetOpts = json_decode($widgetOpts, false);
 
+        if (!empty($widgetOpts->js_api_key)) {
+            $widgetOpts->js_api_key = self::NO_CHANGE;
+        }
+
         $sameUser = true; // assuming there is only one admin by default
         $empId = Configuration::get(TawkTo::TAWKTO_WIDGET_USER);
         if ($this->context->employee->id != $empId && $empId) {
@@ -224,9 +230,14 @@ public function ajaxProcessRemoveWidget()
     public function ajaxProcessSetOptions()
     {
         $key = TawkTo::TAWKTO_WIDGET_OPTS;
+        $jsonOpts = [];
 
-        // Apply selected options
-        $jsonOpts = $this->processSetOptions(Tools::getValue('options'));
+        try {
+            // Process selected options
+            $jsonOpts = $this->processSetOptions(Tools::getValue('options'));
+        } catch (Exception $e) {
+            die(json_encode(['success' => false, 'message' => $e->getMessage()]));
+        }
 
         // Override current options/fallback if not selected
         $currentOpts = Configuration::get($key);
@@ -246,6 +257,8 @@ public function ajaxProcessSetOptions()
      * @param string $options Selected options
      *
      * @return array
+     *
+     * @throws Exception Error processing options
      */
     private function processSetOptions(string $options): array
     {
@@ -266,6 +279,7 @@ private function processSetOptions(string $options): array
             'show_oncustom' => json_encode([]),
 
             'enable_visitor_recognition' => false,
+            'js_api_key' => '',
         ];
 
         if (empty($options)) {
@@ -294,9 +308,69 @@ private function processSetOptions(string $options): array
                 case 'enable_visitor_recognition':
                     $jsonOpts[$column] = ($value == 1);
                     break;
+
+                case 'js_api_key':
+                    if ($value === self::NO_CHANGE) {
+                        unset($jsonOpts['js_api_key']);
+                        break;
+                    }
+
+                    if ($value === '') {
+                        break;
+                    }
+
+                    try {
+                        if (strlen(trim($value)) !== 40) {
+                            throw new Exception('Invalid API key. Please provide value with 40 characters');
+                        }
+
+                        $jsonOpts['js_api_key'] = $this->encryptData($value);
+                    } catch (Exception $e) {
+                        unset($jsonOpts['js_api_key']);
+
+                        throw new Exception('Javascript API Key: ' . $e->getMessage());
+                    }
+
+                    break;
             }
         }
 
         return $jsonOpts;
     }
+
+    /**
+     * Encrypt data
+     *
+     * @param string $data Data to encrypt
+     *
+     * @return string Encrypted data
+     *
+     * @throws Exception Error encrypting data
+     */
+    private function encryptData(string $data)
+    {
+        if (!defined('_COOKIE_KEY_')) {
+            throw new Exception('Cookie key not defined');
+        }
+
+        try {
+            $iv = random_bytes(16);
+        } catch (Exception $e) {
+            throw new Exception('Failed to generate IV');
+        }
+
+        $encrypted = openssl_encrypt($data, 'AES-256-CBC', _COOKIE_KEY_, 0, $iv);
+
+        if ($encrypted === false) {
+            throw new Exception('Failed to encrypt data');
+        }
+
+        $encrypted = base64_encode($iv . $encrypted);
+
+        if ($encrypted === false) {
+            throw new Exception('Failed to encode data');
+        }
+
+        return $encrypted;
+    }
 }
diff --git a/prestashop8.x/tawkto.php b/prestashop8.x/tawkto.php
index 7f43d53..4911c5a 100644
--- a/prestashop8.x/tawkto.php
+++ b/prestashop8.x/tawkto.php
@@ -167,19 +167,29 @@ public function hookDisplayFooter()
         }
 
         // add customer details as visitor info
-        $customer_name = null;
-        $customer_email = null;
+        $customer_name = '';
+        $customer_email = '';
+        $hash = '';
         if ($enable_visitor_recognition && !is_null($this->context->customer->id)) {
             $customer = $this->context->customer;
             $customer_name = $customer->firstname . ' ' . $customer->lastname;
             $customer_email = $customer->email;
+
+            if (!empty($options->js_api_key)) {
+                $key = $this->getJsApiKey($options->js_api_key);
+
+                if (!empty($key)) {
+                    $hash = hash_hmac('sha256', $customer_email, $key);
+                }
+            }
         }
 
         $this->context->smarty->assign([
             'widget_id' => $widgetId,
             'page_id' => $pageId,
-            'customer_name' => (!is_null($customer_name)) ? $customer_name : '',
-            'customer_email' => (!is_null($customer_email)) ? $customer_email : '',
+            'customer_name' => $customer_name,
+            'customer_email' => $customer_email,
+            'hash' => $hash,
         ]);
 
         return $this->display(__FILE__, 'widget.tpl');
@@ -281,4 +291,47 @@ private function getArrayFromJson($data)
 
         return $arr;
     }
+
+    /**
+     * Retrieve JS API key
+     *
+     * @param string $js_api_key Encrypted JS API key
+     *
+     * @return string
+     */
+    private function getJsApiKey(string $js_api_key)
+    {
+        // Cache::store & Cache::retrieve are not persistent
+
+        $key = $this->getDecryptedData($js_api_key);
+
+        return $key;
+    }
+
+    /**
+     * Decrypt data
+     *
+     * @param string $data Data to decrypt
+     *
+     * @return string
+     */
+    private function getDecryptedData(string $data)
+    {
+        $decoded = base64_decode($data);
+
+        if ($decoded === false) {
+            return '';
+        }
+
+        $iv = substr($decoded, 0, 16);
+        $encrypted_data = substr($decoded, 16);
+
+        $decrypted_data = openssl_decrypt($encrypted_data, 'AES-256-CBC', _COOKIE_KEY_, 0, $iv);
+
+        if ($decrypted_data === false) {
+            return '';
+        }
+
+        return $decrypted_data;
+    }
 }
diff --git a/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl b/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl
index 9585086..8f34d33 100644
--- a/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl
+++ b/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl
@@ -67,6 +67,13 @@
 .tawk-tooltip:hover .tawk-tooltiptext {
   visibility: visible;
 }
+
+.options-alert {
+    width: 50%;
+    float: left;
+    font-weight: bold;
+    display: none;
+}
 </style>
 
 <iframe
@@ -204,6 +211,26 @@
                     </div>
                 </div>
             </div>
+            <p class='tawk-notice'>
+                Note: If Secure Mode is enabled on your property, please enter your Javascript API Key to ensure visitor recognition works correctly.
+            </p>
+            <div class="form-group row">
+                <label class="control-label col-lg-3">
+                    <span data-toggle="tooltip" data-html="true"
+                        title=""  data-original-title="Javascript API Key">
+                        Javascript API Key
+                    </span>
+                </label>
+                <div class="col-lg-9">
+                    <div class="radio ">
+                        <label>
+                            <input type="password" name="js_api_key" id="js_api_key"
+                                value="{if !is_null($widget_opts) && $widget_opts->js_api_key}{$widget_opts->js_api_key|escape:'html':'UTF-8'}{/if}"
+                            />
+                        </label>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
     <div class="panel" id="fieldset_1">
@@ -400,7 +427,8 @@
             </div>
         </div>
         <div class="panel-footer">
-            <div id="optionsSuccessMessage" style="width: 50%; float: left; background-color: #dff0d8; color: #3c763d; border-color: #d6e9c6; font-weight: bold; display: none;" class="alert alert-success">Successfully set widget options to your site</div>
+            <div id="optionsSuccessMessage" style="background-color: #dff0d8; color: #3c763d; border-color: #d6e9c6;" class="alert alert-success options-alert">Successfully set widget options to your site</div>
+            <div id="optionsFailureMessage" class="alert alert-danger options-alert"></div>
             <button type="submit" value="1" id="module_form_submit_btn" name="submitBlockCategories" class="btn btn-default pull-right">
             <i class="process-icon-save"></i> Save</button>
         </div>
@@ -433,6 +461,7 @@ jQuery(document).ready(function() {
                 if(r.success) {
                     $('#optionsSuccessMessage').toggle().delay(3000).fadeOut();
                 } else {
+                    $('#optionsFailureMessage').text(r.message).toggle().delay(3000).fadeOut();
                 }
             }
         });
@@ -456,6 +485,20 @@ jQuery(document).ready(function() {
             jQuery('.show_specific').prop('disabled', false);
         }
     });
+
+    if (jQuery('#enable_visitor_recognition').prop("checked")) {
+        jQuery('#js_api_key').prop('disabled', false);
+    } else {
+        jQuery('#js_api_key').prop('disabled', true);
+    }
+
+    jQuery('#enable_visitor_recognition').change(function() {
+        if (this.checked) {
+            jQuery('#js_api_key').prop('disabled', false);
+        } else {
+            jQuery('#js_api_key').prop('disabled', true);
+        }
+    });
     {/literal}
 });
 </script>
diff --git a/prestashop8.x/views/templates/hook/widget.tpl b/prestashop8.x/views/templates/hook/widget.tpl
index b863a0a..2330a28 100644
--- a/prestashop8.x/views/templates/hook/widget.tpl
+++ b/prestashop8.x/views/templates/hook/widget.tpl
@@ -22,7 +22,10 @@ var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();
 {if $customer_email != ''}
    Tawk_API.visitor = {
         name  : "{$customer_name|escape:'javascript':'UTF-8'}",
-        email : "{$customer_email|escape:'javascript':'UTF-8'}"
+        email : "{$customer_email|escape:'javascript':'UTF-8'}",
+        {if $hash != ''}
+            hash : "{$hash|escape:'javascript':'UTF-8'}"
+        {/if}
     };
 {/if}
 

From 6f6d80a3f5f09b0daed5540c3fc55279f1595d95 Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Fri, 31 Jan 2025 11:33:06 +0800
Subject: [PATCH 04/17] no disabling api key input

---
 .../templates/admin/tawkto/helpers/view/view.tpl   | 14 --------------
 .../templates/admin/tawkto/helpers/view/view.tpl   | 14 --------------
 2 files changed, 28 deletions(-)

diff --git a/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl b/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl
index 8f34d33..80d1a44 100644
--- a/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl
+++ b/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl
@@ -485,20 +485,6 @@ jQuery(document).ready(function() {
             jQuery('.show_specific').prop('disabled', false);
         }
     });
-
-    if (jQuery('#enable_visitor_recognition').prop("checked")) {
-        jQuery('#js_api_key').prop('disabled', false);
-    } else {
-        jQuery('#js_api_key').prop('disabled', true);
-    }
-
-    jQuery('#enable_visitor_recognition').change(function() {
-        if (this.checked) {
-            jQuery('#js_api_key').prop('disabled', false);
-        } else {
-            jQuery('#js_api_key').prop('disabled', true);
-        }
-    });
     {/literal}
 });
 </script>
diff --git a/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl b/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl
index 8f34d33..80d1a44 100644
--- a/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl
+++ b/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl
@@ -485,20 +485,6 @@ jQuery(document).ready(function() {
             jQuery('.show_specific').prop('disabled', false);
         }
     });
-
-    if (jQuery('#enable_visitor_recognition').prop("checked")) {
-        jQuery('#js_api_key').prop('disabled', false);
-    } else {
-        jQuery('#js_api_key').prop('disabled', true);
-    }
-
-    jQuery('#enable_visitor_recognition').change(function() {
-        if (this.checked) {
-            jQuery('#js_api_key').prop('disabled', false);
-        } else {
-            jQuery('#js_api_key').prop('disabled', true);
-        }
-    });
     {/literal}
 });
 </script>

From 76899094e62935934ef7fea8eb1c217366f81077 Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Fri, 31 Jan 2025 11:54:23 +0800
Subject: [PATCH 05/17] throw error when fail retrieving js api key

---
 prestashop1.7/tawkto.php | 27 +++++++++++++++++++--------
 prestashop8.x/tawkto.php | 25 ++++++++++++++++++-------
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/prestashop1.7/tawkto.php b/prestashop1.7/tawkto.php
index ae42129..898e9a6 100644
--- a/prestashop1.7/tawkto.php
+++ b/prestashop1.7/tawkto.php
@@ -176,12 +176,11 @@ public function hookDisplayFooter()
             $customer_name = $customer->firstname . ' ' . $customer->lastname;
             $customer_email = $customer->email;
 
-            if (!empty($options->js_api_key)) {
+            try {
                 $key = $this->getJsApiKey($options->js_api_key);
-
-                if (!empty($key)) {
-                    $hash = hash_hmac('sha256', $customer_email, $key);
-                }
+                $hash = hash_hmac('sha256', $customer_email, $key);
+            } catch (Exception $e) {
+                $hash = '';
             }
         }
 
@@ -300,9 +299,15 @@ private function getArrayFromJson($data)
      * @param string $js_api_key Encrypted JS API key
      *
      * @return string
+     *
+     * @throws Exception error retrieving JS API key
      */
     private function getJsApiKey(string $js_api_key)
     {
+        if (empty($js_api_key)) {
+            throw new Exception('JS API key is empty');
+        }
+
         // Cache::store & Cache::retrieve are not persistent
 
         $key = $this->getDecryptedData($js_api_key);
@@ -315,14 +320,20 @@ private function getJsApiKey(string $js_api_key)
      *
      * @param string $data Data to decrypt
      *
-     * @return string
+     * @return string Decrypted data
+     *
+     * @throws Exception error decrypting data
      */
     private function getDecryptedData(string $data)
     {
+        if (!defined('_COOKIE_KEY_')) {
+            throw new Exception('Cookie key not defined');
+        }
+
         $decoded = base64_decode($data);
 
         if ($decoded === false) {
-            return '';
+            throw new Exception('Failed to decode data');
         }
 
         $iv = substr($decoded, 0, 16);
@@ -331,7 +342,7 @@ private function getDecryptedData(string $data)
         $decrypted_data = openssl_decrypt($encrypted_data, 'AES-256-CBC', _COOKIE_KEY_, 0, $iv);
 
         if ($decrypted_data === false) {
-            return '';
+            throw new Exception('Failed to decrypt data');
         }
 
         return $decrypted_data;
diff --git a/prestashop8.x/tawkto.php b/prestashop8.x/tawkto.php
index 4911c5a..5dc0589 100644
--- a/prestashop8.x/tawkto.php
+++ b/prestashop8.x/tawkto.php
@@ -175,12 +175,11 @@ public function hookDisplayFooter()
             $customer_name = $customer->firstname . ' ' . $customer->lastname;
             $customer_email = $customer->email;
 
-            if (!empty($options->js_api_key)) {
+            try {
                 $key = $this->getJsApiKey($options->js_api_key);
-
-                if (!empty($key)) {
-                    $hash = hash_hmac('sha256', $customer_email, $key);
-                }
+                $hash = hash_hmac('sha256', $customer_email, $key);
+            } catch (Exception $e) {
+                $hash = '';
             }
         }
 
@@ -298,9 +297,15 @@ private function getArrayFromJson($data)
      * @param string $js_api_key Encrypted JS API key
      *
      * @return string
+     *
+     * @throws Exception error retrieving JS API key
      */
     private function getJsApiKey(string $js_api_key)
     {
+        if (empty($js_api_key)) {
+            throw new Exception('JS API key is empty');
+        }
+
         // Cache::store & Cache::retrieve are not persistent
 
         $key = $this->getDecryptedData($js_api_key);
@@ -314,13 +319,19 @@ private function getJsApiKey(string $js_api_key)
      * @param string $data Data to decrypt
      *
      * @return string
+     *
+     * @throws Exception error decrypting data
      */
     private function getDecryptedData(string $data)
     {
+        if (!defined('_COOKIE_KEY_')) {
+            throw new Exception('Cookie key not defined');
+        }
+
         $decoded = base64_decode($data);
 
         if ($decoded === false) {
-            return '';
+            throw new Exception('Failed to decode data');
         }
 
         $iv = substr($decoded, 0, 16);
@@ -329,7 +340,7 @@ private function getDecryptedData(string $data)
         $decrypted_data = openssl_decrypt($encrypted_data, 'AES-256-CBC', _COOKIE_KEY_, 0, $iv);
 
         if ($decrypted_data === false) {
-            return '';
+            throw new Exception('Failed to decrypt data');
         }
 
         return $decrypted_data;

From c590190d9310d7ed136e6d79f00635eb2963f88c Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Fri, 31 Jan 2025 12:04:44 +0800
Subject: [PATCH 06/17] use `parse_str` to handle options string

---
 .../controllers/admin/AdminTawktoController.php       | 11 +++++------
 .../controllers/admin/AdminTawktoController.php       | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/prestashop1.7/controllers/admin/AdminTawktoController.php b/prestashop1.7/controllers/admin/AdminTawktoController.php
index 5854e7f..bc6cb1a 100644
--- a/prestashop1.7/controllers/admin/AdminTawktoController.php
+++ b/prestashop1.7/controllers/admin/AdminTawktoController.php
@@ -254,13 +254,13 @@ public function ajaxProcessSetOptions()
     /**
      * Process options
      *
-     * @param string $options Selected options
+     * @param string $params Selected options
      *
      * @return array
      *
      * @throws Exception error processing options
      */
-    private function processSetOptions(string $options): array
+    private function processSetOptions(string $params): array
     {
         // default options
         $jsonOpts = [
@@ -282,13 +282,12 @@ private function processSetOptions(string $options): array
             'js_api_key' => '',
         ];
 
-        if (empty($options)) {
+        if (empty($params)) {
             return $jsonOpts;
         }
 
-        $options = explode('&', $options);
-        foreach ($options as $post) {
-            [$column, $value] = explode('=', $post);
+        parse_str($params, $options);
+        foreach ($options as $column => $value) {
             switch ($column) {
                 case 'hide_oncustom':
                 case 'show_oncustom':
diff --git a/prestashop8.x/controllers/admin/AdminTawktoController.php b/prestashop8.x/controllers/admin/AdminTawktoController.php
index 26a63bf..6a245f2 100644
--- a/prestashop8.x/controllers/admin/AdminTawktoController.php
+++ b/prestashop8.x/controllers/admin/AdminTawktoController.php
@@ -254,13 +254,13 @@ public function ajaxProcessSetOptions()
     /**
      * Process options
      *
-     * @param string $options Selected options
+     * @param string $params Selected options
      *
      * @return array
      *
      * @throws Exception Error processing options
      */
-    private function processSetOptions(string $options): array
+    private function processSetOptions(string $params): array
     {
         // default options
         $jsonOpts = [
@@ -282,13 +282,12 @@ private function processSetOptions(string $options): array
             'js_api_key' => '',
         ];
 
-        if (empty($options)) {
+        if (empty($params)) {
             return $jsonOpts;
         }
 
-        $options = explode('&', $options);
-        foreach ($options as $post) {
-            [$column, $value] = explode('=', $post);
+        parse_str($params, $options);
+        foreach ($options as $column => $value) {
             switch ($column) {
                 case 'hide_oncustom':
                 case 'show_oncustom':

From c388363c44786e0241169b711bf862ac13807423 Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Thu, 13 Feb 2025 14:26:43 +0800
Subject: [PATCH 07/17] use session cache for api key

---
 prestashop1.7/tawkto.php | 9 ++++++++-
 prestashop8.x/tawkto.php | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/prestashop1.7/tawkto.php b/prestashop1.7/tawkto.php
index 898e9a6..2ca7714 100644
--- a/prestashop1.7/tawkto.php
+++ b/prestashop1.7/tawkto.php
@@ -35,6 +35,7 @@ class Tawkto extends Module
     public const TAWKTO_WIDGET_OPTS = 'TAWKTO_WIDGET_OPTS';
     public const TAWKTO_WIDGET_USER = 'TAWKTO_WIDGET_USER';
     public const TAWKTO_SELECTED_WIDGET = 'TAWKTO_SELECTED_WIDGET';
+    public const TAWKTO_JS_API_KEY = 'TAWKTO_JS_API_KEY';
 
     /**
      * __construct
@@ -101,6 +102,8 @@ private function installTab()
      */
     public function hookDisplayFooter()
     {
+        session_start();
+
         $current_widget = self::getPropertyAndWidget();
         if (empty($current_widget)) {
             return '';
@@ -308,10 +311,14 @@ private function getJsApiKey(string $js_api_key)
             throw new Exception('JS API key is empty');
         }
 
-        // Cache::store & Cache::retrieve are not persistent
+        if (isset($_SESSION[self::TAWKTO_JS_API_KEY])) {
+            return $_SESSION[self::TAWKTO_JS_API_KEY];
+        }
 
         $key = $this->getDecryptedData($js_api_key);
 
+        $_SESSION[self::TAWKTO_JS_API_KEY] = $key;
+
         return $key;
     }
 
diff --git a/prestashop8.x/tawkto.php b/prestashop8.x/tawkto.php
index 5dc0589..7a25a67 100644
--- a/prestashop8.x/tawkto.php
+++ b/prestashop8.x/tawkto.php
@@ -34,6 +34,7 @@ class Tawkto extends Module
     public const TAWKTO_WIDGET_OPTS = 'TAWKTO_WIDGET_OPTS';
     public const TAWKTO_WIDGET_USER = 'TAWKTO_WIDGET_USER';
     public const TAWKTO_SELECTED_WIDGET = 'TAWKTO_SELECTED_WIDGET';
+    public const TAWKTO_JS_API_KEY = 'TAWKTO_JS_API_KEY';
 
     /**
      * __construct
@@ -100,6 +101,8 @@ private function installTab()
      */
     public function hookDisplayFooter()
     {
+        session_start();
+
         $current_widget = self::getPropertyAndWidget();
         if (empty($current_widget)) {
             return '';
@@ -306,10 +309,14 @@ private function getJsApiKey(string $js_api_key)
             throw new Exception('JS API key is empty');
         }
 
-        // Cache::store & Cache::retrieve are not persistent
+        if (isset($_SESSION[self::TAWKTO_JS_API_KEY])) {
+            return $_SESSION[self::TAWKTO_JS_API_KEY];
+        }
 
         $key = $this->getDecryptedData($js_api_key);
 
+        $_SESSION[self::TAWKTO_JS_API_KEY] = $key;
+
         return $key;
     }
 

From 240fd96b70eff65907eb83c67cf81fd26e79e401 Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Thu, 13 Feb 2025 15:29:40 +0800
Subject: [PATCH 08/17] safety checks for session_start

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 prestashop1.7/tawkto.php | 4 +++-
 prestashop8.x/tawkto.php | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/prestashop1.7/tawkto.php b/prestashop1.7/tawkto.php
index 2ca7714..1ee2938 100644
--- a/prestashop1.7/tawkto.php
+++ b/prestashop1.7/tawkto.php
@@ -102,7 +102,9 @@ private function installTab()
      */
     public function hookDisplayFooter()
     {
-        session_start();
+        if (session_status() === PHP_SESSION_NONE && !headers_sent()) {
+            session_start();
+        }
 
         $current_widget = self::getPropertyAndWidget();
         if (empty($current_widget)) {
diff --git a/prestashop8.x/tawkto.php b/prestashop8.x/tawkto.php
index 7a25a67..98ce10e 100644
--- a/prestashop8.x/tawkto.php
+++ b/prestashop8.x/tawkto.php
@@ -101,7 +101,9 @@ private function installTab()
      */
     public function hookDisplayFooter()
     {
-        session_start();
+        if (session_status() === PHP_SESSION_NONE && !headers_sent()) {
+            session_start();
+        }
 
         $current_widget = self::getPropertyAndWidget();
         if (empty($current_widget)) {

From b222d1412949cde1ad60d14b1862aa2d57ec8bb8 Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Tue, 11 Mar 2025 13:40:10 +0800
Subject: [PATCH 09/17] add null check for `$widgetOpts`

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 prestashop1.7/controllers/admin/AdminTawktoController.php | 2 +-
 prestashop8.x/controllers/admin/AdminTawktoController.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/prestashop1.7/controllers/admin/AdminTawktoController.php b/prestashop1.7/controllers/admin/AdminTawktoController.php
index bc6cb1a..4d34e01 100644
--- a/prestashop1.7/controllers/admin/AdminTawktoController.php
+++ b/prestashop1.7/controllers/admin/AdminTawktoController.php
@@ -95,7 +95,7 @@ public function renderView()
         }
         $widgetOpts = Tools::jsonDecode($widgetOpts);
 
-        if (!empty($widgetOpts->js_api_key)) {
+        if ($widgetOpts && !empty($widgetOpts->js_api_key)) {
             $widgetOpts->js_api_key = self::NO_CHANGE;
         }
 
diff --git a/prestashop8.x/controllers/admin/AdminTawktoController.php b/prestashop8.x/controllers/admin/AdminTawktoController.php
index 6a245f2..41c3622 100644
--- a/prestashop8.x/controllers/admin/AdminTawktoController.php
+++ b/prestashop8.x/controllers/admin/AdminTawktoController.php
@@ -94,7 +94,7 @@ public function renderView()
         }
         $widgetOpts = json_decode($widgetOpts, false);
 
-        if (!empty($widgetOpts->js_api_key)) {
+        if ($widgetOpts && !empty($widgetOpts->js_api_key)) {
             $widgetOpts->js_api_key = self::NO_CHANGE;
         }
 

From 3074abd53ad2504a5a429b5c11129e3c3bac5bb0 Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Tue, 11 Mar 2025 13:40:24 +0800
Subject: [PATCH 10/17] add array check for `$currentOpts`Co-authored-by:
 coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---
 prestashop1.7/controllers/admin/AdminTawktoController.php | 4 +++-
 prestashop8.x/controllers/admin/AdminTawktoController.php | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/prestashop1.7/controllers/admin/AdminTawktoController.php b/prestashop1.7/controllers/admin/AdminTawktoController.php
index 4d34e01..e5ca51a 100644
--- a/prestashop1.7/controllers/admin/AdminTawktoController.php
+++ b/prestashop1.7/controllers/admin/AdminTawktoController.php
@@ -243,7 +243,9 @@ public function ajaxProcessSetOptions()
         $currentOpts = Configuration::get($key);
         if (!empty($currentOpts)) {
             $currentOpts = json_decode($currentOpts, true);
-            $jsonOpts = array_merge($currentOpts, $jsonOpts);
+            if (is_array($currentOpts)) {
+                $jsonOpts = array_merge($currentOpts, $jsonOpts);
+            }
         }
 
         Configuration::updateValue($key, json_encode($jsonOpts));
diff --git a/prestashop8.x/controllers/admin/AdminTawktoController.php b/prestashop8.x/controllers/admin/AdminTawktoController.php
index 41c3622..16ababa 100644
--- a/prestashop8.x/controllers/admin/AdminTawktoController.php
+++ b/prestashop8.x/controllers/admin/AdminTawktoController.php
@@ -243,7 +243,9 @@ public function ajaxProcessSetOptions()
         $currentOpts = Configuration::get($key);
         if (!empty($currentOpts)) {
             $currentOpts = json_decode($currentOpts, true);
-            $jsonOpts = array_merge($currentOpts, $jsonOpts);
+            if (is_array($currentOpts)) {
+                $jsonOpts = array_merge($currentOpts, $jsonOpts);
+            }
         }
 
         Configuration::updateValue($key, json_encode($jsonOpts));

From a9994c7c4027ab46334daf9c3a075a1f7d59fc02 Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Tue, 11 Mar 2025 13:52:08 +0800
Subject: [PATCH 11/17] update error handling & trim value before encrypting

---
 .../controllers/admin/AdminTawktoController.php    | 14 +++++++++-----
 .../controllers/admin/AdminTawktoController.php    | 14 +++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/prestashop1.7/controllers/admin/AdminTawktoController.php b/prestashop1.7/controllers/admin/AdminTawktoController.php
index e5ca51a..f7dc882 100644
--- a/prestashop1.7/controllers/admin/AdminTawktoController.php
+++ b/prestashop1.7/controllers/admin/AdminTawktoController.php
@@ -320,16 +320,20 @@ private function processSetOptions(string $params): array
                         break;
                     }
 
-                    try {
-                        if (strlen(trim($value)) !== 40) {
-                            throw new Exception('Invalid API key. Please provide value with 40 characters');
-                        }
+                    $value = trim($value);
+
+                    if (strlen($value) !== 40) {
+                        throw new Exception('Invalid API key.');
+                    }
 
+                    try {
                         $jsonOpts['js_api_key'] = $this->encryptData($value);
                     } catch (Exception $e) {
+                        error_log($e->getMessage());
+
                         unset($jsonOpts['js_api_key']);
 
-                        throw new Exception('Javascript API Key: ' . $e->getMessage());
+                        throw new Exception('Error saving Javascript API Key.');
                     }
 
                     break;
diff --git a/prestashop8.x/controllers/admin/AdminTawktoController.php b/prestashop8.x/controllers/admin/AdminTawktoController.php
index 16ababa..f44d0bb 100644
--- a/prestashop8.x/controllers/admin/AdminTawktoController.php
+++ b/prestashop8.x/controllers/admin/AdminTawktoController.php
@@ -320,16 +320,20 @@ private function processSetOptions(string $params): array
                         break;
                     }
 
-                    try {
-                        if (strlen(trim($value)) !== 40) {
-                            throw new Exception('Invalid API key. Please provide value with 40 characters');
-                        }
+                    $value = trim($value);
+
+                    if (strlen($value) !== 40) {
+                        throw new Exception('Invalid API key.');
+                    }
 
+                    try {
                         $jsonOpts['js_api_key'] = $this->encryptData($value);
                     } catch (Exception $e) {
+                        error_log($e->getMessage());
+
                         unset($jsonOpts['js_api_key']);
 
-                        throw new Exception('Javascript API Key: ' . $e->getMessage());
+                        throw new Exception('Error saving Javascript API Key.');
                     }
 
                     break;

From 9df855d3103711d7b45e05f4812537ae54ff143f Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Tue, 11 Mar 2025 17:49:05 +0800
Subject: [PATCH 12/17] add config version

---
 prestashop1.7/controllers/admin/AdminTawktoController.php | 6 ++++++
 prestashop8.x/controllers/admin/AdminTawktoController.php | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/prestashop1.7/controllers/admin/AdminTawktoController.php b/prestashop1.7/controllers/admin/AdminTawktoController.php
index f7dc882..7e7bd07 100644
--- a/prestashop1.7/controllers/admin/AdminTawktoController.php
+++ b/prestashop1.7/controllers/admin/AdminTawktoController.php
@@ -248,6 +248,12 @@ public function ajaxProcessSetOptions()
             }
         }
 
+        if (!isset($jsonOpts['config_version'])) {
+            $jsonOpts['config_version'] = 0;
+        } else {
+            ++$jsonOpts['config_version'];
+        }
+
         Configuration::updateValue($key, json_encode($jsonOpts));
 
         die(json_encode(['success' => true]));
diff --git a/prestashop8.x/controllers/admin/AdminTawktoController.php b/prestashop8.x/controllers/admin/AdminTawktoController.php
index f44d0bb..64f49b1 100644
--- a/prestashop8.x/controllers/admin/AdminTawktoController.php
+++ b/prestashop8.x/controllers/admin/AdminTawktoController.php
@@ -248,6 +248,12 @@ public function ajaxProcessSetOptions()
             }
         }
 
+        if (!isset($jsonOpts['config_version'])) {
+            $jsonOpts['config_version'] = 0;
+        } else {
+            ++$jsonOpts['config_version'];
+        }
+
         Configuration::updateValue($key, json_encode($jsonOpts));
 
         die(json_encode(['success' => true]));

From 6ddf7e0fe372549bdd7fd8628bd599e6472f228a Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Wed, 12 Mar 2025 14:59:15 +0800
Subject: [PATCH 13/17] store visitor hash in session instead of api key

---
 prestashop1.7/tawkto.php | 63 ++++++++++++++++++++++++++++------------
 prestashop8.x/tawkto.php | 63 ++++++++++++++++++++++++++++------------
 2 files changed, 88 insertions(+), 38 deletions(-)

diff --git a/prestashop1.7/tawkto.php b/prestashop1.7/tawkto.php
index 1ee2938..de054dd 100644
--- a/prestashop1.7/tawkto.php
+++ b/prestashop1.7/tawkto.php
@@ -35,7 +35,7 @@ class Tawkto extends Module
     public const TAWKTO_WIDGET_OPTS = 'TAWKTO_WIDGET_OPTS';
     public const TAWKTO_WIDGET_USER = 'TAWKTO_WIDGET_USER';
     public const TAWKTO_SELECTED_WIDGET = 'TAWKTO_SELECTED_WIDGET';
-    public const TAWKTO_JS_API_KEY = 'TAWKTO_JS_API_KEY';
+    public const TAWKTO_VISITOR_SESSION = 'TAWKTO_VISITOR_SESSION';
 
     /**
      * __construct
@@ -115,7 +115,11 @@ public function hookDisplayFooter()
         $widgetId = $current_widget['widget_id'];
 
         $result = Configuration::get(self::TAWKTO_WIDGET_OPTS);
-        $enable_visitor_recognition = true; // default value
+        // default values
+        $enable_visitor_recognition = true;
+        $js_api_key = '';
+        $config_version = 0;
+
         if ($result) {
             $options = json_decode($result);
             $current_page = (string) $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
@@ -124,6 +128,14 @@ public function hookDisplayFooter()
                 $enable_visitor_recognition = $options->enable_visitor_recognition;
             }
 
+            if (isset($options->js_api_key)) {
+                $js_api_key = $options->js_api_key;
+            }
+
+            if (isset($options->config_version)) {
+                $config_version = $options->config_version;
+            }
+
             // prepare visibility
             if (false == $options->always_display) {
                 // show on specified urls
@@ -181,12 +193,7 @@ public function hookDisplayFooter()
             $customer_name = $customer->firstname . ' ' . $customer->lastname;
             $customer_email = $customer->email;
 
-            try {
-                $key = $this->getJsApiKey($options->js_api_key);
-                $hash = hash_hmac('sha256', $customer_email, $key);
-            } catch (Exception $e) {
-                $hash = '';
-            }
+            $hash = $this->getVisitorHash($customer_email, $js_api_key, $config_version);
         }
 
         $this->context->smarty->assign([
@@ -299,29 +306,47 @@ private function getArrayFromJson($data)
     }
 
     /**
-     * Retrieve JS API key
+     * Get visitor hash
      *
-     * @param string $js_api_key Encrypted JS API key
+     * @param string $email Visitor email
+     * @param string $js_api_key JS API key
+     * @param int $config_version Config version
      *
      * @return string
-     *
-     * @throws Exception error retrieving JS API key
      */
-    private function getJsApiKey(string $js_api_key)
+    private function getVisitorHash(string $email, string $js_api_key, int $config_version)
     {
+        if (isset($_SESSION[self::TAWKTO_VISITOR_SESSION])) {
+            $current_session = $_SESSION[self::TAWKTO_VISITOR_SESSION];
+
+            if (isset($current_session['hash'])
+                && $current_session['email'] === $email
+                && $current_session['config_version'] === $config_version) {
+                return $current_session['hash'];
+            }
+        }
+
         if (empty($js_api_key)) {
-            throw new Exception('JS API key is empty');
+            return '';
         }
 
-        if (isset($_SESSION[self::TAWKTO_JS_API_KEY])) {
-            return $_SESSION[self::TAWKTO_JS_API_KEY];
+        try {
+            $key = $this->getDecryptedData($js_api_key);
+        } catch (Exception $e) {
+            error_log($e->getMessage());
+
+            return '';
         }
 
-        $key = $this->getDecryptedData($js_api_key);
+        $hash = hash_hmac('sha256', $email, $key);
 
-        $_SESSION[self::TAWKTO_JS_API_KEY] = $key;
+        $_SESSION[self::TAWKTO_VISITOR_SESSION] = [
+            'hash' => $hash,
+            'email' => $email,
+            'config_version' => $config_version,
+        ];
 
-        return $key;
+        return $hash;
     }
 
     /**
diff --git a/prestashop8.x/tawkto.php b/prestashop8.x/tawkto.php
index 98ce10e..9c1eb73 100644
--- a/prestashop8.x/tawkto.php
+++ b/prestashop8.x/tawkto.php
@@ -34,7 +34,7 @@ class Tawkto extends Module
     public const TAWKTO_WIDGET_OPTS = 'TAWKTO_WIDGET_OPTS';
     public const TAWKTO_WIDGET_USER = 'TAWKTO_WIDGET_USER';
     public const TAWKTO_SELECTED_WIDGET = 'TAWKTO_SELECTED_WIDGET';
-    public const TAWKTO_JS_API_KEY = 'TAWKTO_JS_API_KEY';
+    public const TAWKTO_VISITOR_SESSION = 'TAWKTO_VISITOR_SESSION';
 
     /**
      * __construct
@@ -114,7 +114,11 @@ public function hookDisplayFooter()
         $widgetId = $current_widget['widget_id'];
 
         $result = Configuration::get(self::TAWKTO_WIDGET_OPTS);
-        $enable_visitor_recognition = true; // default value
+        // default values
+        $enable_visitor_recognition = true;
+        $js_api_key = '';
+        $config_version = 0;
+
         if ($result) {
             $options = json_decode($result);
             $current_page = (string) $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
@@ -123,6 +127,14 @@ public function hookDisplayFooter()
                 $enable_visitor_recognition = $options->enable_visitor_recognition;
             }
 
+            if (isset($options->js_api_key)) {
+                $js_api_key = $options->js_api_key;
+            }
+
+            if (isset($options->config_version)) {
+                $config_version = $options->config_version;
+            }
+
             // prepare visibility
             if (false == $options->always_display) {
                 // show on specified urls
@@ -180,12 +192,7 @@ public function hookDisplayFooter()
             $customer_name = $customer->firstname . ' ' . $customer->lastname;
             $customer_email = $customer->email;
 
-            try {
-                $key = $this->getJsApiKey($options->js_api_key);
-                $hash = hash_hmac('sha256', $customer_email, $key);
-            } catch (Exception $e) {
-                $hash = '';
-            }
+            $hash = $this->getVisitorHash($customer_email, $js_api_key, $config_version);
         }
 
         $this->context->smarty->assign([
@@ -297,29 +304,47 @@ private function getArrayFromJson($data)
     }
 
     /**
-     * Retrieve JS API key
+     * Get visitor hash
      *
-     * @param string $js_api_key Encrypted JS API key
+     * @param string $email Visitor email
+     * @param string $js_api_key JS API key
+     * @param int $config_version Config version
      *
      * @return string
-     *
-     * @throws Exception error retrieving JS API key
      */
-    private function getJsApiKey(string $js_api_key)
+    private function getVisitorHash(string $email, string $js_api_key, int $config_version)
     {
+        if (isset($_SESSION[self::TAWKTO_VISITOR_SESSION])) {
+            $current_session = $_SESSION[self::TAWKTO_VISITOR_SESSION];
+
+            if (isset($current_session['hash'])
+                && $current_session['email'] === $email
+                && $current_session['config_version'] === $config_version) {
+                return $current_session['hash'];
+            }
+        }
+
         if (empty($js_api_key)) {
-            throw new Exception('JS API key is empty');
+            return '';
         }
 
-        if (isset($_SESSION[self::TAWKTO_JS_API_KEY])) {
-            return $_SESSION[self::TAWKTO_JS_API_KEY];
+        try {
+            $key = $this->getDecryptedData($js_api_key);
+        } catch (Exception $e) {
+            error_log($e->getMessage());
+
+            return '';
         }
 
-        $key = $this->getDecryptedData($js_api_key);
+        $hash = hash_hmac('sha256', $email, $key);
 
-        $_SESSION[self::TAWKTO_JS_API_KEY] = $key;
+        $_SESSION[self::TAWKTO_VISITOR_SESSION] = [
+            'hash' => $hash,
+            'email' => $email,
+            'config_version' => $config_version,
+        ];
 
-        return $key;
+        return $hash;
     }
 
     /**

From 83c4535db1a25518197486b36c9a2077dd39a1d0 Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Fri, 21 Mar 2025 10:38:52 +0200
Subject: [PATCH 14/17] move session init to when generating hash

---
 prestashop1.7/tawkto.php | 8 ++++----
 prestashop8.x/tawkto.php | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/prestashop1.7/tawkto.php b/prestashop1.7/tawkto.php
index de054dd..135eb5c 100644
--- a/prestashop1.7/tawkto.php
+++ b/prestashop1.7/tawkto.php
@@ -102,10 +102,6 @@ private function installTab()
      */
     public function hookDisplayFooter()
     {
-        if (session_status() === PHP_SESSION_NONE && !headers_sent()) {
-            session_start();
-        }
-
         $current_widget = self::getPropertyAndWidget();
         if (empty($current_widget)) {
             return '';
@@ -316,6 +312,10 @@ private function getArrayFromJson($data)
      */
     private function getVisitorHash(string $email, string $js_api_key, int $config_version)
     {
+        if (session_status() === PHP_SESSION_NONE && !headers_sent()) {
+            session_start();
+        }
+
         if (isset($_SESSION[self::TAWKTO_VISITOR_SESSION])) {
             $current_session = $_SESSION[self::TAWKTO_VISITOR_SESSION];
 
diff --git a/prestashop8.x/tawkto.php b/prestashop8.x/tawkto.php
index 9c1eb73..98cdd97 100644
--- a/prestashop8.x/tawkto.php
+++ b/prestashop8.x/tawkto.php
@@ -101,10 +101,6 @@ private function installTab()
      */
     public function hookDisplayFooter()
     {
-        if (session_status() === PHP_SESSION_NONE && !headers_sent()) {
-            session_start();
-        }
-
         $current_widget = self::getPropertyAndWidget();
         if (empty($current_widget)) {
             return '';
@@ -314,6 +310,10 @@ private function getArrayFromJson($data)
      */
     private function getVisitorHash(string $email, string $js_api_key, int $config_version)
     {
+        if (session_status() === PHP_SESSION_NONE && !headers_sent()) {
+            session_start();
+        }
+
         if (isset($_SESSION[self::TAWKTO_VISITOR_SESSION])) {
             $current_session = $_SESSION[self::TAWKTO_VISITOR_SESSION];
 

From 013362b4b58b66e55d8f5588d2855131059e94f7 Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Fri, 21 Mar 2025 10:39:39 +0200
Subject: [PATCH 15/17] return null for hash if not generated

---
 prestashop1.7/tawkto.php                      | 8 ++++----
 prestashop1.7/views/templates/hook/widget.tpl | 4 ++--
 prestashop8.x/tawkto.php                      | 8 ++++----
 prestashop8.x/views/templates/hook/widget.tpl | 6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/prestashop1.7/tawkto.php b/prestashop1.7/tawkto.php
index 135eb5c..d45dbfd 100644
--- a/prestashop1.7/tawkto.php
+++ b/prestashop1.7/tawkto.php
@@ -183,7 +183,7 @@ public function hookDisplayFooter()
         // add customer details as visitor info
         $customer_name = '';
         $customer_email = '';
-        $hash = '';
+        $hash = null;
         if ($enable_visitor_recognition && !is_null($this->context->customer->id)) {
             $customer = $this->context->customer;
             $customer_name = $customer->firstname . ' ' . $customer->lastname;
@@ -308,7 +308,7 @@ private function getArrayFromJson($data)
      * @param string $js_api_key JS API key
      * @param int $config_version Config version
      *
-     * @return string
+     * @return string|null
      */
     private function getVisitorHash(string $email, string $js_api_key, int $config_version)
     {
@@ -327,7 +327,7 @@ private function getVisitorHash(string $email, string $js_api_key, int $config_v
         }
 
         if (empty($js_api_key)) {
-            return '';
+            return null;
         }
 
         try {
@@ -335,7 +335,7 @@ private function getVisitorHash(string $email, string $js_api_key, int $config_v
         } catch (Exception $e) {
             error_log($e->getMessage());
 
-            return '';
+            return null;
         }
 
         $hash = hash_hmac('sha256', $email, $key);
diff --git a/prestashop1.7/views/templates/hook/widget.tpl b/prestashop1.7/views/templates/hook/widget.tpl
index 2330a28..ea3d88e 100644
--- a/prestashop1.7/views/templates/hook/widget.tpl
+++ b/prestashop1.7/views/templates/hook/widget.tpl
@@ -23,8 +23,8 @@ var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();
    Tawk_API.visitor = {
         name  : "{$customer_name|escape:'javascript':'UTF-8'}",
         email : "{$customer_email|escape:'javascript':'UTF-8'}",
-        {if $hash != ''}
-            hash : "{$hash|escape:'javascript':'UTF-8'}"
+        {if $hash != null}
+            , hash : "{$hash}"
         {/if}
     };
 {/if}
diff --git a/prestashop8.x/tawkto.php b/prestashop8.x/tawkto.php
index 98cdd97..0aec79f 100644
--- a/prestashop8.x/tawkto.php
+++ b/prestashop8.x/tawkto.php
@@ -182,7 +182,7 @@ public function hookDisplayFooter()
         // add customer details as visitor info
         $customer_name = '';
         $customer_email = '';
-        $hash = '';
+        $hash = null;
         if ($enable_visitor_recognition && !is_null($this->context->customer->id)) {
             $customer = $this->context->customer;
             $customer_name = $customer->firstname . ' ' . $customer->lastname;
@@ -306,7 +306,7 @@ private function getArrayFromJson($data)
      * @param string $js_api_key JS API key
      * @param int $config_version Config version
      *
-     * @return string
+     * @return string|null
      */
     private function getVisitorHash(string $email, string $js_api_key, int $config_version)
     {
@@ -325,7 +325,7 @@ private function getVisitorHash(string $email, string $js_api_key, int $config_v
         }
 
         if (empty($js_api_key)) {
-            return '';
+            return null;
         }
 
         try {
@@ -333,7 +333,7 @@ private function getVisitorHash(string $email, string $js_api_key, int $config_v
         } catch (Exception $e) {
             error_log($e->getMessage());
 
-            return '';
+            return null;
         }
 
         $hash = hash_hmac('sha256', $email, $key);
diff --git a/prestashop8.x/views/templates/hook/widget.tpl b/prestashop8.x/views/templates/hook/widget.tpl
index 2330a28..e43dc5f 100644
--- a/prestashop8.x/views/templates/hook/widget.tpl
+++ b/prestashop8.x/views/templates/hook/widget.tpl
@@ -22,9 +22,9 @@ var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();
 {if $customer_email != ''}
    Tawk_API.visitor = {
         name  : "{$customer_name|escape:'javascript':'UTF-8'}",
-        email : "{$customer_email|escape:'javascript':'UTF-8'}",
-        {if $hash != ''}
-            hash : "{$hash|escape:'javascript':'UTF-8'}"
+        email : "{$customer_email|escape:'javascript':'UTF-8'}"
+        {if $hash != null}
+            , hash : "{$hash}"
         {/if}
     };
 {/if}

From 0af72b8e7123a83a603d0fdf1632dd682a814cfb Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Fri, 21 Mar 2025 10:40:40 +0200
Subject: [PATCH 16/17] add error subclass for better error handling

---
 .../admin/AdminTawktoController.php           | 21 +++++++++++++------
 .../admin/AdminTawktoController.php           | 21 +++++++++++++------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/prestashop1.7/controllers/admin/AdminTawktoController.php b/prestashop1.7/controllers/admin/AdminTawktoController.php
index 7e7bd07..9f4c007 100644
--- a/prestashop1.7/controllers/admin/AdminTawktoController.php
+++ b/prestashop1.7/controllers/admin/AdminTawktoController.php
@@ -21,6 +21,13 @@
     exit;
 }
 
+/**
+ * Tawkto exception
+ */
+class TawktoException extends Exception
+{
+}
+
 /**
  * Admin settings controller
  */
@@ -236,7 +243,11 @@ public function ajaxProcessSetOptions()
             // Process selected options
             $jsonOpts = $this->processSetOptions(Tools::getValue('options'));
         } catch (Exception $e) {
-            die(json_encode(['success' => false, 'message' => $e->getMessage()]));
+            if ($e instanceof TawktoException) {
+                die(json_encode(['success' => false, 'message' => $e->getMessage()]));
+            }
+
+            die(json_encode(['success' => false, 'message' => 'An error occurred while saving options']));
         }
 
         // Override current options/fallback if not selected
@@ -266,7 +277,7 @@ public function ajaxProcessSetOptions()
      *
      * @return array
      *
-     * @throws Exception error processing options
+     * @throws TawktoException Error processing options
      */
     private function processSetOptions(string $params): array
     {
@@ -329,7 +340,7 @@ private function processSetOptions(string $params): array
                     $value = trim($value);
 
                     if (strlen($value) !== 40) {
-                        throw new Exception('Invalid API key.');
+                        throw new TawktoException('Invalid API key.');
                     }
 
                     try {
@@ -337,9 +348,7 @@ private function processSetOptions(string $params): array
                     } catch (Exception $e) {
                         error_log($e->getMessage());
 
-                        unset($jsonOpts['js_api_key']);
-
-                        throw new Exception('Error saving Javascript API Key.');
+                        throw new TawktoException('Error saving Javascript API Key.');
                     }
 
                     break;
diff --git a/prestashop8.x/controllers/admin/AdminTawktoController.php b/prestashop8.x/controllers/admin/AdminTawktoController.php
index 64f49b1..48ccdbf 100644
--- a/prestashop8.x/controllers/admin/AdminTawktoController.php
+++ b/prestashop8.x/controllers/admin/AdminTawktoController.php
@@ -20,6 +20,13 @@
     exit;
 }
 
+/**
+ * Tawkto exception
+ */
+class TawktoException extends Exception
+{
+}
+
 /**
  * Admin settings controller
  */
@@ -236,7 +243,11 @@ public function ajaxProcessSetOptions()
             // Process selected options
             $jsonOpts = $this->processSetOptions(Tools::getValue('options'));
         } catch (Exception $e) {
-            die(json_encode(['success' => false, 'message' => $e->getMessage()]));
+            if ($e instanceof TawktoException) {
+                die(json_encode(['success' => false, 'message' => $e->getMessage()]));
+            }
+
+            die(json_encode(['success' => false, 'message' => 'An error occurred while saving options']));
         }
 
         // Override current options/fallback if not selected
@@ -266,7 +277,7 @@ public function ajaxProcessSetOptions()
      *
      * @return array
      *
-     * @throws Exception Error processing options
+     * @throws TawktoException Error processing options
      */
     private function processSetOptions(string $params): array
     {
@@ -329,7 +340,7 @@ private function processSetOptions(string $params): array
                     $value = trim($value);
 
                     if (strlen($value) !== 40) {
-                        throw new Exception('Invalid API key.');
+                        throw new TawktoException('Invalid API key.');
                     }
 
                     try {
@@ -337,9 +348,7 @@ private function processSetOptions(string $params): array
                     } catch (Exception $e) {
                         error_log($e->getMessage());
 
-                        unset($jsonOpts['js_api_key']);
-
-                        throw new Exception('Error saving Javascript API Key.');
+                        throw new TawktoException('Error saving Javascript API Key.');
                     }
 
                     break;

From 7fb6721a01bf97bf769d968d2800f5dda4fdbaed Mon Sep 17 00:00:00 2001
From: eug-L <eugene4198@gmail.com>
Date: Fri, 21 Mar 2025 12:04:28 +0200
Subject: [PATCH 17/17] move api key to before session init

---
 prestashop1.7/tawkto.php | 8 ++++----
 prestashop8.x/tawkto.php | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/prestashop1.7/tawkto.php b/prestashop1.7/tawkto.php
index d45dbfd..555c7dd 100644
--- a/prestashop1.7/tawkto.php
+++ b/prestashop1.7/tawkto.php
@@ -312,6 +312,10 @@ private function getArrayFromJson($data)
      */
     private function getVisitorHash(string $email, string $js_api_key, int $config_version)
     {
+        if (empty($js_api_key)) {
+            return null;
+        }
+
         if (session_status() === PHP_SESSION_NONE && !headers_sent()) {
             session_start();
         }
@@ -326,10 +330,6 @@ private function getVisitorHash(string $email, string $js_api_key, int $config_v
             }
         }
 
-        if (empty($js_api_key)) {
-            return null;
-        }
-
         try {
             $key = $this->getDecryptedData($js_api_key);
         } catch (Exception $e) {
diff --git a/prestashop8.x/tawkto.php b/prestashop8.x/tawkto.php
index 0aec79f..207803f 100644
--- a/prestashop8.x/tawkto.php
+++ b/prestashop8.x/tawkto.php
@@ -310,6 +310,10 @@ private function getArrayFromJson($data)
      */
     private function getVisitorHash(string $email, string $js_api_key, int $config_version)
     {
+        if (empty($js_api_key)) {
+            return null;
+        }
+
         if (session_status() === PHP_SESSION_NONE && !headers_sent()) {
             session_start();
         }
@@ -324,10 +328,6 @@ private function getVisitorHash(string $email, string $js_api_key, int $config_v
             }
         }
 
-        if (empty($js_api_key)) {
-            return null;
-        }
-
         try {
             $key = $this->getDecryptedData($js_api_key);
         } catch (Exception $e) {