fix(integration): add state param while using discord auth

dev-protocol · Jan 26, 2023 · ef390a1 · ef390a1
1 parent 9a67cb0
commit ef390a1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/pages/auth-callback/DiscordAuthCallback.tsx b/src/pages/auth-callback/DiscordAuthCallback.tsx
@@ -18,7 +18,10 @@ const DiscordAuthCallbackPage: FunctionComponent<AuthCallbackPageProps> = () =>
   const navigate = useNavigate()
   const [isVerify, setIsVerify] = useState(false)
   const [market, setMarket] = useState<UndefinedOr<Market>>()
-  const isPopup = Boolean(queryParams.popup)
+
+  const encodedStateParam: string = queryParams.state
+  const decodedStateParam: { isPopup: boolean } = JSON.parse(window.atob(decodeURIComponent(encodedStateParam)))
+  const isPopup: boolean = decodedStateParam.isPopup
 
   const clientId = import.meta.env.VITE_DISCORD_CLIENT_ID
   const clientSecret = import.meta.env.VITE_DISCORD_CLIENT_SECRET
@@ -107,6 +110,7 @@ const DiscordAuthCallbackPage: FunctionComponent<AuthCallbackPageProps> = () =>
   const onChange = (v: ChangeEvent<HTMLInputElement>) => {
     setAssetName(v.target.value)
   }
+
   const onSubmit = () => {
     if (!assetName) {
       return setError('select guild')

diff --git a/src/pages/tokenize-form/DiscordForm.tsx b/src/pages/tokenize-form/DiscordForm.tsx
@@ -31,9 +31,11 @@ const DiscordForm: FunctionComponent<DiscordFormProps> = ({ isPopup }) => {
     const redirectUri = encodeURI((import.meta.env.VITE_DISCORD_AUTH_REDIRECT_URI as string) || '')
 
     const scope = encodeURI('guilds')
-    const url = `https://discord.com/api/oauth2/authorize?client_id=${clientId}&redirect_uri=${
-      isPopup ? `${redirectUri}?popup=true` : redirectUri
-    }&scope=${scope}&response_type=code&prompt=consent`
+    const popupState: { isPopup: boolean } = {
+      isPopup
+    }
+    const stateParam = encodeURIComponent(window.btoa(JSON.stringify(popupState)))
+    const url = `https://discord.com/api/oauth2/authorize?client_id=${clientId}&redirect_uri=${redirectUri}&scope=${scope}&response_type=code&prompt=consent&state=${stateParam}`
 
     window.location.assign(url)
   }