From 91596be70e50a401cff1efa442f87a7aeb8b5aa1 Mon Sep 17 00:00:00 2001 From: Zero King Date: Thu, 6 Mar 2025 18:14:30 +0800 Subject: [PATCH 01/13] fix: add missing awaits (#814) --- apps/server/src/core/comment/comment.service.ts | 2 +- apps/server/src/core/workspace/services/workspace.service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/server/src/core/comment/comment.service.ts b/apps/server/src/core/comment/comment.service.ts index 48a5dd99..b1d4ae4c 100644 --- a/apps/server/src/core/comment/comment.service.ts +++ b/apps/server/src/core/comment/comment.service.ts @@ -20,7 +20,7 @@ export class CommentService { ) {} async findById(commentId: string) { - const comment = this.commentRepo.findById(commentId, { + const comment = await this.commentRepo.findById(commentId, { includeCreator: true, }); if (!comment) { diff --git a/apps/server/src/core/workspace/services/workspace.service.ts b/apps/server/src/core/workspace/services/workspace.service.ts index e81ba47b..445a85ad 100644 --- a/apps/server/src/core/workspace/services/workspace.service.ts +++ b/apps/server/src/core/workspace/services/workspace.service.ts @@ -39,7 +39,7 @@ export class WorkspaceService { } async getWorkspaceInfo(workspaceId: string) { - const workspace = this.workspaceRepo.findById(workspaceId); + const workspace = await this.workspaceRepo.findById(workspaceId); if (!workspace) { throw new NotFoundException('Workspace not found'); } From b81c9ee10c29830d1fe4633674d923d7065b3616 Mon Sep 17 00:00:00 2001 From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com> Date: Thu, 6 Mar 2025 13:38:37 +0000 Subject: [PATCH 02/13] feat: cloud and ee (#805) * stripe init git submodules for enterprise modules * * Cloud billing UI - WIP * Proxy websockets in dev mode * Separate workspace login and creation for cloud * Other fixes * feat: billing (cloud) * * add domain service * prepare links from workspace hostname * WIP * Add exchange token generation * Validate JWT token type during verification * domain service * add SkipTransform decorator * * updates (server) * add new packages * new sso migration file * WIP * Fix hostname generation * WIP * WIP * Reduce input error font-size * set max password length * jwt package * license page - WIP * * License management UI * Move license key store to db * add reflector * SSO enforcement * * Add default plan * Add usePlan hook * * Fix auth container margin in mobile * Redirect login and home to select page in cloud * update .gitignore * Default to yearly * * Trial messaging * Handle ended trials * Don't set to readonly on collab disconnect (Cloud) * Refine trial (UI) * Fix bug caused by using jotai optics atom in AppHeader component * configurable database maximum pool * Close SSO form on save * wip * sync * Only show sign-in in cloud * exclude base api part from workspaceId check * close db connection beforeApplicationShutdown * Add health/live endpoint * clear cookie on hostname change * reset currentUser atom * Change text * return 401 if workspace does not match * feat: show user workspace list in cloud login page * sync * Add home path * Prefetch to speed up queries * * Add robots.txt * Disallow login and forgot password routes * wildcard user-agent * Fix space query cache * fix * fix * use space uuid for recent pages * prefetch billing plans * enhance license page * sync --- .gitignore | 2 + .gitmodules | 3 + apps/client/package.json | 14 +- apps/client/src/App.tsx | 24 +- apps/client/src/components/common/copy.tsx | 31 + .../src/components/icons/google-icon.tsx | 33 + .../src/components/icons/openid-icon.tsx | 20 + .../components/layouts/global/app-header.tsx | 33 +- .../layouts/global/global-app-shell.tsx | 19 +- .../components/layouts/global/top-menu.tsx | 6 +- .../components/settings/settings-queries.tsx | 51 + .../components/settings/settings-sidebar.tsx | 160 +- .../components/settings/settings.module.css | 2 +- apps/client/src/ee/LICENSE | 1 + .../ee/billing/components/billing-details.tsx | 130 + .../billing/components/billing-incomplete.tsx | 13 + .../ee/billing/components/billing-plans.tsx | 115 + .../ee/billing/components/billing-trial.tsx | 32 + .../ee/billing/components/billing.module.css | 10 + .../ee/billing/components/manage-billing.tsx | 34 + apps/client/src/ee/billing/pages/billing.tsx | 41 + .../src/ee/billing/queries/billing-query.ts | 20 + .../ee/billing/services/billing-service.ts | 29 + .../src/ee/billing/types/billing.types.ts | 49 + apps/client/src/ee/billing/utils.ts | 17 + apps/client/src/ee/cloud/query/cloud-query.ts | 13 + .../src/ee/cloud/service/cloud-service.ts | 7 + .../src/ee/components/cloud-login-form.tsx | 96 + .../components/joined-workspaces.module.css | 13 + .../src/ee/components/joined-workspaces.tsx | 49 + .../src/ee/components/manage-hostname.tsx | 119 + .../src/ee/components/sso-cloud-signup.tsx | 25 + apps/client/src/ee/components/sso-login.tsx | 57 + apps/client/src/ee/hooks/use-plan.tsx | 15 + .../ee/hooks/use-redirect-to-cloud-select.tsx | 20 + .../src/ee/hooks/use-trial-end-action.tsx | 36 + apps/client/src/ee/hooks/use-trial.tsx | 16 + .../components/activate-license-modal.tsx | 89 + .../components/installation-details.tsx | 71 + .../ee/licence/components/license-details.tsx | 81 + .../ee/licence/components/license-message.tsx | 3 + .../src/ee/licence/components/oss-details.tsx | 39 + .../ee/licence/components/remove-license.tsx | 33 + apps/client/src/ee/licence/license.utils.ts | 26 + apps/client/src/ee/licence/pages/license.tsx | 35 + .../src/ee/licence/queries/license-query.ts | 52 + .../ee/licence/services/license-service.ts | 18 + .../src/ee/licence/types/license.types.ts | 8 + apps/client/src/ee/pages/cloud-login.tsx | 20 + apps/client/src/ee/pages/create-workspace.tsx | 15 + .../security/components/allowed-domains.tsx | 88 + .../components/create-sso-provider.tsx | 79 + .../ee/security/components/enforce-sso.tsx | 61 + .../security/components/sso-google-form.tsx | 91 + .../ee/security/components/sso-oidc-form.tsx | 140 + .../security/components/sso-provider-list.tsx | 186 + .../components/sso-provider-modal.tsx | 43 + .../ee/security/components/sso-saml-form.tsx | 153 + .../src/ee/security/components/sso.module.css | 14 + apps/client/src/ee/security/contants.ts | 5 + .../client/src/ee/security/pages/security.tsx | 52 + .../src/ee/security/queries/security-query.ts | 88 + .../ee/security/services/security-service.ts | 32 + apps/client/src/ee/security/sso.utils.ts | 39 + .../src/ee/security/types/security.types.ts | 20 + apps/client/src/ee/utils.ts | 16 + .../features/auth/components/auth.module.css | 13 + .../auth/components/forgot-password-form.tsx | 4 +- .../auth/components/invite-sign-up-form.tsx | 4 +- .../features/auth/components/login-form.tsx | 89 +- .../auth/components/password-reset-form.tsx | 4 +- .../auth/components/setup-workspace-form.tsx | 115 +- .../src/features/auth/hooks/use-auth.ts | 25 +- .../src/features/auth/queries/auth-query.tsx | 9 +- .../features/auth/services/auth-service.ts | 5 +- .../src/features/editor/page-editor.tsx | 2 + .../features/group/components/group-list.tsx | 12 +- .../src/features/group/queries/group-query.ts | 17 +- .../features/space/components/space-grid.tsx | 6 +- .../src/features/space/queries/space-query.ts | 33 +- .../src/features/user/user-provider.tsx | 15 +- .../src/features/websocket/types/constants.ts | 5 +- .../members/components/invite-action-menu.tsx | 18 +- .../components/workspace-invite-section.tsx | 3 +- .../components/workspace-name-form.tsx | 14 +- .../workspace/queries/workspace-query.ts | 3 +- .../workspace/services/workspace-service.ts | 20 +- .../workspace/types/workspace.types.ts | 21 +- apps/client/src/lib/api-client.ts | 6 +- apps/client/src/lib/app-route.ts | 4 + apps/client/src/lib/config.ts | 13 + apps/client/src/lib/utils.tsx | 30 + apps/client/src/main.tsx | 5 +- apps/client/src/pages/auth/login.tsx | 6 +- .../client/src/pages/auth/setup-workspace.tsx | 13 +- apps/client/src/pages/dashboard/home.tsx | 35 +- .../settings/workspace/workspace-members.tsx | 112 +- .../settings/workspace/workspace-settings.tsx | 27 +- apps/client/src/theme.ts | 54 +- apps/client/vite.config.ts | 27 +- apps/server/package.json | 7 + apps/server/src/app.module.ts | 17 + .../extensions/authentication.extension.ts | 5 +- .../src/collaboration/server/collab-main.ts | 5 +- .../decorators/skip-transform.decorator.ts | 4 + .../src/common/guards/jwt-auth.guard.ts | 39 +- .../interceptors/http-response.interceptor.ts | 13 +- .../common/middlewares/domain.middleware.ts | 3 +- apps/server/src/core/auth/auth.controller.ts | 20 +- apps/server/src/core/auth/auth.module.ts | 1 + apps/server/src/core/auth/auth.util.ts | 8 + .../src/core/auth/dto/create-user.dto.ts | 3 +- apps/server/src/core/auth/dto/jwt-payload.ts | 7 + .../src/core/auth/guards/setup.guard.ts | 10 +- .../src/core/auth/services/auth.service.ts | 26 +- .../src/core/auth/services/signup.service.ts | 15 +- .../src/core/auth/services/token.service.ts | 33 +- .../src/core/auth/strategies/jwt.strategy.ts | 2 +- apps/server/src/core/user/user.controller.ts | 22 +- .../controllers/workspace.controller.spec.ts | 20 - .../controllers/workspace.controller.ts | 35 +- .../core/workspace/dto/check-hostname.dto.ts | 8 + .../workspace/dto/create-workspace.dto.ts | 13 +- .../workspace/dto/update-workspace.dto.ts | 10 +- .../services/workspace-invitation.service.ts | 50 +- .../workspace/services/workspace.service.ts | 150 +- .../src/core/workspace/workspace.constants.ts | 117 + apps/server/src/database/database.module.ts | 9 +- .../migrations/20250106T195516-billing.ts | 83 + .../migrations/20250118T194658-sso-auth.ts | 86 + ...222T114520-add_license_key_to_workspace.ts | 12 + .../src/database/repos/user/user.repo.ts | 39 +- .../repos/workspace/workspace.repo.ts | 95 +- apps/server/src/database/types/db.d.ts | 66 + .../server/src/database/types/entity.types.ts | 18 + apps/server/src/ee | 1 + .../environment/domain.service.ts | 21 + .../environment/environment.module.ts | 5 +- .../environment/environment.service.ts | 35 +- .../environment/environment.validation.ts | 14 + .../integrations/health/health.controller.ts | 7 + .../security/robots.txt.controller.ts | 12 + .../integrations/security/security.module.ts | 7 + .../src/integrations/static/static.module.ts | 3 + apps/server/src/main.ts | 39 +- apps/server/src/ws/ws.gateway.ts | 12 +- apps/server/tsconfig.json | 3 +- pnpm-lock.yaml | 7474 ++++++++++------- 148 files changed, 8947 insertions(+), 3458 deletions(-) create mode 100644 .gitmodules create mode 100644 apps/client/src/components/common/copy.tsx create mode 100644 apps/client/src/components/icons/google-icon.tsx create mode 100644 apps/client/src/components/icons/openid-icon.tsx create mode 100644 apps/client/src/components/settings/settings-queries.tsx create mode 100644 apps/client/src/ee/LICENSE create mode 100644 apps/client/src/ee/billing/components/billing-details.tsx create mode 100644 apps/client/src/ee/billing/components/billing-incomplete.tsx create mode 100644 apps/client/src/ee/billing/components/billing-plans.tsx create mode 100644 apps/client/src/ee/billing/components/billing-trial.tsx create mode 100644 apps/client/src/ee/billing/components/billing.module.css create mode 100644 apps/client/src/ee/billing/components/manage-billing.tsx create mode 100644 apps/client/src/ee/billing/pages/billing.tsx create mode 100644 apps/client/src/ee/billing/queries/billing-query.ts create mode 100644 apps/client/src/ee/billing/services/billing-service.ts create mode 100644 apps/client/src/ee/billing/types/billing.types.ts create mode 100644 apps/client/src/ee/billing/utils.ts create mode 100644 apps/client/src/ee/cloud/query/cloud-query.ts create mode 100644 apps/client/src/ee/cloud/service/cloud-service.ts create mode 100644 apps/client/src/ee/components/cloud-login-form.tsx create mode 100644 apps/client/src/ee/components/joined-workspaces.module.css create mode 100644 apps/client/src/ee/components/joined-workspaces.tsx create mode 100644 apps/client/src/ee/components/manage-hostname.tsx create mode 100644 apps/client/src/ee/components/sso-cloud-signup.tsx create mode 100644 apps/client/src/ee/components/sso-login.tsx create mode 100644 apps/client/src/ee/hooks/use-plan.tsx create mode 100644 apps/client/src/ee/hooks/use-redirect-to-cloud-select.tsx create mode 100644 apps/client/src/ee/hooks/use-trial-end-action.tsx create mode 100644 apps/client/src/ee/hooks/use-trial.tsx create mode 100644 apps/client/src/ee/licence/components/activate-license-modal.tsx create mode 100644 apps/client/src/ee/licence/components/installation-details.tsx create mode 100644 apps/client/src/ee/licence/components/license-details.tsx create mode 100644 apps/client/src/ee/licence/components/license-message.tsx create mode 100644 apps/client/src/ee/licence/components/oss-details.tsx create mode 100644 apps/client/src/ee/licence/components/remove-license.tsx create mode 100644 apps/client/src/ee/licence/license.utils.ts create mode 100644 apps/client/src/ee/licence/pages/license.tsx create mode 100644 apps/client/src/ee/licence/queries/license-query.ts create mode 100644 apps/client/src/ee/licence/services/license-service.ts create mode 100644 apps/client/src/ee/licence/types/license.types.ts create mode 100644 apps/client/src/ee/pages/cloud-login.tsx create mode 100644 apps/client/src/ee/pages/create-workspace.tsx create mode 100644 apps/client/src/ee/security/components/allowed-domains.tsx create mode 100644 apps/client/src/ee/security/components/create-sso-provider.tsx create mode 100644 apps/client/src/ee/security/components/enforce-sso.tsx create mode 100644 apps/client/src/ee/security/components/sso-google-form.tsx create mode 100644 apps/client/src/ee/security/components/sso-oidc-form.tsx create mode 100644 apps/client/src/ee/security/components/sso-provider-list.tsx create mode 100644 apps/client/src/ee/security/components/sso-provider-modal.tsx create mode 100644 apps/client/src/ee/security/components/sso-saml-form.tsx create mode 100644 apps/client/src/ee/security/components/sso.module.css create mode 100644 apps/client/src/ee/security/contants.ts create mode 100644 apps/client/src/ee/security/pages/security.tsx create mode 100644 apps/client/src/ee/security/queries/security-query.ts create mode 100644 apps/client/src/ee/security/services/security-service.ts create mode 100644 apps/client/src/ee/security/sso.utils.ts create mode 100644 apps/client/src/ee/security/types/security.types.ts create mode 100644 apps/client/src/ee/utils.ts create mode 100644 apps/server/src/common/decorators/skip-transform.decorator.ts create mode 100644 apps/server/src/core/auth/auth.util.ts delete mode 100644 apps/server/src/core/workspace/controllers/workspace.controller.spec.ts create mode 100644 apps/server/src/core/workspace/dto/check-hostname.dto.ts create mode 100644 apps/server/src/core/workspace/workspace.constants.ts create mode 100644 apps/server/src/database/migrations/20250106T195516-billing.ts create mode 100644 apps/server/src/database/migrations/20250118T194658-sso-auth.ts create mode 100644 apps/server/src/database/migrations/20250222T114520-add_license_key_to_workspace.ts create mode 160000 apps/server/src/ee create mode 100644 apps/server/src/integrations/environment/domain.service.ts create mode 100644 apps/server/src/integrations/security/robots.txt.controller.ts create mode 100644 apps/server/src/integrations/security/security.module.ts diff --git a/.gitignore b/.gitignore index eac6aedb..862c9e2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ .env +.env.dev +.env.prod data # compiled output /dist diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..2bdf0e03 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "apps/server/src/ee"] + path = apps/server/src/ee + url = https://github.com/docmost/ee diff --git a/apps/client/package.json b/apps/client/package.json index cd1248c7..2a0ec761 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -16,12 +16,12 @@ "@emoji-mart/data": "^1.2.1", "@emoji-mart/react": "^1.1.1", "@excalidraw/excalidraw": "^0.17.6", - "@mantine/core": "^7.14.2", - "@mantine/form": "^7.14.2", - "@mantine/hooks": "^7.14.2", - "@mantine/modals": "^7.14.2", - "@mantine/notifications": "^7.14.2", - "@mantine/spotlight": "^7.14.2", + "@mantine/core": "^7.17.0", + "@mantine/form": "^7.17.0", + "@mantine/hooks": "^7.17.0", + "@mantine/modals": "^7.17.0", + "@mantine/notifications": "^7.17.0", + "@mantine/spotlight": "^7.17.0", "@tabler/icons-react": "^3.22.0", "@tanstack/react-query": "^5.61.4", "axios": "^1.7.9", @@ -30,7 +30,7 @@ "file-saver": "^2.0.5", "i18next": "^23.14.0", "i18next-http-backend": "^2.6.1", - "jotai": "^2.10.3", + "jotai": "^2.12.1", "jotai-optics": "^0.4.0", "js-cookie": "^3.0.5", "katex": "0.16.21", diff --git a/apps/client/src/App.tsx b/apps/client/src/App.tsx index 95389e06..c806f852 100644 --- a/apps/client/src/App.tsx +++ b/apps/client/src/App.tsx @@ -18,10 +18,18 @@ import { ErrorBoundary } from "react-error-boundary"; import InviteSignup from "@/pages/auth/invite-signup.tsx"; import ForgotPassword from "@/pages/auth/forgot-password.tsx"; import PasswordReset from "./pages/auth/password-reset"; +import Billing from "@/ee/billing/pages/billing.tsx"; +import CloudLogin from "@/ee/pages/cloud-login.tsx"; +import CreateWorkspace from "@/ee/pages/create-workspace.tsx"; +import { isCloud } from "@/lib/config.ts"; import { useTranslation } from "react-i18next"; +import Security from "@/ee/security/pages/security.tsx"; +import License from "@/ee/licence/pages/license.tsx"; +import { useRedirectToCloudSelect } from "@/ee/hooks/use-redirect-to-cloud-select.tsx"; export default function App() { const { t } = useTranslation(); + useRedirectToCloudSelect(); return ( <> @@ -29,15 +37,24 @@ export default function App() { } /> } /> } /> - } /> } /> } /> + {!isCloud() && ( + } /> + )} + + {isCloud() && ( + <> + } /> + } /> + + )} + } /> }> } /> - } /> } /> } /> } /> + } /> + {!isCloud() && } />} + {isCloud() && } />} diff --git a/apps/client/src/components/common/copy.tsx b/apps/client/src/components/common/copy.tsx new file mode 100644 index 00000000..efae5750 --- /dev/null +++ b/apps/client/src/components/common/copy.tsx @@ -0,0 +1,31 @@ +import { ActionIcon, CopyButton, Tooltip } from "@mantine/core"; +import { IconCheck, IconCopy } from "@tabler/icons-react"; +import React from "react"; +import { useTranslation } from "react-i18next"; + +interface CopyProps { + text: string; +} +export default function CopyTextButton({ text }: CopyProps) { + const { t } = useTranslation(); + + return ( + + {({ copied, copy }) => ( + + + {copied ? : } + + + )} + + ); +} diff --git a/apps/client/src/components/icons/google-icon.tsx b/apps/client/src/components/icons/google-icon.tsx new file mode 100644 index 00000000..e30be880 --- /dev/null +++ b/apps/client/src/components/icons/google-icon.tsx @@ -0,0 +1,33 @@ +import { rem } from "@mantine/core"; + +interface Props { + size?: number | string; +} + +export function GoogleIcon({ size }: Props) { + return ( + + + + + + + ); +} diff --git a/apps/client/src/components/icons/openid-icon.tsx b/apps/client/src/components/icons/openid-icon.tsx new file mode 100644 index 00000000..3252d47c --- /dev/null +++ b/apps/client/src/components/icons/openid-icon.tsx @@ -0,0 +1,20 @@ +import { rem } from "@mantine/core"; + +interface Props { + size?: number | string; +} + +export function OpenIdIcon({ size }: Props) { + return ( + + + + ); +} diff --git a/apps/client/src/components/layouts/global/app-header.tsx b/apps/client/src/components/layouts/global/app-header.tsx index 04b2b09d..30d03b53 100644 --- a/apps/client/src/components/layouts/global/app-header.tsx +++ b/apps/client/src/components/layouts/global/app-header.tsx @@ -1,19 +1,21 @@ -import {Group, Text, Tooltip} from "@mantine/core"; +import { Badge, Group, Text, Tooltip } from "@mantine/core"; import classes from "./app-header.module.css"; import React from "react"; import TopMenu from "@/components/layouts/global/top-menu.tsx"; -import {Link} from "react-router-dom"; +import { Link } from "react-router-dom"; import APP_ROUTE from "@/lib/app-route.ts"; -import {useAtom} from "jotai/index"; +import { useAtom } from "jotai"; import { desktopSidebarAtom, mobileSidebarAtom, } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts"; -import {useToggleSidebar} from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts"; +import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts"; import SidebarToggle from "@/components/ui/sidebar-toggle-button.tsx"; import { useTranslation } from "react-i18next"; +import useTrial from "@/ee/hooks/use-trial.tsx"; +import { isCloud } from "@/lib/config.ts"; -const links = [{link: APP_ROUTE.HOME, label: "Home"}]; +const links = [{ link: APP_ROUTE.HOME, label: "Home" }]; export function AppHeader() { const { t } = useTranslation(); @@ -22,6 +24,7 @@ export function AppHeader() { const [desktopOpened] = useAtom(desktopSidebarAtom); const toggleDesktop = useToggleSidebar(desktopSidebarAtom); + const { isTrial, trialDaysLeft } = useTrial(); const isHomeRoute = location.pathname.startsWith("/home"); @@ -38,7 +41,6 @@ export function AppHeader() { {!isHomeRoute && ( <> - @@ -75,8 +77,21 @@ export function AppHeader() { - - + + {isCloud() && isTrial && trialDaysLeft !== 0 && ( + + {trialDaysLeft === 1 + ? "1 day left" + : `${trialDaysLeft} days left`} + + )} + diff --git a/apps/client/src/components/layouts/global/global-app-shell.tsx b/apps/client/src/components/layouts/global/global-app-shell.tsx index e5fe224b..4b5c0269 100644 --- a/apps/client/src/components/layouts/global/global-app-shell.tsx +++ b/apps/client/src/components/layouts/global/global-app-shell.tsx @@ -1,23 +1,26 @@ import { AppShell, Container } from "@mantine/core"; -import React, { useCallback, useEffect, useRef, useState } from "react"; +import React, { useEffect, useRef, useState } from "react"; import { useLocation } from "react-router-dom"; import SettingsSidebar from "@/components/settings/settings-sidebar.tsx"; import { useAtom } from "jotai"; import { asideStateAtom, desktopSidebarAtom, - mobileSidebarAtom, sidebarWidthAtom, + mobileSidebarAtom, + sidebarWidthAtom, } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts"; import { SpaceSidebar } from "@/features/space/components/sidebar/space-sidebar.tsx"; import { AppHeader } from "@/components/layouts/global/app-header.tsx"; import Aside from "@/components/layouts/global/aside.tsx"; import classes from "./app-shell.module.css"; +import { useTrialEndAction } from "@/ee/hooks/use-trial-end-action.tsx"; export default function GlobalAppShell({ children, }: { children: React.ReactNode; }) { + useTrialEndAction(); const [mobileOpened] = useAtom(mobileSidebarAtom); const [desktopOpened] = useAtom(desktopSidebarAtom); const [{ isAsideOpen }] = useAtom(asideStateAtom); @@ -37,7 +40,9 @@ export default function GlobalAppShell({ const resize = React.useCallback( (mouseMoveEvent) => { if (isResizing) { - const newWidth = mouseMoveEvent.clientX - sidebarRef.current.getBoundingClientRect().left; + const newWidth = + mouseMoveEvent.clientX - + sidebarRef.current.getBoundingClientRect().left; if (newWidth < 220) { setSidebarWidth(220); return; @@ -49,7 +54,7 @@ export default function GlobalAppShell({ setSidebarWidth(newWidth); } }, - [isResizing] + [isResizing], ); useEffect(() => { @@ -94,7 +99,11 @@ export default function GlobalAppShell({ {!isHomeRoute && ( - +
{isSpaceRoute && } {isSettingsRoute && } diff --git a/apps/client/src/components/layouts/global/top-menu.tsx b/apps/client/src/components/layouts/global/top-menu.tsx index 28c64660..52cabb5a 100644 --- a/apps/client/src/components/layouts/global/top-menu.tsx +++ b/apps/client/src/components/layouts/global/top-menu.tsx @@ -33,13 +33,13 @@ export default function TopMenu() { - {workspace.name} + {workspace?.name} diff --git a/apps/client/src/components/settings/settings-queries.tsx b/apps/client/src/components/settings/settings-queries.tsx new file mode 100644 index 00000000..a37ecd8b --- /dev/null +++ b/apps/client/src/components/settings/settings-queries.tsx @@ -0,0 +1,51 @@ +import { queryClient } from "@/main.tsx"; +import { + getBilling, + getBillingPlans, +} from "@/ee/billing/services/billing-service.ts"; +import { getSpaces } from "@/features/space/services/space-service.ts"; +import { getGroups } from "@/features/group/services/group-service.ts"; +import { QueryParams } from "@/lib/types.ts"; +import { getWorkspaceMembers } from "@/features/workspace/services/workspace-service.ts"; +import { getLicenseInfo } from "@/ee/licence/services/license-service.ts"; + +export const prefetchWorkspaceMembers = () => { + const params = { limit: 100, page: 1, query: "" } as QueryParams; + queryClient.prefetchQuery({ + queryKey: ["workspaceMembers", params], + queryFn: () => getWorkspaceMembers(params), + }); +}; + +export const prefetchSpaces = () => { + queryClient.prefetchQuery({ + queryKey: ["spaces", { page: 1 }], + queryFn: () => getSpaces({ page: 1 }), + }); +}; + +export const prefetchGroups = () => { + queryClient.prefetchQuery({ + queryKey: ["groups", { page: 1 }], + queryFn: () => getGroups({ page: 1 }), + }); +}; + +export const prefetchBilling = () => { + queryClient.prefetchQuery({ + queryKey: ["billing"], + queryFn: () => getBilling(), + }); + + queryClient.prefetchQuery({ + queryKey: ["billing-plans"], + queryFn: () => getBillingPlans(), + }); +}; + +export const prefetchLicense = () => { + queryClient.prefetchQuery({ + queryKey: ["license"], + queryFn: () => getLicenseInfo(), + }); +}; diff --git a/apps/client/src/components/settings/settings-sidebar.tsx b/apps/client/src/components/settings/settings-sidebar.tsx index 8ffb7c4a..a6cf9474 100644 --- a/apps/client/src/components/settings/settings-sidebar.tsx +++ b/apps/client/src/components/settings/settings-sidebar.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from "react"; -import { Group, Text, ScrollArea, ActionIcon, rem } from "@mantine/core"; +import { Group, Text, ScrollArea, ActionIcon } from "@mantine/core"; import { IconUser, IconSettings, @@ -8,15 +8,33 @@ import { IconUsersGroup, IconSpaces, IconBrush, + IconCoin, + IconLock, + IconKey, } from "@tabler/icons-react"; import { Link, useLocation, useNavigate } from "react-router-dom"; import classes from "./settings.module.css"; import { useTranslation } from "react-i18next"; +import { isCloud } from "@/lib/config.ts"; +import useUserRole from "@/hooks/use-user-role.tsx"; +import { useAtom } from "jotai/index"; +import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts"; +import { + prefetchBilling, + prefetchGroups, + prefetchLicense, + prefetchSpaces, + prefetchWorkspaceMembers, +} from "@/components/settings/settings-queries.tsx"; interface DataItem { label: string; icon: React.ElementType; path: string; + isCloud?: boolean; + isEnterprise?: boolean; + isAdmin?: boolean; + isSelfhosted?: boolean; } interface DataGroup { @@ -45,10 +63,35 @@ const groupedData: DataGroup[] = [ icon: IconUsers, path: "/settings/members", }, + { + label: "Billing", + icon: IconCoin, + path: "/settings/billing", + isCloud: true, + isAdmin: true, + }, + { + label: "Security & SSO", + icon: IconLock, + path: "/settings/security", + isCloud: true, + isEnterprise: true, + isAdmin: true, + }, { label: "Groups", icon: IconUsersGroup, path: "/settings/groups" }, { label: "Spaces", icon: IconSpaces, path: "/settings/spaces" }, ], }, + { + heading: "System", + items: [ + { + label: "License & Edition", + icon: IconKey, + path: "/settings/license", + }, + ], + }, ]; export default function SettingsSidebar() { @@ -56,29 +99,92 @@ export default function SettingsSidebar() { const location = useLocation(); const [active, setActive] = useState(location.pathname); const navigate = useNavigate(); + const { isAdmin } = useUserRole(); + const [workspace] = useAtom(workspaceAtom); useEffect(() => { setActive(location.pathname); }, [location.pathname]); - const menuItems = groupedData.map((group) => ( -
- - {t(group.heading)} - - {group.items.map((item) => ( - - - {t(item.label)} - - ))} -
- )); + const canShowItem = (item: DataItem) => { + if (item.isCloud && item.isEnterprise) { + if (!(isCloud() || workspace?.hasLicenseKey)) return false; + return item.isAdmin ? isAdmin : true; + } + + if (item.isCloud) { + return isCloud() ? (item.isAdmin ? isAdmin : true) : false; + } + + if (item.isSelfhosted) { + return !isCloud() ? (item.isAdmin ? isAdmin : true) : false; + } + + if (item.isEnterprise) { + return workspace?.hasLicenseKey ? (item.isAdmin ? isAdmin : true) : false; + } + + if (item.isAdmin) { + return isAdmin; + } + + return true; + }; + + const menuItems = groupedData.map((group) => { + if (group.heading === "System" && (!isAdmin || isCloud())) { + return null; + } + + return ( +
+ + {t(group.heading)} + + {group.items.map((item) => { + if (!canShowItem(item)) { + return null; + } + + let prefetchHandler: any; + switch (item.label) { + case "Members": + prefetchHandler = prefetchWorkspaceMembers; + break; + case "Spaces": + prefetchHandler = prefetchSpaces; + break; + case "Groups": + prefetchHandler = prefetchGroups; + break; + case "Billing": + prefetchHandler = prefetchBilling; + break; + case "License & Edition": + if (workspace?.hasLicenseKey) { + prefetchHandler = prefetchLicense; + } + break; + default: + break; + } + + return ( + + + {t(item.label)} + + ); + })} +
+ ); + }); return (
@@ -95,9 +201,8 @@ export default function SettingsSidebar() { {menuItems} -
+
+ + {isCloud() && ( +
+ + help@docmost.com + +
+ )}
); } diff --git a/apps/client/src/components/settings/settings.module.css b/apps/client/src/components/settings/settings.module.css index 546ff351..48de4c79 100644 --- a/apps/client/src/components/settings/settings.module.css +++ b/apps/client/src/components/settings/settings.module.css @@ -58,7 +58,7 @@ align-items: center; } -.version { +.text { padding-left: var(--mantine-spacing-xs) ; padding-top: 10px; } diff --git a/apps/client/src/ee/LICENSE b/apps/client/src/ee/LICENSE new file mode 100644 index 00000000..2a9b8b4c --- /dev/null +++ b/apps/client/src/ee/LICENSE @@ -0,0 +1 @@ +Files in this directory are subject to the Docmost Enterprise Software license. \ No newline at end of file diff --git a/apps/client/src/ee/billing/components/billing-details.tsx b/apps/client/src/ee/billing/components/billing-details.tsx new file mode 100644 index 00000000..9ecd1558 --- /dev/null +++ b/apps/client/src/ee/billing/components/billing-details.tsx @@ -0,0 +1,130 @@ +import { + useBillingPlans, + useBillingQuery, +} from "@/ee/billing/queries/billing-query.ts"; +import { Group, Text, SimpleGrid, Paper } from "@mantine/core"; +import classes from "./billing.module.css"; +import { format } from "date-fns"; +import { formatInterval } from "@/ee/billing/utils.ts"; + +export default function BillingDetails() { + const { data: billing } = useBillingQuery(); + const { data: plans } = useBillingPlans(); + + if (!billing || !plans) { + return null; + } + + return ( +
+ + + +
+ + Plan + + + { + plans.find( + (plan) => plan.productId === billing.stripeProductId, + )?.name + } + +
+ + + + + +
+ + Billing Period + + + {formatInterval(billing.interval)} + +
+ + + + + +
+ + {billing.cancelAtPeriodEnd + ? "Cancellation date" + : "Renewal date"} + + + {format(billing.periodEndAt, "dd MMM, yyyy")} + +
+ + + + + + + +
+ + Seat count + + + {billing.quantity} + +
+ + + + + +
+ + Total + + + {(billing.amount / 100) * billing.quantity}{" "} + {billing.currency.toUpperCase()} + + + ${billing.amount / 100} /user/{billing.interval} + +
+ + + +
+ ); +} diff --git a/apps/client/src/ee/billing/components/billing-incomplete.tsx b/apps/client/src/ee/billing/components/billing-incomplete.tsx new file mode 100644 index 00000000..d2e6b42f --- /dev/null +++ b/apps/client/src/ee/billing/components/billing-incomplete.tsx @@ -0,0 +1,13 @@ +import { Alert } from "@mantine/core"; +import React from "react"; + +export default function BillingIncomplete() { + return ( + <> + + Your subscription is in an incomplete state. Please refresh this page if + you recently made your payment. + + + ); +} diff --git a/apps/client/src/ee/billing/components/billing-plans.tsx b/apps/client/src/ee/billing/components/billing-plans.tsx new file mode 100644 index 00000000..3ff655d6 --- /dev/null +++ b/apps/client/src/ee/billing/components/billing-plans.tsx @@ -0,0 +1,115 @@ +import { + Button, + Card, + List, + SegmentedControl, + ThemeIcon, + Title, + Text, + Group, +} from "@mantine/core"; +import { useState } from "react"; +import { IconCheck } from "@tabler/icons-react"; +import { useBillingPlans } from "@/ee/billing/queries/billing-query.ts"; +import { getCheckoutLink } from "@/ee/billing/services/billing-service.ts"; + +export default function BillingPlans() { + const { data: plans } = useBillingPlans(); + const [interval, setInterval] = useState("yearly"); + + if (!plans) { + return null; + } + + const handleCheckout = async (priceId: string) => { + try { + const checkoutLink = await getCheckoutLink({ + priceId: priceId, + }); + window.location.href = checkoutLink.url; + } catch (err) { + console.error("Failed to get checkout link", err); + } + }; + + return ( + + {plans.map((plan) => { + const price = + interval === "monthly" ? plan.price.monthly : plan.price.yearly; + const priceId = interval === "monthly" ? plan.monthlyId : plan.yearlyId; + const yearlyMonthPrice = parseInt(plan.price.yearly) / 12; + + return ( + + + + + {plan.name} + + + {interval === "monthly" && ( + <> + ${price}{" "} + + /user/month + + + )} + {interval === "yearly" && ( + <> + ${yearlyMonthPrice}{" "} + + /user/month + + + )} +
+ + billed {interval} + + + + + + + + + + + + } + > + {plan.features.map((feature, index) => ( + {feature} + ))} + + + + ); + })} + + ); +} diff --git a/apps/client/src/ee/billing/components/billing-trial.tsx b/apps/client/src/ee/billing/components/billing-trial.tsx new file mode 100644 index 00000000..4628ae00 --- /dev/null +++ b/apps/client/src/ee/billing/components/billing-trial.tsx @@ -0,0 +1,32 @@ +import { Alert } from "@mantine/core"; +import { useBillingQuery } from "@/ee/billing/queries/billing-query.ts"; +import useTrial from "@/ee/hooks/use-trial.tsx"; + +export default function BillingTrial() { + const { data: billing, isLoading } = useBillingQuery(); + const { trialDaysLeft } = useTrial(); + + if (isLoading) { + return null; + } + + return ( + <> + {trialDaysLeft > 0 && !billing && ( + + You have {trialDaysLeft} {trialDaysLeft === 1 ? "day" : "days"} left + in your 14-day trial. Please subscribe to a plan before your trial + ends. + + )} + + {trialDaysLeft === 0 || + (trialDaysLeft === null && !billing && ( + + Your 14-day trial has come to an end. Please subscribe to a plan to + continue using this service. + + ))} + + ); +} diff --git a/apps/client/src/ee/billing/components/billing.module.css b/apps/client/src/ee/billing/components/billing.module.css new file mode 100644 index 00000000..50398f33 --- /dev/null +++ b/apps/client/src/ee/billing/components/billing.module.css @@ -0,0 +1,10 @@ +.root { + padding-top: var(--mantine-spacing-xs); + padding-bottom: var(--mantine-spacing-xs); +} + +.label { + font-family: + Greycliff CF, + var(--mantine-font-family); +} \ No newline at end of file diff --git a/apps/client/src/ee/billing/components/manage-billing.tsx b/apps/client/src/ee/billing/components/manage-billing.tsx new file mode 100644 index 00000000..2424d1e6 --- /dev/null +++ b/apps/client/src/ee/billing/components/manage-billing.tsx @@ -0,0 +1,34 @@ +import { Button, Group, Text } from "@mantine/core"; +import React from "react"; +import { getBillingPortalLink } from "@/ee/billing/services/billing-service.ts"; + +export default function ManageBilling() { + const handleBillingPortal = async () => { + try { + const portalLink = await getBillingPortalLink(); + window.location.href = portalLink.url; + } catch (err) { + console.error("Failed to get billing portal link", err); + } + }; + + return ( + <> + +
+ + Manage subscription + + + Manage your your subscription, invoices, update payment details, and + more. + +
+ + + + + ); +} diff --git a/apps/client/src/ee/billing/pages/billing.tsx b/apps/client/src/ee/billing/pages/billing.tsx new file mode 100644 index 00000000..a389a1e5 --- /dev/null +++ b/apps/client/src/ee/billing/pages/billing.tsx @@ -0,0 +1,41 @@ +import { Helmet } from "react-helmet-async"; +import { getAppName } from "@/lib/config.ts"; +import SettingsTitle from "@/components/settings/settings-title.tsx"; +import BillingPlans from "@/ee/billing/components/billing-plans.tsx"; +import BillingTrial from "@/ee/billing/components/billing-trial.tsx"; +import ManageBilling from "@/ee/billing/components/manage-billing.tsx"; +import { Divider } from "@mantine/core"; +import React from "react"; +import BillingDetails from "@/ee/billing/components/billing-details.tsx"; +import { useBillingQuery } from "@/ee/billing/queries/billing-query.ts"; +import useUserRole from "@/hooks/use-user-role.tsx"; + +export default function Billing() { + const { data: billing, isError: isBillingError } = useBillingQuery(); + const { isAdmin } = useUserRole(); + + if (!isAdmin) { + return null; + } + + return ( + <> + + Billing - {getAppName()} + + + + + + + {isBillingError && } + + {billing && ( + <> + + + + )} + + ); +} diff --git a/apps/client/src/ee/billing/queries/billing-query.ts b/apps/client/src/ee/billing/queries/billing-query.ts new file mode 100644 index 00000000..261102f5 --- /dev/null +++ b/apps/client/src/ee/billing/queries/billing-query.ts @@ -0,0 +1,20 @@ +import { useQuery, UseQueryResult } from "@tanstack/react-query"; +import { + getBilling, + getBillingPlans, +} from "@/ee/billing/services/billing-service.ts"; +import { IBilling, IBillingPlan } from "@/ee/billing/types/billing.types.ts"; + +export function useBillingQuery(): UseQueryResult { + return useQuery({ + queryKey: ["billing"], + queryFn: () => getBilling(), + }); +} + +export function useBillingPlans(): UseQueryResult { + return useQuery({ + queryKey: ["billing-plans"], + queryFn: () => getBillingPlans(), + }); +} diff --git a/apps/client/src/ee/billing/services/billing-service.ts b/apps/client/src/ee/billing/services/billing-service.ts new file mode 100644 index 00000000..c76f4ea5 --- /dev/null +++ b/apps/client/src/ee/billing/services/billing-service.ts @@ -0,0 +1,29 @@ +import api from "@/lib/api-client.ts"; +import { + IBilling, + IBillingPlan, + IBillingPortal, + ICheckoutLink, +} from "@/ee/billing/types/billing.types.ts"; + +export async function getBilling(): Promise { + const req = await api.post("/billing/info"); + return req.data; +} + +export async function getBillingPlans(): Promise { + const req = await api.post("/billing/plans"); + return req.data; +} + +export async function getCheckoutLink(data: { + priceId: string; +}): Promise { + const req = await api.post("/billing/checkout", data); + return req.data; +} + +export async function getBillingPortalLink(): Promise { + const req = await api.post("/billing/portal"); + return req.data; +} diff --git a/apps/client/src/ee/billing/types/billing.types.ts b/apps/client/src/ee/billing/types/billing.types.ts new file mode 100644 index 00000000..89d936f0 --- /dev/null +++ b/apps/client/src/ee/billing/types/billing.types.ts @@ -0,0 +1,49 @@ +export enum BillingPlan { + STANDARD = "standard", +} + +export interface IBilling { + id: string; + stripeSubscriptionId: string; + stripeCustomerId: string; + status: string; + quantity: number; + amount: number; + interval: string; + currency: string; + metadata: Record; + stripePriceId: string; + stripeItemId: string; + stripeProductId: string; + periodStartAt: Date; + periodEndAt: Date; + cancelAtPeriodEnd: boolean; + cancelAt: Date; + canceledAt: Date; + workspaceId: string; + createdAt: Date; + updatedAt: Date; + deletedAt: Date; +} + +export interface ICheckoutLink { + url: string; +} + +export interface IBillingPortal { + url: string; +} + +export interface IBillingPlan { + name: string; + description: string; + productId: string; + monthlyId: string; + yearlyId: string; + currency: string; + price: { + monthly: string; + yearly: string; + }; + features: string[]; +} diff --git a/apps/client/src/ee/billing/utils.ts b/apps/client/src/ee/billing/utils.ts new file mode 100644 index 00000000..bf41dff7 --- /dev/null +++ b/apps/client/src/ee/billing/utils.ts @@ -0,0 +1,17 @@ +import { differenceInCalendarDays } from "date-fns"; + +export function formatInterval(interval: string): string { + if (interval === "month") { + return "monthly"; + } + if (interval === "year") { + return "yearly"; + } +} + +export function getTrialDaysLeft(trialEndAt: Date) { + if (!trialEndAt) return null; + + const daysLeft = differenceInCalendarDays(trialEndAt, new Date()); + return daysLeft > 0 ? daysLeft : 0; +} diff --git a/apps/client/src/ee/cloud/query/cloud-query.ts b/apps/client/src/ee/cloud/query/cloud-query.ts new file mode 100644 index 00000000..367d89e3 --- /dev/null +++ b/apps/client/src/ee/cloud/query/cloud-query.ts @@ -0,0 +1,13 @@ +import { useQuery, UseQueryResult } from "@tanstack/react-query"; +import { IWorkspace } from "@/features/workspace/types/workspace.types.ts"; +import { getJoinedWorkspaces } from "@/ee/cloud/service/cloud-service.ts"; + +export function useJoinedWorkspacesQuery(): UseQueryResult< + Partial, + Error +> { + return useQuery({ + queryKey: ["joined-workspaces"], + queryFn: () => getJoinedWorkspaces(), + }); +} diff --git a/apps/client/src/ee/cloud/service/cloud-service.ts b/apps/client/src/ee/cloud/service/cloud-service.ts new file mode 100644 index 00000000..e544733e --- /dev/null +++ b/apps/client/src/ee/cloud/service/cloud-service.ts @@ -0,0 +1,7 @@ +import { IWorkspace } from "@/features/workspace/types/workspace.types.ts"; +import api from "@/lib/api-client.ts"; + +export async function getJoinedWorkspaces(): Promise> { + const req = await api.post>("/workspace/joined"); + return req.data; +} diff --git a/apps/client/src/ee/components/cloud-login-form.tsx b/apps/client/src/ee/components/cloud-login-form.tsx new file mode 100644 index 00000000..cb1af8a7 --- /dev/null +++ b/apps/client/src/ee/components/cloud-login-form.tsx @@ -0,0 +1,96 @@ +import * as z from "zod"; +import { useForm, zodResolver } from "@mantine/form"; +import { + Container, + Title, + TextInput, + Button, + Box, + Text, + Anchor, + Divider, +} from "@mantine/core"; +import classes from "../../features/auth/components/auth.module.css"; +import { getCheckHostname } from "@/features/workspace/services/workspace-service.ts"; +import { useState } from "react"; +import { getSubdomainHost } from "@/lib/config.ts"; +import { Link } from "react-router-dom"; +import APP_ROUTE from "@/lib/app-route.ts"; +import { useTranslation } from "react-i18next"; +import JoinedWorkspaces from "@/ee/components/joined-workspaces.tsx"; +import { useJoinedWorkspacesQuery } from "@/ee/cloud/query/cloud-query.ts"; + +const formSchema = z.object({ + hostname: z.string().min(1, { message: "subdomain is required" }), +}); + +export function CloudLoginForm() { + const { t } = useTranslation(); + const [isLoading, setIsLoading] = useState(false); + const { data: joinedWorkspaces } = useJoinedWorkspacesQuery(); + + const form = useForm({ + validate: zodResolver(formSchema), + initialValues: { + hostname: "", + }, + }); + + async function onSubmit(data: { hostname: string }) { + setIsLoading(true); + + try { + const checkHostname = await getCheckHostname(data.hostname); + window.location.href = checkHostname.hostname; + } catch (err) { + if (err?.status === 404) { + form.setFieldError("hostname", "We could not find this workspace"); + } else { + form.setFieldError("hostname", "An error occurred"); + } + } + + setIsLoading(false); + } + + return ( +
+ + + + {t("Login")} + + + + + {joinedWorkspaces?.length > 0 && ( + + )} + +
+ .{getSubdomainHost()}} + rightSectionWidth={150} + withErrorStyles={false} + {...form.getInputProps("hostname")} + /> + + +
+ + + + {t("Don't have a workspace?")}{" "} + + {t("Create new workspace")} + + +
+ ); +} diff --git a/apps/client/src/ee/components/joined-workspaces.module.css b/apps/client/src/ee/components/joined-workspaces.module.css new file mode 100644 index 00000000..74871e66 --- /dev/null +++ b/apps/client/src/ee/components/joined-workspaces.module.css @@ -0,0 +1,13 @@ +.workspace { + display: block; + width: 100%; + padding: var(--mantine-spacing-xs); + margin-bottom: var(--mantine-spacing-xs); + color: light-dark(var(--mantine-color-black), var(--mantine-color-dark-0)); + border: 1px solid light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5)); + border-radius: var(--mantine-spacing-xs); + + @mixin hover { + background-color: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-8)); + } +} \ No newline at end of file diff --git a/apps/client/src/ee/components/joined-workspaces.tsx b/apps/client/src/ee/components/joined-workspaces.tsx new file mode 100644 index 00000000..7129aa00 --- /dev/null +++ b/apps/client/src/ee/components/joined-workspaces.tsx @@ -0,0 +1,49 @@ +import { Group, Text, UnstyledButton } from "@mantine/core"; +import { useJoinedWorkspacesQuery } from "../cloud/query/cloud-query"; +import { CustomAvatar } from "@/components/ui/custom-avatar.tsx"; +import classes from "./joined-workspaces.module.css"; +import { IconChevronRight } from "@tabler/icons-react"; +import { getHostnameUrl } from "@/ee/utils.ts"; +import { Link } from "react-router-dom"; +import { IWorkspace } from "@/features/workspace/types/workspace.types.ts"; + +export default function JoinedWorkspaces() { + const { data, isLoading } = useJoinedWorkspacesQuery(); + if (isLoading || !data || data?.length === 0) { + return null; + } + + return ( + <> + {data.map((workspace: Partial, index) => ( + + + + +
+ + {workspace?.name} + + + + {getHostnameUrl(workspace?.hostname)?.split("//")[1]} + +
+ + + + + ))} + + ); +} diff --git a/apps/client/src/ee/components/manage-hostname.tsx b/apps/client/src/ee/components/manage-hostname.tsx new file mode 100644 index 00000000..c7a595ff --- /dev/null +++ b/apps/client/src/ee/components/manage-hostname.tsx @@ -0,0 +1,119 @@ +import { Button, Group, Text, Modal, TextInput } from "@mantine/core"; +import * as z from "zod"; +import { useState } from "react"; +import { useDisclosure } from "@mantine/hooks"; +import * as React from "react"; +import { useForm, zodResolver } from "@mantine/form"; +import { notifications } from "@mantine/notifications"; +import { useTranslation } from "react-i18next"; +import { getSubdomainHost } from "@/lib/config.ts"; +import { IWorkspace } from "@/features/workspace/types/workspace.types.ts"; +import { updateWorkspace } from "@/features/workspace/services/workspace-service.ts"; +import { getHostnameUrl } from "@/ee/utils.ts"; +import { useAtom } from "jotai/index"; +import { + currentUserAtom, + workspaceAtom, +} from "@/features/user/atoms/current-user-atom.ts"; +import useUserRole from "@/hooks/use-user-role.tsx"; +import { RESET } from "jotai/utils"; + +export default function ManageHostname() { + const { t } = useTranslation(); + const [opened, { open, close }] = useDisclosure(false); + const [workspace] = useAtom(workspaceAtom); + const { isAdmin } = useUserRole(); + + return ( + +
+ {t("Hostname")} + + {workspace?.hostname}.{getSubdomainHost()} + +
+ + {isAdmin && ( + + )} + + + + + + ); +} + +const formSchema = z.object({ + hostname: z.string().min(4), +}); + +type FormValues = z.infer; + +interface ChangeHostnameFormProps { + onClose?: () => void; +} +function ChangeHostnameForm({ onClose }: ChangeHostnameFormProps) { + const { t } = useTranslation(); + const [isLoading, setIsLoading] = useState(false); + const [currentUser, setCurrentUser] = useAtom(currentUserAtom); + + const form = useForm({ + validate: zodResolver(formSchema), + initialValues: { + hostname: currentUser?.workspace?.hostname, + }, + }); + + async function handleSubmit(data: Partial) { + setIsLoading(true); + + if (data.hostname === currentUser?.workspace?.hostname) { + onClose(); + return; + } + + try { + await updateWorkspace({ + hostname: data.hostname, + }); + setCurrentUser(RESET); + window.location.href = getHostnameUrl(data.hostname.toLowerCase()); + } catch (err) { + notifications.show({ + message: err?.response?.data?.message, + color: "red", + }); + } + setIsLoading(false); + } + + return ( +
+ .{getSubdomainHost()}} + rightSectionWidth={150} + withErrorStyles={false} + width={200} + {...form.getInputProps("hostname")} + /> + + + + + + ); +} diff --git a/apps/client/src/ee/components/sso-cloud-signup.tsx b/apps/client/src/ee/components/sso-cloud-signup.tsx new file mode 100644 index 00000000..c8657955 --- /dev/null +++ b/apps/client/src/ee/components/sso-cloud-signup.tsx @@ -0,0 +1,25 @@ +import { Button, Divider, Stack } from "@mantine/core"; +import { getGoogleSignupUrl } from "@/ee/security/sso.utils.ts"; +import { GoogleIcon } from "@/components/icons/google-icon.tsx"; + +export default function SsoCloudSignup() { + const handleSsoLogin = () => { + window.location.href = getGoogleSignupUrl(); + }; + + return ( + <> + + + + + + ); +} diff --git a/apps/client/src/ee/components/sso-login.tsx b/apps/client/src/ee/components/sso-login.tsx new file mode 100644 index 00000000..8de93c29 --- /dev/null +++ b/apps/client/src/ee/components/sso-login.tsx @@ -0,0 +1,57 @@ +import { useWorkspacePublicDataQuery } from "@/features/workspace/queries/workspace-query.ts"; +import { Button, Divider, Stack } from "@mantine/core"; +import { IconLock } from "@tabler/icons-react"; +import { IAuthProvider } from "@/ee/security/types/security.types.ts"; +import { buildSsoLoginUrl } from "@/ee/security/sso.utils.ts"; +import { SSO_PROVIDER } from "@/ee/security/contants.ts"; +import { GoogleIcon } from "@/components/icons/google-icon.tsx"; +import { isCloud } from "@/lib/config.ts"; + +export default function SsoLogin() { + const { data, isLoading } = useWorkspacePublicDataQuery(); + + if (!data?.authProviders || data?.authProviders?.length === 0) { + return null; + } + + const handleSsoLogin = (provider: IAuthProvider) => { + window.location.href = buildSsoLoginUrl({ + providerId: provider.id, + type: provider.type, + workspaceId: data.id, + }); + }; + + return ( + <> + {(isCloud() || data.hasLicenseKey) && ( + <> + + {data.authProviders.map((provider) => ( +
+ +
+ ))} + + + {!data.enforceSso && ( + + )} + + )} + + ); +} diff --git a/apps/client/src/ee/hooks/use-plan.tsx b/apps/client/src/ee/hooks/use-plan.tsx new file mode 100644 index 00000000..52790178 --- /dev/null +++ b/apps/client/src/ee/hooks/use-plan.tsx @@ -0,0 +1,15 @@ +import { useAtom } from "jotai"; +import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts"; +import { BillingPlan } from "@/ee/billing/types/billing.types.ts"; + +export const usePlan = () => { + const [workspace] = useAtom(workspaceAtom); + + const isStandard = + typeof workspace?.plan === "string" && + workspace?.plan.toLowerCase() === BillingPlan.STANDARD.toLowerCase(); + + return { isStandard }; +}; + +export default usePlan; diff --git a/apps/client/src/ee/hooks/use-redirect-to-cloud-select.tsx b/apps/client/src/ee/hooks/use-redirect-to-cloud-select.tsx new file mode 100644 index 00000000..a7d78047 --- /dev/null +++ b/apps/client/src/ee/hooks/use-redirect-to-cloud-select.tsx @@ -0,0 +1,20 @@ +import { useEffect } from "react"; +import { useLocation, useNavigate } from "react-router-dom"; +import { getAppUrl, getServerAppUrl, isCloud } from "@/lib/config.ts"; +import APP_ROUTE from "@/lib/app-route.ts"; + +export const useRedirectToCloudSelect = () => { + const navigate = useNavigate(); + const pathname = useLocation().pathname; + + useEffect(() => { + const pathsToRedirect = ["/login", "/home"]; + if (isCloud() && pathsToRedirect.includes(pathname)) { + const frontendUrl = getAppUrl(); + const serverUrl = getServerAppUrl(); + if (frontendUrl === serverUrl) { + navigate(APP_ROUTE.AUTH.SELECT_WORKSPACE); + } + } + }, [navigate]); +}; diff --git a/apps/client/src/ee/hooks/use-trial-end-action.tsx b/apps/client/src/ee/hooks/use-trial-end-action.tsx new file mode 100644 index 00000000..5ca08dbf --- /dev/null +++ b/apps/client/src/ee/hooks/use-trial-end-action.tsx @@ -0,0 +1,36 @@ +import { useEffect } from "react"; +import { useLocation, useNavigate } from "react-router-dom"; +import { isCloud } from "@/lib/config.ts"; +import APP_ROUTE from "@/lib/app-route.ts"; +import useUserRole from "@/hooks/use-user-role.tsx"; +import { notifications } from "@mantine/notifications"; +import useTrial from "@/ee/hooks/use-trial.tsx"; + +export const useTrialEndAction = () => { + const navigate = useNavigate(); + const pathname = useLocation().pathname; + const { isAdmin } = useUserRole(); + const { trialDaysLeft } = useTrial(); + + useEffect(() => { + if (isCloud() && trialDaysLeft === 0) { + if (!pathname.startsWith("/settings")) { + notifications.show({ + position: "top-right", + color: "red", + title: "Your 14-day trial has ended", + message: + "Please upgrade to a paid plan or contact your workspace admin.", + autoClose: false, + }); + + // only admins can access the billing page + if (isAdmin) { + navigate(APP_ROUTE.SETTINGS.WORKSPACE.BILLING); + } else { + navigate(APP_ROUTE.SETTINGS.ACCOUNT.PROFILE); + } + } + } + }, [navigate]); +}; diff --git a/apps/client/src/ee/hooks/use-trial.tsx b/apps/client/src/ee/hooks/use-trial.tsx new file mode 100644 index 00000000..2ae68af2 --- /dev/null +++ b/apps/client/src/ee/hooks/use-trial.tsx @@ -0,0 +1,16 @@ +import { useAtom } from "jotai"; +import { currentUserAtom } from "@/features/user/atoms/current-user-atom.ts"; +import { getTrialDaysLeft } from "@/ee/billing/utils.ts"; +import { ICurrentUser } from "@/features/user/types/user.types.ts"; + +export const useTrial = () => { + const [currentUser] = useAtom(currentUserAtom); + const workspace = currentUser?.workspace; + + const trialDaysLeft = getTrialDaysLeft(workspace?.trialEndAt); + const isTrial = !!workspace?.trialEndAt && trialDaysLeft !== null; + + return { isTrial: isTrial, trialDaysLeft: trialDaysLeft }; +}; + +export default useTrial; diff --git a/apps/client/src/ee/licence/components/activate-license-modal.tsx b/apps/client/src/ee/licence/components/activate-license-modal.tsx new file mode 100644 index 00000000..9d81f29e --- /dev/null +++ b/apps/client/src/ee/licence/components/activate-license-modal.tsx @@ -0,0 +1,89 @@ +import * as z from "zod"; +import React from "react"; +import { Button, Group, Modal, Textarea } from "@mantine/core"; +import { useForm, zodResolver } from "@mantine/form"; +import { useTranslation } from "react-i18next"; +import { useActivateMutation } from "@/ee/licence/queries/license-query.ts"; +import { useDisclosure } from "@mantine/hooks"; +import { useAtom } from "jotai"; +import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts"; +import RemoveLicense from "@/ee/licence/components/remove-license.tsx"; + +export default function ActivateLicense() { + const { t } = useTranslation(); + const [opened, { open, close }] = useDisclosure(false); + const [workspace] = useAtom(workspaceAtom); + + return ( + + + + {workspace?.hasLicenseKey && } + + + + + + ); +} + +const formSchema = z.object({ + licenseKey: z.string().min(1), +}); + +type FormValues = z.infer; + +interface ActivateLicenseFormProps { + onClose?: () => void; +} +export function ActivateLicenseForm({ onClose }: ActivateLicenseFormProps) { + const { t } = useTranslation(); + const activateLicenseMutation = useActivateMutation(); + + const form = useForm({ + validate: zodResolver(formSchema), + initialValues: { + licenseKey: "", + }, + }); + + async function handleSubmit(data: { licenseKey: string }) { + await activateLicenseMutation.mutateAsync(data.licenseKey); + form.reset(); + onClose(); + } + + return ( +
+