Set up environments, fix auth

src/client/client.ts

@@ -2,6 +2,7 @@ import { verifyKey } from "discord-interactions";
 import { Env } from "env";
 import { Command } from "types";
 import { DiscordResponse } from "./response";
+import { APIBaseInteraction, InteractionResponseType, InteractionType } from "discord-api-types/v10";
 
 export class DiscordClient {
 
@@ -18,22 +19,35 @@ export class DiscordClient {
 
 	async handle(request: Request): Promise<DiscordResponse>
 	{
-		if(!this.isRequestValid(request))
+		const {body, valid} = await this.isRequestValid(request);
+		if(!valid)
 		{
 			return new DiscordResponse("Invalid request signature", { status: 401 });
 		}
-
 
+		const interaction = JSON.parse(body) as APIBaseInteraction<InteractionType, any>
+
+		if (interaction.type == InteractionType.Ping) {
+			return new DiscordResponse({ type: InteractionResponseType.Pong });
+		}
 
 		return new DiscordResponse("Not Found", {status: 404});
 	}
 
-	async isRequestValid(request: Request): Promise<boolean>
+	async isRequestValid(request: Request): Promise<{body: string, valid: boolean}>
 	{
 		const signature = request.headers.get('x-signature-ed25519');
 		const timestamp = request.headers.get('x-signature-timestamp');
 		const body = await request.text();
-		return (signature && timestamp && verifyKey(body, signature, timestamp, this.env.DISCORD_PUBLIC_KEY)) as boolean;
+
+		const valid = signature && timestamp && verifyKey(body, signature, timestamp, this.env.DISCORD_PUBLIC_KEY)
+
+		if(valid)
+		{
+			return {body, valid: true};
+		}
+
+		return {body, valid: false};
 	}
 
 }

src/env.ts

@@ -1,5 +1,7 @@
 import { Snowflake } from "discord-api-types/globals";
 
 export interface Env {
-	DISCORD_PUBLIC_KEY: Snowflake
+	DISCORD_PUBLIC_KEY: string,
+	DISCORD_TOKEN: string,
+	DISCORD_CLIENT_ID: string
 }

wrangler.toml

@@ -4,4 +4,18 @@ main = "./src/index.ts"
 compatibility_date = "2024-04-04"
 compatibility_flags = [ "nodejs_compat" ]
 
-workers_dev = false
+workers_dev = false
+
+[env.staging]
+routes = [{ pattern = "staging.ptal-bot.marijnkneppers.dev", custom_domain = true }]
+
+[env.staging.vars]
+DISCORD_PUBLIC_KEY = "0f04aa2be4c2825bcd520f73bd9523ba0e97b11acb58c91927855daf7831d22c"
+DISCORD_APPLICATION_ID = "1225902905786110074"
+
+[env.production]
+routes = [{ pattern = "ptal-bot.marijnkneppers.dev", custom_domain = true }]
+
+[env.production.vars]
+DISCORD_PUBLIC_KEY = "5d53f1984903809b1b8dc5843cd4735904d5d011d66a076d41f21d0cedd356ee"
+DISCORD_APPLICATION_ID = "1225902823842119820"