From d806ade84c50efb4eaaa045fc68ebafa6d8128f6 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Tue, 12 Mar 2024 23:59:35 -0700
Subject: [PATCH] Potentially fix application stuck when Navidrome credential
 expires (#538)

---
 src/renderer/api/navidrome/navidrome-api.ts                | 7 ++++---
 .../action-required/routes/action-required-route.tsx       | 5 ++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/renderer/api/navidrome/navidrome-api.ts b/src/renderer/api/navidrome/navidrome-api.ts
index e15e3aa2b..b9eb93f9f 100644
--- a/src/renderer/api/navidrome/navidrome-api.ts
+++ b/src/renderer/api/navidrome/navidrome-api.ts
@@ -286,9 +286,10 @@ axiosClient.interceptors.response.use(
                             });
 
                             const serverId = currentServer.id;
-                            useAuthStore
-                                .getState()
-                                .actions.updateServer(serverId, { ndCredential: undefined });
+                            useAuthStore.getState().actions.updateServer(serverId, {
+                                credential: undefined,
+                                ndCredential: undefined,
+                            });
                             useAuthStore.getState().actions.setCurrentServer(null);
 
                             // special error to prevent sending a second message, and stop other messages that could be enqueued
diff --git a/src/renderer/features/action-required/routes/action-required-route.tsx b/src/renderer/features/action-required/routes/action-required-route.tsx
index 458540ed2..f6b8822c6 100644
--- a/src/renderer/features/action-required/routes/action-required-route.tsx
+++ b/src/renderer/features/action-required/routes/action-required-route.tsx
@@ -1,7 +1,7 @@
 import { Center, Group, Stack } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import { RiCheckFill } from 'react-icons/ri';
-import { Link, Navigate } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 import { Button, PageHeader, Text } from '/@/renderer/components';
 import { ActionRequiredContainer } from '/@/renderer/features/action-required/components/action-required-container';
 import { ServerCredentialRequired } from '/@/renderer/features/action-required/components/server-credential-required';
@@ -14,7 +14,7 @@ const ActionRequiredRoute = () => {
     const { t } = useTranslation();
     const currentServer = useCurrentServer();
     const isServerRequired = !currentServer;
-    const isCredentialRequired = false;
+    const isCredentialRequired = currentServer && !currentServer.credential;
 
     const checks = [
         {
@@ -50,7 +50,6 @@ const ActionRequiredRoute = () => {
                     <Stack mt="2rem">
                         {canReturnHome && (
                             <>
-                                <Navigate to={AppRoute.HOME} />
                                 <Group
                                     noWrap
                                     position="center"