From 10ccfc588ba65113a5ad90cb7f5c400852250550 Mon Sep 17 00:00:00 2001
From: Tristan Yang <yanggc888@163.com>
Date: Thu, 8 Jun 2023 18:34:58 +0800
Subject: [PATCH] refactor: check token in reg base entry

---
 public/locales/en/auth.json |  2 +-
 src/routes/reg/index.tsx    | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/public/locales/en/auth.json b/public/locales/en/auth.json
index e1a40d43..2a22f07c 100644
--- a/public/locales/en/auth.json
+++ b/public/locales/en/auth.json
@@ -45,7 +45,7 @@
   "github_logging_in": "GitHub Logging in...",
   "github_cb_tip": "Please close this window and return widget window",
   "magic_link_expire": {
-    "title": "Magic link expired",
+    "title": "Magic link invalid or expired",
     "desc": "Go back to your original VoceChat tab and request a new magic link.",
     "desc_close": "You can close this window now."
   },
diff --git a/src/routes/reg/index.tsx b/src/routes/reg/index.tsx
index 41df60e4..f4769155 100644
--- a/src/routes/reg/index.tsx
+++ b/src/routes/reg/index.tsx
@@ -25,7 +25,15 @@ export default function RegContainer() {
   return (
     <div className="flex-center h-screen overflow-x-hidden overflow-y-auto dark:bg-gray-700">
       <div className="py-8 px-10 shadow-md rounded-xl max-h-[95vh] overflow-y-auto overflow-x-hidden">
-        {tokenIsValid ? <Outlet context={{ token }} /> : <ExpiredTip />}
+        {magic_token ? (
+          tokenIsValid ? (
+            <Outlet context={{ token }} />
+          ) : (
+            <ExpiredTip />
+          )
+        ) : (
+          <Outlet context={{ token }} />
+        )}
       </div>
     </div>
   );