Merge pull request #62 from Real-Dev-Squad/develop

Updated group roles

Author: ankushdharkar

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

@@ -31,10 +31,12 @@ jobs:
             DISCORD_GUILD_ID
             CURRENT_ENVIRONMENT
             BOT_PRIVATE_KEY
+            RDS_SERVERLESS_PUBLIC_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}}
+          RDS_SERVERLESS_PUBLIC_KEY: ${{secrets.RDS_SERVERLESS_PUBLIC_KEY}}

package.json

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

src/constants/responses.ts

@@ -21,3 +21,5 @@ export const INTERNAL_SERVER_ERROR =
 
 export const RETRY_COMMAND =
   "Oops, we didn't catch that! Please use the command again.";
+
+export const ROLE_ADDED = "Role added successfully";

src/constants/urls.ts

@@ -1,6 +1,6 @@
 export const RDS_BASE_API_URL = "https://api.realdevsquad.com";
 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 RDS_BASE_DEVELOPMENT_API_URL = "YOUR_LOCAL_API_URL"; // If needed, modify the URL to your local API server
 
 export const DISCORD_BASE_URL = "https://discord.com/api/v10";
 export const DISCORD_AVATAR_BASE_URL = "https://cdn.discordapp.com/avatars";

src/controllers/getMembersInServer.ts

@@ -0,0 +1,30 @@
+import { IRequest } from "itty-router";
+import jwt from "@tsndr/cloudflare-worker-jwt";
+import * as response from "../constants/responses";
+import { env } from "../typeDefinitions/default.types";
+import JSONResponse from "../utils/JsonResponse";
+import { User } from "../typeDefinitions/user.types";
+import { getMembersInServer } from "../utils/getMembersInServer";
+
+export const getMembersInServerHandler = async (
+  request: IRequest,
+  env: env
+) => {
+  const authHeader = request.headers.get("Authorization");
+
+  if (!authHeader) {
+    return new JSONResponse(response.BAD_SIGNATURE);
+  }
+  try {
+    const authToken = authHeader.split(" ")[1];
+    await jwt.verify(authToken, env.RDS_SERVERLESS_PUBLIC_KEY, {
+      algorithm: "RS256",
+    });
+
+    const users = (await getMembersInServer(env)) as User[];
+
+    return new JSONResponse(users);
+  } catch (err) {
+    return new JSONResponse(response.BAD_SIGNATURE);
+  }
+};

src/controllers/guildRoleHandler.ts

@@ -0,0 +1,41 @@
+import * as response from "../constants/responses";
+import { env } from "../typeDefinitions/default.types";
+import JSONResponse from "../utils/JsonResponse";
+import { IRequest } from "itty-router";
+import { addGroupRole, createGuildRole } from "../utils/guildRole";
+import {
+  createNewRole,
+  memberGroupRole,
+} from "../typeDefinitions/discordMessage.types";
+import { verifyAuthToken } from "../utils/verifyAuthToken";
+
+export async function createGuildRoleHandler(request: IRequest, env: env) {
+  const authHeader = request.headers.get("Authorization");
+  if (!authHeader) {
+    return new JSONResponse(response.BAD_SIGNATURE);
+  }
+  try {
+    await verifyAuthToken(authHeader, env);
+    const body: createNewRole = await request.json();
+
+    const res = await createGuildRole(body, env);
+    return new JSONResponse(res);
+  } catch (err) {
+    return new JSONResponse(response.BAD_SIGNATURE);
+  }
+}
+export async function addGroupRoleHandler(request: IRequest, env: env) {
+  const authHeader = request.headers.get("Authorization");
+  if (!authHeader) {
+    return new JSONResponse(response.BAD_SIGNATURE);
+  }
+  try {
+    await verifyAuthToken(authHeader, env);
+    const body: memberGroupRole = await request.json();
+
+    const res = await addGroupRole(body, env);
+    return new JSONResponse(res);
+  } catch (err) {
+    return new JSONResponse(response.BAD_SIGNATURE);
+  }
+}

src/index.ts

@@ -6,6 +6,11 @@ import { env } from "./typeDefinitions/default.types";
 import { discordMessageRequest } from "./typeDefinitions/discordMessage.types";
 import JSONResponse from "./utils/JsonResponse";
 import { verifyBot } from "./utils/verifyBot";
+import {
+  addGroupRoleHandler,
+  createGuildRoleHandler,
+} from "./controllers/guildRoleHandler";
+import { getMembersInServerHandler } from "./controllers/getMembersInServer";
 
 const router = Router();
 
@@ -15,6 +20,12 @@ router.get("/", async () => {
   });
 });
 
+router.put("/roles/create", createGuildRoleHandler);
+
+router.put("/roles/add", addGroupRoleHandler);
+
+router.get("/discord-members", getMembersInServerHandler);
+
 router.post("/", async (request, env) => {
   const message: discordMessageRequest = await request.json();
   if (message.type === InteractionType.PING) {

src/typeDefinitions/discordMessage.types.d.ts

@@ -30,3 +30,25 @@ export interface messageMember {
 export interface createDmChannel {
   id: number;
 }
+export interface createNewRole {
+  rolename: string;
+  mentionable: boolean;
+}
+export interface memberGroupRole {
+  userid: string;
+  roleid: string;
+}
+
+export interface guildRoleResponse {
+  id: string;
+  name: string;
+  color: number;
+  hoist: boolean;
+  icon?: string;
+  unicode_emoji?: string;
+  position: number;
+  permissions: string;
+  managed: boolean;
+  mentionable: boolean;
+  tags?: object;
+}

src/typeDefinitions/user.types.d.ts

@@ -0,0 +1,23 @@
+export interface User {
+  avatar: null | string;
+  communication_disabled_until: null | string;
+  flags: 0;
+  is_pending: boolean;
+  joined_at: string; //ISO8601 timestamp
+  nick: null | string;
+  pending: boolean;
+  premium_since: null | string;
+  roles: string[];
+  user: {
+    id: string;
+    username: string;
+    global_name: string;
+    display_name: string;
+    avatar: string; // avatar hash
+    discriminator: string; //4-digit discord-tag
+    public_flags: integer;
+    avatar_decoration: null;
+  };
+  mute: boolean;
+  deaf: boolean;
+}

src/utils/getMembersInServer.ts

@@ -0,0 +1,19 @@
+import * as response from "../constants/responses";
+import { env } from "../typeDefinitions/default.types";
+import { DISCORD_BASE_URL } from "../constants/urls";
+
+export const getMembersInServer = async (env: env) => {
+  try {
+    const MEMBERS_URL = `${DISCORD_BASE_URL}/guilds/${env.DISCORD_GUILD_ID}/members?limit=1000`;
+    const response = await fetch(MEMBERS_URL, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bot ${env.DISCORD_TOKEN}`,
+      },
+    });
+    return response.json();
+  } catch (err) {
+    return response.BAD_SIGNATURE;
+  }
+};