aesirx-analytics 2.2.4 → 2.2.6

package/dist/{chunk-FKCTTU52.js → chunk-N36VEWSG.js}

@@ -381,7 +381,7 @@ import { createElement as createElement4 } from "react";
 import { useContext as useContext3 } from "react";
 
 // src/utils/AnalyticsContextProvider.tsx
-import React3, { useState as useState2 } from "react";
+import React3, { useRef as useRef2, useState as useState2 } from "react";
 
 // src/translations/dk/common.json
 var common_default = {
@@ -1093,11 +1093,13 @@ var AnalyticsContext = React3.createContext({
   event_uuid: void 0,
   visitor_uuid: void 0,
   setEventID: void 0,
-  setUUID: void 0
+  setUUID: void 0,
+  ref: void 0
 });
 var AnalyticsContextProvider = ({ children }) => {
   const [eventID, setEventID] = useState2();
   const [UUID, setUUID] = useState2();
+  const ref = useRef2();
   return /* @__PURE__ */ React3.createElement(
     AnalyticsContext.Provider,
     {
@@ -1105,7 +1107,8 @@ var AnalyticsContextProvider = ({ children }) => {
         event_uuid: eventID,
         visitor_uuid: UUID,
         setEventID,
-        setUUID
+        setUUID,
+        ref
       }
     },
     /* @__PURE__ */ React3.createElement(AesirXI18nextProvider, { appLanguages }, children)
@@ -1113,10 +1116,271 @@ var AnalyticsContextProvider = ({ children }) => {
 };
 var AnalyticsContextProvider_default = AnalyticsContextProvider;
 
+// src/utils/consent.ts
+import { stringMessage } from "@concordium/react-components";
+import axios from "axios";
+var agreeConsents = async (endpoint, level, uuid, consent, wallet, signature, web3id, jwt, network = "concordium", gtagId, gtmId, layout) => {
+  const url = `${endpoint}/consent/v1/level${level}/${uuid}`;
+  const urlV2 = `${endpoint}/consent/v2/level${level}/${uuid}`;
+  if (sessionStorage.getItem("consentGranted") !== "true") {
+    gtagId && consentModeGrant(true, gtagId, layout);
+    gtmId && consentModeGrant(false, gtmId, layout);
+  }
+  try {
+    switch (level) {
+      case 1:
+        await axios.post(`${url}/${consent}`);
+        break;
+      case 2:
+        await axios.post(
+          `${url}`,
+          { consent: [1, 2] },
+          {
+            headers: {
+              "Content-Type": "application/json",
+              Authorization: "Bearer " + jwt
+            }
+          }
+        );
+        break;
+      case 3:
+        await axios.post(`${url}/${network}/${wallet}`, {
+          signature,
+          consent
+        });
+        break;
+      case 4:
+        await axios.post(
+          `${urlV2}/${network}/${wallet}`,
+          {
+            signature,
+            consent
+          },
+          {
+            headers: {
+              "Content-Type": "application/json",
+              Authorization: "Bearer " + jwt
+            }
+          }
+        );
+        break;
+      default:
+        break;
+    }
+  } catch (error) {
+    throw error;
+  }
+};
+var consentModeGrant = async (isGtag, id, layout) => {
+  if (layout !== "advance-consent-mode") {
+    isGtag ? loadGtagScript(id) : loadGtmScript(id);
+  }
+  sessionStorage.setItem("consentGranted", "true");
+  function gtag(p0, p1, p2) {
+    dataLayer.push(arguments);
+  }
+  gtag("consent", "update", {
+    ad_user_data: "granted",
+    ad_personalization: "granted",
+    ad_storage: "granted",
+    analytics_storage: "granted"
+  });
+};
+var loadGtagScript = (gtagId) => {
+  const gtagScript = document.createElement("script");
+  gtagScript.async = true;
+  gtagScript.src = `https://www.googletagmanager.com/gtag/js?id=${gtagId}`;
+  const firstScript = document.getElementsByTagName("script")[0];
+  firstScript.parentNode.insertBefore(gtagScript, firstScript);
+};
+var loadGtmScript = (gtmId) => {
+  const gtmScript = document.createElement("script");
+  gtmScript.async = true;
+  gtmScript.src = `https://www.googletagmanager.com/gtm.js?id=${gtmId}`;
+  const firstScript = document.getElementsByTagName("script")[0];
+  firstScript.parentNode.insertBefore(gtmScript, firstScript);
+};
+var getConsents = async (endpoint, uuid) => {
+  try {
+    const response = (await axios.get(`${endpoint}/visitor/v1/${uuid}`))?.data?.visitor_consents;
+    return response;
+  } catch (error) {
+    throw error;
+  }
+};
+var getSignature = async (endpoint, address, provider, text, network = "concordium") => {
+  try {
+    const nonce = await getNonce(endpoint, address, text, network);
+    return getSignedNonce(nonce, address, provider);
+  } catch (error) {
+    throw error;
+  }
+};
+var getNonce = async (endpoint, address, text, network = "concordium") => {
+  try {
+    const nonce = (await axios.post(`${endpoint}/wallet/v1/${network}/${address}/nonce`, { text }))?.data.nonce;
+    return nonce;
+  } catch (error) {
+    throw error;
+  }
+};
+var getSignedNonce = async (nonce, address, provider) => {
+  const signature = await provider.signMessage(address, stringMessage(`${nonce}`));
+  return Buffer.from(
+    typeof signature === "object" && signature !== null ? JSON.stringify(signature) : signature,
+    "utf-8"
+  ).toString("base64");
+};
+var revokeConsents = async (endpoint, level, uuid, wallet, signature, web3id, jwt, network = "concordium") => {
+  const url = `${endpoint}/consent/v1/level${level}/revoke/${uuid}`;
+  const urlV2 = `${endpoint}/consent/v2/level${level}/revoke/${uuid}`;
+  sessionStorage.setItem("consentGranted", "false");
+  try {
+    switch (level) {
+      case "2":
+        await axios.put(`${url}`, null, {
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: "Bearer " + jwt
+          }
+        });
+        break;
+      case "3":
+        await axios.put(`${url}/${network}/${wallet}`, {
+          signature
+        });
+        break;
+      case "4":
+        await axios.put(
+          `${urlV2}/${network}/${wallet}`,
+          {
+            signature
+          },
+          {
+            headers: {
+              "Content-Type": "application/json",
+              Authorization: "Bearer " + jwt
+            }
+          }
+        );
+        break;
+      default:
+        break;
+    }
+  } catch (error) {
+    throw error;
+  }
+};
+var getMember = async (endpoint, accessToken) => {
+  try {
+    const member = await axios.get(
+      `${endpoint}/index.php?webserviceClient=site&webserviceVersion=1.0.0&option=persona&api=hal&task=getTokenByUser`,
+      {
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + accessToken
+        }
+      }
+    );
+    if (member?.data?.result?.member_id) {
+      const data = await axios.get(
+        `${endpoint}/index.php?webserviceClient=site&webserviceVersion=1.0.0&option=member&api=hal&id=${member?.data?.result?.member_id}`,
+        {
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: "Bearer " + accessToken
+          }
+        }
+      );
+      return data?.data;
+    }
+  } catch (error) {
+    console.log("getMember", error);
+    throw error;
+  }
+};
+var getWalletNonce = async (endpoint, wallet, publicAddress) => {
+  try {
+    const reqAuthFormData = {
+      publicAddress,
+      wallet,
+      text: `Login with nonce: {}`
+    };
+    const config = {
+      method: "post",
+      url: `${endpoint}/index.php?webserviceClient=site&webserviceVersion=1.0.0&option=member&task=getWalletNonce&api=hal`,
+      headers: {
+        "Content-Type": "application/json"
+      },
+      data: reqAuthFormData
+    };
+    const { data } = await axios(config);
+    if (data.result) {
+      return data.result;
+    }
+    throw false;
+  } catch (error) {
+    throw error;
+  }
+};
+var verifySignature = async (endpoint, wallet, publicAddress, signature) => {
+  try {
+    const returnParams = new URLSearchParams(window.location.search)?.get("return");
+    const reqAuthFormData = {
+      wallet,
+      publicAddress,
+      signature
+    };
+    const config = {
+      method: "post",
+      url: `${endpoint}/index.php?webserviceClient=site&webserviceVersion=1.0.0&option=member&task=walletLogin&api=hal&return=${returnParams ?? null}`,
+      headers: {
+        "Content-Type": "application/json"
+      },
+      data: reqAuthFormData
+    };
+    const { data } = await axios(config);
+    if (data?.result) {
+      return data?.result;
+    } else {
+      throw false;
+    }
+  } catch (error) {
+    console.log(error);
+    throw error;
+  }
+};
+var getConsentTemplate = async (domain) => {
+  try {
+    const endpointWeb3 = "https://web3id.backend.aesirx.io:8001";
+    const data = await axios.get(`${endpointWeb3}/datastream/template/${domain}`, {
+      headers: {
+        "Content-Type": "application/json"
+      }
+    });
+    if (data) {
+      return data;
+    }
+  } catch (error) {
+    console.log("error", error);
+  }
+};
+
 export {
   useTranslation,
   AnalyticsContext,
-  AnalyticsContextProvider_default
+  AnalyticsContextProvider_default,
+  agreeConsents,
+  loadGtagScript,
+  loadGtmScript,
+  getConsents,
+  getSignature,
+  getNonce,
+  revokeConsents,
+  getMember,
+  getWalletNonce,
+  verifySignature,
+  getConsentTemplate
 };
 /*
  * @copyright   Copyright (C) 2022 AesirX. All rights reserved.

package/dist/index.d.ts

@@ -4,10 +4,12 @@ import { NextRouter } from 'next/router';
 interface AnalyticsNext {
     router: NextRouter;
     attributes: any;
-    customLayout?: boolean;
+    oldLayout?: boolean;
+    loginApp?: any;
+    isLoggedApp?: boolean;
     children?: ReactNode;
 }
-declare const AnalyticsNext: ({ router, attributes, customLayout, children }: AnalyticsNext) => React.JSX.Element;
+declare const AnalyticsNext: ({ router, attributes, oldLayout, loginApp, isLoggedApp, children, }: AnalyticsNext) => React.JSX.Element;
 
 interface AnalyticsReact {
     location: {
@@ -18,8 +20,9 @@ interface AnalyticsReact {
         replace: (_: object) => void;
     };
     children?: ReactNode;
+    oldLayout?: boolean;
 }
-declare const AnalyticsReact: ({ location, history, children }: AnalyticsReact) => React.JSX.Element;
+declare const AnalyticsReact: ({ location, history, oldLayout, children }: AnalyticsReact) => React.JSX.Element;
 
 declare const trackEvent: (endpoint: string, referer?: string, data?: object) => Promise<boolean>;
 
@@ -28,6 +31,7 @@ interface AnalyticsContextType {
     visitor_uuid: string;
     setEventID: Dispatch<SetStateAction<string>>;
     setUUID: Dispatch<SetStateAction<string>>;
+    ref: any;
 }
 declare const AnalyticsContext: React.Context<AnalyticsContextType>;
 

package/dist/index.js

@@ -1,10 +1,11 @@
 import {
   AnalyticsContext,
-  AnalyticsContextProvider_default
-} from "./chunk-FKCTTU52.js";
+  AnalyticsContextProvider_default,
+  getConsentTemplate
+} from "./chunk-N36VEWSG.js";
 
 // src/AnalyticsNext/index.tsx
-import React2 from "react";
+import React2, { useEffect as useEffect2, useState as useState2 } from "react";
 
 // src/AnalyticsNext/handle.tsx
 import React, { useCallback, useEffect, useState } from "react";
@@ -381,10 +382,14 @@ var startTracker = async (endpoint, url, referer, user_agent, attributesVisit) =
     });
     if (window["aesirxTrackEcommerce"] === "true" && sessionStorage.getItem("aesirx-analytics-flow") !== (await responseStart)?.flow_uuid) {
       sessionStorage.setItem("aesirx-analytics-flow", (await responseStart)?.flow_uuid);
-      await trackerService(
-        rememberFlow(window.location.origin, (await responseStart)?.flow_uuid),
-        {}
-      );
+      try {
+        await trackerService(
+          rememberFlow(window.location.origin, (await responseStart)?.flow_uuid),
+          {}
+        );
+      } catch (error) {
+        console.log("Remember Flow Error", error);
+      }
     }
     return responseStart;
   } catch (error) {
@@ -518,36 +523,64 @@ var handle_default = AnalyticsHandle;
 
 // src/AnalyticsNext/index.tsx
 import dynamic from "next/dynamic";
-var ConsentComponent = dynamic(() => import("./Consent-J6XDJB65.js"), { ssr: false });
-var ConsentComponentCustom = dynamic(() => import("./ConsentCustom-6YFZO4ZJ.js"), { ssr: false });
-var AnalyticsNext = ({ router, attributes, customLayout = false, children }) => {
-  return /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(AnalyticsContextProvider_default, null, /* @__PURE__ */ React2.createElement(handle_default, { router, attributes }, children, process.env.NEXT_PUBLIC_DISABLE_ANALYTICS_CONSENT !== "true" && /* @__PURE__ */ React2.createElement(React2.Fragment, null, customLayout ? /* @__PURE__ */ React2.createElement(
-    ConsentComponentCustom,
+var ConsentComponent = dynamic(() => import("./Consent-U7ESRVW5.js"), { ssr: false });
+var ConsentComponentCustom = dynamic(() => import("./ConsentCustom-CSPWI25K.js"), { ssr: false });
+var AnalyticsNext = ({
+  router,
+  attributes,
+  oldLayout = false,
+  loginApp,
+  isLoggedApp,
+  children
+}) => {
+  const [layout, setLayout] = useState2(process.env.NEXT_PUBLIC_CONSENT_LAYOUT);
+  const [gtagId, setGtagId] = useState2(process.env.NEXT_PUBLIC_ANALYTICS_GTAG_ID);
+  const [gtmId, setGtmId] = useState2(process.env.NEXT_PUBLIC_ANALYTICS_GTM_ID);
+  useEffect2(() => {
+    const init = async () => {
+      const data = await getConsentTemplate(window.location.host);
+      setLayout(data?.data?.template ?? process.env.NEXT_PUBLIC_CONSENT_LAYOUT);
+      setGtagId(data?.data?.gtag_id ?? process.env.NEXT_PUBLIC_ANALYTICS_GTAG_ID);
+      setGtmId(data?.data?.gtm_id ?? process.env.NEXT_PUBLIC_ANALYTICS_GTM_ID);
+    };
+    init();
+  }, []);
+  return /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(AnalyticsContextProvider_default, null, /* @__PURE__ */ React2.createElement(handle_default, { router, attributes }, children, process.env.NEXT_PUBLIC_DISABLE_ANALYTICS_CONSENT !== "true" && /* @__PURE__ */ React2.createElement(React2.Fragment, null, oldLayout || layout === "original" ? /* @__PURE__ */ React2.createElement(
+    ConsentComponent,
     {
       endpoint: process.env.NEXT_PUBLIC_ENDPOINT_ANALYTICS_URL,
       networkEnv: process.env.NEXT_PUBLIC_CONCORDIUM_NETWORK,
-      aesirXEndpoint: process.env.NEXT_PUBLIC_ENDPOINT_URL ?? "https://api.aesirx.io"
+      aesirXEndpoint: process.env.NEXT_PUBLIC_ENDPOINT_URL ?? "https://api.aesirx.io",
+      loginApp,
+      isLoggedApp,
+      gtagId,
+      gtmId
     }
   ) : /* @__PURE__ */ React2.createElement(
-    ConsentComponent,
+    ConsentComponentCustom,
     {
       endpoint: process.env.NEXT_PUBLIC_ENDPOINT_ANALYTICS_URL,
       networkEnv: process.env.NEXT_PUBLIC_CONCORDIUM_NETWORK,
-      aesirXEndpoint: process.env.NEXT_PUBLIC_ENDPOINT_URL ?? "https://api.aesirx.io"
+      aesirXEndpoint: process.env.NEXT_PUBLIC_ENDPOINT_URL ?? "https://api.aesirx.io",
+      loginApp,
+      isLoggedApp,
+      gtagId,
+      gtmId,
+      layout
     }
   )))));
 };
 var AnalyticsNext_default = AnalyticsNext;
 
 // src/AnalyticsReact/index.tsx
-import React4, { Suspense } from "react";
+import React4, { Suspense, useEffect as useEffect4, useState as useState3 } from "react";
 
 // src/AnalyticsReact/handle.tsx
-import React3, { useEffect as useEffect2 } from "react";
+import React3, { useEffect as useEffect3 } from "react";
 var AnalyticsHandle2 = ({ location, history, children }) => {
   const AnalyticsStore = React3.useContext(AnalyticsContext);
   const endPoint = process.env.REACT_APP_ENDPOINT_ANALYTICS_URL;
-  useEffect2(() => {
+  useEffect3(() => {
     const init = async () => {
       if (!AnalyticsStore.visitor_uuid) {
         const referer = location.pathname ? location.pathname : "";
@@ -561,13 +594,13 @@ var AnalyticsHandle2 = ({ location, history, children }) => {
     };
     init();
   }, [location.pathname, history]);
-  useEffect2(() => {
+  useEffect3(() => {
     const init = async () => {
       endTrackerVisibilityState(endPoint);
     };
     init();
   }, []);
-  useEffect2(() => {
+  useEffect3(() => {
     const init = async () => {
       window["event_uuid"] = AnalyticsStore.event_uuid;
       window["visitor_uuid"] = AnalyticsStore.visitor_uuid;
@@ -579,14 +612,39 @@ var AnalyticsHandle2 = ({ location, history, children }) => {
 var handle_default2 = AnalyticsHandle2;
 
 // src/AnalyticsReact/index.tsx
-var ConsentComponent2 = React4.lazy(() => import("./Consent-J6XDJB65.js"));
-var AnalyticsReact = ({ location, history, children }) => {
-  return /* @__PURE__ */ React4.createElement(AnalyticsContextProvider_default, null, /* @__PURE__ */ React4.createElement(handle_default2, { location, history }, children, process.env.REACT_APP_DISABLE_ANALYTICS_CONSENT !== "true" && /* @__PURE__ */ React4.createElement(Suspense, { fallback: /* @__PURE__ */ React4.createElement(React4.Fragment, null) }, /* @__PURE__ */ React4.createElement(
+var ConsentComponent2 = React4.lazy(() => import("./Consent-U7ESRVW5.js"));
+var ConsentComponentCustom2 = React4.lazy(() => import("./ConsentCustom-CSPWI25K.js"));
+var AnalyticsReact = ({ location, history, oldLayout = false, children }) => {
+  const [layout, setLayout] = useState3(process.env.REACT_APP_CONSENT_LAYOUT);
+  const [gtagId, setGtagId] = useState3(process.env.REACT_APP_ANALYTICS_GTAG_ID);
+  const [gtmId, setGtmId] = useState3(process.env.REACT_APP_ANALYTICS_GTM_ID);
+  useEffect4(() => {
+    const init = async () => {
+      const data = await getConsentTemplate(window.location.host);
+      setLayout(data?.data?.template ?? process.env.REACT_APP_CONSENT_LAYOUT);
+      setGtagId(data?.data?.gtag_id ?? process.env.REACT_APP_ANALYTICS_GTAG_ID);
+      setGtmId(data?.data?.gtm_id ?? process.env.REACT_APP_ANALYTICS_GTM_ID);
+    };
+    init();
+  }, []);
+  return /* @__PURE__ */ React4.createElement(AnalyticsContextProvider_default, null, /* @__PURE__ */ React4.createElement(handle_default2, { location, history }, children, process.env.REACT_APP_DISABLE_ANALYTICS_CONSENT !== "true" && /* @__PURE__ */ React4.createElement(Suspense, { fallback: /* @__PURE__ */ React4.createElement(React4.Fragment, null) }, oldLayout || layout === "original" ? /* @__PURE__ */ React4.createElement(
     ConsentComponent2,
     {
       endpoint: process.env.REACT_APP_ENDPOINT_ANALYTICS_URL,
       networkEnv: process.env.REACT_APP_CONCORDIUM_NETWORK,
-      aesirXEndpoint: process.env.REACT_APP_ENDPOINT_URL ?? "https://api.aesirx.io"
+      aesirXEndpoint: process.env.REACT_APP_ENDPOINT_URL ?? "https://api.aesirx.io",
+      gtagId,
+      gtmId
+    }
+  ) : /* @__PURE__ */ React4.createElement(
+    ConsentComponentCustom2,
+    {
+      endpoint: process.env.REACT_APP_ENDPOINT_ANALYTICS_URL,
+      networkEnv: process.env.REACT_APP_CONCORDIUM_NETWORK,
+      aesirXEndpoint: process.env.REACT_APP_ENDPOINT_URL ?? "https://api.aesirx.io",
+      gtagId,
+      gtmId,
+      layout
     }
   ))));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aesirx-analytics",
-  "version": "2.2.4",
+  "version": "2.2.6",
   "license": "GPL-3.0-only",
   "author": "AesirX",
   "repository": "https://gitlab.redweb.dk/aesirx/analytics",
@@ -21,13 +21,13 @@
     "buffer": "^6.0.3",
     "ethers": "^6.6.5",
     "i18next": "^23.6.0",
-    "i18next-browser-languagedetector": "^7.1.0",
+    "i18next-browser-languagedetector": "^7.2.1",
     "murmurhash-js": "^1.0.0",
     "next": "^14.1.0",
     "query-string": "^7.1.1",
-    "react": "^18.2.0",
+    "react": "^18.3.1",
     "react-bootstrap": "^2.8.0",
-    "react-content-loader": "^6.2.1",
+    "react-content-loader": "^7.0.0",
     "react-device-detect": "^2.2.3",
     "react-dom": "18",
     "react-toastify": "^9.1.3",
@@ -63,13 +63,13 @@
     ]
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.21.5",
+    "@babel/preset-env": "^7.24.5",
     "@babel/preset-typescript": "^7.23.0",
     "@jest/globals": "^29.7.0",
     "@types/jest": "^29.5.0",
     "@types/murmurhash-js": "^1.0.3",
     "@types/node": "^20.8.0",
-    "@types/react": "^18.2.21",
+    "@types/react": "^18.3.1",
     "@types/react-dom": "^18.2.14",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.57.0",