From c5589793da2ebe832f441e425f218589e1027406 Mon Sep 17 00:00:00 2001
From: Bryan Frimin <bryan@getprobo.com>
Date: Thu, 19 Mar 2026 22:12:08 +0100
Subject: [PATCH] Allow skipping confirmation email when adding mailing list
 subscribers

When creating a new subscriber, operators can now check "Skip confirmation email" if they already have the recipient's consent. This creates the subscriber in confirmed status and skips sending the notification email.

Signed-off-by: Bryan Frimin <bryan@getprobo.com>
---
 .../NewCompliancePageSubscriberDialog.tsx     | 15 ++++++++++--
 pkg/mailman/service.go                        | 24 +++++++++++++------
 pkg/server/api/console/v1/schema.graphql      |  1 +
 pkg/server/api/console/v1/v1_resolver.go      |  1 +
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/apps/console/src/pages/organizations/compliance-page/mailing-list/_components/NewCompliancePageSubscriberDialog.tsx b/apps/console/src/pages/organizations/compliance-page/mailing-list/_components/NewCompliancePageSubscriberDialog.tsx
index 0d0551c36..8b9ddeeae 100644
--- a/apps/console/src/pages/organizations/compliance-page/mailing-list/_components/NewCompliancePageSubscriberDialog.tsx
+++ b/apps/console/src/pages/organizations/compliance-page/mailing-list/_components/NewCompliancePageSubscriberDialog.tsx
@@ -1,5 +1,5 @@
 import { useTranslate } from "@probo/i18n";
-import { Button, Dialog, DialogContent, DialogFooter, type DialogRef, Field, Spinner } from "@probo/ui";
+import { Button, Checkbox, Dialog, DialogContent, DialogFooter, type DialogRef, Field, Spinner } from "@probo/ui";
 import { type DataID, graphql } from "relay-runtime";
 import { z } from "zod";
 
@@ -42,10 +42,11 @@ export function NewCompliancePageSubscriberDialog(props: {
       .min(1, __("Email is required"))
       .trim()
       .email(__("Please enter a valid email address")),
+    confirmed: z.boolean(),
   });
 
   const form = useFormWithSchema(schema, {
-    defaultValues: { fullName: "", email: "" },
+    defaultValues: { fullName: "", email: "", confirmed: false },
   });
 
   const [createSubscriber, isCreating] = useMutationWithToasts<NewCompliancePageSubscriberDialogMutation>(
@@ -63,6 +64,7 @@ export function NewCompliancePageSubscriberDialog(props: {
           mailingListId,
           fullName: data.fullName.trim(),
           email: data.email.trim(),
+          confirmed: data.confirmed || undefined,
         },
         connections: connectionId ? [connectionId] : [],
       },
@@ -102,6 +104,15 @@ export function NewCompliancePageSubscriberDialog(props: {
             {...form.register("email")}
             placeholder={__("john@example.com")}
           />
+          <label className="flex items-center gap-2 cursor-pointer">
+            <Checkbox
+              checked={form.watch("confirmed")}
+              onChange={checked => form.setValue("confirmed", checked)}
+            />
+            <span className="text-sm">
+              {__("Skip confirmation email (I already have consent)")}
+            </span>
+          </label>
         </DialogContent>
         <DialogFooter>
           <Button type="submit" disabled={isCreating}>
diff --git a/pkg/mailman/service.go b/pkg/mailman/service.go
index dafdb911c..6d358a89b 100644
--- a/pkg/mailman/service.go
+++ b/pkg/mailman/service.go
@@ -75,6 +75,7 @@ type (
 		MailingListID gid.GID
 		Email         mail.Addr
 		FullName      string
+		Confirmed     bool
 	}
 )
 
@@ -182,11 +183,18 @@ func (s *Service) CreateSubscriber(
 	mailingListID := req.MailingListID
 	email := req.Email
 	fullName := req.FullName
-
 	scope := coredata.NewScopeFromObjectID(mailingListID)
-	emailRecord, err := s.buildConfirmationMail(ctx, mailingListID, email, fullName)
-	if err != nil {
-		return nil, fmt.Errorf("cannot build confirmation mail: %w", err)
+
+	status := coredata.MailingListSubscriberStatusPending
+	var emailRecord *coredata.Email
+	if req.Confirmed {
+		status = coredata.MailingListSubscriberStatusConfirmed
+	} else {
+		var err error
+		emailRecord, err = s.buildConfirmationMail(ctx, mailingListID, email, fullName)
+		if err != nil {
+			return nil, fmt.Errorf("cannot build confirmation mail: %w", err)
+		}
 	}
 
 	now := time.Now()
@@ -195,7 +203,7 @@ func (s *Service) CreateSubscriber(
 		MailingListID: mailingListID,
 		FullName:      fullName,
 		Email:         email,
-		Status:        coredata.MailingListSubscriberStatusPending,
+		Status:        status,
 		CreatedAt:     now,
 		UpdatedAt:     now,
 	}
@@ -216,8 +224,10 @@ func (s *Service) CreateSubscriber(
 				return fmt.Errorf("cannot insert mailing list subscriber: %w", err)
 			}
 
-			if err := emailRecord.Insert(ctx, tx); err != nil {
-				return fmt.Errorf("cannot insert subscription confirmation email: %w", err)
+			if emailRecord != nil {
+				if err := emailRecord.Insert(ctx, tx); err != nil {
+					return fmt.Errorf("cannot insert subscription confirmation email: %w", err)
+				}
 			}
 
 			return nil
diff --git a/pkg/server/api/console/v1/schema.graphql b/pkg/server/api/console/v1/schema.graphql
index 733afe47a..d5f713771 100644
--- a/pkg/server/api/console/v1/schema.graphql
+++ b/pkg/server/api/console/v1/schema.graphql
@@ -3925,6 +3925,7 @@ input CreateMailingListSubscriberInput {
     mailingListId: ID!
     fullName: String!
     email: EmailAddr!
+    confirmed: Boolean
 }
 
 input DeleteMailingListSubscriberInput {
diff --git a/pkg/server/api/console/v1/v1_resolver.go b/pkg/server/api/console/v1/v1_resolver.go
index f20c9ee6b..c093d1282 100644
--- a/pkg/server/api/console/v1/v1_resolver.go
+++ b/pkg/server/api/console/v1/v1_resolver.go
@@ -2404,6 +2404,7 @@ func (r *mutationResolver) CreateMailingListSubscriber(ctx context.Context, inpu
 			MailingListID: input.MailingListID,
 			Email:         input.Email,
 			FullName:      input.FullName,
+			Confirmed:     input.Confirmed != nil && *input.Confirmed,
 		},
 	)
 	if err != nil {