⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.
TypeScript honoissue-managementissue-trackerjira-alternativekanbanlinear-alternativemcpproject-managementreactself-hostedtypescript
feat(auth): let admins restrict workspace creation to instance admins
pesnikfb8c332600f5
diff --git a/apps/api/src/auth.ts b/apps/api/src/auth.tsindex 1183a11ad..a365d1535 100644--- a/apps/api/src/auth.ts+++ b/apps/api/src/auth.ts@@ -59,6 +59,8 @@ const isPasswordRegistrationDisabled =const isLoginFormDisabled = process.env.DISABLE_LOGIN_FORM === "true";const isEmailOtpSignInDisabled =process.env.DISABLE_EMAIL_OTP_SIGN_IN === "true";+const isWorkspaceCreationDisabled =+ process.env.DISABLE_WORKSPACE_CREATION === "true";function normalizeInvitationId(value: unknown): string | undefined {if (typeof value !== "string") return undefined;@@ -346,7 +348,16 @@ export const auth = betterAuth({},},},- allowUserToCreateOrganization: true,+ // When `DISABLE_WORKSPACE_CREATION` is set, only instance admins+ // (`user.role === "admin"`) may create workspaces — mirrors the+ // implicit-exemption shape of `DISABLE_REGISTRATION` above. This+ // check runs before any workspace membership exists, so only the+ // instance-wide role is meaningful here; per-workspace roles+ // (owner/admin/member/viewer) don't apply until after a workspace+ // is joined.+ allowUserToCreateOrganization: isWorkspaceCreationDisabled+ ? (user) => user.role === "admin"+ : true,// Better Auth defaults this to `true`, which blocks any user whose email// is not verified from accepting/rejecting an invitation. Kaneo does not// verify emails on signup (and guest/anonymous users are unverified bydiff --git a/apps/api/src/schemas.ts b/apps/api/src/schemas.tsindex a8f989199..2cca95ffa 100644--- a/apps/api/src/schemas.ts+++ b/apps/api/src/schemas.ts@@ -266,6 +266,7 @@ export const configSchema = v.object({disableRegistration: v.nullable(v.boolean()),disablePasswordRegistration: v.nullable(v.boolean()),disableEmailOtpSignIn: v.nullable(v.boolean()),+ disableWorkspaceCreation: v.nullable(v.boolean()),isDemoMode: v.boolean(),hasSmtp: v.boolean(),hasGithubSignIn: v.nullable(v.boolean()),diff --git a/apps/api/src/utils/get-settings.ts b/apps/api/src/utils/get-settings.tsindex 8d9609ab1..fe13b68ff 100644--- a/apps/api/src/utils/get-settings.ts+++ b/apps/api/src/utils/get-settings.ts@@ -11,6 +11,7 @@ function getSettings() {disablePasswordRegistration:process.env.DISABLE_PASSWORD_REGISTRATION === "true",disableEmailOtpSignIn: process.env.DISABLE_EMAIL_OTP_SIGN_IN === "true",+ disableWorkspaceCreation: process.env.DISABLE_WORKSPACE_CREATION === "true",isDemoMode: process.env.DEMO_MODE === "true",hasSmtp: isSmtpConfigured(),hasGithubSignIn: isGithubSsoConfigured(),diff --git a/apps/web/src/components/command-palette/index.tsx b/apps/web/src/components/command-palette/index.tsxindex 9c49de146..e16deeaa8 100644--- a/apps/web/src/components/command-palette/index.tsx+++ b/apps/web/src/components/command-palette/index.tsx@@ -23,8 +23,10 @@ import {} from "@/components/ui/command";import { Kbd, KbdGroup } from "@/components/ui/kbd";import { shortcuts } from "@/constants/shortcuts";+import useGetConfig from "@/hooks/queries/config/use-get-config";import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";import { useRegisterShortcuts } from "@/hooks/use-keyboard-shortcuts";+import { authClient } from "@/lib/auth-client";import { useUserPreferencesStore } from "@/store/user-preferences";import CreateProjectModal from "../shared/modals/create-project-modal";@@ -47,6 +49,10 @@ function CommandPalette() {const navigate = useNavigate();const location = useLocation();const { data: workspace } = useActiveWorkspace();+ const { data: session } = authClient.useSession();+ const { data: config } = useGetConfig();+ const canCreateWorkspace =+ !config?.disableWorkspaceCreation || session?.user?.role === "admin";const [open, setOpen] = useState(false);const [isSearchOpen, setIsSearchOpen] = useState(false);const [isCreateTaskOpen, setIsCreateTaskOpen] = useState(false);@@ -147,12 +153,16 @@ function CommandPalette() {value: "commands",label: t("navigation:commandPalette.commands"),items: [- {- value: "create-workspace",- label: t("navigation:commandPalette.createWorkspace"),- shortcut: `${shortcuts.workspace.prefix} ${shortcuts.workspace.create}`,- onRun: () => setIsCreateWorkspaceOpen(true),- },+ ...(canCreateWorkspace+ ? [+ {+ value: "create-workspace",+ label: t("navigation:commandPalette.createWorkspace"),+ shortcut: `${shortcuts.workspace.prefix} ${shortcuts.workspace.create}`,+ onRun: () => setIsCreateWorkspaceOpen(true),+ },+ ]+ : []),{value: "theme-light",label: t("navigation:commandPalette.lightTheme"),@@ -183,7 +193,7 @@ function CommandPalette() {],},],- [navigate, setTheme, t, workspace?.id],+ [navigate, setTheme, t, workspace?.id, canCreateWorkspace],);const shortcutHandlers = useMemo(() => {diff --git a/apps/web/src/components/workspace-switcher.tsx b/apps/web/src/components/workspace-switcher.tsxindex 81cfffb32..c97fce2aa 100644--- a/apps/web/src/components/workspace-switcher.tsx+++ b/apps/web/src/components/workspace-switcher.tsx@@ -20,6 +20,7 @@ import {} from "@/components/ui/sidebar";import { UserAvatar } from "@/components/user-avatar";import { shortcuts } from "@/constants/shortcuts";+import useGetConfig from "@/hooks/queries/config/use-get-config";import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";import useGetWorkspaces from "@/hooks/queries/workspace/use-get-workspaces";import {@@ -38,6 +39,10 @@ export function WorkspaceSwitcher() {// User-scoped WebSocket for real-time events (e.g. NOTIFICATION_CREATED)useUserWebSocket();const { data: workspaces } = useGetWorkspaces();+ const { data: session } = authClient.useSession();+ const { data: config } = useGetConfig();+ const canCreateWorkspace =+ !config?.disableWorkspaceCreation || session?.user?.role === "admin";const navigate = useNavigate();const [isOpen, setIsOpen] = React.useState(false);const [isCreateWorkspaceModalOpen, setIsCreateWorkspaceModalOpen] =@@ -100,7 +105,9 @@ export function WorkspaceSwitcher() {setIsOpen(true);},[shortcuts.workspace.create]: () => {- setIsCreateWorkspaceModalOpen(true);+ if (canCreateWorkspace) {+ setIsCreateWorkspaceModalOpen(true);+ }},},},@@ -172,16 +179,22 @@ export function WorkspaceSwitcher() {</DropdownMenuItem>))}- <DropdownMenuSeparator />- <DropdownMenuItem- onClick={() => {- setIsCreateWorkspaceModalOpen(true);- setIsOpen(false);- }}- className="h-7 text-sm data-highlighted:bg-sidebar-accent data-highlighted:text-sidebar-accent-foreground"- >- <span>{t("navigation:workspaceSwitcher.addWorkspace")}</span>- </DropdownMenuItem>+ {canCreateWorkspace && (+ <>+ <DropdownMenuSeparator />+ <DropdownMenuItem+ onClick={() => {+ setIsCreateWorkspaceModalOpen(true);+ setIsOpen(false);+ }}+ className="h-7 text-sm data-highlighted:bg-sidebar-accent data-highlighted:text-sidebar-accent-foreground"+ >+ <span>+ {t("navigation:workspaceSwitcher.addWorkspace")}+ </span>+ </DropdownMenuItem>+ </>+ )}</DropdownMenuContent></DropdownMenu></SidebarMenuItem>