From cd473393c215a3140040d169385d6b923c795e5c Mon Sep 17 00:00:00 2001 From: Eduardo Liron Date: Fri, 4 Sep 2026 08:51:30 -0300 Subject: [PATCH] remove sso .env guard from login --- .env.app | 1 - .env.docker | 1 - public/public-config.json | 1 - src/config.ts | 4 ---- src/views/Public/Login/LoginView.tsx | 6 ++---- 5 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.env.app b/.env.app index 4e2b3e30..54f1f8e3 100644 --- a/.env.app +++ b/.env.app @@ -1,7 +1,6 @@ VITE_APP_VERSION = $npm_package_version VITE_APP_API_URL = https://neu.aula.de VITE_APP_MULTI = true -VITE_APP_IS_SSO_ENABLED = false VITE_APP_BASENAME = / # vim: set ft=sh: diff --git a/.env.docker b/.env.docker index bd92ccb8..b2e3ecea 100644 --- a/.env.docker +++ b/.env.docker @@ -1,6 +1,5 @@ DOCKER_AULA_CENTRAL_API_URL="http://localhost:8080" DOCKER_AULA_IS_MULTI=false DOCKER_AULA_BASENAME="/" -DOCKER_AULA_IS_SSO_ENABLED=false # vim: set ft=sh: diff --git a/public/public-config.json b/public/public-config.json index ebc9725b..5782da58 100644 --- a/public/public-config.json +++ b/public/public-config.json @@ -1,6 +1,5 @@ { "CENTRAL_API_URL": DOCKER_AULA_CENTRAL_API_URL, "IS_MULTI": DOCKER_AULA_IS_MULTI, - "IS_SSO_ENABLED": DOCKER_AULA_IS_SSO_ENABLED, "BASENAME": DOCKER_AULA_BASENAME } \ No newline at end of file diff --git a/src/config.ts b/src/config.ts index 1890fd67..dcf91b44 100644 --- a/src/config.ts +++ b/src/config.ts @@ -6,14 +6,12 @@ export const APP_TITLE = 'aula'; export interface RuntimeConfig { CENTRAL_API_URL: string; IS_MULTI: boolean; - IS_SSO_ENABLED: boolean; BASENAME: string; } const defaultConfig: RuntimeConfig = { CENTRAL_API_URL: 'https://neu.aula.de/', IS_MULTI: true, - IS_SSO_ENABLED: false, BASENAME: '/', }; @@ -24,8 +22,6 @@ export async function loadRuntimeConfig(): Promise { config = { CENTRAL_API_URL: import.meta.env.VITE_APP_API_URL, IS_MULTI: import.meta.env.VITE_APP_MULTI !== 'false' && import.meta.env.VITE_APP_MULTI !== false, - IS_SSO_ENABLED: - import.meta.env.VITE_APP_IS_SSO_ENABLED !== 'false' && import.meta.env.VITE_APP_IS_SSO_ENABLED !== false, BASENAME: import.meta.env.VITE_APP_BASENAME || '/', }; } else { diff --git a/src/views/Public/Login/LoginView.tsx b/src/views/Public/Login/LoginView.tsx index 50dda5ac..ac7606b4 100644 --- a/src/views/Public/Login/LoginView.tsx +++ b/src/views/Public/Login/LoginView.tsx @@ -1,6 +1,5 @@ import { AppIconButton, AppLink } from "@/components"; import Eduplaces from "@/components/Buttons/Eduplaces/Eduplaces"; -import { getRuntimeConfig } from "@/config"; import { handleOAuthLogin } from "@/services/auth"; import { declineAccountClaim } from "@/services/idpMigration"; import { loginUser } from "@/services/login"; @@ -57,13 +56,12 @@ const LoginView = () => { const [instanceSso, setInstanceSso] = useState(undefined); const [ssoRequired, setSsoRequired] = useState(false); - const ssoAvailable = getRuntimeConfig().IS_SSO_ENABLED && instanceSso === true; + const ssoAvailable = instanceSso === true; const ssoEnforced = ssoAvailable && ssoRequired; const showPasswordLogin = !ssoEnforced || ssoLinkToken !== null; const ssoBrowserSupported = useMemo(() => isSsoBrowserSupported(), []); - const ssoStatusPending = - getRuntimeConfig().IS_SSO_ENABLED && instanceSso === undefined && ssoLinkToken === null; + const ssoStatusPending = instanceSso === undefined && ssoLinkToken === null; const schema = yup .object({