@blotoutio/edgetag-sdk-browser 0.6.8 → 0.7.0

package/index.js

@@ -38,132 +38,6 @@
         });
     }
 
-    const tagStorage = 'edgeTag';
-    const consentKey = 'consent';
-    const keyPrefix = `_worker`;
-
-    const initKey = `${keyPrefix}Store`;
-    const getCookieValue = (key) => {
-        if (!document || !document.cookie) {
-            return '';
-        }
-        const name = `${key}=`;
-        const decodedCookie = decodeURIComponent(document.cookie);
-        const ca = decodedCookie.split(';');
-        for (let i = 0; i < ca.length; i++) {
-            let c = ca[i];
-            while (c.charAt(0) === ' ') {
-                c = c.substring(1);
-            }
-            if (c.indexOf(name) === 0) {
-                return c.substring(name.length, c.length);
-            }
-        }
-        return '';
-    };
-    const saveDataPerKey = (persistType, provider, value, key) => {
-        const storage = getData$1(persistType);
-        if (!storage['data']) {
-            storage['data'] = {};
-        }
-        if (!storage['data'][provider]) {
-            storage['data'][provider] = {};
-        }
-        storage['data'][provider][key] = value;
-        saveData(persistType, storage);
-    };
-    const savePerKey = (persistType, provider, value, key) => {
-        const storage = getData$1(persistType);
-        if (!storage[provider]) {
-            storage[provider] = {};
-        }
-        storage[provider][key] = value;
-        saveData(persistType, storage);
-    };
-    const getDataPerKey = (persistType, provider, key) => {
-        const storage = getData$1(persistType);
-        if (!storage[provider]) {
-            return undefined;
-        }
-        return storage[provider][key];
-    };
-    const saveData = (persistType, value, key = initKey) => {
-        if (persistType === 'session') {
-            saveSession(value, key);
-            return;
-        }
-        saveLocal(value, key);
-    };
-    const getData$1 = (persistType, key = initKey) => {
-        if (persistType === 'session') {
-            return getSession(key);
-        }
-        return getLocal(key);
-    };
-    const saveKV = (data) => {
-        let currentSession = getData$1('session');
-        if (!currentSession) {
-            currentSession = {};
-        }
-        if (!currentSession['kv']) {
-            currentSession['kv'] = {};
-        }
-        currentSession['kv'] = Object.assign(Object.assign({}, currentSession['kv']), data);
-        saveData('session', currentSession);
-    };
-    const saveLocal = (value, key) => {
-        try {
-            if (!localStorage) {
-                return;
-            }
-            localStorage.setItem(key, JSON.stringify(value));
-        }
-        catch (_a) {
-            console.log('Local storage not supported');
-        }
-    };
-    const getLocal = (key) => {
-        try {
-            if (!localStorage) {
-                return {};
-            }
-            const data = localStorage.getItem(key);
-            if (!data) {
-                return {};
-            }
-            return JSON.parse(data) || {};
-        }
-        catch (_a) {
-            return {};
-        }
-    };
-    const saveSession = (value, key) => {
-        try {
-            if (!sessionStorage) {
-                return;
-            }
-            sessionStorage.setItem(key, JSON.stringify(value));
-        }
-        catch (_a) {
-            console.log('Session storage not supported');
-        }
-    };
-    const getSession = (key) => {
-        try {
-            if (!sessionStorage) {
-                return {};
-            }
-            const data = sessionStorage.getItem(key);
-            if (!data) {
-                return {};
-            }
-            return JSON.parse(data) || {};
-        }
-        catch (_a) {
-            return {};
-        }
-    };
-
     let endpointUrl = '';
     const generateUrl = (path) => {
         const endpoint = getUrl();
@@ -224,13 +98,18 @@
             }
             providersPackages[provider.name] = provider;
         });
