@eintrek/erp-shell 0.1.60 → 0.1.61

package/dist/index.js

@@ -324,20 +324,154 @@ function readOrganizationStorage() {
         return null;
     }
 }
+/**
+ * The organisations the signed-in user belongs to, once their list has
+ * loaded (AppLayoutShell reports it); null until then.
+ */
+let knownOrganizationIds = null;
+/**
+ * Record the user's organisations (browser only). From then on a stored or
+ * tab organisation that is not among them loses to one that is: a browser
+ * that still remembers a deleted organisation — or one the user has left —
+ * must not keep sending it while the cookie names a good one.
+ */
+function setKnownOrganizationIds(ids) {
+    if (!isBrowser$1())
+        return;
+    if (ids === null) {
+        knownOrganizationIds = null;
+        return;
+    }
+    const set = new Set();
+    for (const id of ids) {
+        const value = normalise(id);
+        if (value)
+            set.add(value);
+    }
+    knownOrganizationIds = set;
+}
+/** Whether the loaded list says the user is NOT a member of `id`. */
+function isKnownStaleOrganizationId(id) {
+    const value = normalise(id);
+    return (value !== null &&
+        knownOrganizationIds !== null &&
+        !knownOrganizationIds.has(value));
+}
+/**
+ * Marks a request that must not carry X-Organization-ID: the user's own list
+ * of organisations is how a stale organisation id is found out, so it cannot
+ * depend on one. An app's interceptor honours it by passing the request's
+ * config to getRequestOrganizationId(config).
+ *
+ *   axiosInstance.get("/organizations", withoutOrganization({ params }))
+ */
+const WITHOUT_ORGANIZATION_FLAG = "erpWithoutOrganization";
+function withoutOrganization(config) {
+    return { ...(config ?? {}), [WITHOUT_ORGANIZATION_FLAG]: true };
+}
+/**
+ * Marks a request for one particular organisation, whatever this tab has
+ * active. Used to retry the organisation list under each stored id when an
+ * API refuses it without one (see http/organization-fallback.ts).
+ */
+const FOR_ORGANIZATION_FIELD = "erpOrganizationId";
+function isWithoutOrganization(config) {
+    return (!!config &&
+        typeof config === "object" &&
+        config[WITHOUT_ORGANIZATION_FLAG] === true);
+}
+function explicitOrganization(config) {
+    if (!config || typeof config !== "object")
+        return null;
+    const value = config[FOR_ORGANIZATION_FIELD];
+    return typeof value === "string" || typeof value === "number"
+        ? normalise(value)
+        : null;
+}
+/**
+ * Every organisation id this browser has stored for the tab — the tab's
+ * own, localStorage, the cookie — distinct, in that order.
+ */
+function getStoredOrganizationIds() {
+    const ids = [
+        getTabOrganizationId(),
+        readOrganizationStorage(),
+        readOrganizationCookie(),
+    ].filter((id) => id !== null);
+    return [...new Set(ids)];
+}
 /**
  * The organisation a request from this tab belongs to: the tab's own, then
  * localStorage, then the cookie. Use it for the X-Organization-ID header —
  * and read it before any `await` in the interceptor, so the header names the
  * organisation that was active when the request was made.
  *
+ * Pass the request's config: a request marked withoutOrganization() gets
+ * null, so no header.
+ *
  * localStorage before the cookie: setOrganizationId writes localStorage
  * synchronously and then awaits a server action for the cookie, so during
  * that round trip the cookie still names the previous organisation.
+ *
+ * Once the user's organisations are known (setKnownOrganizationIds), the
+ * first of those that is one of them wins: 0.1.60 let a deleted
+ * organisation's id left in localStorage beat a valid cookie, and every
+ * request — the organisation list included — was refused. If none is a
+ * member the first is still sent, as before: the list may simply be behind
+ * (an organisation created a moment ago).
+ */
+function getRequestOrganizationId(config) {
+    const explicit = explicitOrganization(config);
+    if (explicit)
+        return explicit;
+    if (isWithoutOrganization(config))
+        return null;
+    const candidates = [
+        getTabOrganizationId(),
+        readOrganizationStorage(),
+        readOrganizationCookie(),
+    ];
+    if (knownOrganizationIds !== null) {
+        const member = candidates.find(id => id !== null && knownOrganizationIds.has(id));
+        if (member)
+            return member;
+    }
+    return candidates.find(id => id !== null) ?? null;
+}
+function expireOrganizationCookie() {
+    // The cookie is set by the host's server action, host-only or on a parent
+    // domain (AUTH_COOKIE_DOMAIN, e.g. .antniti.com). The browser does not say
+    // which, so expire it on the host and on every parent domain.
+    const base = `${ORGANIZATION_ID_KEY}=; Max-Age=0; path=/; SameSite=Lax`;
+    try {
+        document.cookie = base;
+        const labels = window.location.hostname.split(".");
+        for (let i = 0; i < labels.length - 1; i++) {
+            document.cookie = `${base}; domain=.${labels.slice(i).join(".")}`;
+        }
+    }
+    catch {
+        // Cookies unavailable: nothing to clear.
+    }
+}
+/**
+ * Forget the active organisation everywhere this browser keeps it: the tab,
+ * localStorage and the `erp.organizationId` cookie. Call on sign-out, so the
+ * next person to sign in on this browser does not start in the previous
+ * person's organisation.
  */
