Skip to content

Commit b904bcd

Browse files
add changes and test send handler
1 parent 7e466c9 commit b904bcd

File tree

5 files changed

+14
-5
lines changed

5 files changed

+14
-5
lines changed

src/controllers/baseHandler.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ export async function baseHandler(
1818
return helloCommand(message.member.user.id);
1919
}
2020
case getCommandName(VERIFY): {
21+
console.log("inside verify command case");
2122
return await verifyCommand(
2223
message.member.user.id,
2324
message.member.user.avatar,
2425
message.member.user.username,
26+
message.member.user.discriminator,
2527
env
2628
);
2729
}

src/controllers/verifyCommand.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ export async function verifyCommand(
99
userId: number,
1010
userAvatarHash: string,
1111
userName: string,
12+
discriminator: string,
1213
env: env
1314
) {
1415
const token = await generateUniqueToken();
@@ -18,6 +19,7 @@ export async function verifyCommand(
1819
userId,
1920
userAvatarHash,
2021
userName,
22+
discriminator,
2123
env
2224
);
2325
if (response?.status === 201) {

src/typeDefinitions/discordMessage.types.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export interface messageMember {
2424
id: number;
2525
username: string;
2626
avatar: string;
27+
discriminator: string;
2728
}
2829

2930
export interface createDmChannel {

src/utils/sendUserDiscordData.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import { env } from "../typeDefinitions/default.types";
22
import jwt from "@tsndr/cloudflare-worker-jwt";
3-
import {
4-
DISCORD_AVATAR_BASE_URL,
5-
STAGING_API_BASE_URL,
6-
} from "../constants/urls";
3+
import { DISCORD_AVATAR_BASE_URL } from "../constants/urls";
4+
import config from "../../config/config";
75

86
export const sendUserDiscordData = async (
97
token: string,
108
discordId: number,
119
userAvatarHash: string,
1210
userName: string,
11+
discriminator: string,
1312
env: env
1413
) => {
1514
const authToken = await jwt.sign(
@@ -24,11 +23,14 @@ export const sendUserDiscordData = async (
2423
discordId: discordId,
2524
userAvatar: `${DISCORD_AVATAR_BASE_URL}/${discordId}/${userAvatarHash}.jpg`,
2625
userName: userName,
26+
discriminator: discriminator,
2727
expiry: Date.now() + 1000 * 60 * 2,
2828
},
2929
};
30+
console.log(data);
31+
const base_url = config(env).RDS_BASE_API_URL;
3032
try {
31-
const response = await fetch(`${STAGING_API_BASE_URL}/external-accounts`, {
33+
const response = await fetch(`${base_url}/external-accounts`, {
3234
method: "POST",
3335
headers: {
3436
"Content-Type": "application/json",

tests/fixtures/fixture.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export const dummyHelloMessage: discordMessageRequest = {
1111
id: 123456,
1212
username: "ritik",
1313
avatar: "d1eaa8f8ab5e8235e08e659aef5dfeac",
14+
discriminator: "1234",
1415
},
1516
},
1617
guild_id: 123456,
@@ -26,6 +27,7 @@ export const dummyVerifyMessage: discordMessageRequest = {
2627
id: 123456,
2728
username: "ritik",
2829
avatar: "d1eaa8f8ab5e8235e08e659aef5dfeac",
30+
discriminator: "1234",
2931
},
3032
},
3133
guild_id: 123456,

0 commit comments

Comments
 (0)