@blotoutio/edgetag-sdk-browser 0.7.0 → 0.7.1

package/README.md

@@ -1,3 +1,3 @@
 # EdgeTag SDK Browser
 
-More info on https://app.edgetag.io/integration/js
+More info on https://app.edgetag.io/docs/js

package/index.js

@@ -125,6 +125,39 @@
         allowedProvider = providers;
     };
 
+    const checkConsent = (providers) => {
+        if (isConsentDisabled()) {
+            return true;
+        }
+        const consent = getConsent();
+        if (!consent) {
+            return false;
+        }
+        const consentLength = Object.keys(consent).length;
+        if (!consentLength || (consentLength === 1 && consent['all'] === false)) {
+            return false;
+        }
+        const providersLength = Object.keys(providers || {}).length;
+        if (!providers ||
+            providersLength === 0 ||
+            (providersLength === 1 && providers['all'])) {
+            return (Object.values(consent).find((isAllowed) => isAllowed) || false);
+        }
+        for (const [key, value] of Object.entries(providers)) {
+            if (value === false || consent[key] === false) {
+                continue;
+            }
+            // we have consent
+            if (consent[key] ||
+                (consent['all'] === true && consent[key] === undefined)) {
+                // we have provider
+                if (value || (providers['all'] && providers[key] === undefined)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    };
     const getUserAgent = () => {
         try {
             const nav = navigator;
@@ -140,23 +173,20 @@
         return (providerValue || (providers['all'] === true && providerValue === undefined));
     };
     const allowTag = (providers) => {
-        const consent = getConsent();
-        if (isConsentDisabled()) {
-            return true;
-        }
-        if (!consent) {
+        if (!checkConsent(providers)) {
             return false;
         }
-        if (consent['all']) {
+        const providersLength = Object.values(providers || {}).length;
+        if (!providers || providersLength === 0) {
             return true;
         }
-        if (!providers) {
-            return (Object.values(consent).find((isAllowed) => isAllowed) || false);
-        }
         const allProviders = getAllowedProviders();
+        const allProvidersLength = Object.keys(allProviders || {}).length;
+        if (allProvidersLength === 0) {
+            return true;
+        }
         for (const provider of allProviders) {
-            if (isProviderIncluded(providers, !!providers[provider]) &&
-                consent[provider]) {
+            if (isProviderIncluded(providers, providers[provider])) {
                 return true;
             }
         }
@@ -195,25 +225,15 @@
         if (!allowProvider(providerId)) {
             return false;
         }
+        if (!checkConsent(providers)) {
+            return false;
+        }
         if (providers && Object.keys(providers).length) {
-            const tagProvider = providers[providerId];
-            if (!(tagProvider ||
-                (providers['all'] === true && tagProvider === undefined) ||
-                (providers['all'] === false && tagProvider === true))) {
+            if (!isProviderIncluded(providers, providers[providerId])) {
                 return false;
             }
         }
-        const consent = getConsent();
-        if (isConsentDisabled()) {
-            return true;
-        }
-        if (!consent) {
-            return false;
-        }
-        if (consent['all']) {
-            return true;
-        }
-        return consent[providerId];
+        return true;
     };
 
     const tagStorage = 'edgeTag';
@@ -358,21 +378,70 @@
         initUserId = userId;
     };
 
+    const getHeaders = () => ({
+        'Content-type': 'application/json; charset=utf-8',
+        Accept: 'application/json; charset=utf-8',
+        EdgeTagUserId: handleGetUserId(),
+    });
     const beacon = (url, payload) => {
-        let blob;
-        if (payload) {
-            blob = new Blob([JSON.stringify(payload)], { type: 'application/json' });
+        try {
+            let blob;
+            if (payload) {
+                blob = new Blob([JSON.stringify(payload)], { type: 'application/json' });
+            }
+            return navigator.sendBeacon(url, blob);
+        }
+        catch (e) {
+            console.log('Beacon not supported.');
+            return Promise.reject(new Error('Beacon not supported'));
         }
-        return navigator.sendBeacon(url, blob);
     };
+    const fallbackAjax = (method, url, payload) => __awaiter(void 0, void 0, void 0, function* () {
+        const https = yield import('https');
+        const options = {
+            method,
+            headers: getHeaders(),
+        };
+        return new Promise((resolve, reject) => {
+            const req = https.request(url, options, (res) => {
+                res.on('data', (data) => {
+                    try {
+                        data = JSON.parse(data);
+                    }
+                    catch (_a) {
+                        // do nothing
+                    }
+                    resolve({
+                        body: data,
+                        status: res.statusCode || 500,
+                    });
+                });
+            });
+            req.on('error', (e) => {
+                reject(new Error(e.message));
+            });
+            if (payload && method !== 'GET') {
+                req.write(JSON.stringify(payload));
+            }
+            req.end();
+        });
+    });
     const ajax = (method, url, payload) => __awaiter(void 0, void 0, void 0, function* () {
+        if (typeof fetch === 'undefined') {
+            return yield fallbackAjax(method, url, payload)
+                .then((data) => {
+                if (data.status < 200 || data.status >= 300) {
+                    return Promise.reject(new Error(JSON.stringify(data.body)));
+                }
+                return Promise.resolve(data.body);
+            })
+                .catch((error) => {
+                return Promise.reject(new Error(error));
+            });
+        }
         return yield fetch(url, {
             method,
-            headers: {
-                'Content-type': 'application/json; charset=utf-8',
-                Accept: 'application/json; charset=utf-8',
-                EdgeTagUserId: handleGetUserId(),
-            },
+            headers: getHeaders(),
             body: JSON.stringify(payload),
             credentials: 'include',
         })
@@ -942,6 +1011,12 @@
 
     v35('v5', 0x50, sha1);
 
+    const encodeString = (name) => {
+        if (typeof btoa === 'undefined') {
+            return Buffer.from(name).toString('base64');
+        }
+        return btoa(name);
+    };
     const generateEventId = (name) => {
         let time = Date.now().toString();
         if (typeof performance !== 'undefined' &&
@@ -951,7 +1026,7 @@
                 time = perf.toFixed(4);
             }
         }
-        return `${btoa(name)}-${v4()}-${time}`;
+        return `${encodeString(name)}-${v4()}-${time}`;
     };
 
     const manifestVariables = {};
@@ -1282,6 +1357,10 @@
       keys(callback) {
         keys(callback);
       }
+
+      getUserId() {
+        return getUserId()
+      }
     }
 
     var api = new API();

package/package.json

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