@blotoutio/edgetag-sdk-browser 0.6.5 → 0.6.7

package/index.js

@@ -1,6 +1,18 @@
 (function () {
     'use strict';
 
+    var api$1 = /*#__PURE__*/Object.freeze({
+        __proto__: null,
+        get init () { return init; },
+        get tag () { return tag; },
+        get consent () { return consent; },
+        get user () { return user; },
+        get data () { return data; },
+        get getData () { return getData; },
+        get keys () { return keys; },
+        get getUserId () { return getUserId; }
+    });
+
     /******************************************************************************
     Copyright (c) Microsoft Corporation.
 
@@ -28,7 +40,6 @@
 
     const tagStorage = 'edgeTag';
     const consentKey = 'consent';
-    const providersKey = 'providers';
     const keyPrefix = `_worker`;
 
     const initKey = `${keyPrefix}Store`;
@@ -193,8 +204,10 @@
         return generateUrl(`/keys`);
     };
 
+    let allowedProvider = [];
+    let initialized = false;
     let consentDisabled = false;
-    const providers = {};
+    const providersPackages = {};
     const setPreferences = (preferences) => {
         var _a;
         if (!preferences) {
@@ -209,21 +222,29 @@
             if (!provider.name) {
                 return;
             }
-            providers[provider.name] = provider;
+            providersPackages[provider.name] = provider;
         });
         if (window && Array.isArray(window.edgetagProviders)) {
             window.edgetagProviders.forEach((provider) => {
                 if (!provider.name) {
                     return;
                 }
-                providers[provider.name] = provider;
+                providersPackages[provider.name] = provider;
             });
         }
         setUrl(preferences.edgeURL);
         return true;
     };
     const isConsentDisabled = () => consentDisabled;
-    const getProvidersPackage = () => providers;
+    const getProvidersPackage = () => providersPackages;
+    const isInitialized = () => initialized;
+    const setInitialized = () => {
+        initialized = true;
+    };
+    const getAllowedProviders = () => allowedProvider;
+    const setAllowedProviders = (providers) => {
+        allowedProvider = providers;
+    };
 
     const getUserAgent = () => {
         const nav = navigator;
@@ -232,6 +253,9 @@
         return ua;
     };
     const allowTag = (providers) => {
+        if (!allowProviders(providers)) {
+            return false;
+        }
         const consent = getDataPerKey('local', tagStorage, consentKey);
         if (isConsentDisabled()) {
             return true;
@@ -245,8 +269,7 @@
         if (!providers) {
             return (Object.values(consent).find((isAllowed) => isAllowed) || false);
         }
-        const allProviders = (getDataPerKey('local', tagStorage, providersKey) ||
-            []);
+        const allProviders = getAllowedProviders();
         for (const provider of allProviders) {
             const tagProviderSetting = providers[provider];
             if (tagProviderSetting ||
@@ -259,7 +282,39 @@
         }
         return false;
     };
-    const allowProvider = (providers, providerId) => {
+    const allowProviders = (providers) => {
+        if (!providers) {
+            return true;
+        }
+        const allowedProvider = getAllowedProviders();
+        if (allowedProvider && allowedProvider.length > 0) {
+            let found = false;
+            Object.entries(providers).forEach(([key, value]) => {
+                if (!value) {
+                    return;
+                }
+                if (allowedProvider.includes(key)) {
+                    found = true;
+                }
+            });
+            return found;
+        }
+        return true;
+    };
+    const allowProvider = (providerId) => {
+        if (!providerId) {
+            return true;
+        }
+        const allowedProvider = getAllowedProviders();
+        if (allowedProvider && allowedProvider.length > 0) {
+            return allowedProvider.includes(providerId);
+        }
+        return true;
+    };
+    const allowProviderWithConsent = (providers, providerId) => {
+        if (!allowProvider(providerId)) {
+            return false;
+        }
         if (providers && Object.keys(providers).length) {
             const tagProvider = providers[providerId];
             if (!(tagProvider ||
@@ -867,7 +922,28 @@
     };
     const getProviderVariables = (name) => manifestVariables[name] || {};
 
+    let stubs = [];
+    const addStubs = (newStubs) => {
+        stubs = [...stubs, ...newStubs];
+    };
+    const addStub = (stub) => {
+        stubs.push(stub);
+    };
+    const processStubs = () => {
+        try {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            stubs.forEach((stub) => api$1[stub.name](...(stub.arguments || [])));
+        }
+        catch (e) {
+            console.error(e);
+        }
+    };
+
     const sendTag = ({ eventName, eventId, data, providerData, providers, options, }) => {
+        if (!allowProviders(providers)) {
+            return;
+        }
         const payload = {
             eventName,
             eventId,
@@ -881,6 +957,13 @@
         postRequest(getTagURL(), payload, options).catch(info);
     };
     const handleTag = (eventName, data = {}, providers, options) => {
+        if (!isInitialized()) {
+            addStub({
+                name: 'tag',
+                arguments: [eventName, data, providers, options],
+            });
+            return;
+        }
         if (!allowTag(providers)) {
             console.log('No consent');
             return;
@@ -894,7 +977,7 @@
         const providerData = {};
         if (providerPackages) {
             Object.values(providerPackages).forEach((pkg) => {
-                if (!pkg || !pkg.tag || !allowProvider(providers, pkg.name)) {
+                if (!pkg || !pkg.tag || !allowProviderWithConsent(providers, pkg.name)) {
                     return;
                 }
                 const result = pkg.tag({
@@ -1002,11 +1085,10 @@
     };
 
     const handleManifest = (manifest) => {
-        const providers = [];
         const providerPackages = getProvidersPackage();
         const userId = handleGetUserId();
+        setAllowedProviders(manifest.map((provider) => provider.package));
         manifest.forEach((provider) => {
-            providers.push(provider.package);
             addProviderVariable(provider.package, provider.variables);
             if (provider.rules) {
                 Object.entries(provider.rules).forEach(([name, recipe]) => {
@@ -1020,12 +1102,13 @@
             }
             if (providerPackages) {
                 const pkg = providerPackages[provider.package];
-                if (pkg && pkg.init) {
+                if (pkg && pkg.init && allowProvider(pkg.name)) {
                     pkg.init({ userId, manifest: provider, sendTag });
                 }
             }
         });
-        savePerKey('local', tagStorage, providers, providersKey);
+        setInitialized();
+        processStubs();
     };
 
     const handleInit = (preferences) => {
@@ -1033,6 +1116,9 @@
         if (!success) {
             return;
         }
+        if (preferences.afterManifestEvents) {
+            addStubs(preferences.afterManifestEvents);
+        }
         const url = new URL(getInitURL());
         if (preferences.disableConsentCheck) {
             url.searchParams.set('consentDisabled', 'true');
@@ -1107,6 +1193,9 @@
     const keys = (callback) => {
         handleKeys(callback);
     };
+    const getUserId = () => {
+        return handleGetUserId();
+    };
 
     // TODO https://github.com/blotoutio/solutions/issues/826
 
@@ -1143,16 +1232,9 @@
     var api = new API();
 
     (function () {
-      const handleFunction = (arg) => {
-        const sliced = [].slice.call(arg);
-        if (!Array.isArray(sliced)) {
-          return
-        }
-
+      const handleStubs = (event) => {
         try {
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-ignore
-          return library[sliced[0]](...sliced.slice(1))
+          return library[event.name](...event.arguments)
         } catch (e) {
           console.error(e);
         }
@@ -1161,19 +1243,61 @@
       const library = api;
       let stubs = [];
       if (window.edgetag) {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
         stubs = window.edgetag.stubs || [];
       }
 
       // this needs to be regular function for arguments to work
       window.edgetag = function () {
-        // eslint-disable-next-line prefer-rest-params
-        return handleFunction(arguments)
+        const sliced = [].slice.call(arguments);
+        if (!Array.isArray(sliced)) {
+          return
+        }
+
+        try {
+          return library[sliced[0]](...sliced.slice(1))
+        } catch (e) {
+          console.error(e);
+        }
       };
 
-      // restore calls that were triggered before lib was ready
-      stubs.forEach(handleFunction);
+      const beforeManifestEvents = [];
+      const afterManifestEvents = [];
+      let initCall = null;
+
+      stubs.forEach((arg) => {
+        const sliced = [].slice.call(arg);
+        if (!Array.isArray(sliced)) {
+          return
+        }
+
+        if (sliced[0] === 'init') {
+          initCall = sliced.slice(1);
+          return
+        }
+
+        if (sliced[0] === 'tag') {
+          afterManifestEvents.push({
+            name: sliced[0],
+            arguments: sliced.slice(1),
+          });
+          return
+        }
+
+        beforeManifestEvents.push({
+          name: sliced[0],
+          arguments: sliced.slice(1),
+        });
+      });
+
+      if (initCall) {
+        initCall[0]['afterManifestEvents'] = afterManifestEvents;
+        handleStubs({
+          name: 'init',
+          arguments: initCall,
+        });
+      }
+
+      beforeManifestEvents.forEach(handleStubs);
     })();
 
 })();

package/package.json

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