Merge branch 'master' into dev

2024-05-07 20:04:46 +02:00
parent b70e179ff9 f67e2c5a45
commit 0a08b8fb9b
13 changed files with 25 additions and 18 deletions
--- a/src/server/api/routers/health-monitoring/openmediavault.ts
+++ b/src/server/api/routers/health-monitoring/openmediavault.ts
@@ -67,11 +67,18 @@ export async function makeOpenMediaVaultCalls(app: ConfigAppType, input: any) {
    } else {
      const cookies = authResponse.headers['set-cookie'] || [];
      sessionId = cookies
-        .find((cookie: any) => cookie.includes('X-OPENMEDIAVAULT-SESSIONID'))
+        .find(
+          (cookie: any) =>
+            cookie.includes('X-OPENMEDIAVAULT-SESSIONID') ||
+            cookie.includes('OPENMEDIAVAULT-SESSIONID')
+        )
        ?.split(';')[0];

      loginToken = cookies
-        .find((cookie: any) => cookie.includes('X-OPENMEDIAVAULT-LOGIN'))
+        .find(
+          (cookie: any) =>
+            cookie.includes('X-OPENMEDIAVAULT-LOGIN') || cookie.includes('OPENMEDIAVAULT-LOGIN')
+        )
        ?.split(';')[0];
    }