From 3453bfe10139ef77557f1ead7c8625186c8a453f Mon Sep 17 00:00:00 2001
From: Timon_bed
Date: Sun, 30 Aug 2026 15:00:24 +0200
Subject: [PATCH 1/3] fix: warn about mismatched OAuth callback URLs
---
messages/de.json | 1 +
messages/en.json | 1 +
.../settings/integrations/fitbit-card.tsx | 6 +++
.../integrations/google-health-card.tsx | 10 ++++-
.../integrations/oauth-provider-card.tsx | 6 +++
.../integrations/setup-guide-link.tsx | 39 +++++++++++++++++++
.../settings/integrations/whoop-card.tsx | 6 +++
.../settings/integrations/withings-card.tsx | 6 +++
8 files changed, 74 insertions(+), 1 deletion(-)
diff --git a/messages/de.json b/messages/de.json
index b02ed86da..b0f681548 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -4636,6 +4636,7 @@
"remainingMany": "Noch {count} Messungen bis zum Trend."
},
"settings": {
+ "oauthCallbackPreflightItem": "{provider}: Die Callback-Adresse {configuredOrigin} unterscheidet sich von der App-Adresse {currentOrigin}.",
"shell": {
"sectionsNav": "Einstellungs-Bereiche",
"groups": {
diff --git a/messages/en.json b/messages/en.json
index a7472a8de..e9b91967f 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -4636,6 +4636,7 @@
"remainingMany": "{count} more readings to go."
},
"settings": {
+ "oauthCallbackPreflightItem": "{provider}: callback address {configuredOrigin} differs from this app address {currentOrigin}.",
"shell": {
"sectionsNav": "Settings sections",
"groups": {
diff --git a/src/components/settings/integrations/fitbit-card.tsx b/src/components/settings/integrations/fitbit-card.tsx
index 351ef2dd2..98e7c4056 100644
--- a/src/components/settings/integrations/fitbit-card.tsx
+++ b/src/components/settings/integrations/fitbit-card.tsx
@@ -65,8 +65,10 @@ import {
type SyncOutcomeState,
} from "./sync-outcome";
import {
+ CallbackMismatchNotice,
IntegrationCardDescription,
IntegrationRedirectGuide,
+ integrationCallbackUrl,
} from "./setup-guide-link";
export function FitbitCard({
@@ -521,6 +523,10 @@ export function FitbitCard({
)}
+
);
}
diff --git a/src/components/settings/integrations/google-health-card.tsx b/src/components/settings/integrations/google-health-card.tsx
index c76e11e57..99b127409 100644
--- a/src/components/settings/integrations/google-health-card.tsx
+++ b/src/components/settings/integrations/google-health-card.tsx
@@ -80,7 +80,11 @@ import {
type SyncOutcomeResource,
type SyncOutcomeState,
} from "./sync-outcome";
-import { IntegrationCardDescription } from "./setup-guide-link";
+import {
+ CallbackMismatchNotice,
+ IntegrationCardDescription,
+ integrationCallbackUrl,
+} from "./setup-guide-link";
export function GoogleHealthCard({
viewModel,
@@ -758,6 +762,10 @@ export function GoogleHealthCard({
)}
+
);
}
diff --git a/src/components/settings/integrations/oauth-provider-card.tsx b/src/components/settings/integrations/oauth-provider-card.tsx
index 3b15226f4..147fcc79a 100644
--- a/src/components/settings/integrations/oauth-provider-card.tsx
+++ b/src/components/settings/integrations/oauth-provider-card.tsx
@@ -65,9 +65,11 @@ import {
pillStateForVerdict,
} from "./shared";
import {
+ CallbackMismatchNotice,
IntegrationCardDescription,
IntegrationRedirectGuide,
type IntegrationDocsProvider,
+ integrationCallbackUrl,
} from "./setup-guide-link";
export interface OAuthProviderStatus {
@@ -522,6 +524,10 @@ export function OAuthProviderCard({
)}
+
);
}
diff --git a/src/components/settings/integrations/setup-guide-link.tsx b/src/components/settings/integrations/setup-guide-link.tsx
index 96ac12b49..23889a30a 100644
--- a/src/components/settings/integrations/setup-guide-link.tsx
+++ b/src/components/settings/integrations/setup-guide-link.tsx
@@ -11,6 +11,7 @@
* destination now so a user who is mid-setup always knows where to go.
*/
+import { useSyncExternalStore } from "react";
import { ExternalLink } from "lucide-react";
import { useTranslations } from "@/lib/i18n/context";
@@ -51,6 +52,44 @@ export function integrationCallbackUrl(
return `${base}/api/${provider}/callback`;
}
+/** Shows a compact warning when the callback origin differs from the app. */
+export function CallbackMismatchNotice({
+ provider,
+ callbackUrl,
+}: {
+ provider: string;
+ callbackUrl: string;
+}) {
+ // Get the current origin of the app
+ const { t } = useTranslations();
+ const currentOrigin = useSyncExternalStore(
+ () => () => {},
+ () => window.location.origin,
+ () => null,
+ );
+ // Get the origin of the callback URL
+ const callbackOrigin = (() => {
+ try {
+ return new URL(callbackUrl).origin;
+ } catch {
+ return null;
+ }
+ })();
+ if (!currentOrigin || !callbackOrigin || callbackOrigin === currentOrigin) {
+ return null;
+ }
+ // If the callback origin differs from the app, show a warning
+ return (
+
+ {t("settings.oauthCallbackPreflightItem", {
+ provider,
+ configuredOrigin: callbackOrigin,
+ currentOrigin,
+ })}
+
+ );
+}
+
/**
* v1.29.x (UX audit H2) — compact 3-step BYO-developer-app guide for the
* six providers that require a self-hoster to register their own vendor
diff --git a/src/components/settings/integrations/whoop-card.tsx b/src/components/settings/integrations/whoop-card.tsx
index 6abcec564..db02bd914 100644
--- a/src/components/settings/integrations/whoop-card.tsx
+++ b/src/components/settings/integrations/whoop-card.tsx
@@ -56,8 +56,10 @@ import {
type SyncOutcomeState,
} from "./sync-outcome";
import {
+ CallbackMismatchNotice,
IntegrationCardDescription,
IntegrationRedirectGuide,
+ integrationCallbackUrl,
} from "./setup-guide-link";
export function WhoopCard({
@@ -503,6 +505,10 @@ export function WhoopCard({
)}
+
);
}
diff --git a/src/components/settings/integrations/withings-card.tsx b/src/components/settings/integrations/withings-card.tsx
index faf143687..b85c8b03b 100644
--- a/src/components/settings/integrations/withings-card.tsx
+++ b/src/components/settings/integrations/withings-card.tsx
@@ -55,8 +55,10 @@ import {
type SyncOutcomeState,
} from "./sync-outcome";
import {
+ CallbackMismatchNotice,
IntegrationCardDescription,
IntegrationRedirectGuide,
+ integrationCallbackUrl,
} from "./setup-guide-link";
export function WithingsCard({
@@ -552,6 +554,10 @@ export function WithingsCard({
)}
+
);
}
From 8bec82b551bb2b0824879ba50bcc7f198ae15c93 Mon Sep 17 00:00:00 2001
From: Timon_bed
Date: Sun, 30 Aug 2026 15:10:48 +0200
Subject: [PATCH 2/3] placeholders
---
messages/es.json | 1 +
messages/fr.json | 1 +
messages/it.json | 1 +
messages/ko.json | 1 +
messages/pl.json | 1 +
5 files changed, 5 insertions(+)
diff --git a/messages/es.json b/messages/es.json
index 5cbaeb9f8..10262733d 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -4636,6 +4636,7 @@
"remainingMany": "Faltan {count} mediciones para la tendencia."
},
"settings": {
+ "oauthCallbackPreflightItem": "{provider}: callback address {configuredOrigin} differs from this app address {currentOrigin}.",
"shell": {
"sectionsNav": "Secciones de ajustes",
"groups": {
diff --git a/messages/fr.json b/messages/fr.json
index c05cc7694..b5225e7d1 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -4636,6 +4636,7 @@
"remainingMany": "Encore {count} mesures avant la tendance."
},
"settings": {
+ "oauthCallbackPreflightItem": "{provider}: callback address {configuredOrigin} differs from this app address {currentOrigin}.",
"shell": {
"sectionsNav": "Sections des réglages",
"groups": {
diff --git a/messages/it.json b/messages/it.json
index 3238984e3..9dc7ef027 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -4636,6 +4636,7 @@
"remainingMany": "Mancano {count} misurazioni al trend."
},
"settings": {
+ "oauthCallbackPreflightItem": "{provider}: callback address {configuredOrigin} differs from this app address {currentOrigin}.",
"shell": {
"sectionsNav": "Sezioni delle impostazioni",
"groups": {
diff --git a/messages/ko.json b/messages/ko.json
index 11d30c9fb..6b5d9681a 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -4636,6 +4636,7 @@
"remainingMany": "{count}개만 더 기록하면 돼요."
},
"settings": {
+ "oauthCallbackPreflightItem": "{provider}: callback address {configuredOrigin} differs from this app address {currentOrigin}.",
"shell": {
"sectionsNav": "설정 섹션",
"groups": {
diff --git a/messages/pl.json b/messages/pl.json
index 444d9899d..d7ab1b074 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -4636,6 +4636,7 @@
"remainingMany": "Jeszcze {count} pomiarów do trendu."
},
"settings": {
+ "oauthCallbackPreflightItem": "{provider}: callback address {configuredOrigin} differs from this app address {currentOrigin}.",
"shell": {
"sectionsNav": "Sekcje ustawień",
"groups": {
From 6c4fa2f484f2953613f9f8e17ff92b1c1fb79cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?=
Date: Sun, 30 Aug 2026 15:41:45 +0200
Subject: [PATCH 3/3] i18n: translate the callback mismatch notice into the
remaining five locales
The key shipped with the English sentence in es, fr, it, pl and ko, which
the English-leak guard catches by design: a value byte-identical to the
English one for a multi-word string is a forgotten translation, and that
guard exists because this project has shipped exactly that before.
Nobody sending a two-line fix should have to produce seven languages.
---
messages/es.json | 2 +-
messages/fr.json | 2 +-
messages/it.json | 2 +-
messages/ko.json | 2 +-
messages/pl.json | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/messages/es.json b/messages/es.json
index 10262733d..6c74711c2 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -4636,7 +4636,7 @@
"remainingMany": "Faltan {count} mediciones para la tendencia."
},
"settings": {
- "oauthCallbackPreflightItem": "{provider}: callback address {configuredOrigin} differs from this app address {currentOrigin}.",
+ "oauthCallbackPreflightItem": "{provider}: la dirección de retorno {configuredOrigin} no coincide con la dirección de esta aplicación {currentOrigin}.",
"shell": {
"sectionsNav": "Secciones de ajustes",
"groups": {
diff --git a/messages/fr.json b/messages/fr.json
index b5225e7d1..585a5593f 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -4636,7 +4636,7 @@
"remainingMany": "Encore {count} mesures avant la tendance."
},
"settings": {
- "oauthCallbackPreflightItem": "{provider}: callback address {configuredOrigin} differs from this app address {currentOrigin}.",
+ "oauthCallbackPreflightItem": "{provider} : l'adresse de rappel {configuredOrigin} diffère de l'adresse de cette application {currentOrigin}.",
"shell": {
"sectionsNav": "Sections des réglages",
"groups": {
diff --git a/messages/it.json b/messages/it.json
index 9dc7ef027..52de080b0 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -4636,7 +4636,7 @@
"remainingMany": "Mancano {count} misurazioni al trend."
},
"settings": {
- "oauthCallbackPreflightItem": "{provider}: callback address {configuredOrigin} differs from this app address {currentOrigin}.",
+ "oauthCallbackPreflightItem": "{provider}: l'indirizzo di callback {configuredOrigin} non corrisponde all'indirizzo di questa applicazione {currentOrigin}.",
"shell": {
"sectionsNav": "Sezioni delle impostazioni",
"groups": {
diff --git a/messages/ko.json b/messages/ko.json
index 6b5d9681a..b2a0f8555 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -4636,7 +4636,7 @@
"remainingMany": "{count}개만 더 기록하면 돼요."
},
"settings": {
- "oauthCallbackPreflightItem": "{provider}: callback address {configuredOrigin} differs from this app address {currentOrigin}.",
+ "oauthCallbackPreflightItem": "{provider}: 콜백 주소 {configuredOrigin}이(가) 이 앱 주소 {currentOrigin}과(와) 다릅니다.",
"shell": {
"sectionsNav": "설정 섹션",
"groups": {
diff --git a/messages/pl.json b/messages/pl.json
index d7ab1b074..67b4c6987 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -4636,7 +4636,7 @@
"remainingMany": "Jeszcze {count} pomiarów do trendu."
},
"settings": {
- "oauthCallbackPreflightItem": "{provider}: callback address {configuredOrigin} differs from this app address {currentOrigin}.",
+ "oauthCallbackPreflightItem": "{provider}: adres zwrotny {configuredOrigin} różni się od adresu tej aplikacji {currentOrigin}.",
"shell": {
"sectionsNav": "Sekcje ustawień",
"groups": {