From a0a1d1c24e36e365d0bbefa8c455746666565342 Mon Sep 17 00:00:00 2001
From: Danh <nguyenhoaidanh2096@gmail.com>
Date: Mon, 18 Sep 2023 11:08:18 +0700
Subject: [PATCH] update latest code

---
 src/pages/Oauth/Login.tsx | 10 ++++++----
 src/pages/Oauth/utils.ts  |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pages/Oauth/Login.tsx b/src/pages/Oauth/Login.tsx
index 9a830afabf..53a2ac6e9e 100644
--- a/src/pages/Oauth/Login.tsx
+++ b/src/pages/Oauth/Login.tsx
@@ -13,18 +13,20 @@ import { formatSignature } from 'utils/transaction'
 
 import AuthForm from './components/AuthForm'
 import { BUTTON_IDS } from './constants/index'
-import { createSignMessage, getSupportLoginMethods } from './utils'
+import { createSignMessage, getSupportLoginMethods, isValidRedirectURL } from './utils'
 
 const getErrorMsg = (error: any) => {
   const data = error?.response?.data
   const isExpired = data?.error?.id === 'self_service_flow_expired'
-  if (isExpired)
+  const backUri = queryStringToObject(window.location.search)?.back_uri + ''
+  if (isExpired && isValidRedirectURL(backUri)) {
     return (
       <span>
-        Time to sign-in is Expired, please{' '}
-        <a href={queryStringToObject(window.location.search)?.back_uri + ''}>go back</a> and try again.
+        Time to sign-in is Expired, please <a href={backUri}>go back</a> and try again.
       </span>
     )
+  }
+
   return data?.ui?.messages?.[0]?.text || data?.error?.reason || data?.error?.message || error?.message || error + ''
 }
 
diff --git a/src/pages/Oauth/utils.ts b/src/pages/Oauth/utils.ts
index 00d67528c1..1d5bcdfaba 100644
--- a/src/pages/Oauth/utils.ts
+++ b/src/pages/Oauth/utils.ts
@@ -5,7 +5,7 @@ export const getSupportLoginMethods = (loginFlow: LoginFlow | undefined) => {
 }
 
 const whiteListDomains = [/https:\/\/(.+?\.)?kyberswap.com/, /https:\/\/(.+)\.kyberengineering.io/]
-const isValidRedirectURL = (url: string | undefined) => {
+export const isValidRedirectURL = (url: string | undefined) => {
   try {
     if (!url) return false
     const newUrl = new URL(url) // valid url