done

Author: rohittp0

netlify/functions/discord-auth.js

@@ -1,7 +1,6 @@
 // netlify/functions/discord-auth.js
-const axios = require('axios');
 const admin = require('firebase-admin');
-const { Client } = require('discord.js');
+const { Client, GatewayIntentBits, Partials } = require("discord.js");
 
 if (!admin.apps.length) {
     admin.initializeApp({
@@ -25,32 +24,25 @@ client.login(process.env.DISCORD_TOKEN).then();
 const ready = new Promise((resolve) => client.once('ready', resolve));
 
 exports.handler = async function (event) {
-    const { code, state  } = event.queryStringParameters;
-    const clientId = process.env.DISCORD_CLIENT_ID;
-    const clientSecret = process.env.DISCORD_CLIENT_SECRET;
-    const redirectUri = `${process.env.URL}/.netlify/functions/discord-auth`;
+    const { access_token, state, token_type  } = event.queryStringParameters;
+
+    if (!access_token || !state || !token_type) {
+        return {
+            statusCode: 400,
+            body: 'Bad Request',
+        };
+    }
 
     try {
-        const tokenResponse = await axios.post('https://discord.com/api/oauth2/token', null, {
-            params: {
-                client_id: clientId,
-                client_secret: clientSecret,
-                grant_type: 'authorization_code',
-                code,
-                redirect_uri: redirectUri,
-            },
+        const response = await fetch('https://discord.com/api/users/@me', {
             headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
+                Authorization: `${token_type} ${access_token}`,
             },
-        });
+        }).then((res) => res.json());
 
-        const userResponse = await axios.get('https://discord.com/api/users/@me', {
-            headers: {
-                Authorization: `Bearer ${tokenResponse.data.access_token}`,
-            },
-        });
+        console.log(response);
 
-        const discordId = userResponse.data.id;
+        const discordId = response.id;
         const userId = decodeURIComponent(state);
 
         await ready
@@ -74,11 +66,12 @@ exports.handler = async function (event) {
         client.destroy().then();
 
         return {
-            statusCode: 200,
-            body: JSON.stringify({ discordInvite: invite.url }),
+            statusCode: 302,
+            headers: {
+                Location: `${process.env.URL}/profile`
+            }
         };
     } catch (error) {
-        console.error(error);
         return {
             statusCode: 500,
             body: 'Internal Server Error',

package-lock.json

@@ -12,7 +12,6 @@
     "@chakra-ui/react": "^2.8.1",
     "@fontsource/archivo": "^5.0.12",
     "@hookform/resolvers": "^3.3.1",
-    "axios": "^1.5.1",
     "chakra-react-select": "^4.7.3",
     "dayjs": "^1.11.10",
     "discord.js": "^14.13.0",

package.json

@@ -0,0 +1,24 @@
+import {PageLoader} from "@/components/loading";
+import {BaseLayout} from "@/layout";
+import {useEffect} from "react";
+import {useRouter} from "next/router";
+
+const DiscordAuth = () => {
+    const router = useRouter();
+
+    useEffect(() => {
+        if(typeof window === 'undefined')
+            return;
+
+        const query = window.location.hash.slice(1);
+        router.push(`/.netlify/functions/discord-auth?${query}`).then();
+    }, [router]);
+
+    return (
+        <PageLoader/>
+    );
+};
+
+DiscordAuth.Layout = BaseLayout;
+
+export default DiscordAuth;

src/pages/auth/discord.tsx

@@ -110,7 +110,9 @@ const Index = () => {
 
         const skillsArr = val?.skills?.map((el: any) => el.value);
         const dbData: Form = {
-            team: null,
+            discordId: user?.discordId || null,
+            discordInvite: user?.discordInvite || null,
+            team: user?.team || null,
             accept: user?.accept || false,
             college: college || user?.college || null,
             ...val,

src/pages/auth/[[...paths]].tsx renamed to src/pages/auth/index.tsx

@@ -60,6 +60,8 @@ const Wizard = () => {
 
             const skillsArr = val.skills?.map((el: { value: string }) => el.value);
             const dbData: Form = {
+                discordId: null,
+                discordInvite: null,
                 team: null,
                 accept: null,
                 college: college || null,

src/pages/profile.tsx

@@ -26,9 +26,9 @@ export const ProfileBar = ({
 
     const handleConnectDiscord = () => {
         const state = encodeURIComponent(user.mobile);
-        const redirectUri = encodeURIComponent(`${window.location.origin}/.netlify/functions/discord-auth`);
+        const redirectUri = encodeURIComponent(`${window.location.origin}/auth/discord`);
         const clientId = process.env.NEXT_PUBLIC_CLIENT_ID;
-        return router.push(`https://discord.com/api/oauth2/authorize?client_id=${clientId}&redirect_uri=${redirectUri}&response_type=code&scope=identify&state=${state}`);
+        return router.push(`https://discord.com/api/oauth2/authorize?client_id=${clientId}&redirect_uri=${redirectUri}&response_type=token&scope=identify&state=${state}`);
     };
 
     const valid = user.discordInvite?.expiry && user.discordInvite.expiry > Date.now();