From 3768c13194326a57c3e7011f88eb4f268b0d9b3b Mon Sep 17 00:00:00 2001 From: Ajeyakrishna Date: Sat, 27 Jan 2024 07:07:44 +0530 Subject: [PATCH 1/4] feat: adds dev flag for new private key --- src/services/discordBotServices.ts | 4 ++-- src/utils/generateJwt.ts | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/services/discordBotServices.ts b/src/services/discordBotServices.ts index 5550262..896043e 100644 --- a/src/services/discordBotServices.ts +++ b/src/services/discordBotServices.ts @@ -6,8 +6,8 @@ export const updateUserRoles = async (env: env, payload: DiscordUserRole[]): Pro try { const url = config(env).DISCORD_BOT_API_URL; const token = await generateDiscordBotJwt(env); - - const response = await env.DISCORD_BOT.fetch(`${url}/roles?action=add-role`, { + const devQuery = env.DEV ? '&dev=true' : ''; + const response = await env.DISCORD_BOT.fetch(`${url}/roles?action=add-role${devQuery}`, { method: 'POST', headers: { Authorization: `Bearer ${token}`, diff --git a/src/utils/generateJwt.ts b/src/utils/generateJwt.ts index dd1c203..587b1fc 100644 --- a/src/utils/generateJwt.ts +++ b/src/utils/generateJwt.ts @@ -21,11 +21,12 @@ export const generateJwt = async (env: env) => { export const generateDiscordBotJwt = async (env: env) => { try { + const privateKey = env.DEV ? env.DISCORD_SERVICE_PRIVATE_KEY : env.DISCORD_BOT_PRIVATE_KEY; const authToken = await jwt.sign( { exp: Math.floor(Date.now() / 1000) + 60, }, - env.DISCORD_BOT_PRIVATE_KEY, + privateKey, { algorithm: 'RS256' }, ); return authToken; From 7a2446260bf36766c7301773673461ee92935a64 Mon Sep 17 00:00:00 2001 From: Ajeyakrishna Date: Sat, 27 Jan 2024 07:25:32 +0530 Subject: [PATCH 2/4] chore: add comments to remove dev flag --- src/services/discordBotServices.ts | 1 + src/utils/generateJwt.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/services/discordBotServices.ts b/src/services/discordBotServices.ts index 896043e..400504e 100644 --- a/src/services/discordBotServices.ts +++ b/src/services/discordBotServices.ts @@ -6,6 +6,7 @@ export const updateUserRoles = async (env: env, payload: DiscordUserRole[]): Pro try { const url = config(env).DISCORD_BOT_API_URL; const token = await generateDiscordBotJwt(env); + //TODO(@Ajeyakrishna-k): remove dev flag https://github.com/Real-Dev-Squad/discord-slash-commands/issues/193 const devQuery = env.DEV ? '&dev=true' : ''; const response = await env.DISCORD_BOT.fetch(`${url}/roles?action=add-role${devQuery}`, { method: 'POST', diff --git a/src/utils/generateJwt.ts b/src/utils/generateJwt.ts index 587b1fc..238bbc5 100644 --- a/src/utils/generateJwt.ts +++ b/src/utils/generateJwt.ts @@ -21,6 +21,7 @@ export const generateJwt = async (env: env) => { export const generateDiscordBotJwt = async (env: env) => { try { + //TODO(@Ajeyakrishna-k): remove dev flag https://github.com/Real-Dev-Squad/discord-slash-commands/issues/193 const privateKey = env.DEV ? env.DISCORD_SERVICE_PRIVATE_KEY : env.DISCORD_BOT_PRIVATE_KEY; const authToken = await jwt.sign( { From 4191cfd7c539482d2747606c28e673ada3766949 Mon Sep 17 00:00:00 2001 From: Ajeyakrishna Date: Sun, 28 Jan 2024 04:47:50 +0530 Subject: [PATCH 3/4] chore: rename dev flag --- src/services/discordBotServices.ts | 2 +- src/utils/generateJwt.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/discordBotServices.ts b/src/services/discordBotServices.ts index 400504e..70282ac 100644 --- a/src/services/discordBotServices.ts +++ b/src/services/discordBotServices.ts @@ -7,7 +7,7 @@ export const updateUserRoles = async (env: env, payload: DiscordUserRole[]): Pro const url = config(env).DISCORD_BOT_API_URL; const token = await generateDiscordBotJwt(env); //TODO(@Ajeyakrishna-k): remove dev flag https://github.com/Real-Dev-Squad/discord-slash-commands/issues/193 - const devQuery = env.DEV ? '&dev=true' : ''; + const devQuery = env.FF_SELF_PRIVATE_KEY === 'true' ? '&dev=true' : ''; const response = await env.DISCORD_BOT.fetch(`${url}/roles?action=add-role${devQuery}`, { method: 'POST', headers: { diff --git a/src/utils/generateJwt.ts b/src/utils/generateJwt.ts index 238bbc5..76bfe0b 100644 --- a/src/utils/generateJwt.ts +++ b/src/utils/generateJwt.ts @@ -22,7 +22,7 @@ export const generateJwt = async (env: env) => { export const generateDiscordBotJwt = async (env: env) => { try { //TODO(@Ajeyakrishna-k): remove dev flag https://github.com/Real-Dev-Squad/discord-slash-commands/issues/193 - const privateKey = env.DEV ? env.DISCORD_SERVICE_PRIVATE_KEY : env.DISCORD_BOT_PRIVATE_KEY; + const privateKey = env.FF_SELF_PRIVATE_KEY === 'true' ? env.DISCORD_SERVICE_PRIVATE_KEY : env.DISCORD_BOT_PRIVATE_KEY; const authToken = await jwt.sign( { exp: Math.floor(Date.now() / 1000) + 60, From f18e71cc1331111169cd97bd5a30cee4aa402cf3 Mon Sep 17 00:00:00 2001 From: Ajeyakrishna Date: Tue, 30 Jan 2024 10:25:55 +0530 Subject: [PATCH 4/4] chore: update ff name --- src/services/discordBotServices.ts | 2 +- src/utils/generateJwt.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/discordBotServices.ts b/src/services/discordBotServices.ts index 70282ac..fea813c 100644 --- a/src/services/discordBotServices.ts +++ b/src/services/discordBotServices.ts @@ -7,7 +7,7 @@ export const updateUserRoles = async (env: env, payload: DiscordUserRole[]): Pro const url = config(env).DISCORD_BOT_API_URL; const token = await generateDiscordBotJwt(env); //TODO(@Ajeyakrishna-k): remove dev flag https://github.com/Real-Dev-Squad/discord-slash-commands/issues/193 - const devQuery = env.FF_SELF_PRIVATE_KEY === 'true' ? '&dev=true' : ''; + const devQuery = env.FF_CRON_DISCORD_KEY_PAIR_FLOW === 'true' ? '&dev=true' : ''; const response = await env.DISCORD_BOT.fetch(`${url}/roles?action=add-role${devQuery}`, { method: 'POST', headers: { diff --git a/src/utils/generateJwt.ts b/src/utils/generateJwt.ts index 76bfe0b..4a7f278 100644 --- a/src/utils/generateJwt.ts +++ b/src/utils/generateJwt.ts @@ -22,7 +22,7 @@ export const generateJwt = async (env: env) => { export const generateDiscordBotJwt = async (env: env) => { try { //TODO(@Ajeyakrishna-k): remove dev flag https://github.com/Real-Dev-Squad/discord-slash-commands/issues/193 - const privateKey = env.FF_SELF_PRIVATE_KEY === 'true' ? env.DISCORD_SERVICE_PRIVATE_KEY : env.DISCORD_BOT_PRIVATE_KEY; + const privateKey = env.FF_CRON_DISCORD_KEY_PAIR_FLOW === 'true' ? env.DISCORD_SERVICE_PRIVATE_KEY : env.DISCORD_BOT_PRIVATE_KEY; const authToken = await jwt.sign( { exp: Math.floor(Date.now() / 1000) + 60,