From 249065a90b62b8034868e3eda691e5da40905dce Mon Sep 17 00:00:00 2001 From: Simon <9295182+grimsi@users.noreply.github.com> Date: Wed, 18 Jun 2025 15:45:08 +0200 Subject: [PATCH] Merge pull request #600 * Removed CORS configuration --- .../administration/SystemManagement.tsx | 17 ++--------------- .../org/gameyfin/app/config/ConfigProperties.kt | 12 ------------ .../app/core/security/SecurityConfig.kt | 1 - 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/app/src/main/frontend/components/administration/SystemManagement.tsx b/app/src/main/frontend/components/administration/SystemManagement.tsx index 40da042..0057fde 100644 --- a/app/src/main/frontend/components/administration/SystemManagement.tsx +++ b/app/src/main/frontend/components/administration/SystemManagement.tsx @@ -1,25 +1,12 @@ -import React, {useEffect} from "react"; +import React from "react"; import {SystemEndpoint} from "Frontend/generated/endpoints"; import withConfigPage from "Frontend/components/administration/withConfigPage"; import {Button} from "@heroui/react"; -import ConfigFormField from "Frontend/components/administration/ConfigFormField"; import Section from "Frontend/components/general/Section"; -function SystemManagementLayout({getConfig, formik, setSaveMessage}: any) { - - useEffect(() => { - if (formik.dirty && (formik.initialValues.system.cors["allowed-origins"] !== formik.values.system.cors["allowed-origins"])) { - setSaveMessage("Gameyfin must be restarted for the changes to take effect"); - } else { - setSaveMessage(null); - } - }, [formik.dirty]); - +function SystemManagementLayout() { return (
-
- -
diff --git a/app/src/main/kotlin/org/gameyfin/app/config/ConfigProperties.kt b/app/src/main/kotlin/org/gameyfin/app/config/ConfigProperties.kt index bab6434..b58bba4 100644 --- a/app/src/main/kotlin/org/gameyfin/app/config/ConfigProperties.kt +++ b/app/src/main/kotlin/org/gameyfin/app/config/ConfigProperties.kt @@ -256,18 +256,6 @@ sealed class ConfigProperties( ) } } - - /** System */ - sealed class System { - sealed class Cors { - data object AllowedOrigins : ConfigProperties>( - Array::class, - "system.cors.allowed-origins", - "List of allowed CORS origins (currently unused)", - emptyArray() - ) - } - } } enum class MatchUsersBy { diff --git a/app/src/main/kotlin/org/gameyfin/app/core/security/SecurityConfig.kt b/app/src/main/kotlin/org/gameyfin/app/core/security/SecurityConfig.kt index 413ad2d..d0ba699 100644 --- a/app/src/main/kotlin/org/gameyfin/app/core/security/SecurityConfig.kt +++ b/app/src/main/kotlin/org/gameyfin/app/core/security/SecurityConfig.kt @@ -31,7 +31,6 @@ class SecurityConfig( ) : VaadinWebSecurity() { private val ssoProviderKey: String = "oidc" - private val allowedOrigins: List? = config.get(ConfigProperties.System.Cors.AllowedOrigins)?.toList() @Throws(Exception::class) override fun configure(http: HttpSecurity) {