Merge branch 'develop' into add-addount-id

Author: RitikJaiswal75

config/config.ts

@@ -3,18 +3,23 @@ import {
   RDS_BASE_API_URL,
   RDS_BASE_STAGING_API_URL,
   RDS_BASE_DEVELOPMENT_API_URL,
+  VERIFICATION_SITE_URL,
+  STAGING_VERIFICATION_SITE_URL,
 } from "../src/constants/urls";
 
 const config = (env: env) => {
   const environment: environment = {
     production: {
       RDS_BASE_API_URL: RDS_BASE_API_URL,
+      VERIFICATION_SITE_URL: VERIFICATION_SITE_URL,
     },
     staging: {
       RDS_BASE_API_URL: RDS_BASE_STAGING_API_URL,
+      VERIFICATION_SITE_URL: STAGING_VERIFICATION_SITE_URL,
     },
     default: {
       RDS_BASE_API_URL: RDS_BASE_DEVELOPMENT_API_URL,
+      VERIFICATION_SITE_URL: STAGING_VERIFICATION_SITE_URL,
     },
   };
 

src/constants/urls.ts

@@ -3,6 +3,8 @@ export const RDS_BASE_STAGING_API_URL = "https://staging-api.realdevsquad.com";
 export const RDS_BASE_DEVELOPMENT_API_URL = "http://localhost:3000"; // If needed, modify the URL to your local API server
 
 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";
+
+export const VERIFICATION_SITE_URL = "https://my.realdevsquad.com";
+export const STAGING_VERIFICATION_SITE_URL =
+  "https://staging-my.realdevsquad.com";

src/controllers/verifyCommand.ts

@@ -1,4 +1,4 @@
-import { VERIFICATION_SITE_URL } from "../constants/urls";
+import config from "../../config/config";
 import { env } from "../typeDefinitions/default.types";
 import { discordTextResponse } from "../utils/discordResponse";
 import { generateUniqueToken } from "../utils/generateUniqueToken";
@@ -23,7 +23,8 @@ export async function verifyCommand(
     env
   );
   if (response?.status === 201) {
-    const message = `${VERIFICATION_SITE_URL}/discord?token=${token}`;
+    const verificationSiteURL = config(env).VERIFICATION_SITE_URL;
+    const message = `${verificationSiteURL}/discord?token=${token}`;
     await sendDiscordDm(userId, env, message);
     return discordTextResponse("Please check the DM");
   } else {

src/typeDefinitions/default.types.d.ts

@@ -8,6 +8,7 @@ export interface environment {
 
 export interface variables {
   RDS_BASE_API_URL: string;
+  VERIFICATION_SITE_URL: string;
 }
 
 export interface discordCommand {