Merge remote-tracking branch 'upstream/main'

bentwnghk · Mar 6, 2024 · dcb2049 · dcb2049
2 parents 76f5f6a + 96117fa
commit dcb2049
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/locales/create.ts b/src/locales/create.ts
@@ -39,6 +39,15 @@ export const createI18nNext = (lang?: string) => {
         detection: {
           caches: ['cookie'],
           cookieMinutes: 60 * 24 * COOKIE_CACHE_DAYS,
+          /**
+             Set `sameSite` to `lax` so that the i18n cookie can be passed to the
+             server side when returning from the OAuth authorization website.
+             ref: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#samesitesamesite-value
+             discussion: https://github.com/lobehub/lobe-chat/pull/1474
+          */
+          cookieOptions: {
+            sameSite: 'lax',
+          },
           lookupCookie: LOBE_LOCALE_COOKIE,
         },
         fallbackLng: DEFAULT_LANG,