Merge pull request #48 from Women-in-Computing-at-RIT/feature/discordWorkaround

Discord HotFix

Author: ha1lie

api/src/controller/discordIntegration.py

@@ -14,7 +14,9 @@
 
 
 def getRedirectUrl():
-    return getRedirectDomain() + "/discord/callback"
+    # @TODO find true solution for hotfix
+    # return getRedirectDomain() + "/discord/callback"
+    return getRedirectDomain()
 
 
 def getUrlSafeRedirectUrl():

ui/src/pages/hackers/hackerLanding.js

@@ -83,7 +83,7 @@ export default function UserHomepage() {
     const acceptingConfirmations = true;
 
     // @TODO: set programmatic/dynamic way to set that discord is open
-    const discordReadyForConnections = false;
+    const discordReadyForConnections = true;
 
     useEffect(() => {
         getUserData(getAccessTokenSilently, setUserData, setNewUser)

ui/src/pages/wichacksLanding.js

@@ -1,10 +1,32 @@
-import {useNavigate} from "react-router-dom";
+import {useNavigate, useSearchParams, createSearchParams} from "react-router-dom";
 import {Grommet, Button, Box, Heading, Paragraph, Image, Text } from "grommet";
 import { Home } from "grommet-icons";
 import NavBar from "../components/navBar";
+import {useEffect} from "react";
+
+// @TODO: Remove hotfix
+const checkDiscordIntegration = (searchParams, navigate) => {
+    if (searchParams.get('code') && searchParams.get('state')){
+        console.log("navigate")
+        navigate({
+            pathname: "discord/callback",
+            search: '?' + createSearchParams({
+                "code": searchParams.get('code'),
+                "state": searchParams.get('state')
+            })
+        })
+    }
+}
 
 export default function WiCHacksLanding() {
     let navigate = useNavigate()
+
+    const [searchParams, setSearchParams] = useSearchParams();
+    useEffect(() => {
+        checkDiscordIntegration(searchParams, navigate)
+    }, [])
+
+
     return (
         <Grommet>
             <NavBar title="WiCHacks" />