dandri/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2026-07-28 09:49:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unify webhook token parameter name

Browse Source
This commit is contained in:
Rory&
2026-07-15 12:03:47 +02:00
parent 8bec8b866f
commit 3c4e9e6c53
4 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/openapi.json
BIN
View File
Binary file not shown.
src/api/routes/webhooks/#webhook_id/#token/github.ts → src/api/routes/webhooks/#webhook_id/#webhook_token/github.ts
View File
src/api/routes/webhooks/#webhook_id/#token/index.ts → src/api/routes/webhooks/#webhook_id/#webhook_token/index.ts
+11 -13
View File
@@ -24,7 +24,6 @@ import { Webhook, Message } from "@spacebar/database";
import { Config, DiscordApiErrors, emitEvent, handleFile, ValidateName, WebhooksUpdateEvent } from "@spacebar/util";
import { executeWebhook } from "@spacebar/api/util/handlers/Webhook";
import { WebhookUpdateSchema } from "@spacebar/schemas";
import { FindOptionsWhere } from "typeorm";
const router = Router({ mergeParams: true });
@@ -40,7 +39,7 @@ router.get(
},
}),
async (req: Request, res: Response) => {
const { webhook_id, token } = req.params as { [key: string]: string };
const { webhook_id, webhook_token } = req.params as { [key: string]: string };
const webhook = await Webhook.findOne({
where: {
id: webhook_id,
@@ -52,7 +51,7 @@ router.get(
throw DiscordApiErrors.UNKNOWN_WEBHOOK;
}
if (webhook.token !== token) {
if (webhook.token !== webhook_token) {
throw DiscordApiErrors.INVALID_WEBHOOK_TOKEN_PROVIDED;
}
@@ -123,7 +122,7 @@ router.delete(
},
}),
async (req: Request, res: Response) => {
const { webhook_id, token } = req.params as { [key: string]: string };
const { webhook_id, webhook_token } = req.params as { [key: string]: string };
const webhook = await Webhook.findOne({
where: {
@@ -132,13 +131,9 @@ router.delete(
relations: { channel: true, guild: true, application: true },
});
if (!webhook) {
throw DiscordApiErrors.UNKNOWN_WEBHOOK;
}
if (!webhook) throw DiscordApiErrors.UNKNOWN_WEBHOOK;
if (webhook.token !== webhook_token) throw DiscordApiErrors.INVALID_WEBHOOK_TOKEN_PROVIDED;
if (webhook.token !== token) {
throw DiscordApiErrors.INVALID_WEBHOOK_TOKEN_PROVIDED;
}
const channel_id = webhook.channel_id;
await Message.delete({ channel_id, webhook_id });
await Webhook.delete({ id: webhook_id });
@@ -172,14 +167,17 @@ router.patch(
},
}),
async (req: Request, res: Response) => {
// noinspection JSUnusedLocalSymbols - TODO: shouldnt token be checked?
const { webhook_id, token } = req.params as { [key: string]: string };
const { webhook_id, webhook_token } = req.params as { [key: string]: string };
const body = req.body as WebhookUpdateSchema;
const webhook = await Webhook.findOneOrFail({
const webhook = await Webhook.findOne({
where: { id: webhook_id },
relations: { user: true, channel: true, source_channel: true, guild: true, source_guild: true, application: true },
});
if (!webhook) throw DiscordApiErrors.UNKNOWN_WEBHOOK;
if (webhook.token != webhook_token) throw DiscordApiErrors.INVALID_WEBHOOK_TOKEN_PROVIDED;
const channel_id = webhook.channel_id;
if (!body.name && !body.avatar) {
throw new HTTPError("Empty webhook updates are not allowed", 50006);
src/api/util/handlers/Webhook.ts
+3 -8
View File
@@ -28,7 +28,7 @@ export const executeWebhook = async (req: Request, res: Response) => {
const body = req.body as WebhookExecuteSchema;
const messageId = Snowflake.generate();
const { webhook_id, token } = req.params as { [key: string]: string };
const { webhook_id, webhook_token } = req.params as { [key: string]: string };
const webhook = await Webhook.findOne({
where: {
@@ -37,13 +37,8 @@ export const executeWebhook = async (req: Request, res: Response) => {
relations: { channel: true, guild: true, application: true },
});
if (!webhook) {
throw DiscordApiErrors.UNKNOWN_WEBHOOK;
}
if (webhook.token !== token) {
throw DiscordApiErrors.INVALID_WEBHOOK_TOKEN_PROVIDED;
}
if (!webhook) throw DiscordApiErrors.UNKNOWN_WEBHOOK;
if (webhook.token !== webhook_token) throw DiscordApiErrors.INVALID_WEBHOOK_TOKEN_PROVIDED;
if (body.username) {
ValidateName(body.username);