@stokr/components-library 3.0.25 → 3.0.27

package/dist/context/AuthContext.js

@@ -6,10 +6,8 @@ import fetchData from "../api/fetchData.js";
 import { identify, reset } from "../analytics/index.js";
 import { withRouter } from "../utils/withRouter.js";
 import { configure } from "../config.js";
-import { AppSurface, AppRoute } from "../routing/app-routes.js";
-import { resolveAppHref, isAlreadyOnOnboardingFlow } from "../routing/resolve-app-href.js";
-import { navigateToHref, navigateApp } from "../routing/navigate-app.js";
-import { getConfig } from "../runtime-config.js";
+import { getPlatformURL, getConfig } from "../runtime-config.js";
+import { isAlreadyOnOnboardingFlow } from "../utils/app-urls.js";
 import { Text } from "../components/Text/Text.styles.js";
 import { getFirebaseAuth } from "../firebase-config.js";
 import { Auth } from "./Auth.js";
@@ -17,6 +15,7 @@ import { DEFAULT_TOKEN_EXPIRY_MS } from "./Auth.js";
 import { ConfirmModal as ConfirmModalComponent } from "../components/ConfirmModal/ConfirmModal.js";
 import avatarPlaceholder from "../static/images/avatar-placeholder.png.js";
 import { signOut, getMultiFactorResolver, PhoneMultiFactorGenerator, TotpMultiFactorGenerator, multiFactor } from "firebase/auth";
+import { navigateToHref } from "../routing/navigate-app.js";
 const AuthContext = React__default.createContext();
 const INACTIVITY_TIME_MS = 5 * 60 * 1e3;
 const INACTIVITY_EVENTS = ["mousemove", "keydown", "click", "scroll", "touchstart"];
