analytica.click 0.0.236 → 0.0.241

package/dist/index.d.ts

@@ -130,6 +130,24 @@ declare module 'analytica.click/ui-npm/src/components/Feedback/index' {
   import { IFeedbackWidget } from 'analytica.click/common-ui/src/types/index';
   export const Feedback: (props: IFeedbackWidget) => JSX.Element;
 
+}
+declare module 'analytica.click/ui-npm/src/components/index' {
+  export * from 'analytica.click/ui-npm/src/components/AnalyticaConfig/index';
+  export * from 'analytica.click/ui-npm/src/components/ErrorBoundary/index';
+  export * from 'analytica.click/ui-npm/src/components/ExternalComponent/index';
+  export * from 'analytica.click/ui-npm/src/components/Feedback/index';
+  export * from 'analytica.click/ui-npm/src/components/UserProvider/index';
+  export { DashboardAuthValidation } from 'analytica.click/ui-npm/src/components/UserProvider/DashboardAuthValidation';
+
+}
+declare module 'analytica.click/ui-npm/src/components/UserProvider/cognito' {
+  import { ICognitoAuth } from 'ag-common/dist/ui/helpers/cognito';
+  import { User, AwsCreds } from 'ag-common/dist/ui/helpers/jwt';
+  export function getAwsCreds({ user, config, }: {
+      user?: User;
+      config: ICognitoAuth;
+  }): Promise<AwsCreds | undefined>;
+
 }
 declare module 'analytica.click/ui-npm/src/components/UserProvider/DashboardAuthValidation' {
   /// <reference types="react" />
@@ -160,15 +178,6 @@ declare module 'analytica.click/ui-npm/src/components/UserProvider/DashboardAuth
       openApiDisabled: boolean;
   };
 
-}
-declare module 'analytica.click/ui-npm/src/components/UserProvider/cognito' {
-  import { ICognitoAuth } from 'ag-common/dist/ui/helpers/cognito';
-  import { User, AwsCreds } from 'ag-common/dist/ui/helpers/jwt';
-  export function getAwsCreds({ user, config, }: {
-      user?: User;
-      config: ICognitoAuth;
-  }): Promise<AwsCreds | undefined>;
-
 }
 declare module 'analytica.click/ui-npm/src/components/UserProvider/getTokensFromCode' {
   import { User } from 'ag-common/dist/ui/helpers/jwt';
@@ -217,13 +226,12 @@ declare module 'analytica.click/ui-npm/src/components/UserProvider/refreshToken'
   }): Promise<User | undefined>;
 
 }
-declare module 'analytica.click/ui-npm/src/components/index' {
-  export * from 'analytica.click/ui-npm/src/components/AnalyticaConfig/index';
-  export * from 'analytica.click/ui-npm/src/components/ErrorBoundary/index';
-  export * from 'analytica.click/ui-npm/src/components/ExternalComponent/index';
-  export * from 'analytica.click/ui-npm/src/components/Feedback/index';
-  export * from 'analytica.click/ui-npm/src/components/UserProvider/index';
-  export { DashboardAuthValidation } from 'analytica.click/ui-npm/src/components/UserProvider/DashboardAuthValidation';
+declare module 'analytica.click/ui-npm/src/components/UserProvider/useGranularHook' {
+  import { DependencyList, EffectCallback } from 'react';
+  type HookWithDependencies<C, R> = (callback: C, deps: DependencyList) => R;
+  export const useGranularHook: <T extends HookWithDependencies<C, ReturnType<T>>, C>(hook: T, callback: C, primaryDeps: DependencyList, secondaryDeps: DependencyList) => ReturnType<T>;
+  export const useGranularEffect: (effect: EffectCallback, primaryDeps: DependencyList, secondaryDeps: DependencyList) => void;
+  export {};
 
 }
 declare module 'analytica.click/ui-npm/src/helpers/errorTrack' {

package/dist/index.js

@@ -1310,13 +1310,45 @@ function getTokensFromCode(_0) {
   });
 }
 
+// src/components/UserProvider/useGranularHook.ts
+var import_react7 = require("react");
+var useGranularHook = (hook, callback, primaryDeps, secondaryDeps) => {
+  const ref = (0, import_react7.useRef)();
+  if (!ref.current || !primaryDeps.every((w, i) => {
+    var _a;
+    return Object.is(w, (_a = ref.current) == null ? void 0 : _a[i]);
+  }))
+    ref.current = [...primaryDeps, ...secondaryDeps];
+  return hook(callback, ref.current);
+};
+var useGranularEffect = (effect, primaryDeps, secondaryDeps) => useGranularHook(import_react7.useEffect, effect, primaryDeps, secondaryDeps);
+
 // src/components/UserProvider/index.tsx
 var import_log9 = require("ag-common/dist/common/helpers/log");
