From 30d7b3d2581cb49e96145952281d2d80a54a1d50 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 2 Dec 2025 21:46:01 +0000 Subject: [PATCH] fix entitlements on login --- .../src/components/inputs/SwitchSettings.tsx | 3 ++- .../components/status-pages/NameHeader.tsx | 26 +++++++++--------- client/src/config/index.ts | 27 +++++++++++++++++++ client/src/env.d.ts | 12 +++++++++ client/src/pages/auth/Invite.tsx | 5 ++-- .../src/pages/infrastructure/InfraDetails.tsx | 4 +-- .../pages/infrastructure/InfraMonitors.tsx | 3 ++- .../src/pages/pagespeed/PageSpeedDetails.tsx | 3 ++- .../src/pages/pagespeed/PageSpeedMonitors.tsx | 3 ++- .../pages/status-page/StatusPageDetails.tsx | 3 ++- .../pages/status-page/StatusPagePublic.tsx | 4 ++- client/src/pages/uptime/UptimeDetails.tsx | 4 ++- client/src/pages/uptime/UptimeMonitors.tsx | 3 ++- client/src/types/env.d.ts | 17 ------------ client/src/types/env.ts | 1 + server/src/services/business/AuthService.ts | 22 ++++++++++++--- .../services/system/EntitlementsService.ts | 6 +++-- 17 files changed, 100 insertions(+), 46 deletions(-) create mode 100644 client/src/config/index.ts create mode 100644 client/src/env.d.ts delete mode 100644 client/src/types/env.d.ts create mode 100644 client/src/types/env.ts diff --git a/client/src/components/inputs/SwitchSettings.tsx b/client/src/components/inputs/SwitchSettings.tsx index 759fa8a8d..e4b45b85b 100644 --- a/client/src/components/inputs/SwitchSettings.tsx +++ b/client/src/components/inputs/SwitchSettings.tsx @@ -9,7 +9,8 @@ import { useAppSelector } from "@/hooks/AppHooks"; import { useMemo, useState } from "react"; import { useTheme } from "@mui/material/styles"; import { Tooltip } from "@/components/design-elements"; -const DEPLOYMENT_MODE = import.meta.env.VITE_APP_DEPLOYMENT_MODE; +import { config } from "@/config/index"; +const DEPLOYMENT_MODE = config.DEPLOYMENT_MODE; const IS_SAAS = DEPLOYMENT_MODE === "saas"; export const SettingsSwitch = () => { diff --git a/client/src/components/status-pages/NameHeader.tsx b/client/src/components/status-pages/NameHeader.tsx index 63f57ced8..2f63ac717 100644 --- a/client/src/components/status-pages/NameHeader.tsx +++ b/client/src/components/status-pages/NameHeader.tsx @@ -1,32 +1,34 @@ import Typography from "@mui/material/Typography"; import Stack from "@mui/material/Stack"; import { ExternalLink } from "lucide-react"; +import Link from "@mui/material/Link"; +import { config } from "@/config/index"; import type { IStatusPageWithMonitors } from "@/types/status-page"; -import { useTheme } from "@mui/material/styles"; -const HOST = import.meta.env.VITE_APP_HOST; +const HOST = config.HOST; export const NameHeader = ({ statusPage, }: { statusPage: IStatusPageWithMonitors; }) => { - const theme = useTheme(); return ( - + {statusPage?.name} {statusPage?.isPublished && ( - - Public link - - + + Public link + + + )} ); diff --git a/client/src/config/index.ts b/client/src/config/index.ts new file mode 100644 index 000000000..9fe0c15f3 --- /dev/null +++ b/client/src/config/index.ts @@ -0,0 +1,27 @@ +import type { DeploymentMode } from "@/types/env"; + +export interface IEnvConfig { + HOST: string; + GLOBAL_REFRESH: number; + API_BASE_URL: string; + DEPLOYMENT_MODE: DeploymentMode; +} + +const rawRefresh = import.meta.env.VITE_APP_GLOBAL_REFRESH; +const parsedRefresh = Number(rawRefresh); +const GLOBAL_REFRESH = Number.isFinite(parsedRefresh) ? parsedRefresh : 60000; + +const rawMode = import.meta.env.VITE_APP_DEPLOYMENT_MODE as + | DeploymentMode + | string + | undefined; +const DEPLOYMENT_MODE: DeploymentMode = + rawMode === "saas" || rawMode === "self_hosted" ? (rawMode as DeploymentMode) : "self_hosted"; + +export const config: IEnvConfig = { + HOST: import.meta.env.VITE_APP_HOST || "http://localhost:5173", + GLOBAL_REFRESH, + API_BASE_URL: + import.meta.env.VITE_APP_API_BASE_URL || "http://localhost:52345/api/v1", + DEPLOYMENT_MODE, +}; diff --git a/client/src/env.d.ts b/client/src/env.d.ts new file mode 100644 index 000000000..717f8accd --- /dev/null +++ b/client/src/env.d.ts @@ -0,0 +1,12 @@ +/// +import type { DeploymentMode } from "@/types/env"; +interface ImportMetaEnv { + readonly VITE_APP_HOST?: string; + readonly VITE_APP_GLOBAL_REFRESH?: string; + readonly VITE_APP_API_BASE_URL?: string; + readonly VITE_APP_DEPLOYMENT_MODE?: DeploymentMode; +} + +interface ImportMeta { + readonly env: ImportMetaEnv; +} diff --git a/client/src/pages/auth/Invite.tsx b/client/src/pages/auth/Invite.tsx index 238c9e805..e97d14d09 100644 --- a/client/src/pages/auth/Invite.tsx +++ b/client/src/pages/auth/Invite.tsx @@ -14,7 +14,8 @@ import { useForm, Controller } from "react-hook-form"; import { zodResolver } from "@hookform/resolvers/zod"; import { useGet, usePost } from "@/hooks/UseApi"; import type { ApiResponse } from "@/hooks/UseApi"; -const host = import.meta.env.VITE_APP_HOST; +import { config } from "@/config/index"; +const HOST = config.HOST; type FormValues = z.infer; @@ -202,7 +203,7 @@ const Invite = () => { {token && ( Invite link: - {`${host}/register/${token}`} + {`${HOST}/register/${token}`} )} diff --git a/client/src/pages/infrastructure/InfraDetails.tsx b/client/src/pages/infrastructure/InfraDetails.tsx index d72167985..23a8965f4 100644 --- a/client/src/pages/infrastructure/InfraDetails.tsx +++ b/client/src/pages/infrastructure/InfraDetails.tsx @@ -21,8 +21,8 @@ import { getOsAndPlatform, } from "@/pages/infrastructure/InfraUtils"; import { InfraDetailsGauges } from "./InfraDetailsGauges"; - -const GLOBAL_REFRESH = import.meta.env.VITE_APP_GLOBAL_REFRESH; +import { config } from "@/config/index"; +const GLOBAL_REFRESH = config.GLOBAL_REFRESH; const InfraDetailsPage = () => { const theme = useTheme(); diff --git a/client/src/pages/infrastructure/InfraMonitors.tsx b/client/src/pages/infrastructure/InfraMonitors.tsx index 8e0c1d896..08b6b2b7c 100644 --- a/client/src/pages/infrastructure/InfraMonitors.tsx +++ b/client/src/pages/infrastructure/InfraMonitors.tsx @@ -20,8 +20,9 @@ import { useState } from "react"; import { useDelete } from "@/hooks/UseApi"; import { InitializingStatusBox } from "@/components/design-elements/StatusBox"; import { useAppSelector } from "@/hooks/AppHooks"; +import { config } from "@/config/index"; -const GLOBAL_REFRESH = import.meta.env.VITE_APP_GLOBAL_REFRESH; +const GLOBAL_REFRESH = config.GLOBAL_REFRESH; const PageSpeedMonitorsPage = () => { const theme = useTheme(); diff --git a/client/src/pages/pagespeed/PageSpeedDetails.tsx b/client/src/pages/pagespeed/PageSpeedDetails.tsx index 1bd152750..a7cc46700 100644 --- a/client/src/pages/pagespeed/PageSpeedDetails.tsx +++ b/client/src/pages/pagespeed/PageSpeedDetails.tsx @@ -14,8 +14,9 @@ import type { IMonitor, IMonitorWithMonitorStats } from "@/types/monitor"; import { getStatusPalette } from "@/utils/MonitorUtils"; import prettyMilliseconds from "pretty-ms"; import useMediaQuery from "@mui/material/useMediaQuery"; +import { config } from "@/config/index"; -const GLOBAL_REFRESH = import.meta.env.VITE_APP_GLOBAL_REFRESH; +const GLOBAL_REFRESH = config.GLOBAL_REFRESH; const PageSpeedDetailsPage = () => { const theme = useTheme(); const { id } = useParams(); diff --git a/client/src/pages/pagespeed/PageSpeedMonitors.tsx b/client/src/pages/pagespeed/PageSpeedMonitors.tsx index 045752d52..f526f9374 100644 --- a/client/src/pages/pagespeed/PageSpeedMonitors.tsx +++ b/client/src/pages/pagespeed/PageSpeedMonitors.tsx @@ -20,8 +20,9 @@ import { useState } from "react"; import { useDelete } from "@/hooks/UseApi"; import { InitializingStatusBox } from "@/components/design-elements/StatusBox"; import { useAppSelector } from "@/hooks/AppHooks"; +import { config } from "@/config/index"; -const GLOBAL_REFRESH = import.meta.env.VITE_APP_GLOBAL_REFRESH; +const GLOBAL_REFRESH = config.GLOBAL_REFRESH; const PageSpeedMonitorsPage = () => { const theme = useTheme(); diff --git a/client/src/pages/status-page/StatusPageDetails.tsx b/client/src/pages/status-page/StatusPageDetails.tsx index 8f7281a79..1459b043e 100644 --- a/client/src/pages/status-page/StatusPageDetails.tsx +++ b/client/src/pages/status-page/StatusPageDetails.tsx @@ -10,8 +10,9 @@ import type { ApiResponse } from "@/hooks/UseApi"; import { useParams } from "react-router"; import type { IStatusPageWithMonitors } from "@/types/status-page"; import { NameHeader } from "@/components/status-pages/NameHeader"; +import { config } from "@/config/index"; -const GLOBAL_REFRESH = import.meta.env.VITE_APP_GLOBAL_REFRESH; +const GLOBAL_REFRESH = config.GLOBAL_REFRESH; const StatusPages = () => { const theme = useTheme(); const { id } = useParams(); diff --git a/client/src/pages/status-page/StatusPagePublic.tsx b/client/src/pages/status-page/StatusPagePublic.tsx index 7d3f06c7e..097846d32 100644 --- a/client/src/pages/status-page/StatusPagePublic.tsx +++ b/client/src/pages/status-page/StatusPagePublic.tsx @@ -10,7 +10,9 @@ import type { ApiResponse } from "@/hooks/UseApi"; import { useParams } from "react-router"; import type { IStatusPageWithMonitors } from "@/types/status-page"; import { NameHeader } from "@/components/status-pages/NameHeader"; -const GLOBAL_REFRESH = import.meta.env.VITE_APP_GLOBAL_REFRESH; +import { config } from "@/config/index"; + +const GLOBAL_REFRESH = config.GLOBAL_REFRESH; const StatusPages = () => { const theme = useTheme(); const { url } = useParams(); diff --git a/client/src/pages/uptime/UptimeDetails.tsx b/client/src/pages/uptime/UptimeDetails.tsx index bcfa6c722..c65dc30f0 100644 --- a/client/src/pages/uptime/UptimeDetails.tsx +++ b/client/src/pages/uptime/UptimeDetails.tsx @@ -17,7 +17,9 @@ import { useGet, usePatch, type ApiResponse } from "@/hooks/UseApi"; import { useState } from "react"; import { getStatusPalette } from "@/utils/MonitorUtils"; import prettyMilliseconds from "pretty-ms"; -const GLOBAL_REFRESH = import.meta.env.VITE_APP_GLOBAL_REFRESH; +import { config } from "@/config/index"; + +const GLOBAL_REFRESH = config.GLOBAL_REFRESH; const UptimeDetailsPage = () => { const { id } = useParams(); diff --git a/client/src/pages/uptime/UptimeMonitors.tsx b/client/src/pages/uptime/UptimeMonitors.tsx index 104434903..12c2310cc 100644 --- a/client/src/pages/uptime/UptimeMonitors.tsx +++ b/client/src/pages/uptime/UptimeMonitors.tsx @@ -28,8 +28,9 @@ import useMediaQuery from "@mui/material/useMediaQuery"; import { useState } from "react"; import { useDelete } from "@/hooks/UseApi"; import { useAppSelector } from "@/hooks/AppHooks"; +import { config } from "@/config/index"; -const GLOBAL_REFRESH = import.meta.env.VITE_APP_GLOBAL_REFRESH; +const GLOBAL_REFRESH = config.GLOBAL_REFRESH; const UptimeMonitors = () => { const theme = useTheme(); diff --git a/client/src/types/env.d.ts b/client/src/types/env.d.ts deleted file mode 100644 index f711139e8..000000000 --- a/client/src/types/env.d.ts +++ /dev/null @@ -1,17 +0,0 @@ -/// - -interface ImportMetaEnv { - readonly VITE_APP_API_V2_BASE_URL?: string; -} - -interface ImportMeta { - readonly env: ImportMetaEnv; -} - -declare module "*.svg?react" { - import * as React from "react"; - const ReactComponent: React.FunctionComponent< - React.SVGProps & { title?: string } - >; - export default ReactComponent; -} diff --git a/client/src/types/env.ts b/client/src/types/env.ts new file mode 100644 index 000000000..07eeb0732 --- /dev/null +++ b/client/src/types/env.ts @@ -0,0 +1 @@ +export type DeploymentMode = "saas" | "self_hosted"; diff --git a/server/src/services/business/AuthService.ts b/server/src/services/business/AuthService.ts index 624973014..16caeaa5c 100644 --- a/server/src/services/business/AuthService.ts +++ b/server/src/services/business/AuthService.ts @@ -22,6 +22,8 @@ import { IJobQueue } from "../infrastructure/JobQueue.js"; import { hashPassword } from "@/utils/JWTUtils.js"; import { Plans } from "@/types/entitlements.js"; import { PERMISSIONS } from "@/types/permissions.js"; +import { EntitlementsFactory } from "@/services/system/EntitlementsService.js"; +import type { Entitlements } from "@/types/entitlements.js"; const SERVICE_NAME = "AuthService"; @@ -255,6 +257,11 @@ class AuthService implements IAuthService { permissions: roles[2]?.permissions || [], }; + const provider = EntitlementsFactory.create(); + const entitlements: Entitlements = await provider.getForOrg( + org._id.toString() + ); + const returnableUser: IUserReturnable = { id: user._id.toString(), email: user.email, @@ -266,7 +273,7 @@ class AuthService implements IAuthService { permissions: roles[0]?.permissions || [], }, teams: [returnableTeam], - entitlements: org.entitlements, + entitlements, }; return { tokenizedUser, returnableUser }; @@ -392,6 +399,10 @@ class AuthService implements IAuthService { const orgRole = await Role.findById(orgMembership.roleId); const orgPermissions = orgRole?.permissions || []; + const provider = EntitlementsFactory.create(); + const entitlements: Entitlements = await provider.getForOrg( + org._id.toString() + ); const returnableUser: IUserReturnable = { id: user._id.toString(), email: user.email, @@ -403,7 +414,7 @@ class AuthService implements IAuthService { permissions: orgPermissions, }, teams: returnableTeams, - entitlements: org.entitlements, + entitlements, }; return { @@ -499,6 +510,11 @@ class AuthService implements IAuthService { orgId: orgMembership.orgId.toString(), }; + const provider = EntitlementsFactory.create(); + const entitlements: Entitlements = await provider.getForOrg( + org._id.toString() + ); + const returnableUser: IUserReturnable = { id: user._id.toString(), email: user.email, @@ -510,7 +526,7 @@ class AuthService implements IAuthService { permissions: orgRoles?.permissions || [], }, teams: returnableTeams, - entitlements: org.entitlements, + entitlements, }; return { diff --git a/server/src/services/system/EntitlementsService.ts b/server/src/services/system/EntitlementsService.ts index 70c7628f8..447700838 100644 --- a/server/src/services/system/EntitlementsService.ts +++ b/server/src/services/system/EntitlementsService.ts @@ -1,5 +1,7 @@ import { Entitlements, Plans } from "@/types/entitlements.js"; import { Org } from "@/db/models/index.js"; +import { DeploymentMode } from "@/utils/FeatureFlags.js"; +import { config } from "@/config/index.js"; export interface IEntitlementsProvider { getForOrg(orgId: string): Promise; @@ -31,8 +33,8 @@ export class SelfHostedEntitlementsProvider implements IEntitlementsProvider { export class EntitlementsFactory { static create(): IEntitlementsProvider { - const mode = (process.env.DEPLOYMENT_MODE || "saas").toLowerCase(); - if (mode === "self") return new SelfHostedEntitlementsProvider(); + const mode: DeploymentMode = config.DEPLOYMENT_MODE || "self_hosted"; + if (mode === "self_hosted") return new SelfHostedEntitlementsProvider(); return new SaaSEntitlementsProvider(); } }