Skip to content

A full-featured CRM built with React, shadcn/ui, and Supabase.

remove attachments webhook secret requirement from setup and edge function

Anibal Svarcas14269b4b3a0d
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2482a681..7c5a38b2 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -109,7 +109,6 @@ jobs:
POSTMARK_WEBHOOK_USER: ${{secrets.POSTMARK_WEBHOOK_USER}}
POSTMARK_WEBHOOK_PASSWORD: ${{secrets.POSTMARK_WEBHOOK_PASSWORD}}
POSTMARK_WEBHOOK_AUTHORIZED_IPS: ${{secrets.POSTMARK_WEBHOOK_AUTHORIZED_IPS}}
- ATTACHMENTS_WEBHOOK_SECRET: ${{secrets.ATTACHMENTS_WEBHOOK_SECRET}}
VITE_GOOGLE_WORKPLACE_DOMAIN: ${{secrets.VITE_GOOGLE_WORKPLACE_DOMAIN}}
steps:
@@ -154,10 +153,6 @@ jobs:
npx supabase secrets set POSTMARK_WEBHOOK_PASSWORD=${{ env.POSTMARK_WEBHOOK_PASSWORD }}
npx supabase secrets set POSTMARK_WEBHOOK_AUTHORIZED_IPS=${{ env.POSTMARK_WEBHOOK_AUTHORIZED_IPS }}
- - if: ${{ env.IS_SUPABASE_CONFIGURED && env.ATTACHMENTS_WEBHOOK_SECRET }}
- name: 📡 Push note attachments webhook secret
- run: npx supabase secrets set ATTACHMENTS_WEBHOOK_SECRET=${{ env.ATTACHMENTS_WEBHOOK_SECRET }}
-
- if: ${{ env.IS_SUPABASE_CONFIGURED }}
name: 📡 Deploy supabase functions
run: npx supabase functions deploy
@@ -194,10 +189,6 @@ jobs:
name: Check POSTMARK_WEBHOOK_USER secret
run: echo ':warning:POSTMARK_WEBHOOK_AUTHORIZED_IPS secret is missing' >> $GITHUB_STEP_SUMMARY
- - if: ${{ !env.ATTACHMENTS_WEBHOOK_SECRET }}
- name: Check ATTACHMENTS_WEBHOOK_SECRET secret
- run: echo ':warning:ATTACHMENTS_WEBHOOK_SECRET secret is missing' >> $GITHUB_STEP_SUMMARY
-
- if: ${{ !env.IS_SUPABASE_CONFIGURED }}
name: Supabase deployment skipped
run: echo ':warning:Supabase deployment skipped' >> $GITHUB_STEP_SUMMARY
diff --git a/doc/src/content/docs/developers/deploy.mdx b/doc/src/content/docs/developers/deploy.mdx
index dce994ed..61119169 100644
--- a/doc/src/content/docs/developers/deploy.mdx
+++ b/doc/src/content/docs/developers/deploy.mdx
@@ -68,7 +68,6 @@ SUPABASE_DB_PASSWORD: Your supabase database password
SUPABASE_PROJECT_ID: Your supabase project id
SUPABASE_URL: Your supabase project URL
SB_PUBLISHABLE_KEY: Your supabase project publishable key
-ATTACHMENTS_WEBHOOK_SECRET: Shared secret used by database webhooks calling delete_note_attachments edge function
POSTMARK_WEBHOOK_USER: User configured in Postmark to secure the webhook
POSTMARK_WEBHOOK_PASSWORD: Password configured in Postmark to secure the webhook
POSTMARK_WEBHOOK_AUTHORIZED_IPS: List of IPs (comma separated) authorized to send requests to the Postmark webhook
diff --git a/doc/src/content/docs/developers/supabase-configuration.mdx b/doc/src/content/docs/developers/supabase-configuration.mdx
index 333379cc..7c99c7d9 100644
--- a/doc/src/content/docs/developers/supabase-configuration.mdx
+++ b/doc/src/content/docs/developers/supabase-configuration.mdx
@@ -48,12 +48,6 @@ npx supabase functions deploy
The migrations create database triggers that call `delete_note_attachments` when notes are deleted or when attachments are removed from an existing note.
-Atomic CRM also needs one extra secret for note attachment cleanup:
-
-```sh
-npx supabase secrets set ATTACHMENTS_WEBHOOK_SECRET=atomic-crm-note-attachments-webhook-secret
-```
-
Finally, add a `.env.production.local` file in the root directory with your remote Supabase credentials:
```sh
diff --git a/scripts/supabase-remote-init.mjs b/scripts/supabase-remote-init.mjs
index 33040739..b2129010 100644
--- a/scripts/supabase-remote-init.mjs
+++ b/scripts/supabase-remote-init.mjs
@@ -2,9 +2,6 @@ import { input } from "@inquirer/prompts";
import { execa } from "execa";
import fs from "node:fs";
-const DEFAULT_ATTACHMENTS_WEBHOOK_SECRET =
- "atomic-crm-note-attachments-webhook-secret";
-
(async () => {
await loginToSupabase();
const projectName = await input({
@@ -15,9 +12,6 @@ const DEFAULT_ATTACHMENTS_WEBHOOK_SECRET =
message: "Enter a database password:",
default: generatePassword(16),
});
- const attachmentsWebhookSecret =
- process.env.ATTACHMENTS_WEBHOOK_SECRET ??
- DEFAULT_ATTACHMENTS_WEBHOOK_SECRET;
const projectRef = await createProject({ projectName, databasePassword });
await waitForProjectToBeReady({ projectRef });
@@ -40,7 +34,6 @@ const DEFAULT_ATTACHMENTS_WEBHOOK_SECRET =
projectRef,
publishableKey,
secretKey,
- attachmentsWebhookSecret,
});
await persistSupabaseEnv({
@@ -227,7 +220,6 @@ async function setupSupabaseSecrets({
projectRef,
publishableKey,
secretKey,
- attachmentsWebhookSecret,
}) {
await execa(
"npx",
@@ -237,7 +229,6 @@ async function setupSupabaseSecrets({
"set",
`SB_PUBLISHABLE_KEY=${publishableKey}`,
`SB_SECRET_KEY=${secretKey}`,
- `ATTACHMENTS_WEBHOOK_SECRET=${attachmentsWebhookSecret}`,
"--project-ref",
projectRef,
],
diff --git a/supabase/functions/.env b/supabase/functions/.env
index 29391ddf..c07bcf9c 100644
--- a/supabase/functions/.env
+++ b/supabase/functions/.env
@@ -9,4 +9,3 @@ POSTMARK_WEBHOOK_AUTHORIZED_IPS=3.134.147.250,50.31.156.6,50.31.156.77,18.217.20
SB_JWT_ISSUER=http://127.0.0.1:54321/auth/v1
SB_PUBLISHABLE_KEY=sb_publishable_ACJWlzQHlZjBrEguHvfOxg_3BJgxAaH
SB_SECRET_KEY=sb_secret_N7UND0UgjKTVK-Uodkm0Hg_xSvEMPvz
-ATTACHMENTS_WEBHOOK_SECRET=atomic-crm-note-attachments-webhook-secret
diff --git a/supabase/functions/delete_note_attachments/index.ts b/supabase/functions/delete_note_attachments/index.ts
index 38629345..b8ff3ef3 100644
--- a/supabase/functions/delete_note_attachments/index.ts
+++ b/supabase/functions/delete_note_attachments/index.ts
@@ -2,8 +2,6 @@ import "jsr:@supabase/functions-js/edge-runtime.d.ts";
import { supabaseAdmin } from "../_shared/supabaseAdmin.ts";
const ATTACHMENTS_BUCKET = "attachments";
-const WEBHOOK_SECRET_HEADER = "x-webhook-secret";
-const DEFAULT_WEBHOOK_SECRET = "atomic-crm-note-attachments-webhook-secret";
type NoteAttachment = {
path?: string | null;
@@ -28,19 +26,6 @@ Deno.serve(async (req: Request) => {
return jsonResponse({ error: "Method Not Allowed" }, 405);
}
- const expectedSecret = Deno.env.get("ATTACHMENTS_WEBHOOK_SECRET");
- const receivedSecret = req.headers.get(WEBHOOK_SECRET_HEADER);
- const acceptedSecrets = [expectedSecret, DEFAULT_WEBHOOK_SECRET].filter(
- (secret): secret is string => Boolean(secret),
- );
- if (!receivedSecret || !acceptedSecrets.includes(receivedSecret)) {
- console.error("delete_note_attachments.unauthorized", {
- hasExpectedSecret: Boolean(expectedSecret),
- hasReceivedSecret: Boolean(receivedSecret),
- });
- return jsonResponse({ error: "Unauthorized" }, 401);
- }
-
const payload = (await req.json()) as WebhookPayload;
const paths = getPathsToDelete(payload);
const noteId = payload.old_record?.id ?? payload.record?.id ?? null;