-var import_react7 = __toESM(require("react"));
+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_react7.default.createContext(void 0);
+var CognitoAuthContext = import_react8.default.createContext(void 0);
+var getStatefulUrl = ({
+  redirectUrl,
+  qs
+}) => {
+  let url = redirectUrl || "/";
+  if (qs == null ? void 0 : qs.state) {
+    try {
+      if (!url.includes("?")) {
+        url += "?";
+      } else {
+        url += "&";
+      }
+      url += `state=${qs.state}`;
+    } catch (e) {
+      (0, import_log9.warn)("bad state passed in");
+    }
+  }
+  return url;
+};
 var CognitoAuthProvider = ({
   config,
   children,
@@ -1327,7 +1359,7 @@ var CognitoAuthProvider = ({
   cookieDocument
 }) => {
   var _a, _b;
-  const [error2, setError] = (0, import_react7.useState)();
+  const [error2, setError] = (0, import_react8.useState)();
   const [idTokenRaw, setIdToken] = (0, import_cookie.useCookieString)({
     name: "id_token",
     cookieDocument: typeof window === "undefined" ? cookieDocument : void 0,
@@ -1335,17 +1367,20 @@ var CognitoAuthProvider = ({
   });
   let idToken = idTokenRaw;
   if (idToken && !decodeIdToken(idToken)) {
-    (0, import_log9.warn)(`bad token, logging out`);
+    (0, import_log9.warn)(`bad token, wiping`);
     (0, import_cookie.wipeCookies)("id_token");
-    void goToPageUrl({ url: location.origin, login: false });
     idToken = "";
   }
   let defUser;
   if (idToken && !(0, import_useLocalStorage.getLocalStorageItem)("user", void 0)) {
     defUser = getUserFromIdToken(idToken);
   }
-  const [user, setUser] = (0, import_useLocalStorage.UseLocalStorage)("user", defUser);
-  const [loading, setLoading] = (0, import_react7.useState)(false);
+  const [user, setUserRaw] = (0, import_useLocalStorage.UseLocalStorage)("user", defUser);
+  const setUser = (value2) => {
+    setUserRaw(value2);
+    return;
+  };
+  const [loading, setLoading] = (0, import_react8.useState)(false);
   const qs = (0, import_dom3.extractQs)({
     search: typeof window === "undefined" ? "" : window.location.search,
     sanatise: false
@@ -1360,8 +1395,7 @@ var CognitoAuthProvider = ({
     yield goToPageUrl({ url: location.origin, login: false });
     setLoading(false);
   });
-  const logoutCopy = logout;
-  (0, import_react7.useEffect)(() => {
+  (0, import_react8.useEffect)(() => {
     var _a2;
     const newT = (_a2 = user == null ? void 0 : user.jwt) == null ? void 0 : _a2.id_token;
     if (!!newT && newT !== idToken) {
@@ -1387,29 +1421,33 @@ var CognitoAuthProvider = ({
       login: true
     });
   });
-  (0, import_react7.useEffect)(() => {
+  useGranularEffect(() => {
     function run() {
       return __async(this, null, function* () {
-        var _a2, _b2, _c;
+        var _a2, _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 (!hasQs && !expired && !onlyJwt) {
+        if (loading || error2 || ((_a2 = user == null ? void 0 : user.idJwt) == null ? void 0 : _a2.email) && !hasQs && !expired) {
           return;
         }
         try {
           setLoading(true);
-          if (hasQs && !expired) {
-            yield goToPageUrl({ url: redirectUrl, login: true });
-          } else if (hasQs) {
-            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);
-              }
-            } else if (qs == null ? void 0 : qs.code) {
+          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,
@@ -1417,31 +1455,24 @@ var CognitoAuthProvider = ({
                 setUser
               });
             }
-            const newPath = "";
-            let url = newPath || redirectUrl || "/";
-            if (qs == null ? void 0 : qs.state) {
-              try {
-                if (!url.includes("?")) {
-                  url += "?";
-                } else {
-                  url += "&";
-                }
-                url += `state=${qs.state}`;
-              } catch (e) {
-                (0, import_log9.warn)("bad state passed in");
-              }
-            }
-            yield goToPageUrl({ url, login: true });
-          } else if (expired && ((_a2 = user == null ? void 0 : user.jwt) == null ? void 0 : _a2.refresh_token)) {
+            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: logoutCopy
+              logout
             });
-          } else if (onlyJwt) {
-            const token = (_c = (_b2 = user == null ? void 0 : user.jwt) == null ? void 0 : _b2.id_token) == null ? void 0 : _c.substr(user.jwt.id_token.indexOf(" ") + 1);
+            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);
@@ -1458,21 +1489,19 @@ var CognitoAuthProvider = ({
         }
       });
     }
-    if (!loading && !error2) {
-      run();
-    }
-  }, [
+    void run();
+  }, [user == null ? void 0 : user.jwt, qs], [
     config,
     error2,
     goToPageUrl,
-    logoutCopy,
+    logout,
     loading,
     qs,
     redirectUrl,
     setUser,
     user
   ]);
-  (0, import_react7.useEffect)(() => {
+  (0, import_react8.useEffect)(() => {
     var _a2;
     if (error2) {
       (0, import_log9.error)(JSON.stringify(error2));
@@ -1497,7 +1526,7 @@ var CognitoAuthProvider = ({
     error: error2,
     user
   };
-  return /* @__PURE__ */ import_react7.default.createElement(CognitoAuthContext.Provider, {
+  return /* @__PURE__ */ import_react8.default.createElement(CognitoAuthContext.Provider, {
     value
   }, children);
 };
@@ -1506,7 +1535,8 @@ var CognitoAuthProvider = ({
 var import_log10 = require("ag-common/dist/common/helpers/log");
 var import_string = require("ag-common/dist/common/helpers/string");
 var import_Loader = require("ag-common/dist/ui/components/Loader");
-var import_react8 = __toESM(require("react"));
+var import_useQueryString = require("ag-common/dist/ui/helpers/useQueryString");
+var import_react9 = __toESM(require("react"));
 var DashboardAuthValidation = ({
   rc: { request, pushPath },
   cac: {
@@ -1520,7 +1550,7 @@ var DashboardAuthValidation = ({
   getUnauthedPage,
   addToast
 }) => {
-  (0, import_react8.useEffect)(() => {
+  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` : "";
@@ -1530,28 +1560,29 @@ var DashboardAuthValidation = ({
       (0, import_log10.error)(`auth error:`, JSON.stringify(authError, null, 2));
       void logout();
     }
-  }, [authError]);
+  }, [authError], [authError, addToast, logout]);
   const forceLogin = Object.keys(request.url.query || {}).includes("login");
   if (forceLogin) {
     if (!isAuthenticated) {
       void loginWithRedirect(request.url.query.state);
-      return { render: /* @__PURE__ */ import_react8.default.createElement(import_react8.default.Fragment, null), openApiDisabled: true };
+      return { render: /* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, null), openApiDisabled: true };
     }
     if (isAuthenticated) {
       void pushPath(getDashboardPath());
-      return { render: /* @__PURE__ */ import_react8.default.createElement(import_react8.default.Fragment, null), openApiDisabled: true };
+      return { render: /* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, null), openApiDisabled: true };
     }
   }
   if (request.url.query.state && isAuthenticated) {
     const decoded = JSON.parse((0, import_string.fromBase64)(request.url.query.state));
     if (decoded.redirect) {
       void pushPath(decoded.redirect);
-      return { render: /* @__PURE__ */ import_react8.default.createElement(import_react8.default.Fragment, null), openApiDisabled: true };
+      return { render: /* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, null), openApiDisabled: true };
     }
   }
-  if (authLoading) {
+  const serverAuthLoading = import_useQueryString.isServer && !authError && !authLoading && !isAuthenticated && Object.keys(request.url.query || {}).includes("code");
+  if (authLoading || serverAuthLoading) {
     return {
-      render: /* @__PURE__ */ import_react8.default.createElement(import_Loader.Loader, {
+      render: /* @__PURE__ */ import_react9.default.createElement(import_Loader.Loader, {
         name: "authload"
       }),
       openApiDisabled: true
@@ -1559,7 +1590,7 @@ var DashboardAuthValidation = ({
   }
   if (!isAuthenticated && !authLoading && !authError && getUnauthedPage) {
     void pushPath(getUnauthedPage());
-    return { render: /* @__PURE__ */ import_react8.default.createElement(import_react8.default.Fragment, null), openApiDisabled: true };
+    return { render: /* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, null), openApiDisabled: true };
   }
   const openApiDisabled = !isAuthenticated || authLoading || !!authError;
   return { openApiDisabled };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "analytica.click",
-  "version": "0.0.236",
+  "version": "0.0.241",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -9,7 +9,7 @@
   "scripts": {
     "format": "npx eslint --ext .ts,.tsx ./src --fix",
     "lint": "tsc && npx eslint --ext .ts,.tsx ./src",
-    "build-direct": "cross-env NODE_ENV=prod ts-node esbuild",
+    "build-direct": "rimraf .build && rimraf dist && cross-env NODE_ENV=prod ts-node esbuild",
     "build": "yarn lint && yarn build-direct",
     "start": "cross-env NODE_ENV=dev nodemon -e ts,tsx -w ./src --exec 'ts-node esbuild'"
   },
@@ -30,6 +30,7 @@
     "nodemon": "2.x",
     "react": "18.x",
     "react-dom": "18.x",
+    "rimraf": "3.x",
     "styled-components": "5.x",
     "ts-node": "10.x",
     "typescript": "4.x"