From e0105115f4ce5325ffa126518d3c2386fb0fea7e Mon Sep 17 00:00:00 2001
From: jubnl <jgunther021@gmail.com>
Date: Fri, 3 Apr 2026 19:12:26 +0200
Subject: [PATCH] =?UTF-8?q?fix(immich):=20detect=20http=E2=86=92https=20re?=
 =?UTF-8?q?direct=20on=20test=20connection=20and=20update=20URL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When a user enters an http:// Immich URL that redirects to https://,
the test succeeded (GET follows redirects fine) but subsequent POST
requests (e.g. photo search) broke due to method downgrade on 301/302.

Now testConnection() checks resp.url against the input URL after a
successful fetch. If the only difference is http→https on the same
host and port, it returns a canonicalUrl so the frontend can update
the input field before the user saves — ensuring the correct URL is
stored.
---
 client/src/pages/SettingsPage.tsx    |  7 ++++++-
 server/src/services/immichService.ts | 20 ++++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/client/src/pages/SettingsPage.tsx b/client/src/pages/SettingsPage.tsx
index 6558344..d888fc4 100644
--- a/client/src/pages/SettingsPage.tsx
+++ b/client/src/pages/SettingsPage.tsx
@@ -176,7 +176,12 @@ export default function SettingsPage(): React.ReactElement {
     try {
       const res = await apiClient.post('/integrations/immich/test', { immich_url: immichUrl, immich_api_key: immichApiKey })
       if (res.data.connected) {
-        toast.success(`${t('memories.connectionSuccess')} — ${res.data.user?.name || ''}`)
+        if (res.data.canonicalUrl) {
+          setImmichUrl(res.data.canonicalUrl)
+          toast.success(`${t('memories.connectionSuccess')} — ${res.data.user?.name || ''} (URL updated to ${res.data.canonicalUrl})`)
+        } else {
+          toast.success(`${t('memories.connectionSuccess')} — ${res.data.user?.name || ''}`)
+        }
         setImmichTestPassed(true)
       } else {
         toast.error(`${t('memories.connectionError')}: ${res.data.error}`)
diff --git a/server/src/services/immichService.ts b/server/src/services/immichService.ts
index 9dd3de5..6468338 100644
--- a/server/src/services/immichService.ts
+++ b/server/src/services/immichService.ts
@@ -69,7 +69,7 @@ export async function saveImmichSettings(
 export async function testConnection(
   immichUrl: string,
   immichApiKey: string
-): Promise<{ connected: boolean; error?: string; user?: { name?: string; email?: string } }> {
+): Promise<{ connected: boolean; error?: string; user?: { name?: string; email?: string }; canonicalUrl?: string }> {
   const ssrf = await checkSsrf(immichUrl);
   if (!ssrf.allowed) return { connected: false, error: ssrf.error ?? 'Invalid Immich URL' };
   try {
@@ -79,7 +79,23 @@ export async function testConnection(
     });
     if (!resp.ok) return { connected: false, error: `HTTP ${resp.status}` };
     const data = await resp.json() as { name?: string; email?: string };
-    return { connected: true, user: { name: data.name, email: data.email } };
+
+    // Detect http → https upgrade only: same host/port, protocol changed to https
+    let canonicalUrl: string | undefined;
+    if (resp.url) {
+      const finalUrl = new URL(resp.url);
+      const inputUrl = new URL(immichUrl);
+      if (
+        inputUrl.protocol === 'http:' &&
+        finalUrl.protocol === 'https:' &&
+        finalUrl.hostname === inputUrl.hostname &&
+        finalUrl.port === inputUrl.port
+      ) {
+        canonicalUrl = finalUrl.origin;
+      }
+    }
+
+    return { connected: true, user: { name: data.name, email: data.email }, canonicalUrl };
   } catch (err: unknown) {
     return { connected: false, error: err instanceof Error ? err.message : 'Connection failed' };
   }