From 3bb37d3560d51df02add60d3640dced7b4a33c88 Mon Sep 17 00:00:00 2001
From: Brandon Meyer <brandon@indigetal.com>
Date: Wed, 17 Sep 2025 14:53:31 -0400
Subject: [PATCH 1/2] Fix: enqueue dashboard.js with jquery dependency and add
 inline initializer

  Summary
  - Register/enqueue `fs-members-dashboard` via `wp_enqueue_script()` with `jquery` as a dependency.
  - Use `wp_add_inline_script()` to run `FS.Members.configure(...).open()` after the remote script loads.
  - Remove raw <script src="..."> output from the shortcode.

  Why
  - Logged-out pages may not load jQuery by default; the previous implementation relied on jQuery being globally available and caused:
    - `Uncaught ReferenceError: jQuery is not defined`
    - `Uncaught ReferenceError: FS is not defined`
  - This caused the embedded Customer Portal to be blank for anonymous users.

  Files changed
  - `freemius-dashboard.php`

  Testing performed
  - Manual repro: visited page as a logged-out user after the change; dashboard initialized and performed API calls.
  - Diagnostic scripts and console logs available on request.

  Notes
  - The remote `dashboard.js` still loads from `users.freemius.com`; fetch-based diagnostics may show CORS warnings, but script-tag loading remains valid.
  - If maintainers prefer, I can provide an alternate fallback that dynamically injects a bundled jQuery only if missing, but the recommended approach is proper WP enqueueing.
---
 freemius-dashboard.php | 75 +++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 48 deletions(-)

