analytica.click 0.0.258 → 0.0.261

package/dist/index.js

@@ -36,7 +36,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
@@ -672,6 +675,31 @@ var require_api = __commonJS({
   }
 });
 
+// ../common/dist/helpers/logsend.js
+var require_logsend = __commonJS({
+  "../common/dist/helpers/logsend.js"(exports) {
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.isValidLogMessage = void 0;
+    var log_1 = require("ag-common/dist/common/helpers/log");
+    function isValidLogMessage2(m) {
+      if (!m) {
+        (0, log_1.info)("no message?");
+        return false;
+      }
+      if (m.match(/^"?[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}"?$/)) {
+        (0, log_1.info)("ignoring react devtools message");
+        return false;
+      }
+      if (m === JSON.stringify([{}])) {
+        (0, log_1.info)("empty message payload?");
+        return false;
+      }
+      return true;
+    }
+    exports.isValidLogMessage = isValidLogMessage2;
+  }
+});
+
 // ../common-ui/dist/components/ErrorBoundary/index.js
 var require_ErrorBoundary = __commonJS({
   "../common-ui/dist/components/ErrorBoundary/index.js"(exports) {
@@ -705,8 +733,17 @@ var require_ErrorBoundary = __commonJS({
           if (notify) {
             notify(hasError);
           }
-          return react_1.default.createElement(Modal_1.Modal, { open: true, setOpen: () => {
-          } }, react_1.default.createElement(Base, null, "A fatal error has occurred - the admin has been notified.", react_1.default.createElement("button", { type: "button", onClick: () => window.location.reload() }, "Press here to restart app")));
+          return react_1.default.createElement(
+            Modal_1.Modal,
+            { open: true, setOpen: () => {
+            } },
+            react_1.default.createElement(
+              Base,
+              null,
+              "A fatal error has occurred - the admin has been notified.",
+              react_1.default.createElement("button", { type: "button", onClick: () => window.location.reload() }, "Press here to restart app")
+            )
+          );
         }
         return children;
       }
@@ -813,6 +850,7 @@ var import_array = require("ag-common/dist/common/helpers/array");
 var import_log = require("ag-common/dist/common/helpers/log");
 var import_callOpenApi = require("ag-common/dist/ui/helpers/callOpenApi");
 var import_api = __toESM(require_api());
+var import_logsend = __toESM(require_logsend());
 function callOpenApi(p) {
   return (0, import_callOpenApi.callOpenApi)(__spreadProps(__spreadValues({}, p), {
     func: (d) => p.func(d),
@@ -875,8 +913,16 @@ var errorTrack = (_0) => __async(void 0, [_0], function* ({
   data,
   overrideBaseUrl = "https://api.analytica.click"
 }) {
+  var _a2;
   if (isLocal) {
-    (0, import_log.debug)(`local error tracking ignored:${data.data.message} ${JSON.stringify(data)}, to ${overrideBaseUrl}`);
+    (0, import_log.debug)(
+      `local error tracking ignored:${data.data.message} ${JSON.stringify(
+        data
+      )}, to ${overrideBaseUrl}`
+    );
+    return {};
+  }
+  if (!(0, import_logsend.isValidLogMessage)((_a2 = data == null ? void 0 : data.data) == null ? void 0 : _a2.message)) {
     return {};
   }
   (0, import_log.debug)("error track", data.data.message, JSON.stringify(data));
@@ -959,7 +1005,9 @@ var feedback = (_0) => __async(void 0, [_0], function* ({
 }) {
   var _a2;
   if (typeof window !== "undefined" && ((_a2 = window == null ? void 0 : window.location) == null ? void 0 : _a2.hostname) === "localhost") {
-    (0, import_log3.debug)(`local feedback ignored:${JSON.stringify(data)}, to ${overrideBaseUrl}`);
+    (0, import_log3.debug)(
+      `local feedback ignored:${JSON.stringify(data)}, to ${overrideBaseUrl}`
+    );
     return {};
   }
   (0, import_log3.debug)("feedback", JSON.stringify(data));
@@ -973,7 +1021,9 @@ var feedback = (_0) => __async(void 0, [_0], function* ({
   return {};
 });
 var useFeedback = () => {
-  const { analyticaToken, overrideBaseUrl } = (0, import_react2.useContext)(AnalyticaConfigContext);
+  const { analyticaToken, overrideBaseUrl } = (0, import_react2.useContext)(
+    AnalyticaConfigContext
+  );
   if (!analyticaToken) {
     (0, import_log3.warn)(tokenMissing("useFeedback"));
     return { trackWithToken: () => ({ error: "no token" }) };
@@ -1079,7 +1129,9 @@ var page = (_0) => __async(void 0, [_0], function* ({
   return track({ analyticaToken, userData, overrideBaseUrl, eventName: "PAGE" });
 });
 var useTrack = () => {
-  const { analyticaToken, overrideBaseUrl } = (0, import_react3.useContext)(AnalyticaConfigContext);
+  const { analyticaToken, overrideBaseUrl } = (0, import_react3.useContext)(
+    AnalyticaConfigContext
+  );
   if (!analyticaToken) {
     (0, import_log5.warn)(tokenMissing("useTrack"));
     const def = () => __async(void 0, null, function* () {
@@ -1192,7 +1244,9 @@ var ExternalComponent = ({
 var import_react6 = __toESM(require("react"));
 var import_log7 = require("ag-common/dist/common/helpers/log");
 var Feedback = (props) => {
-  const { analyticaToken, overrideBaseUrl, devMode } = (0, import_react6.useContext)(AnalyticaConfigContext);
+  const { analyticaToken, overrideBaseUrl, devMode } = (0, import_react6.useContext)(
+    AnalyticaConfigContext
+  );
   if (!analyticaToken) {
     (0, import_log7.warn)(tokenMissing("Feedback"));
     return /* @__PURE__ */ import_react6.default.createElement(import_react6.default.Fragment, null);
@@ -1375,7 +1429,9 @@ var import_react8 = __toESM(require("react"));
 var import_useLocalStorage = require("ag-common/dist/ui/helpers/useLocalStorage");
 var import_cookie = require("ag-common/dist/ui/helpers/cookie");
 var import_dom3 = __toESM(require_dom());
-var CognitoAuthContext = import_react8.default.createContext(void 0);
+var CognitoAuthContext = import_react8.default.createContext(
+  void 0
+);
 var getStatefulUrl = ({
   redirectUrl,
   qs
@@ -1467,86 +1523,92 @@ var CognitoAuthProvider = ({
       login: true
     });
   });
-  useGranularEffect(() => {
-    function run() {
-      return __async(this, null, function* () {
-        var _a3, _b2, _c, _d;
-        const hasQs = !!(qs == null ? void 0 : qs.code) || !!(qs == null ? void 0 : qs.error);
-        const expired = jwtExpired(user == null ? void 0 : user.jwt);
-        const onlyJwt = !(user == null ? void 0 : user.userId) && !!(user == null ? void 0 : user.jwt);
-        if (loading || error2 || ((_a3 = user == null ? void 0 : user.idJwt) == null ? void 0 : _a3.email) && !hasQs && !expired) {
-          return;
-        }
-        try {
-          setLoading(true);
-          if (qs == null ? void 0 : qs.error) {
-            const newerror = {
-              message: (qs == null ? void 0 : qs.error_description) || "auth error"
-            };
-            if (JSON.stringify(newerror || {}) !== JSON.stringify(error2 || {})) {
-              setError(newerror);
-            }
-            return;
-          }
-          if ((qs == null ? void 0 : qs.code) && !expired) {
-            yield goToPageUrl({ url: redirectUrl, login: false });
+  useGranularEffect(
+    () => {
+      function run() {
+        return __async(this, null, function* () {
+          var _a3, _b2, _c, _d;
+          const hasQs = !!(qs == null ? void 0 : qs.code) || !!(qs == null ? void 0 : qs.error);
+          const expired = jwtExpired(user == null ? void 0 : user.jwt);
+          const onlyJwt = !(user == null ? void 0 : user.userId) && !!(user == null ? void 0 : user.jwt);
+          if (loading || error2 || ((_a3 = user == null ? void 0 : user.idJwt) == null ? void 0 : _a3.email) && !hasQs && !expired) {
             return;
           }
-          if (qs == null ? void 0 : qs.code) {
-            if (expired) {
-              yield getTokensFromCode({
-                code: qs.code,
-                redirectUrl,
+          try {
+            setLoading(true);
+            if (qs == null ? void 0 : qs.error) {
+              const newerror = {
+                message: (qs == null ? void 0 : qs.error_description) || "auth error"
+              };
+              if (JSON.stringify(newerror || {}) !== JSON.stringify(error2 || {})) {
+                setError(newerror);
+              }
+              return;
+            }
+            if ((qs == null ? void 0 : qs.code) && !expired) {
+              yield goToPageUrl({ url: redirectUrl, login: false });
+              return;
+            }
+            if (qs == null ? void 0 : qs.code) {
+              if (expired) {
+                yield getTokensFromCode({
+                  code: qs.code,
+                  redirectUrl,
+                  config,
+                  setUser
+                });
+              }
+              yield goToPageUrl({
+                url: getStatefulUrl({ redirectUrl, qs }),
+                login: false
+              });
+              return;
+            }
+            if (expired && ((_b2 = user == null ? void 0 : user.jwt) == null ? void 0 : _b2.refresh_token)) {
+              yield refreshToken({
+                setUser,
+                setError,
+                user,
                 config,
-                setUser
+                logout
               });
+              return;
             }
-            yield goToPageUrl({
-              url: getStatefulUrl({ redirectUrl, qs }),
-              login: false
-            });
-            return;
-          }
-          if (expired && ((_b2 = user == null ? void 0 : user.jwt) == null ? void 0 : _b2.refresh_token)) {
-            yield refreshToken({
-              setUser,
-              setError,
-              user,
-              config,
-              logout
-            });
-            return;
-          }
-          if (onlyJwt) {
-            const token = (_d = (_c = user == null ? void 0 : user.jwt) == null ? void 0 : _c.id_token) == null ? void 0 : _d.substr(user.jwt.id_token.indexOf(" ") + 1);
-            if (!user || !token) {
-              (0, import_log9.info)("logging out no token");
-              setUser(void 0);
-              setError(void 0);
-            } else {
-              setUser(__spreadProps(__spreadValues({}, getUserFromIdToken(token)), {
-                jwt: user.jwt,
-                credentials: user.credentials
-              }));
+            if (onlyJwt) {
+              const token = (_d = (_c = user == null ? void 0 : user.jwt) == null ? void 0 : _c.id_token) == null ? void 0 : _d.substr(
+                user.jwt.id_token.indexOf(" ") + 1
+              );
+              if (!user || !token) {
+                (0, import_log9.info)("logging out no token");
+                setUser(void 0);
+                setError(void 0);
+              } else {
+                setUser(__spreadProps(__spreadValues({}, getUserFromIdToken(token)), {
+                  jwt: user.jwt,
+                  credentials: user.credentials
+                }));
+              }
             }
+          } finally {
+            setLoading(false);
           }
-        } finally {
-          setLoading(false);
-        }
-      });
-    }
-    void run();
-  }, [user == null ? void 0 : user.jwt, qs], [
-    config,
-    error2,
-    goToPageUrl,
-    logout,
-    loading,
-    qs,
-    redirectUrl,
-    setUser,
-    user
-  ]);
+        });
+      }
+      void run();
+    },
+    [user == null ? void 0 : user.jwt, qs],
+    [
+      config,
+      error2,
+      goToPageUrl,
+      logout,
+      loading,
+      qs,
+      redirectUrl,
+      setUser,
+      user
+    ]
+  );
   (0, import_react8.useEffect)(() => {
     var _a3;
     if (error2) {
@@ -1596,17 +1658,24 @@ var DashboardAuthValidation = ({
   getUnauthedPage,
   addToast
 }) => {
-  useGranularEffect(() => {
-    if (authError) {
-      const emailOption = authError.message.includes("email") ? ` We require the use of your email for the functionality of this app.
+  useGranularEffect(
+    () => {
+      if (authError) {
+        const emailOption = authError.message.includes("email") ? ` We require the use of your email for the functionality of this app.
         You can update your settings at https://www.facebook.com/settings?tab=applications` : "";
-      addToast(`An Error has occured with your login attempt.${emailOption}`, {
-        appearance: "error"
-      });
-      (0, import_log10.error)(`auth error:`, JSON.stringify(authError, null, 2));
-      void logout();
-    }
-  }, [authError], [authError, addToast, logout]);
+        addToast(
+          `An Error has occured with your login attempt.${emailOption}`,
+          {
+            appearance: "error"
+          }
+        );
+        (0, import_log10.error)(`auth error:`, JSON.stringify(authError, null, 2));
+        void logout();
+      }
+    },
+    [authError],
+    [authError, addToast, logout]
+  );
   const forceLogin = Object.keys(request.url.query || {}).includes("login");
   if (forceLogin) {
     if (!isAuthenticated) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "analytica.click",
-  "version": "0.0.258",
+  "version": "0.0.261",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",