Merge pull request #23 from aesirxio/opt-out-consent

Opt-Out Consent fix reload

Author: vietredweb

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aesirx-consent",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "license": "GPL-3.0-only",
   "author": "AesirX",
   "repository": "https://github.com/aesirxio/consent",

src/Components/ConsentCustom.tsx

@@ -313,8 +313,7 @@ const ConsentComponentCustomApp = (props: any) => {
     }
   };
 
-  const handleAgree = async (visitor_uuid?: string) => {
-    const uuidConsent = visitor_uuid ?? uuid;
+  const handleAgree = async () => {
     try {
       let flag = true;
       // Wallets
@@ -381,7 +380,7 @@ const ConsentComponentCustomApp = (props: any) => {
           await agreeConsents(
             endpoint,
             level,
-            uuidConsent,
+            uuid,
             consents,
             account,
             signature,
@@ -413,7 +412,7 @@ const ConsentComponentCustomApp = (props: any) => {
         }
       } else {
         setLoading('saving');
-        const consentList = await getConsents(endpoint, uuidConsent);
+        const consentList = await getConsents(endpoint, uuid);
         consents.forEach(async (consent) => {
           const existConsent = consentList.find((item: any) => item?.consent === consent);
           if (!existConsent) {
@@ -424,7 +423,7 @@ const ConsentComponentCustomApp = (props: any) => {
                 : disabledBlockDomains?.length || window['disabledBlockJSDomains']?.length
                   ? 5
                   : 1,
-              uuidConsent,
+              uuid,
               consent,
               null,
               null,
@@ -446,7 +445,7 @@ const ConsentComponentCustomApp = (props: any) => {
                 : disabledBlockDomains?.length || window['disabledBlockJSDomains']?.length
                   ? 5
                   : 1,
-              uuidConsent,
+              uuid,
               consent,
               null,
               null,
@@ -462,7 +461,7 @@ const ConsentComponentCustomApp = (props: any) => {
       }
 
       if (flag && (account || level < 3)) {
-        sessionStorage.setItem('aesirx-analytics-uuid', uuidConsent);
+        sessionStorage.setItem('aesirx-analytics-uuid', uuid);
         sessionStorage.setItem('aesirx-analytics-allow', '1');
 
         setShow(false);
@@ -760,16 +759,11 @@ const ConsentComponentCustomApp = (props: any) => {
     }
     const init = async () => {
       const isAnalyticsEnabled = window['aesirx-analytics-enable'] === 'true';
-      const isOptOutMode = window['aesirxOptOutMode'] === 'true';
       const disableGPC = window['disableGPCsupport'] === 'true';
       const hasGlobalPrivacyControl = (navigator as any).globalPrivacyControl;
       const shouldStartTracking =
         (!analyticsContext?.setUUID && !isAnalyticsEnabled) ||
         (analyticsContext?.setUUID && isAnalyticsEnabled);
-      const isConsented =
-        showRevoke ||
-        (sessionStorage.getItem('aesirx-analytics-revoke') &&
-          sessionStorage.getItem('aesirx-analytics-revoke') !== '0');
 
       if (shouldStartTracking) {
         const response = await startTracker(endpoint, '', '', '', window['attributes']);
@@ -786,10 +780,6 @@ const ConsentComponentCustomApp = (props: any) => {
               window['event_uuid'] = response.event_uuid;
             }
           }
-
-          if (isOptOutMode && !isConsented && !isRejected) {
-            handleAgree(response.visitor_uuid);
-          }
         }
       }
 
@@ -800,6 +790,21 @@ const ConsentComponentCustomApp = (props: any) => {
     init();
   }, []);
 
+  useEffect(() => {
+    const isOptOutMode = window['aesirxOptOutMode'] === 'true';
+    const isRejected = sessionStorage.getItem('aesirx-analytics-rejected') === 'true';
+    const isConsented =
+      showRevoke ||
+      (sessionStorage.getItem('aesirx-analytics-revoke') &&
+        sessionStorage.getItem('aesirx-analytics-revoke') !== '0');
+    const uuid = sessionStorage.getItem('aesirx-analytics-uuid');
+    if (uuid) {
+      if (isOptOutMode && !isConsented && !isRejected) {
+        handleAgree();
+      }
+    }
+  }, [showRevoke, show]);
+
   useEffect(() => {
     (gtagId || gtmId) && loadConsentDefault(gtagId, gtmId);
   }, [layout, gtagId, gtmId]);

src/Hooks/useConsentStatus.ts

@@ -66,15 +66,15 @@ const useConsentStatus = (endpoint?: string, layout?: string, props?: WalletConn
           endpoint,
           isUsingAnalytics ? analyticsContext.visitor_uuid : consentContext.visitor_uuid
         );
+        sessionStorage.setItem(
+          'aesirx-analytics-uuid',
+          isUsingAnalytics ? analyticsContext.visitor_uuid : consentContext.visitor_uuid
+        );
         if (consentList?.length === 0) {
           setShow(true);
           sessionStorage.removeItem('aesirx-analytics-allow');
         } else {
           if (level > 1) {
-            sessionStorage.setItem(
-              'aesirx-analytics-uuid',
-              isUsingAnalytics ? analyticsContext.visitor_uuid : consentContext.visitor_uuid
-            );
             sessionStorage.setItem('aesirx-analytics-allow', '1');
             handleRevoke(true, '1');
           }