Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes the function to verify cron auth token #191

Merged
merged 9 commits into from
Jan 30, 2024
Merged

Changes the function to verify cron auth token #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
44edbf8
feat: adds new function to verify cron jobs auth token
Ajeyakrishna-k Jan 10, 2024
949b5b3
chore: renames key names
Ajeyakrishna-k Jan 10, 2024
a1fe6ce
chore: changes function used to verify cron jobs token
Ajeyakrishna-k Jan 10, 2024
6fd0180
chore: adds validations
Ajeyakrishna-k Jan 10, 2024
b469f7e
Merge branch 'develop' into chore/verify-cron-token
Ajeyakrishna-k Jan 11, 2024
37b37b3
feat: adds dev flag to auth
Ajeyakrishna-k Jan 27, 2024
9457312
chore: checks if dev flag is true
Ajeyakrishna-k Jan 27, 2024
726db40
chore: runs prettier
Ajeyakrishna-k Jan 27, 2024
8e7ba27
Merge branch 'develop' into chore/verify-cron-token
Ajeyakrishna-k Jan 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/controllers/guildRoleHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
createNewRole,
memberGroupRole,
} from "../typeDefinitions/discordMessage.types";
import { verifyAuthToken } from "../utils/verifyAuthToken";
import { verifyAuthToken, verifyCronJobsToken } from "../utils/verifyAuthToken";
import { batchDiscordRequests } from "../utils/batchDiscordRequests";
import { DISCORD_BASE_URL } from "../constants/urls";
import { GROUP_ROLE_ADD } from "../constants/requestsActions";
Expand Down Expand Up @@ -59,8 +59,13 @@ export async function getGuildRolesPostHandler(request: IRequest, env: env) {
const reason = request.headers.get("X-Audit-Log-Reason");

try {
await verifyAuthToken(authHeader, env);
const { action } = request.query;
const { action, dev } = request.query;
//TODO(@Ajeyakrishna-k): remove dev flag https://github.com/Real-Dev-Squad/discord-slash-commands/issues/193
if (dev === "true") {
await verifyCronJobsToken(authHeader, env);
} else {
await verifyAuthToken(authHeader, env);
}

switch (action) {
case GROUP_ROLE_ADD.ADD_ROLE: {
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/fixture.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export const dummyAddRoleBody: memberGroupRole = {
export const guildEnv = {
DISCORD_GUILD_ID: "1234",
DISCORD_TOKEN: "abcd",
CRON_JOBS_PUBLIC_KEY: "test",
};

export const dummyInviteBody = {
Expand Down
1 change: 1 addition & 0 deletions tests/unit/handlers/guildRoleHandler.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { GROUP_ROLE_ADD } from "../../../src/constants/requestsActions";

jest.mock("../../../src/utils/verifyAuthToken", () => ({
verifyAuthToken: jest.fn().mockReturnValue(true),
verifyCronJobsToken: jest.fn().mockReturnValue(true),
}));

const getGuildRolesSpy = jest.spyOn(guildRoleUtils, "getGuildRoles");
Expand Down
Loading