🐛 (wp) Fix wordpress user parsing

baptisteArno · Mar 28, 2023 · cbeb275 · cbeb275
1 parent b788272
commit cbeb275
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/packages/embeds/wordpress/package.json b/packages/embeds/wordpress/package.json
@@ -1,17 +1,17 @@
 {
   "name": "@typebot.io/wordpress",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "main": "index.js",
   "repository": "https://github.com/baptisteArno/typebot.io",
   "author": "baptisteArno",
   "license": "AGPL-3.0-or-later",
   "devDependencies": {
     "@prettier/plugin-php": "0.19.4",
-    "prettier": "2.8.4"
+    "prettier": "2.8.7"
   },
   "scripts": {
     "deploy": "pnpm copy && pnpm commit",
-    "copy": "svn copy ./trunk ./tags/3.1.6",
-    "commit": "svn ci -m 'Fix default apiHost typo'"
+    "copy": "svn copy ./trunk ./tags/3.1.7",
+    "commit": "svn ci -m 'Fix wordpress user prefill variables'"
   }
 }
diff --git a/packages/embeds/wordpress/trunk/README.txt b/packages/embeds/wordpress/trunk/README.txt
@@ -5,7 +5,7 @@ Requires at least: 5.0
 Tested up to: 6.0
 License: GPL 2.0
 License URI: http://www.gnu.org/licenses/gpl-2.0.txt
-Stable Tag: 3.1.6
+Stable Tag: 3.1.7
 
 == Description ==
 Collect 4x more responses with conversational apps using Typebot.
@@ -24,6 +24,9 @@ This plugin relies on Typebot which is a tool that allows you to create conversa
 3. Activate your Typebot with the "Typebot" admin button located in the sidebar
 
 == Changelog ==
+= 3.1.7 =
+* Fix forwarded user prefilled variables 
+
 = 3.1.6 =
 * Fix default apiHost typo
 

diff --git a/packages/embeds/wordpress/trunk/public/class-typebot-public.php b/packages/embeds/wordpress/trunk/public/class-typebot-public.php
@@ -10,19 +10,19 @@ function parse_wp_user()
       echo '<script>
       if(typeof window.typebotWpUser === "undefined"){
       window.typebotWpUser = {
-          wp_id:"' .
+          "WP ID":"' .
         $wp_user->ID .
         '",
-          wp_username:"' .
+          "WP Username":"' .
         $wp_user->user_login .
         '",
-          wp_email:"' .
+          "WP Email":"' .
         $wp_user->user_email .
         '",
-          wp_first_name:"' .
+          "WP First name":"' .
         $wp_user->user_firstname .
         '",
-          wp_last_name:"' .
+          "WP Last name":"' .
         $wp_user->user_lastname .
         '",
         }
@@ -65,7 +65,7 @@ function typebot_script()
 					return windowPath !== excludePath;
 				})) {
           ' . get_option('init_snippet') . '
-          Typebot.setPrefilledVariables({ typebotWpUser });
+          Typebot.setPrefilledVariables({ ...typebotWpUser });
           
         }';
       }
@@ -101,7 +101,7 @@ public function add_typebot_container($attributes = [])
 
     $bot_initializer = '<script type="module">
     import Typebot from "' . $lib_url . '"
-    Typebot.initStandard({ apiHost: "' . $api_host . '", id: "' . $id . '", typebot: "' . $typebot . '", prefilledVariables: { typebotWpUser } });</script>';
+    Typebot.initStandard({ apiHost: "' . $api_host . '", id: "' . $id . '", typebot: "' . $typebot . '", prefilledVariables: { ...typebotWpUser } });</script>';
 
     return  '<typebot-standard id="' . $id . '" style="width: ' . $width . '; height: ' . $height . ';"></typebot-standard>' . $bot_initializer;
   }

diff --git a/packages/embeds/wordpress/trunk/typebot.php b/packages/embeds/wordpress/trunk/typebot.php
@@ -3,7 +3,7 @@
 /**
  * Plugin Name:       Typebot
  * Description:       Convert more with conversational forms
- * Version:           3.1.6
+ * Version:           3.1.7
  * Author:            Typebot
  * Author URI:        http://typebot.io/
  * License:           GPL-2.0+
@@ -16,7 +16,7 @@
   die();
 }
 
-define('TYPEBOT_VERSION', '3.1.6');
+define('TYPEBOT_VERSION', '3.1.7');
 
 function activate_typebot()
 {