fix entitlements on login

This commit is contained in:
Alex Holliday committed 2025-12-02 21:46:01 +00:00
1 parent 53355cad04
commit 30d7b3d258
17 files changed
+100 -46

No files matched your search

@@ -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 = () => {
@@ -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 (
<Stack direction={"row"} alignItems={"flex-end"} spacing={theme.spacing(4)}>
<Stack direction={"row"} alignItems={"flex-end"} spacing={4}>
<Typography variant="h1">{statusPage?.name}</Typography>
{statusPage?.isPublished && (
<Stack
component={"a"}
href={`${HOST}/status-pages/public/${statusPage?.url}`}
<Link
href={`${HOST ?? ""}/status-pages/public/${statusPage?.url}`}
target="_blank"
rel="noopener noreferrer"
direction={"row"}
sx={{ textDecoration: "none", color: "inherit" }}
underline="none"
color="inherit"
sx={{ display: "inline-flex" }}
>
<Typography>Public link</Typography>
<ExternalLink size={16} strokeWidth={1.5} />
</Stack>
<Stack direction="row" alignItems="center" spacing={1}>
<Typography>Public link</Typography>
<ExternalLink size={16} strokeWidth={1.5} />
</Stack>
</Link>
)}
</Stack>
);
+27
View File
@@ -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,
};
+12
View File
@@ -0,0 +1,12 @@
/// <reference types="vite/client" />
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;
}
+3 -2
View File
@@ -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<typeof inviteSchema>;
@@ -202,7 +203,7 @@ const Invite = () => {
{token && (
<Stack>
<Typography variant="h2">Invite link:</Typography>
<Typography>{`${host}/register/${token}`}</Typography>
<Typography>{`${HOST}/register/${token}`}</Typography>
</Stack>
)}
<Box flex={1}>
@@ -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();
@@ -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();
@@ -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();
@@ -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();
@@ -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();
@@ -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();
+3 -1
View File
@@ -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();
+2 -1
View File
@@ -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();
-17
View File
@@ -1,17 +0,0 @@
/// <reference types="vite/client" />
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<SVGSVGElement> & { title?: string }
>;
export default ReactComponent;
}
+1
View File
@@ -0,0 +1 @@
export type DeploymentMode = "saas" | "self_hosted";
+19 -3
View File
@@ -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 {
@@ -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<Entitlements>;
@@ -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();
}
}