-        if (window && Array.isArray(window.edgetagProviders)) {
-            window.edgetagProviders.forEach((provider) => {
-                if (!provider.name) {
-                    return;
-                }
-                providersPackages[provider.name] = provider;
-            });
+        try {
+            if (window && Array.isArray(window.edgetagProviders)) {
+                window.edgetagProviders.forEach((provider) => {
+                    if (!provider.name) {
+                        return;
+                    }
+                    providersPackages[provider.name] = provider;
+                });
+            }
+        }
+        catch (_b) {
+            // do nothing
         }
         setUrl(preferences.edgeURL);
         return true;
@@ -247,16 +126,21 @@
     };
 
     const getUserAgent = () => {
-        const nav = navigator;
-        let ua = nav.userAgent;
-        ua += nav.brave ? `${ua} Brave` : '';
-        return ua;
+        try {
+            const nav = navigator;
+            let ua = nav.userAgent;
+            ua += nav.brave ? `${ua} Brave` : '';
+            return ua;
+        }
+        catch (_a) {
+            return '';
+        }
+    };
+    const isProviderIncluded = (providers, providerValue) => {
+        return (providerValue || (providers['all'] === true && providerValue === undefined));
     };
     const allowTag = (providers) => {
-        if (!allowProviders(providers)) {
-            return false;
-        }
-        const consent = getDataPerKey('local', tagStorage, consentKey);
+        const consent = getConsent();
         if (isConsentDisabled()) {
             return true;
         }
@@ -271,19 +155,15 @@
         }
         const allProviders = getAllowedProviders();
         for (const provider of allProviders) {
-            const tagProviderSetting = providers[provider];
-            if (tagProviderSetting ||
-                (providers['all'] === true && tagProviderSetting === undefined) ||
-                (providers['all'] === false && tagProviderSetting === true)) {
-                if (consent[provider]) {
-                    return true;
-                }
+            if (isProviderIncluded(providers, !!providers[provider]) &&
+                consent[provider]) {
+                return true;
             }
         }
         return false;
     };
     const allowProviders = (providers) => {
-        if (!providers || Object.keys(providers).length === 0) {
+        if (!providers || Object.keys(providers).length === 0 || providers['all']) {
             return true;
         }
         const allowedProvider = getAllowedProviders();
@@ -323,7 +203,7 @@
                 return false;
             }
         }
-        const consent = getDataPerKey('local', tagStorage, consentKey);
+        const consent = getConsent();
         if (isConsentDisabled()) {
             return true;
         }
@@ -336,6 +216,148 @@
         return consent[providerId];
     };
 
