Merge pull request #34 from Real-Dev-Squad/fetchcall-to-store-token-in-rds-backend

Store Discord User Data in RDS Backend

Author: prakashchoudhary07

.github/workflows/register-commands-production.yaml

@@ -29,9 +29,11 @@ jobs:
             DISCORD_TOKEN
             DISCORD_GUILD_ID
             CURRENT_ENVIRONMENT
+            BOT_PRIVATE_KEY
         env:
           CURRENT_ENVIRONMENT: production
           CLOUDFLARE_API_TOKEN: ${{secrets.CLOUDFLARE_API_TOKEN}}
           DISCORD_PUBLIC_KEY: ${{secrets.DISCORD_PUBLIC_KEY}}
           DISCORD_TOKEN: ${{secrets.DISCORD_TOKEN}}
+          BOT_PRIVATE_KEY: ${{secrets.BOT_PRIVATE_KEY}}
           DISCORD_GUILD_ID: ${{secrets.DISCORD_GUILD_ID}}

.github/workflows/register-commands-staging.yaml

@@ -29,9 +29,11 @@ jobs:
             DISCORD_TOKEN
             DISCORD_GUILD_ID
             CURRENT_ENVIRONMENT
+            BOT_PRIVATE_KEY
         env:
           CURRENT_ENVIRONMENT: staging
           CLOUDFLARE_API_TOKEN: ${{secrets.CLOUDFLARE_API_TOKEN}}
           DISCORD_PUBLIC_KEY: ${{secrets.DISCORD_PUBLIC_KEY}}
           DISCORD_TOKEN: ${{secrets.DISCORD_TOKEN}}
+          BOT_PRIVATE_KEY: ${{secrets.BOT_PRIVATE_KEY}}
           DISCORD_GUILD_ID: ${{secrets.DISCORD_GUILD_ID}}

package-lock.json

@@ -35,6 +35,7 @@
     "wrangler": "^2.5.0"
   },
   "dependencies": {
+    "@tsndr/cloudflare-worker-jwt": "^2.2.1",
     "discord-interactions": "^3.2.0",
     "dotenv": "^16.0.3",
     "itty-router": "^3.0.11",

package.json

@@ -4,3 +4,5 @@ export const RDS_BASE_DEVELOPMENT_API_URL = "http://localhost:3000"; // If neede
 
 export const DISCORD_BASE_URL = "https://discord.com/api/v10";
 export const VERIFICATION_SITE_URL = "https://my.realdevsquad.com";
+export const STAGING_API_BASE_URL = "https://staging-api.realdevsquad.com";
+export const DISCORD_AVATAR_BASE_URL = "https://cdn.discordapp.com/avatars";

src/constants/urls.ts

@@ -18,7 +18,13 @@ export async function baseHandler(
       return helloCommand(message.member.user.id);
     }
     case getCommandName(VERIFY): {
-      return await verifyCommand(message.member.user.id, env);
+      return await verifyCommand(
+        message.member.user.id,
+        message.member.user.avatar,
+        message.member.user.username,
+        message.member.user.discriminator,
+        env
+      );
     }
     default: {
       return commandNotFound();

src/controllers/baseHandler.ts

@@ -3,10 +3,30 @@ import { env } from "../typeDefinitions/default.types";
 import { discordTextResponse } from "../utils/discordResponse";
 import { generateUniqueToken } from "../utils/generateUniqueToken";
 import { sendDiscordDm } from "../utils/sendDiscordDm";
+import { sendUserDiscordData } from "../utils/sendUserDiscordData";
 
-export async function verifyCommand(userId: number, env: env) {
+export async function verifyCommand(
+  userId: number,
+  userAvatarHash: string,
+  userName: string,
+  discriminator: string,
+  env: env
+) {
   const token = await generateUniqueToken();
-  const message = `${VERIFICATION_SITE_URL}/?token=${token}`;
-  await sendDiscordDm(userId, env, message);
-  return discordTextResponse("Please check the DM");
+
+  const response = await sendUserDiscordData(
+    token,
+    userId,
+    userAvatarHash,
+    userName,
+    discriminator,
+    env
+  );
+  if (response?.status === 201) {
+    const message = `${VERIFICATION_SITE_URL}/?token=${token}`;
+    await sendDiscordDm(userId, env, message);
+    return discordTextResponse("Please check the DM");
+  } else {
+    return discordTextResponse("Error, please use the verify command again. ");
+  }
 }

src/controllers/verifyCommand.ts

@@ -23,6 +23,8 @@ export interface messageRequestMember {
 export interface messageMember {
   id: number;
   username: string;
+  avatar: string;
+  discriminator: string;
 }
 
 export interface createDmChannel {

src/typeDefinitions/discordMessage.types.d.ts

@@ -0,0 +1,44 @@
+import { env } from "../typeDefinitions/default.types";
+import jwt from "@tsndr/cloudflare-worker-jwt";
+import { DISCORD_AVATAR_BASE_URL } from "../constants/urls";
+import config from "../../config/config";
+
+export const sendUserDiscordData = async (
+  token: string,
+  discordId: number,
+  userAvatarHash: string,
+  userName: string,
+  discriminator: string,
+  env: env
+) => {
+  const authToken = await jwt.sign(
+    { name: "Cloudflare Worker", exp: Math.floor(Date.now() / 1000) + 2 },
+    env.BOT_PRIVATE_KEY,
+    { algorithm: "RS256" }
+  );
+  const data = {
+    type: "discord",
+    token: token,
+    attributes: {
+      discordId: discordId,
+      userAvatar: `${DISCORD_AVATAR_BASE_URL}/${discordId}/${userAvatarHash}.jpg`,
+      userName: userName,
+      discriminator: discriminator,
+      expiry: Date.now() + 1000 * 60 * 2,
+    },
+  };
+  const base_url = config(env).RDS_BASE_API_URL;
+  try {
+    const response = await fetch(`${base_url}/external-accounts`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${authToken}`,
+      },
+      body: JSON.stringify(data),
+    });
+    return response;
+  } catch (err) {
+    console.log("Error in sending the discord user data. Error: ", err);
+  }
+};

src/utils/sendUserDiscordData.ts

@@ -10,6 +10,8 @@ export const dummyHelloMessage: discordMessageRequest = {
     user: {
       id: 123456,
       username: "ritik",
+      avatar: "d1eaa8f8ab5e8235e08e659aef5dfeac",
+      discriminator: "1234",
     },
   },
   guild_id: 123456,
@@ -24,6 +26,8 @@ export const dummyVerifyMessage: discordMessageRequest = {
     user: {
       id: 123456,
       username: "ritik",
+      avatar: "d1eaa8f8ab5e8235e08e659aef5dfeac",
+      discriminator: "1234",
     },
   },
   guild_id: 123456,