+
+
+
+
+
+
diff --git a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/regenerate.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/regenerate.svelte
index 93a7e6e8b..be924894d 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/regenerate.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/regenerate.svelte
@@ -2,25 +2,47 @@
import { invalidate } from '$app/navigation';
import { page } from '$app/state';
import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
- import Confirm from '$lib/components/confirm.svelte';
+ import Modal from '$lib/components/modal.svelte';
+ import { Secret } from '$lib/components';
import { Dependencies } from '$lib/constants';
+ import { Button, InputPassword } from '$lib/elements/forms';
import { addNotification } from '$lib/stores/notifications';
import { sdk } from '$lib/stores/sdk';
- import { webhook } from './store';
+ import { Layout, Typography } from '@appwrite.io/pink-svelte';
+ import type { Models } from '@appwrite.io/console';
+ import { get } from 'svelte/store';
+ import { webhook as webhookStore } from './store';
+
+ type WebhooksWithCustomSecret = {
+ updateSecret(params: { webhookId: string; secret?: string }): Promise;
+ };
export let show = false;
+
const projectId = page.params.project;
+ let secret = '';
+ let revealedSecret = '';
+
+ $: if (!show) {
+ secret = '';
+ revealedSecret = '';
+ }
async function regenerate() {
try {
- await sdk.forProject(page.params.region, projectId).webhooks.updateSecret({
- webhookId: $webhook.$id
+ const currentWebhook = get(webhookStore);
+ const customSecret = secret.trim();
+ const updatedWebhook = await (
+ sdk.forProject(page.params.region, projectId).webhooks as WebhooksWithCustomSecret
+ ).updateSecret({
+ webhookId: currentWebhook.$id,
+ secret: customSecret || undefined
});
await invalidate(Dependencies.WEBHOOK);
- show = false;
+ revealedSecret = customSecret || updatedWebhook.secret;
addNotification({
type: 'success',
- message: 'Key has been regenerated'
+ message: customSecret ? 'Webhook secret updated.' : 'Webhook secret rotated.'
});
trackEvent(Submit.WebhookUpdateSignature);
} catch (error) {
@@ -33,7 +55,38 @@
}
-
- Are you sure you want to generate a new Signature key?
- You will not be able to recover the current key.
-
+
+
+ {#if revealedSecret}
+
+ This secret is only shown once after webhook creation or secret rotation. Copy it
+ now.
+
+
+ {:else}
+
+ Leave this empty to rotate the webhook secret automatically, or enter a value to set
+ a custom secret.
+
+
+ Used to validate incoming webhook payloads.
+
+
+ {/if}
+
+
+
+ {#if revealedSecret}
+
+ {:else}
+
+
+ {/if}
+
+
diff --git a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateSecurity.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateSecurity.svelte
index 18d72cd8b..6cd871088 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateSecurity.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateSecurity.svelte
@@ -73,7 +73,7 @@
bind:value={authPassword} />
diff --git a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateSignature.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateSignature.svelte
index a229bd487..fac14e8e7 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateSignature.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateSignature.svelte
@@ -1,26 +1,25 @@
- Signature key
- Add the Signature Key to the X-Appwrite-Webhook-Signature header to validate your webhooks.
+ Webhook secret
+ Used to validate incoming webhook payloads with the `X-Appwrite-Webhook-Signature` header.
Learn more
-
-
-
+
+ This secret is only shown once after webhook creation or secret rotation.
+
+ submit>Rotate secret
diff --git a/src/routes/(console)/project-[region]-[project]/settings/webhooks/create/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/create/+page.svelte
index 03d80aadb..10158b62c 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/webhooks/create/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/create/+page.svelte
@@ -1,8 +1,10 @@