Changeset 3384845

Timestamp:

10/26/2025 09:05:39 PM (4 months ago)

Author:

digitload330

Message:

MAJ Audit

Location:

fitconsent-cmp/trunk

Files:

• fitconsent-cmp.php (modified) (3 diffs)
• js/integration.js (modified) (3 diffs)

fitconsent-cmp/trunk/fitconsent-cmp.php

@@ -4 +4 @@
  * Plugin URI:        https://app.fitconsent.com
  * Description:       Integrates the FitConsent Consent Management Platform with WordPress and the WP Consent API for Google Site Kit compatibility.
- * Version:           1.0.1
+ * Version:           1.0.2
  * Author:            FitConsent
  * Author URI:        https://fitconsent.com
@@ -16 +16 @@
 }
 
-define( 'FITCONSENT_VERSION', '1.0.1' );
+define( 'FITCONSENT_VERSION', '1.0.2' );
 define( 'FITCONSENT_PLUGIN_FILE', __FILE__ );
 define( 'FITCONSENT_PLUGIN_PATH', plugin_dir_path( FITCONSENT_PLUGIN_FILE ) );
@@ -49 +49 @@
             'fitconsent-wp-integration',
             plugins_url( 'js/integration.js', FITCONSENT_PLUGIN_FILE ),
-            [], // No dependencies, it will wait for the consent event
+            [ 'wp-consent-api' ], // Explicitly depend on the WP Consent API.
             FITCONSENT_VERSION,
             true

fitconsent-cmp/trunk/js/integration.js

@@ -2 +2 @@
  * FitConsent - WP Consent API Integration
  *
- * This script listens for the FitConsent banner's consent event and translates it
- * into a WP Consent API update, ensuring compatibility with Google Site Kit.
+ * This script sets a default consent state on page load and then listens for the
+ * FitConsent banner's consent event to update the WP Consent API, ensuring
+ * compatibility with Google Site Kit.
  */
-(function () {
+(function (wp) {
     'use strict';
 
@@ -21 +22 @@
 
     /**
+     * Creates a baseline consent state object, denying all optional categories.
+     * @returns {Object} The baseline consent state.
+     */
+    function createBaselineConsentState() {
+        const state = {};
+        for (const key in categoryMap) {
+            const wpCategory = categoryMap[key];
+            state[wpCategory] = (wpCategory === 'necessary') ? 'allow' : 'deny';
+        }
+        return state;
+    }
+
+    /**
+     * Sets the default consent state before the user has interacted with the banner.
+     */
+    function setDefaultConsentState() {
+        if (wp && wp.set_consent) {
+            const defaultState = createBaselineConsentState();
+            console.log('FitConsent cmp: Setting default WP Consent API state:', defaultState);
+            wp.set_consent('page', defaultState);
+        }
+    }
+
+    /**
      * Handles the consent update from the FitConsent banner.
      * @param {Event} event The custom event fired by the banner.
@@ -31 +56 @@
 
         const choices = event.detail.choices;
-        const consentType = 'page'; // 'page' or 'session'
-        const consentState = {};
-        
-        let allAccepted = true;
+        const consentType = 'page';
+
+        const consentState = createBaselineConsentState();
 
         for (const fitconsentCategory in choices) {
             if (Object.prototype.hasOwnProperty.call(choices, fitconsentCategory)) {
-                const wpCategory = categoryMap[fitconsentCategory] || fitconsentCategory;
-                const consentValue = choices[fitconsentCategory] ? 'allow' : 'deny';
+                // Use the mapped category if it exists, otherwise fall back to the original name.
+                // This ensures custom categories are passed through correctly.
+                const wpCategory = categoryMap[fitconsentCategory] ?? fitconsentCategory;
 
-                if (consentValue === 'deny') {
-                    allAccepted = false;
+                if (choices[fitconsentCategory]) {
+                    consentState[wpCategory] = 'allow';
                 }
-                
-                consentState[wpCategory] = consentValue;
             }
         }
-        
-        // Ensure all standard categories have a defined state.
-        if (allAccepted) {
-            consentState.statistics = 'allow';
-            consentState.marketing = 'allow';
-        } else {
-             if (typeof consentState.statistics === 'undefined') consentState.statistics = 'deny';
-             if (typeof consentState.marketing === 'undefined') consentState.marketing = 'deny';
-        }
-
 
         // Use the WP Consent API to set the consent state.
-        if (window.wp_set_consent) {
+        if (wp && wp.set_consent) {
             console.log('FitConsent cmp: Updating WP Consent API with state:', consentState);
-            window.wp_set_consent(consentType, consentState);
+            wp.set_consent(consentType, consentState);
         } else {
             console.warn('FitConsent cmp: WP Consent API (wp_set_consent) not found.');
         }
     }
-    
-    // Listen for the custom event dispatched by the FitConsent banner upon user interaction.
-    // We assume the banner script will dispatch a `fitconsent:consentUpdated` event.
-    // The banner script needs to be modified to do this.
+
+    // Set the default state as soon as this script runs.
+    setDefaultConsentState();
+
+    // Listen for the custom event dispatched by the FitConsent banner.
     document.addEventListener('fitconsent:consentUpdated', handleConsentUpdate);
 
-})();
+})(window);