From 784677e180981a9e9a93bff7bcc03294895aa53a Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Thu, 24 Jul 2025 23:05:51 -0700 Subject: [PATCH] Moved env checks to server pages. --- src/app/(main)/App.tsx | 4 ---- src/app/actions/getConfig.ts | 4 ---- src/app/layout.tsx | 8 ++++++++ src/app/login/LoginPage.tsx | 7 ------- src/app/login/page.tsx | 4 ++++ src/app/logout/LogoutPage.tsx | 5 ++--- src/app/logout/page.tsx | 4 ++++ 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/app/(main)/App.tsx b/src/app/(main)/App.tsx index 4cbb1c80..b4cbdfde 100644 --- a/src/app/(main)/App.tsx +++ b/src/app/(main)/App.tsx @@ -22,10 +22,6 @@ export function App({ children }) { return null; } - if (config.uiDisabled) { - return null; - } - return ( <> {children} diff --git a/src/app/actions/getConfig.ts b/src/app/actions/getConfig.ts index c490327d..32b8a7d0 100644 --- a/src/app/actions/getConfig.ts +++ b/src/app/actions/getConfig.ts @@ -2,22 +2,18 @@ export type Config = { faviconUrl: string | undefined; - loginDisabled: boolean; privateMode: boolean; telemetryDisabled: boolean; trackerScriptName: string | undefined; - uiDisabled: boolean; updatesDisabled: boolean; }; export async function getConfig(): Promise { return { faviconUrl: process.env.FAVICON_URL, - loginDisabled: !!process.env.DISABLE_LOGIN, privateMode: !!process.env.PRIVATE_MODE, telemetryDisabled: !!process.env.DISABLE_TELEMETRY, trackerScriptName: process.env.TRACKER_SCRIPT_NAME, - uiDisabled: !!process.env.DISABLE_UI, updatesDisabled: !!process.env.DISABLE_UPDATES, }; } diff --git a/src/app/layout.tsx b/src/app/layout.tsx index ebe313e6..e939f8c4 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -9,6 +9,14 @@ import '@/styles/index.css'; import '@/styles/variables.css'; export default function ({ children }) { + if (process.env.DISABLE_UI) { + return ( + + + + ); + } + return ( diff --git a/src/app/login/LoginPage.tsx b/src/app/login/LoginPage.tsx index 61d1b7fb..2eca070f 100644 --- a/src/app/login/LoginPage.tsx +++ b/src/app/login/LoginPage.tsx @@ -1,15 +1,8 @@ 'use client'; -import { useConfig } from '@/components/hooks'; import LoginForm from './LoginForm'; import styles from './LoginPage.module.css'; export function LoginPage() { - const config = useConfig(); - - if (config?.loginDisabled) { - return null; - } - return (
diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index 6f34d987..cca230c2 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -2,6 +2,10 @@ import { Metadata } from 'next'; import LoginPage from './LoginPage'; export default async function () { + if (process.env.DISABLE_LOGIN) { + return null; + } + return ; } diff --git a/src/app/logout/LogoutPage.tsx b/src/app/logout/LogoutPage.tsx index 0bbfa90c..2914c4eb 100644 --- a/src/app/logout/LogoutPage.tsx +++ b/src/app/logout/LogoutPage.tsx @@ -1,15 +1,14 @@ 'use client'; import { useEffect } from 'react'; import { useRouter } from 'next/navigation'; -import { useApi, useConfig } from '@/components/hooks'; +import { useApi } from '@/components/hooks'; import { setUser } from '@/store/app'; import { removeClientAuthToken } from '@/lib/client'; export function LogoutPage() { - const config = useConfig(); const router = useRouter(); const { post } = useApi(); - const disabled = !!(config?.loginDisabled || process.env.cloudMode); + const disabled = process.env.cloudMode; useEffect(() => { async function logout() { diff --git a/src/app/logout/page.tsx b/src/app/logout/page.tsx index a253049a..80a61f52 100644 --- a/src/app/logout/page.tsx +++ b/src/app/logout/page.tsx @@ -2,6 +2,10 @@ import LogoutPage from './LogoutPage'; import { Metadata } from 'next'; export default function () { + if (process.env.DISABLE_LOGIN) { + return null; + } + return ; }