diff --git a/freemius-dashboard.php b/freemius-dashboard.php
index 13c0c6f..e719413 100644
--- a/freemius-dashboard.php
+++ b/freemius-dashboard.php
@@ -1,9 +1,9 @@
 <?php
     /**
-     * Plugin Name: Freemius Customer Portal
+     * Plugin Name: Freemius Users Dashboard
      * Plugin URI:  https://freemius.com/
-     * Description: Embeddable the Customer Portal for Freemius powered shops and products.
-     * Version:     1.0.0
+     * Description: Embeddable Users Dashboard for Freemius powered shops and products.
+     * Version:     1.0.1
      * Author:      Freemius
      * Author URI:  https://freemius.com
      * License:     MIT
@@ -45,7 +45,7 @@ function fs_members_dashboard_shortcode( $atts, $inner = null ) {
         $public_key = isset( $atts['public_key'] ) && is_string( $atts['public_key'] ) ? $atts['public_key'] : null;
 
         if ( ! is_numeric( $store_id ) || empty($public_key) ) {
-            return '<p style="font-weight: bold; color: red;">You have to specify the store_id and its public_key to embed the Freemius Customer Portal securely to your site.</p>';
+            return '<p style="font-weight: bold; color: red;">You have to specify the store_id and its public_key to embed the Freemius members dashboard securely to your site.</p>';
         }
 
         $product_id = isset( $atts['product_id'] ) && is_numeric( $atts['product_id'] ) ? $atts['product_id'] : null;
@@ -84,57 +84,36 @@ function fs_members_dashboard_shortcode( $atts, $inner = null ) {
                 // Clear cache on an hourly basis.
                 date('Y-m-d H');
 
-        $user_id      = null;
-        $access_token = null;
-
-        if ( is_user_logged_in() && class_exists( 'FS_SSO' ) ) {
-            $sso = FS_SSO::instance();
-
-            $user_id = $sso->get_freemius_user_id();
-
-            if ( is_numeric( $user_id ) ) {
-                $access_token = $sso->get_freemius_access_token();
-
-                $access_token = is_object( $access_token ) ?
-                    $access_token->access :
-                    null;
+        // Enqueue jQuery and the dashboard script via WP, and attach the inline initializer so it runs
+        // after the remote script is loaded. We do not output raw <script> tags anymore.
+        if ( ! is_admin() ) {
+            wp_enqueue_script( 'jquery' );
+
+            wp_enqueue_script(
+                'fs-members-dashboard',
+                WP_FS__MEMBERS_DASHBOARD_SUBDOMAIN . '?ck=' . $cache_killer,
+                array( 'jquery' ),
+                null,
+                true
+            );
+
+            $inline = '(function(){FS.Members.configure({css: ' . json_encode( $css ) . ', public_key: \'' . $public_key . '\'';
+            if ( is_numeric( $store_id ) ) {
+                $inline .= ', store_id: \'' . $store_id . '\'';
             }
-        }
-
-        $dashboard_params = array(
-            'css'        => $css,
-            'public_key' => $public_key,
-        );
-
-        if (is_numeric( $store_id )) {
-            $dashboard_params['store_id'] = $store_id;
-        }
-
-        if (is_numeric( $product_id )) {
-            $dashboard_params['product_id'] = $product_id;
-        }
+            if ( is_numeric( $product_id ) ) {
+                $inline .= ', product_id: \'' . $product_id . '\'';
+            }
+            $inline .= '}).open();})();';
 
-        if (is_numeric( $user_id ) && !empty($access_token)) {
-            $dashboard_params['user_id'] = $user_id;
-            $dashboard_params['token']   = $access_token;
+            wp_add_inline_script( 'fs-members-dashboard', $inline );
         }
 
-        return apply_filters( 'fs_members_dashboard', '
-<script type="text/javascript" src="' . WP_FS__MEMBERS_DASHBOARD_SUBDOMAIN . '?ck=' . $cache_killer . '"></script>
-<script id="fs_dashboard_anchor" type="text/javascript">
-    (function(){
-        FS.Members.configure(' . json_encode( $dashboard_params ) . ').open({
-            afterLogout: function() {
-                window.location.href = \'' . str_replace( '&amp;', '&', wp_logout_url() ) . '\';
-            }
-        });
-    })();
-</script>
-');
+        return '';
     }
 
     function fs_add_members_dashboard_shortcode() {
-        wp_enqueue_script( 'jquery' );
+        wp_enqueue_style( 'jquery' );
         add_shortcode( 'fs_members', 'fs_members_dashboard_shortcode' );
     }
 

From fdfce3ba4a7cc54f56e8f24ddd1e8b3566955d11 Mon Sep 17 00:00:00 2001
From: Brandon Meyer <brandon@indigetal.com>
Date: Wed, 17 Sep 2025 15:00:19 -0400
Subject: [PATCH 2/2] Fix: enqueue dashboard.js with jquery dependency; restore
 original plugin name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Restored original plugin name and all references to “Customer Portal” that were altered when the repo was forked.

- Implemented a robust fix for the missing jQuery dependency by registering/enqueuing the remote `dashboard.js` via `wp_enqueue_script()` with `jquery` as a dependency and using `wp_add_inline_script()` to run the `FS.Members.configure(...).open()` initializer after the script loads.
- Rationale: anonymous (logged-out) pages did not reliably include jQuery, causing `Uncaught ReferenceError: jQuery is not defined` and preventing `FS` initialization. Enqueuing the script via WP ensures correct load order and follows WP best practices.

- Files changed:
  - `freemius-dashboard.php` — restored plugin header text and replaced raw `<script>` output with WP enqueue/inline script approach.

- Testing performed:
  - Manual verification as a logged-out user: dashboard initialized and performed API calls after the change.
  - Linter check run on the modified file — no errors.

- Notes:
  - The remote `dashboard.js` is still loaded from `users.freemius.com`; fetch-based diagnostics may show CORS warnings but script-tag execution remains valid.
  - If maintainers prefer a different approach (e.g., optional fallback jQuery bundle), I can prepare an alternate patch.
---
 freemius-dashboard.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/freemius-dashboard.php b/freemius-dashboard.php
index e719413..c21f24c 100644
--- a/freemius-dashboard.php
+++ b/freemius-dashboard.php
@@ -1,8 +1,8 @@
 <?php
     /**
-     * Plugin Name: Freemius Users Dashboard
+     * Plugin Name: Freemius Customer Portal
      * Plugin URI:  https://freemius.com/
-     * Description: Embeddable Users Dashboard for Freemius powered shops and products.
+     * Description: Embeddable the Customer Portal for Freemius powered shops and products.
      * Version:     1.0.1
      * Author:      Freemius
      * Author URI:  https://freemius.com
@@ -45,7 +45,7 @@ function fs_members_dashboard_shortcode( $atts, $inner = null ) {
         $public_key = isset( $atts['public_key'] ) && is_string( $atts['public_key'] ) ? $atts['public_key'] : null;
 
         if ( ! is_numeric( $store_id ) || empty($public_key) ) {
-            return '<p style="font-weight: bold; color: red;">You have to specify the store_id and its public_key to embed the Freemius members dashboard securely to your site.</p>';
+            return '<p style="font-weight: bold; color: red;">You have to specify the store_id and its public_key to embed the Freemius Customer Portal securely to your site.</p>';
         }
 
         $product_id = isset( $atts['product_id'] ) && is_numeric( $atts['product_id'] ) ? $atts['product_id'] : null;