-function getRequestOrganizationId() {
-    return (getTabOrganizationId() ??
-        readOrganizationStorage() ??
-        readOrganizationCookie());
+function clearStoredOrganization() {
+    if (!isBrowser$1())
+        return;
+    tabOrganizationId = null;
+    knownOrganizationIds = null;
+    try {
+        localStorage.removeItem(ORGANIZATION_ID_KEY);
+    }
+    catch {
+        // Storage unavailable: nothing to clear.
+    }
+    expireOrganizationCookie();
 }
 
 const SELECTED_ORG_STORAGE_KEY = "erp.organizationId";
@@ -1431,6 +1565,44 @@ const runGlobalRequestPrecheck = (config) => {
     return validateGoodsReceiptChecks(config.data);
 };
 
+/**
+ * The organisation list is asked for without an organisation (see
+ * withoutOrganization), but some APIs still refuse it without one: Peoplx's
+ * GET /organizations sits behind its module.hr plan gate, which answers 400
+ * "organization context required" to no header and 403 to an organisation
+ * that does not exist. Until those routes stop needing one, a refused list is
+ * asked again under each organisation this browser has stored — the tab's,
+ * localStorage's, the cookie's — so one good id among stale ones still gets
+ * the user their list, and with it the way back to a working organisation.
+ *
+ * `send` re-sends the request (an axios instance call). Returns the first
+ * answer that succeeds, or undefined when none did or the request is not a
+ * refused organisation-less one. Each retry is marked, so it never retries
+ * itself.
+ */
+const RETRIED = "_erpOrganizationFallback";
+async function retryWithStoredOrganizations(config, status, send) {
+    if (!config ||
+        config[WITHOUT_ORGANIZATION_FLAG] !== true ||
+        config[RETRIED] === true ||
+        (status !== 400 && status !== 403)) {
+        return undefined;
+    }
+    for (const id of getStoredOrganizationIds()) {
+        try {
+            return await send({
+                ...config,
+                [RETRIED]: true,
+                [FOR_ORGANIZATION_FIELD]: id,
+            });
+        }
+        catch {
+            // That one was refused too; try the next.
+        }
+    }
+    return undefined;
+}
+
 const isBrowser = () => typeof window !== "undefined";
 const isAuthEndpoint = (url) => !!url && url.includes("/api/auth/");
 const isAuthPage = () => isBrowser() && window.location.pathname.startsWith("/auth/");
@@ -1439,7 +1611,7 @@ const redirectToLogout = async () => {
         return;
     localStorage.clear();
     sessionStorage.clear();
-    setOrganizationId(null);
+    clearStoredOrganization();
     clearAccessTokenCache();
     await react.signOut({ callbackUrl: "/auth/signin" });
 };
@@ -1471,7 +1643,7 @@ instance.interceptors.request.use(async (config) => {
     // Read before the token await: the header must name the organisation that
     // was active when the request was made (and under which its query is
     // cached), not whatever is active once the token resolves.
-    const organizationId = getRequestOrganizationId();
+    const organizationId = getRequestOrganizationId(config);
     const token = await getAccessToken(false);
     if (token) {
         config.headers.Authorization = `Bearer ${token}`;
@@ -1531,6 +1703,9 @@ instance.interceptors.response.use(response => {
             window.dispatchEvent(new CustomEvent("erp:employee-record-required"));
         }
     }
+    const listed = await retryWithStoredOrganizations(originalRequest, error.response?.status, config => instance(config));
+    if (listed !== undefined)
+        return listed;
     return Promise.reject(toApiError(error));
 });
 
@@ -1557,7 +1732,7 @@ function platformApiBase(app) {
  * This package's version, attached to help messages so the back office can
  * tell which shell a report came from. Keep in step with package.json.
  */
-const SHELL_VERSION = "0.1.60";
+const SHELL_VERSION = "0.1.61";
 
 const HELP_APP_LABEL = {
     platform: "แพลตฟอร์ม",
@@ -1880,6 +2055,9 @@ function NavUser({ organization, avatarSrc, profileHref, selectOrganizationHref
     };
     const handleSignOut = async () => {
         setIsSigningOut(true);
+        // The next person to sign in on this browser must not start in this
+        // person's organisation: forget it in the tab, localStorage and cookie.
+        clearStoredOrganization();
         try {
             await react.signOut({ callbackUrl: signInRedirectHref, redirect: true });
         }
@@ -3273,6 +3451,31 @@ function resolveUrlOrgGate({ code, organizations, organizationsStatus, organizat
             return { state: "unverified" };
     }
 }
+function resolveStaleOrganization({ code, organizations, organizationsStatus, organizationId, }) {
+    const status = organizationsStatus ?? (organizations.length > 0 ? "success" : undefined);
+    if (status !== "success")
+        return { action: "none" };
+    const activeId = organizationId === null || organizationId === undefined
+        ? ""
+        : String(organizationId).trim();
+    if (activeId === "")
+        return { action: "none" };
+    if (organizations.some(org => String(org.id) === activeId)) {
+        return { action: "none" };
+    }
+    const urlOrg = findOrganizationForCode(code, organizations);
+    if (urlOrg) {
+        return { action: "use", targetId: String(urlOrg.id), fromUrl: true };
+    }
+    if (organizations.length === 1) {
+        return {
+            action: "use",
+            targetId: String(organizations[0].id),
+            fromUrl: false,
+        };
+    }
+    return { action: "forget" };
+}
 
 /**
  * Top-level app chrome: sticky header, sidebar slot, content gutter and the
@@ -3334,6 +3537,44 @@ function AppLayoutShell({ children, sidebar, loadingComponent, breadcrumb, permi
         requestedSwitchRef.current = switchTargetId;
         void setOrganizationId(switchTargetId);
     }, [switchTargetId, setOrganizationId]);
+    // Once the user's organisations are known, requests prefer a stored
+    // organisation that is one of them (getRequestOrganizationId).
+    const organizationsLoaded = (organizationsStatus ??
+        (organizations.length > 0 ? "success" : undefined)) === "success";
+    React.useEffect(() => {
+        if (organizationsLoaded) {
+            setKnownOrganizationIds(organizations.map(org => org.id));
+        }
+    }, [organizationsLoaded, organizations]);
+    // An active organisation that is not one of the user's — deleted, or left —
+    // is replaced, so it stops being sent with every request. The URL's
+    // organisation, when the user is a member, is the gate's switch above;
+    // otherwise the user's only organisation, or none (they pick one: the
+    // refusal below offers it, and a path without a code goes to the picker).
+    // Once per stale id and target, so a setter that does not take cannot loop.
+    const staleRecovery = resolveStaleOrganization({
+        code,
+        organizations,
+        organizationsStatus,
+        organizationId,
+    });
+    const staleRecoveryTarget = staleRecovery.action === "forget"
+        ? null
+        : staleRecovery.action === "use" && !staleRecovery.fromUrl
+            ? staleRecovery.targetId
+            : undefined;
+    const staleRecoveryKey = staleRecoveryTarget === undefined
+        ? null
+        : `${String(organizationId)}>${staleRecoveryTarget ?? ""}`;
+    const handledStaleRecoveryRef = React.useRef(null);
+    React.useEffect(() => {
+        if (staleRecoveryKey === null || staleRecoveryTarget === undefined)
+            return;
+        if (handledStaleRecoveryRef.current === staleRecoveryKey)
+            return;
+        handledStaleRecoveryRef.current = staleRecoveryKey;
+        void setOrganizationId(staleRecoveryTarget);
+    }, [staleRecoveryKey, staleRecoveryTarget, setOrganizationId]);
     // Key for the content subtree. It exists so switching organizations throws
     // away the previous org's component state — but it must react ONLY to a real
     // switch. organizationId legitimately passes through null while the context
@@ -4057,6 +4298,7 @@ exports.EMPLOYEE_RECORD_OK_EVENT = EMPLOYEE_RECORD_OK_EVENT;
 exports.EMPLOYEE_RECORD_REQUIRED = EMPLOYEE_RECORD_REQUIRED;
 exports.EMPLOYEE_RECORD_REQUIRED_EVENT = EMPLOYEE_RECORD_REQUIRED_EVENT;
 exports.EmployeeRequiredGate = EmployeeRequiredGate;
+exports.FOR_ORGANIZATION_FIELD = FOR_ORGANIZATION_FIELD;
 exports.FeatureFlagsProvider = FeatureFlagsProvider;
 exports.HeaderBackground = HeaderBackground;
 exports.HelpButton = HelpButton;
@@ -4083,6 +4325,7 @@ exports.SidebarProvider = SidebarProvider;
 exports.SidebarTrigger = SidebarTrigger;
 exports.TapMenu = TapMenu;
 exports.ThemeProvider = ThemeProvider;
+exports.WITHOUT_ORGANIZATION_FLAG = WITHOUT_ORGANIZATION_FLAG;
 exports.WORKSPACE_HEADER_VARS = WORKSPACE_HEADER_VARS;
 exports.WORKSPACE_LIGHT_HEADER_VARS = WORKSPACE_LIGHT_HEADER_VARS;
 exports.WorkspaceBrand = WorkspaceBrand;
@@ -4092,6 +4335,7 @@ exports.buildUrlWithCode = buildUrlWithCode;
 exports.canAccessNavPermissionRoute = canAccessNavPermissionRoute;
 exports.clearAccessTokenCache = clearAccessTokenCache;
 exports.clearOrganizationId = clearOrganizationId;
+exports.clearStoredOrganization = clearStoredOrganization;
 exports.closeHelp = closeHelp;
 exports.decodeJWT = decodeJWT;
 exports.describeAttached = describeAttached;
@@ -4108,8 +4352,10 @@ exports.getOrganizationId = getOrganizationId;
 exports.getQueryClientConfig = getQueryClientConfig;
 exports.getRequestOrganizationId = getRequestOrganizationId;
 exports.getRequiredChildGroups = getRequiredChildGroups;
+exports.getStoredOrganizationIds = getStoredOrganizationIds;
 exports.getTabOrganizationId = getTabOrganizationId;
 exports.hasPlanFeature = hasPlanFeature;
+exports.isKnownStaleOrganizationId = isKnownStaleOrganizationId;
 exports.isLikelyTransientNetworkError = isLikelyTransientNetworkError;
 exports.isPathActive = isPathActive;
 exports.myRolesQueryKey = myRolesQueryKey;
@@ -4119,11 +4365,14 @@ exports.organizationScopedQueryHash = organizationScopedQueryHash;
 exports.parseMyRoles = parseMyRoles;
 exports.resolveActiveNav = resolveActiveNav;
 exports.resolveSidebarNav = resolveSidebarNav;
+exports.resolveStaleOrganization = resolveStaleOrganization;
 exports.resolveUiRoutePermission = resolveUiRoutePermission;
 exports.resolveUrlOrgGate = resolveUrlOrgGate;
+exports.retryWithStoredOrganizations = retryWithStoredOrganizations;
 exports.roleSummary = roleSummary;
 exports.runGlobalRequestPrecheck = runGlobalRequestPrecheck;
 exports.runWithTransientRetry = runWithTransientRetry;
+exports.setKnownOrganizationIds = setKnownOrganizationIds;
 exports.setOrganizationId = setOrganizationId;
 exports.setTabOrganizationId = setTabOrganizationId;
 exports.shouldRetryQuery = shouldRetryQuery;
@@ -4141,4 +4390,5 @@ exports.usePermissionRules = usePermissionRules;
 exports.useSessionRefresh = useSessionRefresh;
 exports.useSidebar = useSidebar;
 exports.useSidebarToggle = useSidebarToggle;
+exports.withoutOrganization = withoutOrganization;
 //# sourceMappingURL=index.js.map