From 1f94d7d1bc6a67f8089387f0302b346460fa0802 Mon Sep 17 00:00:00 2001
From: Gabriele <schiraldigabriele@gmail.com>
Date: Sun, 1 Feb 2026 15:05:19 +0100
Subject: [PATCH] Merge commit from fork

---
 packages/frontend/core/src/desktop/pages/redirect/index.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/core/src/desktop/pages/redirect/index.tsx b/packages/frontend/core/src/desktop/pages/redirect/index.tsx
index c5c5e5d8e..502cfb32d 100644
--- a/packages/frontend/core/src/desktop/pages/redirect/index.tsx
+++ b/packages/frontend/core/src/desktop/pages/redirect/index.tsx
@@ -1,5 +1,6 @@
 import { DebugLogger } from '@affine/debug';
 import { type LoaderFunction, Navigate, useLoaderData } from 'react-router-dom';
+import { escapeRegExp } from 'lodash-es';
 
 const trustedDomain = [
   'google.com',
@@ -41,7 +42,7 @@ export const loader: LoaderFunction = async ({ request }) => {
     if (
       target.hostname === window.location.hostname ||
       trustedDomain.some(domain =>
-        new RegExp(`.?${domain}$`).test(target.hostname)
+        new RegExp(`(^|\\.)${escapeRegExp(domain)}$`).test(target.hostname)
       )
     ) {
       location.href = redirectUri;