+    const tagStorage = 'edgeTag';
+    const consentKey = 'consent';
+    const keyPrefix = `_worker`;
+
+    const initKey = `${keyPrefix}Store`;
+    const getCookieValue = (key) => {
+        try {
+            if (!document || !document.cookie) {
+                return '';
+            }
+            const name = `${key}=`;
+            const decodedCookie = decodeURIComponent(document.cookie);
+            const ca = decodedCookie.split(';');
+            for (let i = 0; i < ca.length; i++) {
+                let c = ca[i];
+                while (c.charAt(0) === ' ') {
+                    c = c.substring(1);
+                }
+                if (c.indexOf(name) === 0) {
+                    return c.substring(name.length, c.length);
+                }
+            }
+            return '';
+        }
+        catch (_a) {
+            return '';
+        }
+    };
+    const saveDataPerKey = (persistType, provider, value, key) => {
+        const storage = getData$1(persistType);
+        if (!storage['data']) {
+            storage['data'] = {};
+        }
+        if (!storage['data'][provider]) {
+            storage['data'][provider] = {};
+        }
+        storage['data'][provider][key] = value;
+        saveData(persistType, storage);
+    };
+    const savePerKey = (persistType, provider, value, key) => {
+        const storage = getData$1(persistType);
+        if (!storage[provider]) {
+            storage[provider] = {};
+        }
+        storage[provider][key] = value;
+        saveData(persistType, storage);
+    };
+    const getDataPerKey = (persistType, provider, key) => {
+        const storage = getData$1(persistType);
+        if (!storage[provider]) {
+            return undefined;
+        }
+        return storage[provider][key];
+    };
+    const saveData = (persistType, value, key = initKey) => {
+        if (persistType === 'session') {
+            saveSession(value, key);
+            return;
+        }
+        saveLocal(value, key);
+    };
+    const getData$1 = (persistType, key = initKey) => {
+        if (persistType === 'session') {
+            return getSession(key);
+        }
+        return getLocal(key);
+    };
+    const saveKV = (data) => {
+        let currentSession = getData$1('session');
+        if (!currentSession) {
+            currentSession = {};
+        }
+        if (!currentSession['kv']) {
+            currentSession['kv'] = {};
+        }
+        currentSession['kv'] = Object.assign(Object.assign({}, currentSession['kv']), data);
+        saveData('session', currentSession);
+    };
+    const saveLocal = (value, key) => {
+        try {
+            if (!localStorage) {
+                return;
+            }
+            localStorage.setItem(key, JSON.stringify(value));
+        }
+        catch (_a) {
+            console.log('Local storage not supported');
+        }
+    };
+    const getLocal = (key) => {
+        try {
+            if (!localStorage) {
+                return {};
+            }
+            const data = localStorage.getItem(key);
+            if (!data) {
+                return {};
+            }
+            return JSON.parse(data) || {};
+        }
+        catch (_a) {
+            return {};
+        }
+    };
+    const saveSession = (value, key) => {
+        try {
+            if (!sessionStorage) {
+                return;
+            }
+            sessionStorage.setItem(key, JSON.stringify(value));
+        }
+        catch (_a) {
+            console.log('Session storage not supported');
+        }
+    };
+    const getSession = (key) => {
+        try {
+            if (!sessionStorage) {
+                return {};
+            }
+            const data = sessionStorage.getItem(key);
+            if (!data) {
+                return {};
+            }
+            return JSON.parse(data) || {};
+        }
+        catch (_a) {
+            return {};
+        }
+    };
+
+    let initUserId = '';
+    const handleGetUserId = () => {
+        if (initUserId) {
+            return initUserId;
+        }
+        return getCookieValue('tag_user_id');
+    };
+    const setUserId = (userId) => {
+        initUserId = userId;
+    };
+
     const beacon = (url, payload) => {
         let blob;
         if (payload) {
@@ -349,6 +371,7 @@
             headers: {
                 'Content-type': 'application/json; charset=utf-8',
                 Accept: 'application/json; charset=utf-8',
+                EdgeTagUserId: handleGetUserId(),
             },
             body: JSON.stringify(payload),
             credentials: 'include',
@@ -367,7 +390,14 @@
         });
     });
     const getStandardPayload = (payload) => {
-        const data = Object.assign({ pageUrl: window.location.href, userAgent: getUserAgent() }, (payload || {}));
+        let pageUrl;
+        try {
+            pageUrl = window.location.href;
+        }
+        catch (_a) {
+            pageUrl = '';
+        }
+        const data = Object.assign({ pageUrl, userAgent: getUserAgent() }, (payload || {}));
         let storage = {};
         const session = getData$1('session');
         if (session) {
@@ -409,7 +439,9 @@
     const info = (data) => {
     };
 
+    let memoryConsent;
     const saveConsent = (consent) => {
+        setConsent(consent);
         savePerKey('local', tagStorage, consent, consentKey);
     };
     const handleConsent = (consent) => {
@@ -419,6 +451,16 @@
         saveConsent(consent);
         postRequest(getConsentURL(), payload).catch(info);
     };
+    const setConsent = (newConsent) => {
+        memoryConsent = newConsent;
+    };
+    const getConsent = () => {
+        const storageConsent = getDataPerKey('local', tagStorage, consentKey);
+        if (storageConsent) {
+            return storageConsent;
+        }
+        return memoryConsent;
+    };
 
     // Unique ID creation requires a high quality random # generator. In the browser we therefore
     // require the crypto API and do not support built-in fallback to lower quality random number
@@ -912,10 +954,6 @@
         return `${btoa(name)}-${v4()}-${time}`;
     };
 
-    const handleGetUserId = () => {
-        return getCookieValue('tag_user_id');
-    };
-
     const manifestVariables = {};
     const addProviderVariable = (name, variables) => {
         manifestVariables[name] = variables;
@@ -934,6 +972,7 @@
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             stubs.forEach((stub) => api$1[stub.name](...(stub.arguments || [])));
+            stubs = [];
         }
         catch (e) {
             console.error(e);
@@ -942,6 +981,7 @@
 
     const sendTag = ({ eventName, eventId, data, providerData, providers, options, }) => {
         if (!allowProviders(providers)) {
+            console.log('Provider is not allowed.');
             return;
         }
         const payload = {
@@ -964,6 +1004,10 @@
             });
             return;
         }
+        if (!allowProviders(providers)) {
+            console.log('Provider is not allowed.');
+            return;
+        }
         if (!allowTag(providers)) {
             console.log('No consent');
             return;
@@ -1028,7 +1072,12 @@
         handleData({ [`${provider}::${key}`]: value });
     };
     const handleCaptureQuery = (provider, key, persistType) => {
-        if (!window) {
+        try {
+            if (!window) {
+                return;
+            }
+        }
+        catch (_a) {
             return;
         }
         const params = new URLSearchParams(window.location.search);
@@ -1047,19 +1096,24 @@
     };
     const handleCaptureStorage = (provider, key, persistType, location) => {
         let data;
-        switch (location) {
-            case 'cookie': {
-                data = getCookieValue(key);
-                break;
-            }
-            case 'local': {
-                data = getData$1('local', key);
-                break;
-            }
-            case 'session': {
-                data = getData$1('session', key);
+        try {
+            switch (location) {
+                case 'cookie': {
+                    data = getCookieValue(key);
+                    break;
+                }
+                case 'local': {
+                    data = localStorage.getItem(key);
+                    break;
+                }
+                case 'session': {
+                    data = sessionStorage.getItem(key);
+                }
             }
         }
+        catch (_a) {
+            return;
+        }
         if (!data) {
             return;
         }
@@ -1125,6 +1179,7 @@
             saveConsent({ all: true });
         }
         if (preferences.userId) {
+            setUserId(preferences.userId);
             url.searchParams.set('userId', preferences.userId);
         }
         getRequest(url.href)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blotoutio/edgetag-sdk-browser",
-  "version": "0.6.8",
+  "version": "0.7.0",
   "description": "Browser SDK for EdgeTag",
   "author": "Blotout",
   "license": "MIT",