Skip to content

⭐️⭐️⭐️ Open-source, self-hosted alternative to Linear and Plane. Project management and issue tracking where teams and AI agents work side by side to plan and ship products.

Merge commit from fork

Croffbf2f275e9a7a
diff --git a/apps/api/src/modules/webhooks/__tests__/integration/webhooks.test.ts b/apps/api/src/modules/webhooks/__tests__/integration/webhooks.test.ts
index 08bc89cc..15b8beba 100644
--- a/apps/api/src/modules/webhooks/__tests__/integration/webhooks.test.ts
+++ b/apps/api/src/modules/webhooks/__tests__/integration/webhooks.test.ts
@@ -3,6 +3,8 @@ import { apiKeyApi, authedApi, type Api, createProject } from '#tests/helpers/ap
import { signUpTestUser } from '#tests/helpers/auth';
import { resetDb } from '#tests/helpers/db';
import { createAgent } from '#tests/helpers/agents';
+import { addProjectMember } from '#tests/helpers/members';
+import { createRole } from '#tests/helpers/roles';
import type { WebhookEventType } from '../../service';
import { onProjectEvent, type ProjectEvent } from '../../emit';
@@ -197,6 +199,31 @@ describe('webhooks', () => {
});
});
+ describe('rotate secret', () => {
+ it('replaces the secret and lists the new one', async () => {
+ const { asOwner } = await setupOwnerProject();
+ const created = await asOwner.projects({ projectKey: 'MKT' }).webhooks.post({
+ url: 'https://example.com/hook',
+ events: ['issue.created'],
+ });
+ const webhookId = created.data!.id;
+
+ const rotated = await asOwner.webhooks({ webhookId }).secret.post();
+ expect(rotated.status).toBe(200);
+ expect(rotated.data?.secret).toMatch(/^whsec_/);
+ expect(rotated.data?.secret).not.toBe(created.data!.secret);
+
+ const list = await asOwner.projects({ projectKey: 'MKT' }).webhooks.get();
+ expect(list.data?.[0].secret).toBe(rotated.data!.secret);
+ });
+
+ it('returns 404 for a missing webhook', async () => {
+ const { asOwner } = await setupOwnerProject();
+ const res = await asOwner.webhooks({ webhookId: 999999 }).secret.post();
+ expect(res.status).toBe(404);
+ });
+ });
+
describe('delete', () => {
it('deletes a webhook', async () => {
const { asOwner } = await setupOwnerProject();
@@ -673,8 +700,42 @@ describe('webhooks', () => {
const del = await outsider.webhooks({ webhookId }).delete();
expect(del.status).toBe(403);
+ const rotate = await outsider.webhooks({ webhookId }).secret.post();
+ expect(rotate.status).toBe(403);
+
const deliveries = await outsider.webhooks({ webhookId }).deliveries.get();
expect(deliveries.status).toBe(403);
});
+
+ it('returns the secret only to a caller who may create or edit webhooks', async () => {
+ const { asOwner } = await setupOwnerProject();
+ const webhookId = await createWebhook(asOwner, ['issue.created']);
+
+ const readRole = await createRole(asOwner, 'MKT', {
+ name: 'Webhook reader',
+ permissions: { webhooks: { read: true } },
+ });
+ const asReader = await addProjectMember(asOwner, 'MKT', readRole.data!.id);
+ const read = await asReader.projects({ projectKey: 'MKT' }).webhooks.get();
+ expect(read.status).toBe(200);
+ expect(read.data?.[0]).toMatchObject({ id: webhookId, secret: null });
+ expect((await asReader.webhooks({ webhookId }).secret.post()).status).toBe(403);
+
+ const editRole = await createRole(asOwner, 'MKT', {
+ name: 'Webhook editor',
+ permissions: { webhooks: { read: true, edit: true } },
+ });
+ const asEditor = await addProjectMember(asOwner, 'MKT', editRole.data!.id);
+ const edited = await asEditor.projects({ projectKey: 'MKT' }).webhooks.get();
+ expect(edited.data?.[0].secret).toMatch(/^whsec_/);
+
+ const creatorRole = await createRole(asOwner, 'MKT', {
+ name: 'Webhook creator',
+ permissions: { webhooks: { read: true, create: true } },
+ });
+ const asCreator = await addProjectMember(asOwner, 'MKT', creatorRole.data!.id);
+ const created = await asCreator.projects({ projectKey: 'MKT' }).webhooks.get();
+ expect(created.data?.[0].secret).toMatch(/^whsec_/);
+ });
});
});
diff --git a/apps/api/src/modules/webhooks/index.ts b/apps/api/src/modules/webhooks/index.ts
index f4b66a87..77fce5bd 100644
--- a/apps/api/src/modules/webhooks/index.ts
+++ b/apps/api/src/modules/webhooks/index.ts
@@ -2,6 +2,7 @@ import { Elysia, t } from 'elysia';
import { noContent } from '#shared/http';
import { guards, entityGuard } from '#shared/guards';
import { authContext } from '#shared/auth-context';
+import { checkPermission } from '#shared/access';
import { HttpError } from '#shared/lib';
import { assertPublicHttpUrl } from '#shared/net';
import { mcpTool } from '#mcp/generate';
@@ -19,6 +20,7 @@ import {
createWebhook,
getWebhook,
updateWebhook,
+ rotateWebhookSecret,
deleteWebhook,
listWebhookDeliveries,
} from './service';
@@ -35,13 +37,24 @@ export const webhookRoutes = new Elysia({ name: 'webhooks', detail: { tags: ['We
})
.get(
'/projects/:projectKey/webhooks',
- async ({ project }) => {
- return listWebhooks(project.id);
+ async ({ project, user }) => {
+ const rows = await listWebhooks(project.id);
+ // The secret lets its holder sign deliveries the receiver trusts, so it goes only to
+ // a caller who may create or edit webhooks.
+ const canSeeSecret =
+ (await checkPermission(project.id, user, 'webhooks', 'edit')) ||
+ (await checkPermission(project.id, user, 'webhooks', 'create'));
+ return canSeeSecret ? rows : rows.map((row) => ({ ...row, secret: null }));
},
{
permission: ['webhooks', 'read'],
response: { 200: t.Array(WebhookResponse), ...accessErrors },
- detail: { summary: "List a project's webhooks", ...mcpTool('list_webhooks') },
+ detail: {
+ summary: "List a project's webhooks",
+ description:
+ 'The signing secret is returned only to a caller who may create or edit webhooks.',
+ ...mcpTool('list_webhooks'),
+ },
},
)
@@ -82,6 +95,28 @@ export const webhookRoutes = new Elysia({ name: 'webhooks', detail: { tags: ['We
},
)
+ .post(
+ '/webhooks/:webhookId/secret',
+ async ({ params }) => {
+ const rotated = await rotateWebhookSecret(params.webhookId);
+ if (!rotated) throw new HttpError(404, 'Webhook not found');
+ return rotated;
+ },
+ {
+ params: webhookParams,
+ webhook: 'edit',
+ response: { 200: WebhookResponse, ...commonErrors },
+ detail: {
+ summary: 'Rotate the webhook secret',
+ description:
+ 'Issue a new signing secret. The next delivery is signed with it, so the receiver ' +
+ 'has to be given it first.',
+ // The receiver rejects deliveries until it is given the new secret.
+ ...mcpTool('rotate_webhook_secret', { destructiveHint: true }),
+ },
+ },
+ )
+
.delete(
'/webhooks/:webhookId',
async ({ params }) => {
diff --git a/apps/api/src/modules/webhooks/model.ts b/apps/api/src/modules/webhooks/model.ts
index cd0fe3d7..225b1077 100644
--- a/apps/api/src/modules/webhooks/model.ts
+++ b/apps/api/src/modules/webhooks/model.ts
@@ -22,7 +22,11 @@ export const WebhookResponse = t.Object({
id: t.Number(),
projectId: t.Number(),
url: t.String(),
- secret: t.String(),
+ secret: t.Nullable(
+ t.String({
+ description: 'Null in the list for a caller who may neither create nor edit webhooks.',
+ }),
+ ),
events: t.Array(eventType),
isActive: t.Boolean(),
createdAt: t.String(),
diff --git a/apps/api/src/modules/webhooks/service.ts b/apps/api/src/modules/webhooks/service.ts
index bdff144c..77aeddff 100644
--- a/apps/api/src/modules/webhooks/service.ts
+++ b/apps/api/src/modules/webhooks/service.ts
@@ -99,7 +99,7 @@ export async function getWebhook(id: number): Promise<WebhookRow | null> {
return rows[0] ? mapWebhook(rows[0]) : null;
}
-// Updates only the fields the patch provides. A caller cannot change the secret.
+// Updates only the fields the patch provides. The secret changes only through rotation.
export async function updateWebhook(
id: number,
patch: { url?: string; events?: WebhookEventType[]; isActive?: boolean },
@@ -118,6 +118,17 @@ export async function updateWebhook(
return row ? mapWebhook(row) : null;
}
+// Deliveries are signed when they are sent, so a retry queued before the rotation is
+// signed with the new secret too.
+export async function rotateWebhookSecret(id: number): Promise<WebhookRow | null> {
+ const [row] = await db
+ .update(webhook)
+ .set({ secret: generateSecret() })
+ .where(eq(webhook.id, id))
+ .returning();
+ return row ? mapWebhook(row) : null;
+}
+
export async function deleteWebhook(id: number): Promise<void> {
await db.delete(webhook).where(eq(webhook.id, id));
}
diff --git a/apps/web/messages/ar/settings.json b/apps/web/messages/ar/settings.json
index 81d5fd3f..cda1cad2 100644
--- a/apps/web/messages/ar/settings.json
+++ b/apps/web/messages/ar/settings.json
@@ -381,6 +381,10 @@
"hideSecret": "إخفاء السر",
"revealSecret": "إظهار السر",
"copySecret": "نسخ السر",
+ "rotateSecret": "إعادة توليد السرّ",
+ "rotateSecretTitle": "إعادة توليد سرّ التوقيع؟",
+ "rotateSecretMessage": "التسليمات لـ <v>{url}</v> هتتوقّع بالسرّ الجديد على طول. حدّثه عند المستقبِل، وإلا هيرفض التسليمات الجاية.",
+ "secretRotated": "سرّ التوقيع اتولّد من جديد",
"deliveryHistory": "سجل التسليم",
"moreActions": "إجراءات أخرى",
"edit": "تعديل خطاف الويب",
diff --git a/apps/web/messages/en/settings.json b/apps/web/messages/en/settings.json
index ce8e6dcd..a32741bc 100644
--- a/apps/web/messages/en/settings.json
+++ b/apps/web/messages/en/settings.json
@@ -381,6 +381,10 @@
"hideSecret": "Hide secret",
"revealSecret": "Reveal secret",
"copySecret": "Copy secret",
+ "rotateSecret": "Regenerate secret",
+ "rotateSecretTitle": "Regenerate the signing secret?",
+ "rotateSecretMessage": "Deliveries to <v>{url}</v> are signed with the new secret right away. Update it on your receiver, or it will reject the next deliveries.",
+ "secretRotated": "Signing secret regenerated",
"deliveryHistory": "Delivery history",
"moreActions": "More actions",
"edit": "Edit webhook",
diff --git a/apps/web/messages/es-ES/settings.json b/apps/web/messages/es-ES/settings.json
index b935c077..d2356026 100644
--- a/apps/web/messages/es-ES/settings.json
+++ b/apps/web/messages/es-ES/settings.json
@@ -381,6 +381,10 @@
"hideSecret": "Ocultar el secreto",
"revealSecret": "Mostrar el secreto",
"copySecret": "Copiar el secreto",
+ "rotateSecret": "Regenerar el secreto",
+ "rotateSecretTitle": "¿Regenerar el secreto de firma?",
+ "rotateSecretMessage": "Las entregas a <v>{url}</v> se firmarán con el nuevo secreto de inmediato. Actualízalo en el receptor o rechazará las próximas entregas.",
+ "secretRotated": "Secreto de firma regenerado",
"deliveryHistory": "Historial de entregas",
"moreActions": "Más acciones",
"edit": "Editar el webhook",
diff --git a/apps/web/messages/fa/settings.json b/apps/web/messages/fa/settings.json
index e5436be8..bac83b0b 100644
--- a/apps/web/messages/fa/settings.json
+++ b/apps/web/messages/fa/settings.json
@@ -381,6 +381,10 @@
"hideSecret": "پنهان کردن کلید",
"revealSecret": "نمایش کلید",
"copySecret": "کپی کلید",
+ "rotateSecret": "بازتولید راز",
+ "rotateSecretTitle": "راز امضا بازتولید شود؟",
+ "rotateSecretMessage": "ارسال‌ها به <v>{url}</v> از همین حالا با راز جدید امضا می‌شوند. آن را در گیرنده به‌روز کنید، وگرنه ارسال‌های بعدی را رد می‌کند.",
+ "secretRotated": "راز امضا بازتولید شد",
"deliveryHistory": "تاریخچه ارسال",
"moreActions": "اکشن‌های بیشتر",
"edit": "ویرایش وب‌هوک",
diff --git a/apps/web/messages/fr/settings.json b/apps/web/messages/fr/settings.json
index 29cd82ec..096a7711 100644
--- a/apps/web/messages/fr/settings.json
+++ b/apps/web/messages/fr/settings.json
@@ -381,6 +381,10 @@
"hideSecret": "Masquer le secret",
"revealSecret": "Afficher le secret",
"copySecret": "Copier le secret",
+ "rotateSecret": "Régénérer le secret",
+ "rotateSecretTitle": "Régénérer le secret de signature ?",
+ "rotateSecretMessage": "Les livraisons vers <v>{url}</v> sont signées avec le nouveau secret dès maintenant. Mettez-le à jour sur le récepteur, sinon il refusera les prochaines livraisons.",
+ "secretRotated": "Secret de signature régénéré",
"deliveryHistory": "Historique des livraisons",
"moreActions": "Plus d'actions",
"edit": "Modifier le webhook",
diff --git a/apps/web/messages/id/settings.json b/apps/web/messages/id/settings.json
index a51d285a..ad93b49b 100644
--- a/apps/web/messages/id/settings.json
+++ b/apps/web/messages/id/settings.json
@@ -381,6 +381,10 @@
"hideSecret": "Sembunyikan rahasia",
"revealSecret": "Tampilkan rahasia",
"copySecret": "Salin rahasia",
+ "rotateSecret": "Buat ulang rahasia",
+ "rotateSecretTitle": "Buat ulang rahasia tanda tangan?",
+ "rotateSecretMessage": "Pengiriman ke <v>{url}</v> langsung ditandatangani dengan rahasia baru. Perbarui di penerima, atau penerima akan menolak pengiriman berikutnya.",
+ "secretRotated": "Rahasia tanda tangan dibuat ulang",
"deliveryHistory": "Riwayat pengiriman",
"moreActions": "Tindakan lainnya",
"edit": "Ubah webhook",
diff --git a/apps/web/messages/ko/settings.json b/apps/web/messages/ko/settings.json
index 26415d69..b4f2f502 100644
--- a/apps/web/messages/ko/settings.json
+++ b/apps/web/messages/ko/settings.json
@@ -381,6 +381,10 @@
"hideSecret": "시크릿 숨기기",
"revealSecret": "시크릿 표시",
"copySecret": "시크릿 복사",
+ "rotateSecret": "시크릿 다시 생성",
+ "rotateSecretTitle": "서명 시크릿을 다시 생성할까요?",
+ "rotateSecretMessage": "<v>{url}</v>(으)로의 전송은 즉시 새 시크릿으로 서명됩니다. 수신 측에서 업데이트하지 않으면 다음 전송을 거부합니다.",
+ "secretRotated": "서명 시크릿을 다시 생성했습니다",
"deliveryHistory": "전송 기록",
"moreActions": "더 보기",
"edit": "웹훅 편집",
diff --git a/apps/web/messages/pt-BR/settings.json b/apps/web/messages/pt-BR/settings.json
index f9e20ee5..abcd5873 100644
--- a/apps/web/messages/pt-BR/settings.json
+++ b/apps/web/messages/pt-BR/settings.json
@@ -381,6 +381,10 @@
"hideSecret": "Ocultar segredo",
"revealSecret": "Revelar segredo",
"copySecret": "Copiar segredo",
+ "rotateSecret": "Regenerar segredo",
+ "rotateSecretTitle": "Regenerar o segredo de assinatura?",
+ "rotateSecretMessage": "As entregas para <v>{url}</v> passam a ser assinadas com o novo segredo na hora. Atualize-o no receptor, ou ele vai recusar as próximas entregas.",
+ "secretRotated": "Segredo de assinatura regenerado",
"deliveryHistory": "Histórico de entregas",
"moreActions": "Mais ações",
"edit": "Editar webhook",
diff --git a/apps/web/messages/ru/settings.json b/apps/web/messages/ru/settings.json
index 20604a92..787eecd4 100644
--- a/apps/web/messages/ru/settings.json
+++ b/apps/web/messages/ru/settings.json
@@ -381,6 +381,10 @@
"hideSecret": "Скрыть секрет",
"revealSecret": "Показать секрет",
"copySecret": "Скопировать секрет",
+ "rotateSecret": "Перевыпустить секрет",
+ "rotateSecretTitle": "Перевыпустить секрет подписи?",
+ "rotateSecretMessage": "Доставки на <v>{url}</v> сразу начнут подписываться новым секретом. Обновите его у получателя, иначе он отклонит следующие доставки.",
+ "secretRotated": "Секрет подписи перевыпущен",
"deliveryHistory": "История доставок",
"moreActions": "Ещё действия",
"edit": "Редактировать вебхук",
diff --git a/apps/web/messages/tr/settings.json b/apps/web/messages/tr/settings.json
index 72e2959d..9186e839 100644
--- a/apps/web/messages/tr/settings.json
+++ b/apps/web/messages/tr/settings.json
@@ -381,6 +381,10 @@
"hideSecret": "Anahtarı gizle",
"revealSecret": "Anahtarı göster",
"copySecret": "Anahtarı kopyala",
+ "rotateSecret": "Gizli anahtarı yeniden oluştur",
+ "rotateSecretTitle": "İmza gizli anahtarı yeniden oluşturulsun mu?",
+ "rotateSecretMessage": "<v>{url}</v> adresine gönderimler hemen yeni gizli anahtarla imzalanır. Alıcıda güncelleyin, aksi halde sonraki gönderimleri reddeder.",
+ "secretRotated": "İmza gizli anahtarı yeniden oluşturuldu",
"deliveryHistory": "Teslimat geçmişi",
"moreActions": "Diğer işlemler",
"edit": "Webhook'u düzenle",
diff --git a/apps/web/messages/uk/settings.json b/apps/web/messages/uk/settings.json
index 334ddfac..4fd245dd 100644
--- a/apps/web/messages/uk/settings.json
+++ b/apps/web/messages/uk/settings.json
@@ -381,6 +381,10 @@
"hideSecret": "Сховати секрет",
"revealSecret": "Показати секрет",
"copySecret": "Скопіювати секрет",
+ "rotateSecret": "Перегенерувати секрет",
+ "rotateSecretTitle": "Перегенерувати секрет підпису?",
+ "rotateSecretMessage": "Доставки на <v>{url}</v> одразу підписуватимуться новим секретом. Оновіть його в отримувача, інакше він відхилить наступні доставки.",
+ "secretRotated": "Секрет підпису перегенеровано",
"deliveryHistory": "Історія доставок",
"moreActions": "Ще дії",
"edit": "Редагувати вебхук",
diff --git a/apps/web/messages/zh-CN/settings.json b/apps/web/messages/zh-CN/settings.json
index 7dc24679..63d9fdfb 100644
--- a/apps/web/messages/zh-CN/settings.json
+++ b/apps/web/messages/zh-CN/settings.json
@@ -381,6 +381,10 @@
"hideSecret": "隐藏密钥",
"revealSecret": "显示密钥",
"copySecret": "复制密钥",
+ "rotateSecret": "重新生成密钥",
+ "rotateSecretTitle": "重新生成签名密钥?",
+ "rotateSecretMessage": "向 <v>{url}</v> 的投递将立即使用新密钥签名。请在接收端更新,否则它会拒绝后续投递。",
+ "secretRotated": "签名密钥已重新生成",
"deliveryHistory": "投递记录",
"moreActions": "更多操作",
"edit": "编辑 Webhook",
diff --git a/apps/web/messages/zh-TW/settings.json b/apps/web/messages/zh-TW/settings.json
index ee25a0fa..d6a50b42 100644
--- a/apps/web/messages/zh-TW/settings.json
+++ b/apps/web/messages/zh-TW/settings.json
@@ -381,6 +381,10 @@
"hideSecret": "隱藏金鑰",
"revealSecret": "顯示金鑰",
"copySecret": "複製金鑰",
+ "rotateSecret": "重新生成金鑰",
+ "rotateSecretTitle": "重新生成簽章金鑰?",
+ "rotateSecretMessage": "向 <v>{url}</v> 的投遞將立即使用新金鑰簽章。請在接收端更新,否則它會拒絕後續投遞。",
+ "secretRotated": "簽章金鑰已重新生成",
"deliveryHistory": "投遞記錄",
"moreActions": "更多操作",
"edit": "編輯 Webhook",
diff --git a/apps/web/src/features/settings/components/webhooks/SettingsWebhookRow.tsx b/apps/web/src/features/settings/components/webhooks/SettingsWebhookRow.tsx
index 84b44f1e..9a3c70ef 100644
--- a/apps/web/src/features/settings/components/webhooks/SettingsWebhookRow.tsx
+++ b/apps/web/src/features/settings/components/webhooks/SettingsWebhookRow.tsx
@@ -1,6 +1,16 @@
import { useState } from 'react';
import { useTranslations } from 'next-intl';
-import { Check, Copy, Eye, EyeOff, History, MoreHorizontal, Pencil, Trash2 } from 'lucide-react';
+import {
+ Check,
+ Copy,
+ Eye,
+ EyeOff,
+ History,
+ MoreHorizontal,
+ Pencil,
+ RefreshCw,
+ Trash2,
+} from 'lucide-react';
import type { Webhook } from '@/lib/api/endpoints/webhooks';
import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
@@ -21,21 +31,24 @@ export function SettingsWebhookRow({
webhook,
onShowDeliveries,
onEdit,
+ onRotateSecret,
onDelete,
}: {
webhook: Webhook;
onShowDeliveries: () => void;
onEdit: () => void;
+ onRotateSecret: () => void;
onDelete: () => void;
}) {
+ const secret = webhook.secret;
const t = useTranslations('settings.webhooks');
const can = useSettingsCan();
const [revealed, setRevealed] = useState(false);
const [copied, setCopied] = useState(false);
- async function copySecret() {
+ async function copySecret(value: string) {
try {
- await navigator.clipboard.writeText(webhook.secret);
+ await navigator.clipboard.writeText(value);
setCopied(true);
setTimeout(() => setCopied(false), 1500);
} catch {
@@ -58,29 +71,29 @@ export function SettingsWebhookRow({
<span className="block truncate text-sm font-medium" title={webhook.url}>
{webhook.url}
</span>
- <div className="flex items-center gap-1.5 text-xs text-muted-foreground">
- <span className="truncate font-mono">
- {revealed ? webhook.secret : maskSecret(webhook.secret)}
- </span>
- <Button
- variant="ghost"
- size="icon"
- className="size-6 shrink-0"
- title={t(revealed ? 'hideSecret' : 'revealSecret')}
- onClick={() => setRevealed((r) => !r)}
- >
- {revealed ? <EyeOff className="size-3.5" /> : <Eye className="size-3.5" />}
- </Button>
- <Button
- variant="ghost"
- size="icon"
- className="size-6 shrink-0"
- title={t('copySecret')}
- onClick={copySecret}
- >
- {copied ? <Check className="size-3.5" /> : <Copy className="size-3.5" />}
- </Button>
- </div>
+ {secret != null && (
+ <div className="flex items-center gap-1.5 text-xs text-muted-foreground">
+ <span className="truncate font-mono">{revealed ? secret : maskSecret(secret)}</span>
+ <Button
+ variant="ghost"
+ size="icon"
+ className="size-6 shrink-0"
+ title={t(revealed ? 'hideSecret' : 'revealSecret')}
+ onClick={() => setRevealed((r) => !r)}
+ >
+ {revealed ? <EyeOff className="size-3.5" /> : <Eye className="size-3.5" />}
+ </Button>
+ <Button
+ variant="ghost"
+ size="icon"
+ className="size-6 shrink-0"
+ title={t('copySecret')}
+ onClick={() => copySecret(secret)}
+ >
+ {copied ? <Check className="size-3.5" /> : <Copy className="size-3.5" />}
+ </Button>
+ </div>
+ )}
</div>
</div>
</TableCell>
@@ -121,6 +134,12 @@ export function SettingsWebhookRow({
{t('edit')}
</DropdownMenuItem>
)}
+ {can('edit') && (
+ <DropdownMenuItem className="min-h-11 sm:min-h-8" onSelect={onRotateSecret}>
+ <RefreshCw />
+ {t('rotateSecret')}
+ </DropdownMenuItem>
+ )}
{can('delete') && can('edit') && <DropdownMenuSeparator />}
{can('delete') && (
<DropdownMenuItem
diff --git a/apps/web/src/features/settings/components/webhooks/SettingsWebhooks.tsx b/apps/web/src/features/settings/components/webhooks/SettingsWebhooks.tsx
index 497eacf5..02e39ea9 100644
--- a/apps/web/src/features/settings/components/webhooks/SettingsWebhooks.tsx
+++ b/apps/web/src/features/settings/components/webhooks/SettingsWebhooks.tsx
@@ -6,9 +6,11 @@ import {
useWebhooksQuery,
useCreateWebhook,
useUpdateWebhook,
+ useRotateWebhookSecret,
useDeleteWebhook,
} from '@/services/webhooks.service';
import { EmptyState } from '@/components/common/page/EmptyState';
+import ConfirmDialog from '@/components/common/overlay/ConfirmDialog';
import ListSkeleton from '@/components/common/skeleton/ListSkeleton';
import SettingsConfirmDeleteDialog from '../crud/SettingsConfirmDeleteDialog';
import { SettingsWebhookDialog, type WebhookFormValue } from './SettingsWebhookDialog';
@@ -33,8 +35,10 @@ export default function SettingsWebhooks({
const webhooks = webhooksQuery.data ?? [];
const createWebhook = useCreateWebhook(projectKey);
const updateWebhook = useUpdateWebhook(projectKey);
+ const rotateSecret = useRotateWebhookSecret(projectKey);
const deleteWebhook = useDeleteWebhook(projectKey);
const [editing, setEditing] = useState<number | 'new' | null>(null);
+ const [rotating, setRotating] = useState<Webhook | null>(null);
const [deleting, setDeleting] = useState<Webhook | null>(null);
const [deliveriesFor, setDeliveriesFor] = useState<Webhook | null>(null);
@@ -71,6 +75,7 @@ export default function SettingsWebhooks({
webhooks={webhooks}
onShowDeliveries={setDeliveriesFor}
onEdit={setEditing}
+ onRotateSecret={setRotating}
onDelete={setDeleting}
/>
</div>
@@ -87,6 +92,25 @@ export default function SettingsWebhooks({
/>
)}
+ {rotating && (
+ <ConfirmDialog
+ title={t('rotateSecretTitle')}
+ confirmLabel={t('rotateSecret')}
+ onClose={() => setRotating(null)}
+ onConfirm={async () => {
+ await rotateSecret.mutateAsync(rotating.id);
+ setRotating(null);
+ }}
+ >
+ <p className="text-sm text-muted-foreground">
+ {t.rich('rotateSecretMessage', {
+ url: rotating.url,
+ v: (chunks) => <span className="font-medium">{chunks}</span>,
+ })}
+ </p>
+ </ConfirmDialog>
+ )}
+
{deleting && (
<SettingsConfirmDeleteDialog
title={t('deleteTitle')}
diff --git a/apps/web/src/features/settings/components/webhooks/SettingsWebhooksTable.tsx b/apps/web/src/features/settings/components/webhooks/SettingsWebhooksTable.tsx
index 805ba581..87de8211 100644
--- a/apps/web/src/features/settings/components/webhooks/SettingsWebhooksTable.tsx
+++ b/apps/web/src/features/settings/components/webhooks/SettingsWebhooksTable.tsx
@@ -7,6 +7,7 @@ interface SettingsWebhooksTableProps {
webhooks: Webhook[];
onShowDeliveries: (webhook: Webhook) => void;
onEdit: (webhookId: number) => void;
+ onRotateSecret: (webhook: Webhook) => void;
onDelete: (webhook: Webhook) => void;
}
@@ -14,6 +15,7 @@ export function SettingsWebhooksTable({
webhooks,
onShowDeliveries,
onEdit,
+ onRotateSecret,
onDelete,
}: SettingsWebhooksTableProps) {
const t = useTranslations('settings.webhooks');
@@ -46,6 +48,7 @@ export function SettingsWebhooksTable({
webhook={webhook}
onShowDeliveries={() => onShowDeliveries(webhook)}
onEdit={() => onEdit(webhook.id)}
+ onRotateSecret={() => onRotateSecret(webhook)}
onDelete={() => onDelete(webhook)}
/>
))}
diff --git a/apps/web/src/lib/api/endpoints/webhooks.ts b/apps/web/src/lib/api/endpoints/webhooks.ts
index 7e117808..785b9eec 100644
--- a/apps/web/src/lib/api/endpoints/webhooks.ts
+++ b/apps/web/src/lib/api/endpoints/webhooks.ts
@@ -33,7 +33,8 @@ export interface Webhook {
id: number;
projectId: number;
url: string;
- secret: string;
+ // Null in the list for a caller who may neither create nor edit webhooks.
+ secret: string | null;
events: WebhookEventType[];
isActive: boolean;
createdAt: string;
@@ -85,6 +86,9 @@ export const createWebhook = (projectKey: string, input: NewWebhookInput) =>
export const updateWebhook = (webhookId: number, patch: WebhookPatch) =>
request<Webhook>(`/webhooks/${webhookId}`, { method: 'PATCH', body: JSON.stringify(patch) });
+export const rotateWebhookSecret = (webhookId: number) =>
+ request<Webhook>(`/webhooks/${webhookId}/secret`, { method: 'POST' });
+
export const deleteWebhook = (webhookId: number) =>
request<void>(`/webhooks/${webhookId}`, { method: 'DELETE' });
diff --git a/apps/web/src/services/webhooks.service.ts b/apps/web/src/services/webhooks.service.ts
index 6cf1eadf..8e7da619 100644
--- a/apps/web/src/services/webhooks.service.ts
+++ b/apps/web/src/services/webhooks.service.ts
@@ -1,9 +1,12 @@
import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useTranslations } from 'next-intl';
+import { toast } from 'sonner';
import {
listWebhooks,
listWebhookDeliveries,
createWebhook,
updateWebhook,
+ rotateWebhookSecret,
deleteWebhook,
} from '@/lib/api/endpoints/webhooks';
import { qk } from '@/services/queryKeys';
@@ -50,6 +53,18 @@ export function useUpdateWebhook(projectKey: string | null) {
});
}
+export function useRotateWebhookSecret(projectKey: string | null) {
+ const t = useTranslations('settings.webhooks');
+ const qc = useQueryClient();
+ return useMutation({
+ mutationFn: (id: number) => rotateWebhookSecret(id),
+ onSuccess: () => {
+ toast.success(t('secretRotated'));
+ if (projectKey) void qc.invalidateQueries({ queryKey: qk.webhooks(projectKey) });
+ },
+ });
+}
+
export function useDeleteWebhook(projectKey: string | null) {
const qc = useQueryClient();
return useMutation({