vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-05-17 06:00:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: properly handle server lock and related properties

Browse Source
This commit is contained in:
Kendall Garner
2026-01-08 07:42:59 -08:00
parent 2fdc214c21
commit 7e67d0dac6
12 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/features/action-required/components/server-required.tsx
+2 -3
View File
@@ -3,6 +3,7 @@ import isElectron from 'is-electron';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router';
import { isServerLock } from '/@/renderer/features/action-required/utils/window-properties';
import JellyfinLogo from '/@/renderer/features/servers/assets/jellyfin.png';
import NavidromeLogo from '/@/renderer/features/servers/assets/navidrome.png';
import OpenSubsonicLogo from '/@/renderer/features/servers/assets/opensubsonic.png';
@@ -28,14 +29,12 @@ const localSettings = isElectron() ? window.api.localSettings : null;
export const ServerRequired = () => {
const serverList = useServerList();
const isServerLock = Boolean(window.SERVER_LOCK) || false;
if (Object.keys(serverList).length > 0) {
return (
<ScrollArea>
<Stack miw="300px">
<ServerSelector />
{!isServerLock && (
{!isServerLock() && (
<>
<Divider my="lg" />
<AddServerForm onCancel={null} />
src/renderer/features/action-required/routes/action-required-route.tsx
+2 -2
View File
@@ -6,6 +6,7 @@ import { PageHeader } from '/@/renderer/components/page-header/page-header';
import { ActionRequiredContainer } from '/@/renderer/features/action-required/components/action-required-container';
import { ServerCredentialRequired } from '/@/renderer/features/action-required/components/server-credential-required';
import { ServerRequired } from '/@/renderer/features/action-required/components/server-required';
import { isServerLock } from '/@/renderer/features/action-required/utils/window-properties';
import LoginRoute from '/@/renderer/features/login/routes/login-route';
import { ServerList } from '/@/renderer/features/servers/components/server-list';
import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page';
@@ -25,8 +26,7 @@ const ActionRequiredRoute = () => {
const isServerRequired = !currentServer;
const isCredentialRequired = currentServer && !currentServer.credential;
const isServerLock = Boolean(window.SERVER_LOCK) || false;
const isLoginRequired = isServerLock && !currentServer;
const isLoginRequired = isServerLock() && !currentServer;
const checks = [
{
src/renderer/features/action-required/utils/window-properties.tsx
+4
View File
@@ -0,0 +1,4 @@
export const isLegacyAuth = () =>
window.LEGACY_AUTHENTICATION === true || window.LEGACY_AUTHENTICATION === 'true';
export const isServerLock = () => window.SERVER_LOCK === true || window.SERVER_LOCK === 'true';