render login page on SERVER_LOCK (#1172)

src/renderer/features/action-required/components/action-required-container.tsx

@@ -1,7 +1,6 @@
 import { ReactNode } from 'react';
 
 import { Group } from '/@/shared/components/group/group';
-import { Icon } from '/@/shared/components/icon/icon';
 import { Stack } from '/@/shared/components/stack/stack';
 import { Text } from '/@/shared/components/text/text';
 
@@ -13,7 +12,6 @@ interface ActionRequiredContainerProps {
 export const ActionRequiredContainer = ({ children, title }: ActionRequiredContainerProps) => (
     <Stack style={{ cursor: 'default', maxWidth: '700px' }}>
         <Group>
-            <Icon fill="warn" icon="warn" size="lg" />
             <Text size="xl" style={{ textTransform: 'uppercase' }}>
                 {title}
             </Text>

src/renderer/features/action-required/components/server-required.tsx

@@ -28,20 +28,14 @@ const localSettings = isElectron() ? window.api.localSettings : null;
 export const ServerRequired = () => {
     const serverList = useServerList();
 
-    const serverLock =
-        (localSettings
-            ? !!localSettings.env.SERVER_LOCK
-            : !!window.SERVER_LOCK &&
-              window.SERVER_TYPE &&
-              window.SERVER_NAME &&
-              window.SERVER_URL) || false;
+    const isServerLock = Boolean(window.SERVER_LOCK) || false;
 
-    if (Object.keys(serverList).length > 0) {
+    if (Object.keys(serverList).length > 1) {
         return (
             <ScrollArea>
                 <Stack miw="300px">
                     <ServerSelector />
-                    {!serverLock && (
+                    {!isServerLock && (
                         <>
                             <Divider my="lg" />
                             <AddServerForm onCancel={null} />

src/renderer/features/action-required/routes/action-required-route.tsx

@@ -1,5 +1,4 @@
 import { openModal } from '@mantine/modals';
-import isElectron from 'is-electron';
 import { useTranslation } from 'react-i18next';
 import { Navigate } from 'react-router';
 
@@ -7,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 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';
 import { PageErrorBoundary } from '/@/renderer/features/shared/components/page-error-boundary';
@@ -18,14 +18,15 @@ import { Group } from '/@/shared/components/group/group';
 import { Icon } from '/@/shared/components/icon/icon';
 import { Stack } from '/@/shared/components/stack/stack';
 
-const localSettings = isElectron() ? window.api.localSettings : null;
-
 const ActionRequiredRoute = () => {
     const { t } = useTranslation();
     const currentServer = useCurrentServerWithCredential();
     const isServerRequired = !currentServer;
     const isCredentialRequired = currentServer && !currentServer.credential;
 
+    const isServerLock = Boolean(window.SERVER_LOCK) || false;
+    const isLoginRequired = isServerLock && !currentServer;
+
     const checks = [
         {
             component: <ServerCredentialRequired />,
@@ -49,6 +50,10 @@ const ActionRequiredRoute = () => {
         });
     };
 
+    if (isLoginRequired) {
+        return <LoginRoute />;
+    }
+
     return (
         <AnimatedPage>
             <PageHeader />
@@ -64,7 +69,7 @@ const ActionRequiredRoute = () => {
                     <Stack mt="2rem">
                         {canReturnHome && <Navigate to={AppRoute.HOME} />}
                         {/* This should be displayed if a credential is required */}
-                        {isCredentialRequired && !localSettings?.env.SERVER_LOCK && (
+                        {isCredentialRequired && !isServerLock && (
                             <Group justify="center" wrap="nowrap">
                                 <Button
                                     fullWidth