authscape 1.0.432 → 1.0.436

package/index.js

@@ -13,6 +13,8 @@ var _navigation = require("next/navigation");
 var _axios = _interopRequireDefault(require("axios"));
 var _queryString = _interopRequireDefault(require("query-string"));
 var _nookies = require("nookies");
+var _router = _interopRequireDefault(require("next/router"));
+var _ga4React = _interopRequireDefault(require("ga-4-react"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -26,6 +28,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+// comment this out
 // import { authService, apiService, setupOEMProps, OEMStyleSheet } from 'authscape';
 
 function AuthScapeApp(_ref) {
@@ -55,6 +58,7 @@ function AuthScapeApp(_ref) {
   var frontEndLoaded = (0, _react.useRef)(false);
   var signedInUser = (0, _react.useRef)(null);
   var queryCodeUsed = (0, _react.useRef)(null);
+  var ga4React = (0, _react.useRef)(null);
   var searchParams = (0, _navigation.useSearchParams)();
   var queryRef = searchParams.get('ref');
   var queryCode = searchParams.get('code');
@@ -146,6 +150,102 @@ function AuthScapeApp(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+  function initGA(_x3) {
+    return _initGA.apply(this, arguments);
+  }
+  function _initGA() {
+    _initGA = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(G) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            if (!(!_ga4React["default"].isInitialized() && G && process.browser)) {
+              _context3.next = 10;
+              break;
+            }
+            ga4React.current = new _ga4React["default"](G, {
+              debug_mode: !process.env.production
+            });
+            _context3.prev = 2;
+            _context3.next = 5;
+            return ga4React.current.initialize();
+          case 5:
+            _context3.next = 10;
+            break;
+          case 7:
+            _context3.prev = 7;
+            _context3.t0 = _context3["catch"](2);
+            console.error(_context3.t0);
+          case 10:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3, null, [[2, 7]]);
+    }));
+    return _initGA.apply(this, arguments);
+  }
+  var logEvent = function logEvent(category, action, label) {
+    if (ga4React != null) {
+      ga4React.current.event(action, label, category);
+    }
+    if (process.env.enableDatabaseAnalytics == "true") {
+      var userId = null;
+      var locationId = null;
+      var companyId = null;
+      var host = window.location.protocol + "//" + window.location.host;
+      if (signedInUser.current != null) {
+        userId = signedInUser.current.id;
+        locationId = signedInUser.current.locationId;
+        companyId = signedInUser.current.companyId;
+      }
+      apiService().post("/Analytics/Event", {
+        userId: userId,
+        locationId: locationId,
+        companyId: companyId,
+        uri: window.location.pathname,
+        category: category,
+        action: action,
+        label: label,
+        host: host
+      });
+    }
+  };
+  var databaseDrivenPageView = function databaseDrivenPageView(pathName) {
+    if (process.env.enableDatabaseAnalytics == "true") {
+      var userId = null;
+      var locationId = null;
+      var companyId = null;
+      var host = window.location.protocol + "//" + window.location.host;
+      if (signedInUser.current != null) {
+        userId = signedInUser.current.id;
+        locationId = signedInUser.current.locationId;
+        companyId = signedInUser.current.companyId;
+      }
+      if (pathName == "/signin-oidc") {
+        return;
+      }
+      apiService().post("/Analytics/PageView", {
+        userId: userId,
+        locationId: locationId,
+        companyId: companyId,
+        uri: pathName,
+        host: host
+      });
+    }
+  };
+  (0, _react.useEffect)(function () {
+    if (frontEndLoadedState) {
+      if (process.env.googleAnalytics4 != "") {
+        initGA(process.env.googleAnalytics4);
+      }
+      databaseDrivenPageView(window.location.pathname);
+      _router["default"].events.on('routeChangeComplete', function () {
+        if (ga4React != null) {
+          ga4React.current.pageview(window.location.pathname);
+        }
+        databaseDrivenPageView(window.location.pathname);
+      });
+    }
+  }, [frontEndLoadedState]);
   var validateUserSignedIn = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var usr;
@@ -193,6 +293,17 @@ function AuthScapeApp(_ref) {
   var setIsLoading = function setIsLoading(isLoading) {
     setIsLoadingShow(isLoading);
   };
+  var logPurchase = function logPurchase(transactionId, amount, tax, items) {
+    if (ga4React != null) {
+      ga4React.current.gtag("event", "purchase", {
+        transaction_id: transactionId,
+        value: amount,
+        tax: tax,
+        currency: "USD",
+        items: items
+      });
+    }
+  };
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_head["default"], null, /*#__PURE__*/_react["default"].createElement("meta", {
     name: "viewport",
     content: "width=device-width, initial-scale=0.86, maximum-scale=5.0, minimum-scale=0.86"
@@ -204,14 +315,19 @@ function AuthScapeApp(_ref) {
   }, frontEndLoadedState != null && frontEndLoadedState && pathname != "/signin-oidc" && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, layout != null && layout({
     children: /*#__PURE__*/_react["default"].createElement(Component, _extends({}, pageProps, {
       currentUser: signedInUser.current,
-      toast: _reactToastify.toast
+      toast: _reactToastify.toast,
+      setIsLoading: setIsLoading,
+      logEvent: logEvent,
+      logPurchase: logPurchase
     })),
     currentUser: signedInUser.current
   }), layout == null && /*#__PURE__*/_react["default"].createElement(Component, _extends({}, pageProps, {
     currentUser: signedInUser.current,
     toast: _reactToastify.toast,
     loadedUser: frontEndLoadedState,
-    setIsLoading: setIsLoading
+    setIsLoading: setIsLoading,
+    logEvent: logEvent,
+    logPurchase: logPurchase
   }))), /*#__PURE__*/_react["default"].createElement(_reactToastify.ToastContainer, null)), loadingLayout && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, loadingLayout(isLoadingShow)), frontEndLoaded.current && process.env.microsoftClarityTrackingCode != null && process.env.staging == "production" && /*#__PURE__*/_react["default"].createElement("script", {
     dangerouslySetInnerHTML: {
       __html: "\n                        (function(c,l,a,r,i,t,y){\n                            c[a] = c[a] || function () { (c[a].q = c[a].q || []).push(arguments) };\n                            t=l.createElement(r);\n                            t.async=1;\n                            t.src=\"https://www.clarity.ms/tag/\"+i;\n                            y=l.getElementsByTagName(r)[0];\n                            y.parentNode.insertBefore(t,y);\n                        })(window, document, \"clarity\", \"script\", \"" + process.env.microsoftClarityTrackingCode + "\");"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.432",
+  "version": "1.0.436",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/components/AuthScapeApp.js

@@ -5,7 +5,11 @@ import Head from "next/head";
 import { useSearchParams, usePathname } from 'next/navigation';
 import axios from 'axios';
 import querystring from "query-string";
-import { setCookie } from 'nookies'
+import { setCookie } from 'nookies';
+import Router from 'next/router';
+import GA4React from 'ga-4-react';
+
+// comment this out
 // import { authService, apiService, setupOEMProps, OEMStyleSheet } from 'authscape';
 
 export function AuthScapeApp ({Component, layout, loadingLayout, pageProps, muiTheme = {}, enforceLoggedIn = false, enableAuth = true}) {
@@ -19,9 +23,10 @@ export function AuthScapeApp ({Component, layout, loadingLayout, pageProps, muiT
     const loadingAuth = useRef(false);
     const frontEndLoaded = useRef(false);
     const signedInUser = useRef(null);
-
     const queryCodeUsed = useRef(null);
 
+    const ga4React = useRef(null);
+
     const searchParams = useSearchParams();
     const queryRef = searchParams.get('ref');
     const queryCode = searchParams.get('code');
@@ -105,6 +110,111 @@ export function AuthScapeApp ({Component, layout, loadingLayout, pageProps, muiT
         }
     }
 
+    async function initGA(G) {
+        if (!GA4React.isInitialized() && G && process.browser) {
+          ga4React.current = new GA4React(G, { debug_mode: !process.env.production });
+      
+          try {
+
+            await ga4React.current.initialize();
+
+        } catch (error) {
+            console.error(error);
+          }
+        }
+    }
+
+    const logEvent = (category, action, label) => {
+  
+        if (ga4React != null)
+        {
+            ga4React.current.event(action, label, category);
+        }
+
+        if (process.env.enableDatabaseAnalytics == "true")
+        {
+            let userId = null;
+            let locationId = null;
+            let companyId = null;
+
+            var host = window.location.protocol + "//" + window.location.host;
+
+            if (signedInUser.current != null)
+            {
+                userId = signedInUser.current.id;
+                locationId = signedInUser.current.locationId;
+                companyId = signedInUser.current.companyId;
+            }
+
+            apiService().post("/Analytics/Event", {
+                userId: userId,
+                locationId: locationId,
+                companyId: companyId,
+                uri: window.location.pathname,
+                category: category,
+                action: action,
+                label: label,
+                host: host
+            });
+        }
+    }
+
+    const databaseDrivenPageView = (pathName) => {
+
+        if (process.env.enableDatabaseAnalytics == "true")
+        {
+            let userId = null;
+            let locationId = null;
+            let companyId = null;
+
+            var host = window.location.protocol + "//" + window.location.host;
+
+            if (signedInUser.current != null)
+            {
+                userId = signedInUser.current.id;
+                locationId = signedInUser.current.locationId;
+                companyId = signedInUser.current.companyId;
+            }
+
+            if (pathName == "/signin-oidc")
+            {
+                return;
+            }
+
+            apiService().post("/Analytics/PageView", {
+                userId: userId,
+                locationId: locationId,
+                companyId: companyId,
+                uri: pathName,
+                host: host
+            });
+
+        }
+    }
+
+    useEffect(() => {
+
+        if (frontEndLoadedState)
+        {
+            if (process.env.googleAnalytics4 != "")
+            {
+                initGA(process.env.googleAnalytics4);
+            }
+
+            databaseDrivenPageView(window.location.pathname);
+            Router.events.on('routeChangeComplete', () => {
+
+                if (ga4React != null)
+                {
+                    ga4React.current.pageview(window.location.pathname);
+                }
+
+                databaseDrivenPageView(window.location.pathname);
+            });
+        }
+
+    }, [frontEndLoadedState]);
+
     const validateUserSignedIn = async () => {
 
         loadingAuth.current = true;
@@ -149,6 +259,20 @@ export function AuthScapeApp ({Component, layout, loadingLayout, pageProps, muiT
         setIsLoadingShow(isLoading);
     }
 
+    const logPurchase = (transactionId, amount, tax, items) => {
+        
+        if (ga4React != null)
+        {
+            ga4React.current.gtag("event", "purchase", {
+                transaction_id: transactionId,
+                value: amount,
+                tax: tax,
+                currency: "USD",
+                items: items
+            });
+        }
+    }
+
     return (
         <>
             <Head>
@@ -165,12 +289,12 @@ export function AuthScapeApp ({Component, layout, loadingLayout, pageProps, muiT
                 {frontEndLoadedState != null && frontEndLoadedState && pathname != "/signin-oidc" &&
                 <>
                     {layout != null && layout({
-                        children: <Component {...pageProps} currentUser={signedInUser.current} toast={toast} />,
+                        children: <Component {...pageProps} currentUser={signedInUser.current} toast={toast} setIsLoading={setIsLoading} logEvent={logEvent} logPurchase={logPurchase} />,
                         currentUser: signedInUser.current
                     })}
 
                     {layout == null &&
-                        <Component {...pageProps} currentUser={signedInUser.current} toast={toast} loadedUser={frontEndLoadedState} setIsLoading={setIsLoading} />   
+                        <Component {...pageProps} currentUser={signedInUser.current} toast={toast} loadedUser={frontEndLoadedState} setIsLoading={setIsLoading} logEvent={logEvent} logPurchase={logPurchase} />   
                     }
                 </>
                 }
@@ -183,7 +307,7 @@ export function AuthScapeApp ({Component, layout, loadingLayout, pageProps, muiT
                 {loadingLayout(isLoadingShow)}
             </>
             }
-            
+
             {(frontEndLoaded.current && process.env.microsoftClarityTrackingCode != null && process.env.staging == "production") &&
                 <script
                 dangerouslySetInnerHTML={{