@@ -44,7 +43,9 @@ class AuthProviderClass extends Component {
     verifyEmailError: null,
     isVerifyingEmail: false,
     loggedOutDueToInactivity: false,
-    loggedOutDueToCookieExpiry: false
+    loggedOutDueToCookieExpiry: false,
+    /** When set, show session modal but keep session until user dismisses (avoids login + session modals at once). */
+    sessionExpiryPendingReason: null
   };
   componentDidMount() {
     if (this.props.config) {
@@ -121,12 +122,12 @@ class AuthProviderClass extends Component {
     if (!expiresAt) return;
     const delay = expiresAt - Date.now();
     if (delay <= 0) {
-      this.logoutUser(false, { dueToCookieExpiry: true });
+      this.setState({ sessionExpiryPendingReason: "cookie" });
       return;
     }
     this.cookieExpiryTimerRef = setTimeout(() => {
       this.cookieExpiryTimerRef = null;
-      this.logoutUser(false, { dueToCookieExpiry: true });
+      this.setState({ sessionExpiryPendingReason: "cookie" });
     }, delay);
   };
   getInactivityTimeMs = () => {
@@ -134,6 +135,7 @@ class AuthProviderClass extends Component {
     return typeof inactivityTimeMs === "number" && inactivityTimeMs > 0 ? inactivityTimeMs : INACTIVITY_TIME_MS;
   };
   resetInactivityTimer = () => {
+    if (this.state.sessionExpiryPendingReason) return;
     const now = Date.now();
     if (now - this._lastActivityAt < 1e3) return;
     this._lastActivityAt = now;
@@ -143,7 +145,7 @@ class AuthProviderClass extends Component {
       const delay = this.getInactivityTimeMs();
       this.inactivityTimerRef = setTimeout(() => {
         this.inactivityTimerRef = null;
-        this.logoutUser(false, { dueToInactivity: true });
+        this.setState({ sessionExpiryPendingReason: "inactivity" });
       }, delay);
     }
   };
@@ -256,14 +258,16 @@ class AuthProviderClass extends Component {
     }
   };
   unenrollUser2FA = async () => {
-    const { userMfaEnrollment, user } = this.state;
-    if (userMfaEnrollment?.length === 0) {
+    const { userMfaEnrollment } = this.state;
+    if (!userMfaEnrollment || userMfaEnrollment.length === 0) {
       console.log("User is not enrolled in 2FA");
       return;
     }
+    const firebaseUser = this.state.firebaseUser || getFirebaseAuth()?.currentUser;
+    if (!firebaseUser) throw new Error("Firebase user not available for MFA unenroll.");
     try {
       for (let i = 0; i < userMfaEnrollment.length; i++) {
-        await multiFactor(user).unenroll(userMfaEnrollment[i].uid);
+        await multiFactor(firebaseUser).unenroll(userMfaEnrollment[i].uid);
       }
     } catch (error) {
       console.log({ error });
@@ -287,15 +291,16 @@ class AuthProviderClass extends Component {
     this.clearInactivityTimer();
     try {
       const auth = getFirebaseAuth();
-      if (auth) signOut(auth).then(() => {
+      if (auth) signOut(auth).catch(() => {
       });
       Auth.logout();
     } catch (_e) {
     }
     delete axiosInstance.defaults.headers.common.Authorization;
     reset();
-    this.setUser(null);
+    this.userRef.current = null;
     this.setState({
+      user: null,
       firebaseUser: null,
       firebaseError: null,
       verifyEmailError: null,
@@ -304,11 +309,12 @@ class AuthProviderClass extends Component {
       isVerifyingEmail: false,
       avatar: avatarPlaceholder,
       isFetchingUser: false,
+      sessionExpiryPendingReason: null,
       loggedOutDueToInactivity: options.dueToInactivity === true,
       loggedOutDueToCookieExpiry: options.dueToCookieExpiry === true
     });
     if (redirect) {
-      const home = resolveAppHref(AppSurface.INVESTOR_ROOT, "") || `https://${getConfig("websiteDomain")}`;
+      const home = getPlatformURL();
       navigateToHref(this.props.navigate, home);
     }
   };
@@ -318,6 +324,15 @@ class AuthProviderClass extends Component {
   clearLoggedOutDueToCookieExpiry = () => {
     this.setState({ loggedOutDueToCookieExpiry: false });
   };
+  /** Dismiss session modal: if expiry was deferred, perform logout; otherwise clear post-logout flags only. */
+  dismissSessionExpiryModal = () => {
+    if (this.state.sessionExpiryPendingReason) {
+      this.logoutUser(false, {});
+      return;
+    }
+    this.clearLoggedOutDueToInactivity();
+    this.clearLoggedOutDueToCookieExpiry();
+  };
   /** Call when user cancels the 2FA step (e.g. goes back to login to try another account). */
   reset2faFlow = () => {
     this.setState({ waitingFor2fa: false, firebaseError: null });
@@ -392,6 +407,7 @@ class AuthProviderClass extends Component {
         isFetchingUser: false
       });
       const code = error?.code;
+      const httpStatus = error?.response?.status;
       if (code === "auth/internal-error" || code === "auth/network-request-failed") {
         Auth.logout();
         if (typeof console !== "undefined" && console.warn) {
@@ -403,6 +419,16 @@ class AuthProviderClass extends Component {
         }
         return;
       }
+      if (httpStatus === 401 || httpStatus === 403) {
+        Auth.logout();
+        this.setState({ user: null, firebaseUser: null });
+        if (typeof console !== "undefined" && console.warn) {
+          console.warn(
+            "[@stokr/components-library] getUser() rejected by server (" + httpStatus + ") — stale session cleared."
+          );
+        }
+        return;
+      }
       console.log(`Error in getUser: ${error}`);
       throw error;
     }
@@ -411,10 +437,10 @@ class AuthProviderClass extends Component {
     if (!user) {
       throw new Error("User is not defined");
     } else if (!user?.emailVerified && !isAlreadyOnOnboardingFlow()) {
-      navigateApp(this.props.navigate, AppSurface.ONBOARDING, AppRoute.RESEND_ACTIVATION);
+      navigateToHref(this.props.navigate, `${getConfig("onboardingUrl")}/resend-activation-email`);
       return false;
     } else if (!user?.country && user?.user_type === "investor" && !isAlreadyOnOnboardingFlow()) {
-      navigateApp(this.props.navigate, AppSurface.ONBOARDING, AppRoute.WELCOME);
+      navigateToHref(this.props.navigate, `${getConfig("onboardingUrl")}/welcome`);
       return false;
     }
     return true;
@@ -713,27 +739,22 @@ class AuthProviderClass extends Component {
           refreshIdToken: Auth.refreshIdToken,
           clearLoggedOutDueToInactivity: this.clearLoggedOutDueToInactivity,
           clearLoggedOutDueToCookieExpiry: this.clearLoggedOutDueToCookieExpiry,
+          dismissSessionExpiryModal: this.dismissSessionExpiryModal,
           reset2faFlow: this.reset2faFlow
         },
         children: [
           children,
-          (this.state.loggedOutDueToInactivity || this.state.loggedOutDueToCookieExpiry) && !this.props.hideInactivityModal && /* @__PURE__ */ jsx(
+          (this.state.loggedOutDueToInactivity || this.state.loggedOutDueToCookieExpiry || this.state.sessionExpiryPendingReason) && !this.props.hideInactivityModal && /* @__PURE__ */ jsx(
             ConfirmModalComponent,
             {
               isOpen: true,
               maxWidth: "600px",
               confirmText: "OK",
-              onCancel: () => {
-                this.clearLoggedOutDueToInactivity();
-                this.clearLoggedOutDueToCookieExpiry();
-              },
-              onConfirm: () => {
-                this.clearLoggedOutDueToInactivity();
-                this.clearLoggedOutDueToCookieExpiry();
-              },
+              onCancel: this.dismissSessionExpiryModal,
+              onConfirm: this.dismissSessionExpiryModal,
               showRedBar: true,
               title: "Session expired",
-              content: /* @__PURE__ */ jsx(Text, { children: /* @__PURE__ */ jsx("p", { style: { fontSize: 16 }, children: this.state.loggedOutDueToInactivity ? "You have been logged out due to inactivity." : "Your session has expired. Please log in again." }) })
+              content: /* @__PURE__ */ jsx(Text, { children: /* @__PURE__ */ jsx("p", { style: { fontSize: 16 }, children: this.state.sessionExpiryPendingReason === "inactivity" || this.state.loggedOutDueToInactivity ? "You have been logged out due to inactivity." : "Your session has expired. Please log in again." }) })
             }
           )
         ]
@@ -752,16 +773,14 @@ AuthProviderClass.propTypes = {
     cookieDomain: PropTypes.string,
     websiteDomain: PropTypes.string,
     photoApiUrl: PropTypes.string,
-    /** Set to `'path'` for single-origin URLs (`/dashboard`, `/admin`, …). Omit for legacy `*.websiteDomain` subdomains. */
-    routingMode: PropTypes.oneOf(["path"]),
-    /** Path mode only: override first path segments (e.g. `{ onboarding: '/signup', dashboard: '/app/dashboard' }`). */
-    appUrlPaths: PropTypes.object,
-    /**
-     * Optional per-surface URL style for incremental cutover. Keys: `onboarding`, `dashboard`, `admin`, `registerEntry`, `investorRoot`.
-     * Each value: `'path'` (same-origin prefix from `appUrlPaths`) or `'subdomain'` (legacy `https://{sub}.{websiteDomain}`).
-     * Omitted keys follow global `routingMode` (`path` vs default subdomain).
-     */
-    surfaceRoutingMode: PropTypes.object,
+    /** Full base URL for the onboarding / sign-up app (e.g. `'https://signup.stokr.io'` or `'https://stokr.io/signin'`). */
+    onboardingUrl: PropTypes.string,
+    /** Full base URL for the investor dashboard (e.g. `'https://dashboard.stokr.io'`). */
+    dashboardUrl: PropTypes.string,
+    /** Full base URL for the admin / venture dashboard (e.g. `'https://admin.stokr.io'`). */
+    adminUrl: PropTypes.string,
+    /** URL for the registration entry point (e.g. `'https://stokr.io/signup'`). */
+    registerUrl: PropTypes.string,
     firebase: PropTypes.shape({
       apiKey: PropTypes.string,
       authDomain: PropTypes.string,

package/dist/index.js

@@ -193,11 +193,9 @@ import { ScrollToTop, scrollToElement, useScrollActions } from "./utils/scrollUt
 import { useTimer } from "./hooks/useTimer.js";
 import { useTransactionPolling } from "./hooks/useTransactionPolling.js";
 import { configure } from "./config.js";
-import { AppRoute, AppSurface } from "./routing/app-routes.js";
-import { SURFACE_ROUTING_PATH_KEYS, getAppPublicOrigin, isAlreadyOnOnboardingFlow, isPathBasedRouting, isPathForSurface, resolveAppHref } from "./routing/resolve-app-href.js";
-import { navigateApp, navigateToHref, pathnameIfSameOrigin } from "./routing/navigate-app.js";
+import { navigateToHref, pathnameIfSameOrigin } from "./routing/navigate-app.js";
 import { RouterWrapper } from "./routing/RouterWrapper.js";
-import { buildDashboardUrl, buildOnboardingUrl, getAdminAppUrl, getDashboardBaseUrl, getInvestorAppOrigin, getOnboardingAppBaseUrl, getRegisterEntryUrl } from "./utils/app-urls.js";
+import { isAlreadyOnOnboardingFlow } from "./utils/app-urls.js";
 import { authenticationApi } from "./api/authenticationApi.js";
 import { default as default39 } from "./components/2FA/Connect2FA.js";
 import { default as default40 } from "./components/2FA/enable-2fa-flow.js";
@@ -220,7 +218,7 @@ import { default as default51 } from "./styles/semanticUi.js";
 import { default as default52 } from "./styles/spacing.js";
 import { default as default53 } from "./styles/theme.js";
 import { BASE_COLOR_HEX, BASE_FONT_SIZE, BASE_MARGIN, BASE_MARGIN_2X_PX, BASE_MARGIN_PX, BLUE_BASE_HEX, BLUE_BASE_RELEASED_HEX, CAPITAL_ANIMATION_LENGTH, COLUMN, DESKTOP_MEDIA, GRAY_BASE_HEX, GRAY_DEEP_HEX, GRAY_SECONDARY_HEX, GREEN, MAX_WIDTH, PHONE_MEDIA, RED_BASE_HEX, RED_BASE_RELEASE_HEX, SLIDER_HEIGHT, SLIDER_MOBILE_HEIGHT, SLIDER_TABLET_HEIGHT, TABLET_MEDIA, WHITE_HEX } from "./constants/style.js";
-import { LoanActivityTypes, ProfessionalInvestorStatuses, ProjectStates, ProjectStatus, ProjectTypes, TransactionTypes, USInvestorAcreditationStatuses, UserTypes, emailRegex, getPlatformURL, transactionTypeDisplayNames, walletTypes } from "./constants/globalVariables.js";
+import { LoanActivityTypes, ProfessionalInvestorStatuses, ProjectStates, ProjectStatus, ProjectTypes, TransactionTypes, USInvestorAcreditationStatuses, UserTypes, emailRegex, transactionTypeDisplayNames, walletTypes } from "./constants/globalVariables.js";
 import { BackButtonIcon, StyledBackButton, StyledBackButtonExternal, StyledWindowBackButton } from "./components/BackButton/BackButton.styles.js";
 import { ContainerWithLine } from "./components/RegisterConfirmModal/RegisterConfirmModal.styles.js";
 import { CopyToClipboard } from "react-copy-to-clipboard";
@@ -245,8 +243,6 @@ export {
   AgreementItem,
   AnimatedSpan,
   AnnouncementTitleMain,
-  AppRoute,
-  AppSurface,
   Arrow,
   ArrowSimple,
   Auth,
@@ -477,7 +473,6 @@ export {
   SLIDER_HEIGHT,
   SLIDER_MOBILE_HEIGHT,
   SLIDER_TABLET_HEIGHT,
-  SURFACE_ROUTING_PATH_KEYS,
   Scroll,
   ScrollToTop,
   SearchInput,
@@ -582,8 +577,6 @@ export {
   Youtube,
   alias,
   authenticationApi,
-  buildDashboardUrl,
-  buildOnboardingUrl,
   checkSaleTimeLeft,
   checkTodoStatus,
   colors,
@@ -597,23 +590,16 @@ export {
   format,
   formatCurrencyValue,
   generateCoreChecklistTasks,
-  getAdminAppUrl,
   getAmountBucket,
   getAnalyticsIngestUrl,
-  getAppPublicOrigin,
   getBackofficeAppUrl,
   getConfig,
   getCurrencyIcon,
   getCurrencySymbol,
-  getDashboardBaseUrl,
   getFooterGroups,
-  getInvestorAppOrigin,
   getLiquidAssetIcon,
   getMedia,
-  getOnboardingAppBaseUrl,
-  getPlatformURL,
   getProjectCurrencySign,
-  getRegisterEntryUrl,
   getTokenBucket,
   getVerifyIdentityChecklist,
   default48 as grid,
@@ -622,15 +608,12 @@ export {
   identify,
   initAnalytics,
   isAlreadyOnOnboardingFlow,
-  isPathBasedRouting,
-  isPathForSurface,
   isUSInvestor,
   km_ify,
   learnMoreCategoryPropTypes,
   learnMorePostPropTypes,
   loaderGif,
   momentUtils,
-  navigateApp,
   navigateToHref,
   openFile,
   optIn,
@@ -639,7 +622,6 @@ export {
   default49 as reactTippyStyle,
   reset,
   resetRuntimeConfig,
-  resolveAppHref,
   default50 as rwd,
   rwdMax,
   saveAs,

package/dist/routing/navigate-app.js

@@ -1,4 +1,3 @@
-import { resolveAppHref } from "./resolve-app-href.js";
 function pathnameIfSameOrigin(absoluteHref) {
   if (typeof window === "undefined" || !absoluteHref) return null;
   try {
@@ -10,16 +9,6 @@ function pathnameIfSameOrigin(absoluteHref) {
   }
   return null;
 }
-function navigateApp(navigate, surface, relativePath = "") {
-  const href = resolveAppHref(surface, relativePath);
-  if (!href) return;
-  const internal = pathnameIfSameOrigin(href);
-  if (internal != null && typeof navigate === "function") {
-    navigate(internal);
-    return;
-  }
-  window.location.assign(href);
-}
 function navigateToHref(navigate, href) {
   if (!href) return;
   const internal = pathnameIfSameOrigin(href);
@@ -30,7 +19,6 @@ function navigateToHref(navigate, href) {
   window.location.assign(href);
 }
 export {
-  navigateApp,
   navigateToHref,
   pathnameIfSameOrigin
 };

package/dist/runtime-config.js

@@ -1,4 +1,4 @@
-const __vite_import_meta_env__ = { "BASE_URL": "/", "DEV": false, "MODE": "production", "PROD": true, "SSR": false };
+const __vite_import_meta_env__ = { "BASE_URL": "/", "DEV": false, "MODE": "production", "PROD": true, "SSR": false, "VITE_ADMIN_URL": "https://admin.stokr.info", "VITE_API_URL": "https://platform-api.stokr.info/api/v1", "VITE_BASE_URL_PUBLIC": "https://platform-api-no-auth.stokr.info/api/v1", "VITE_COOKIE_DOMAIN": "stokr.info", "VITE_DASHBOARD_URL": "https://dashboard.stokr.info", "VITE_FIREBASE_API_KEY": "AIzaSyBBp_3Romnfv--YpUuV0mJgDymvSp3oq0c", "VITE_FIREBASE_APP_ID": "1:568229412804:web:2391857e3e2a0b02346e91", "VITE_FIREBASE_AUTH_DOMAIN": "stokr-development-env.firebaseapp.com", "VITE_FIREBASE_MEASUREMENT_ID": "G-CP53SZVSMN", "VITE_FIREBASE_MESSAGING_SENDER_ID": "568229412804", "VITE_FIREBASE_PROJECT_ID": "stokr-development-env", "VITE_FIREBASE_STORAGE_BUCKET": "stokr-development-env.appspot.com", "VITE_MIXPANEL_TOKEN": "a7bb1e881f9b2600762fded84d8ce0ea", "VITE_ONBOARDING_URL": "https://signup.stokr.info", "VITE_PHOTO_API_URL": "https://platform-api.stokr.info/api/v1", "VITE_REGISTER_URL": "https://stokr.info/signup", "VITE_WEBSITE_DOMAIN": "stokr.info" };
 const _overrides = {};
 const ENV_KEY_BY_CONFIG = {
   apiUrl: "VITE_API_URL",
@@ -6,8 +6,10 @@ const ENV_KEY_BY_CONFIG = {
   cookieDomain: "VITE_COOKIE_DOMAIN",
   websiteDomain: "VITE_WEBSITE_DOMAIN",
   photoApiUrl: "VITE_PHOTO_API_URL",
-  /** `'path'` = single-origin URLs (`https://DOMAIN/dashboard`, …). Anything else = legacy subdomains (`dashboard.`, `signup.`, …). */
-  routingMode: "VITE_ROUTING_MODE"
+  onboardingUrl: "VITE_ONBOARDING_URL",
+  dashboardUrl: "VITE_DASHBOARD_URL",
+  adminUrl: "VITE_ADMIN_URL",
+  registerUrl: "VITE_REGISTER_URL"
 };
 const FIREBASE_ENV_VARS = [
   "VITE_FIREBASE_API_KEY",
@@ -77,18 +79,20 @@ function getConfig(key) {
   if (key === "firebase") {
     return _overrides.firebase ?? buildFirebaseConfigFromEnv();
   }
-  if (key === "appUrlPaths") {
-    return _overrides.appUrlPaths;
-  }
   const envName = ENV_KEY_BY_CONFIG[key];
   if (envName) {
     return _overrides[key] ?? env(envName);
   }
   return _overrides[key];
 }
+function getPlatformURL() {
+  const domain = getConfig("websiteDomain");
+  return domain ? `https://${domain}` : "";
+}
 export {
   assignRuntimeConfig,
   getConfig,
   getMissingRuntimeEnvVarNames,
+  getPlatformURL,
   resetRuntimeConfig
 };