feat: update mail sending functionality to support multiple recipient address sources

tacxou · tacxou · commit e21d5866c7d1 · 2026-05-26T14:15:59.000+02:00
- Refactored MailSendService and MailSendController to handle multiple recipient address sources, allowing for sending emails to both principal and personnel addresses.
- Updated MailSendManyDto to accept an array of recipient address sources, enhancing flexibility in email delivery.
- Modified frontend components to support selection of multiple recipient addresses, improving user experience in the mail template modal.
- Implemented utility functions for normalizing and collecting recipient emails, ensuring robust email handling.
diff --git a/apps/api/src/management/mail/_dto/mail-send-many.dto.ts b/apps/api/src/management/mail/_dto/mail-send-many.dto.ts
@@ -1,6 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { Types } from 'mongoose';
-import { IsArray, IsIn, IsNotEmpty, IsObject, IsOptional, IsString } from 'class-validator';
+import { ArrayMinSize, IsArray, IsIn, IsNotEmpty, IsObject, IsOptional, IsString } from 'class-validator';
 
 export class MailSendManyDto {
   @ApiProperty({ description: 'Ids des identities destinataires' })
@@ -23,11 +23,14 @@ export class MailSendManyDto {
 
   @ApiProperty({
     required: false,
+    isArray: true,
     enum: ['principal', 'personnel'],
     description:
-      'Si renseigné, adresse destinataire lue via le chemin JSON SMTP (e-mail principal ou e-mail personnel). Sinon, politique de mot de passe (emailAttribute).',
+      'Adresses destinataires via les chemins JSON SMTP (e-mail principal et/ou personnel). Plusieurs valeurs = envoi aux deux adresses lorsqu’elles existent.',
   })
   @IsOptional()
-  @IsIn(['principal', 'personnel'])
-  public recipientAddressSource?: 'principal' | 'personnel';
+  @IsArray()
+  @ArrayMinSize(1)
+  @IsIn(['principal', 'personnel'], { each: true })
+  public recipientAddressSources?: ('principal' | 'personnel')[];
 }
diff --git a/apps/api/src/management/mail/mail-send.controller.ts b/apps/api/src/management/mail/mail-send.controller.ts
@@ -25,7 +25,7 @@ export class MailSendController {
       template: body.template,
       subject: body.subject,
       variables: body.variables,
-      recipientAddressSource: body.recipientAddressSource,
+      recipientAddressSources: body.recipientAddressSources,
     });
     return res.status(HttpStatus.OK).json({ statusCode: HttpStatus.OK, data: result });
   }
diff --git a/apps/api/src/management/mail/mail-send.service.ts b/apps/api/src/management/mail/mail-send.service.ts
@@ -7,6 +7,36 @@ import { MailadmService } from '~/settings/mailadm.service';
 import { IdentityState } from '~/management/identities/_enums/states.enum';
 import { isUserSendableMailTemplate } from './mail-templates.service';
 
+export type RecipientAddressSource = 'principal' | 'personnel';
+
+function normalizeEmailAddress(raw: unknown): string {
+  if (raw == null) {
+    return '';
+  }
+  if (Array.isArray(raw)) {
+    for (const item of raw) {
+      const email = normalizeEmailAddress(item);
+      if (email) {
+        return email;
+      }
+    }
+    return '';
+  }
+  const value = String(raw).trim();
+  return value.includes('@') ? value : '';
+}
+
+function collectRecipientEmails(identity: unknown, mailPaths: string[]): string[] {
+  const emails = new Set<string>();
+  for (const mailPath of mailPaths) {
+    const email = normalizeEmailAddress(get(identity, mailPath));
+    if (email) {
+      emails.add(email);
+    }
+  }
+  return [...emails];
+}
+
 @Injectable()
 export class MailSendService {
   private readonly logger = new Logger(MailSendService.name);
@@ -18,12 +48,53 @@ export class MailSendService {
     private readonly mailadmService: MailadmService,
   ) {}
 
+  private resolveMailPaths(args: {
+    recipientAddressSources?: RecipientAddressSource[];
+    principalPath: string;
+    personnelPath: string;
+    policyMailAttribute: string;
+  }): string[] {
+    const sources = Array.isArray(args.recipientAddressSources)
+      ? [...new Set(args.recipientAddressSources)]
+      : [];
+
+    if (!sources.length) {
+      if (!args.policyMailAttribute) {
+        throw new BadRequestException(
+          'Attribut mail alternatif non configuré (settings.passwordpolicies.emailAttribute)',
+        );
+      }
+      return [args.policyMailAttribute];
+    }
+
+    const mailPaths: string[] = [];
+    for (const source of sources) {
+      if (source === 'principal') {
+        if (!args.principalPath) {
+          throw new BadRequestException(
+            "Chemin JSON « e-mail principal » non configuré (paramètres → Serveur SMTP → Chemin JSON de l'e-mail principal).",
+          );
+        }
+        mailPaths.push(args.principalPath);
+      } else if (source === 'personnel') {
+        if (!args.personnelPath) {
+          throw new BadRequestException(
+            "Chemin JSON « e-mail personnel » non configuré (paramètres → Serveur SMTP → Chemin JSON de l'e-mail personnel).",
+          );
+        }
+        mailPaths.push(args.personnelPath);
+      }
+    }
+
+    return mailPaths;
+  }
+
   public async sendTemplateToIdentities(args: {
     ids: string[];
     template: string;
     subject: string;
     variables?: Record<string, string>;
-    recipientAddressSource?: 'principal' | 'personnel';
+    recipientAddressSources?: RecipientAddressSource[];
   }): Promise<{ sent: number; skipped: number }> {
     const template = String(args.template || '').trim();
     if (!template) {
@@ -50,30 +121,12 @@ export class MailSendService {
     const policies: any = await this.passwdadmService.getPolicies();
     const policyMailAttribute = String(policies?.emailAttribute || '');
 
-    const source = args.recipientAddressSource;
-    let mailPath: string;
-    if (source === 'principal') {
-      mailPath = principalPath;
-      if (!mailPath) {
-        throw new BadRequestException(
-          "Chemin JSON « e-mail principal » non configuré (paramètres → Serveur SMTP → Chemin JSON de l'e-mail principal).",
-        );
-      }
-    } else if (source === 'personnel') {
-      mailPath = personnelPath;
-      if (!mailPath) {
-        throw new BadRequestException(
-          "Chemin JSON « e-mail personnel » non configuré (paramètres → Serveur SMTP → Chemin JSON de l'e-mail personnel).",
-        );
-      }
-    } else {
-      mailPath = policyMailAttribute;
-      if (!mailPath) {
-        throw new BadRequestException(
-          'Attribut mail alternatif non configuré (settings.passwordpolicies.emailAttribute)',
-        );
-      }
-    }
+    const mailPaths = this.resolveMailPaths({
+      recipientAddressSources: args.recipientAddressSources,
+      principalPath,
+      personnelPath,
+      policyMailAttribute,
+    });
 
     const identities = await this.identities.model.find({ _id: { $in: args.ids }, state: IdentityState.SYNCED }).lean();
     if (!identities?.length) {
@@ -84,15 +137,15 @@ export class MailSendService {
     let skipped = 0;
 
     for (const identity of identities) {
-      const to = get(identity as any, mailPath) as string;
-      if (!to) {
+      const recipients = collectRecipientEmails(identity, mailPaths);
+      if (!recipients.length) {
         skipped++;
         continue;
       }
 
       try {
         await this.mailer.sendMail({
-          to,
+          to: recipients.length === 1 ? recipients[0] : recipients,
           subject,
           template,
           context: {
diff --git a/apps/web/src/components/pages/identities/modals/mail-template.vue b/apps/web/src/components/pages/identities/modals/mail-template.vue
@@ -73,13 +73,15 @@ q-dialog(
                 strong Paramètres → Serveur SMTP
                 | .
             q-select.q-mt-md(
-              v-if="!isInternalTemplate && recipientSourceOptions.length > 1"
-              v-model="recipientAddressSource"
+              v-if="!isInternalTemplate && recipientSourceOptions.length > 0"
+              v-model="recipientAddressSources"
               :options="recipientSourceOptions"
-              label="Adresse du destinataire"
-              hint="Chemin JSON défini dans Paramètres → Serveur SMTP"
+              label="Adresse(s) du destinataire"
+              hint="Une ou plusieurs adresses (principal et/ou personnel)"
               outlined
               dense
+              multiple
+              use-chips
               emit-value
               map-options
               color="teal-7"
@@ -252,13 +254,15 @@ q-dialog(
               strong Paramètres → Serveur SMTP
               | .
           q-select.q-mt-md(
-            v-if="!isInternalTemplate && recipientSourceOptions.length > 1"
-            v-model="recipientAddressSource"
+            v-if="!isInternalTemplate && recipientSourceOptions.length > 0"
+            v-model="recipientAddressSources"
             :options="recipientSourceOptions"
-            label="Adresse du destinataire"
-            hint="Chemin JSON défini dans Paramètres → Serveur SMTP"
+            label="Adresse(s) du destinataire"
+            hint="Une ou plusieurs adresses (principal et/ou personnel)"
             outlined
             dense
+            multiple
+            use-chips
             emit-value
             map-options
             color="teal-7"
@@ -529,7 +533,7 @@ const availableVariables = ref<{ key: string; label?: string; description?: stri
 
 const mailPaths = ref<{ personnel: string; principal: string }>({ personnel: '', principal: '' })
 const mailPathsReady = ref(false)
-const recipientAddressSource = ref<'principal' | 'personnel' | null>(null)
+const recipientAddressSources = ref<('principal' | 'personnel')[]>([])
 
 const isInternalTemplate = computed(() => {
   const name = String(templateName.value || '').trim()
@@ -561,7 +565,7 @@ const canSendMailTemplate = computed(
     !isInternalTemplate.value &&
     mailPathsReady.value &&
     String(mailSubject.value || '').trim().length > 0 &&
-    (recipientAddressSource.value === 'principal' || recipientAddressSource.value === 'personnel'),
+    recipientAddressSources.value.length > 0,
 )
 
 const sendButtonTitle = computed(() => {
@@ -580,7 +584,7 @@ const sendButtonTitle = computed(() => {
   if (recipientSourceOptions.value.length === 0) {
     return 'Configurez au moins un chemin JSON (e-mail personnel ou principal) dans Paramètres → Serveur SMTP.'
   }
-  return "Choisissez l'adresse du destinataire (e-mail personnel ou principal)."
+  return "Sélectionnez au moins une adresse destinataire (e-mail personnel et/ou principal)."
 })
 
 const addVar = () => {
@@ -626,20 +630,17 @@ async function fetchMailPathsConfig() {
       personnel: String(d.recipientJsonPathEmailPersonnel || '').trim(),
       principal: String(d.recipientJsonPathEmailPrincipal || '').trim(),
     }
-    const per = mailPaths.value.personnel
-    const prin = mailPaths.value.principal
-    if (prin && per) {
-      recipientAddressSource.value = 'principal'
-    } else if (prin) {
-      recipientAddressSource.value = 'principal'
-    } else if (per) {
-      recipientAddressSource.value = 'personnel'
-    } else {
-      recipientAddressSource.value = null
+    const sources: ('principal' | 'personnel')[] = []
+    if (mailPaths.value.principal) {
+      sources.push('principal')
     }
+    if (mailPaths.value.personnel) {
+      sources.push('personnel')
+    }
+    recipientAddressSources.value = sources
   } catch {
     mailPaths.value = { personnel: '', principal: '' }
-    recipientAddressSource.value = null
+    recipientAddressSources.value = []
   } finally {
     mailPathsReady.value = true
   }
@@ -742,7 +743,7 @@ const syncIdentities = () => {
     template: templateName.value,
     subject: String(mailSubject.value || '').trim(),
     variables: variablesToSend.value,
-    recipientAddressSource: recipientAddressSource.value,
+    recipientAddressSources: recipientAddressSources.value,
   })
 }
 
diff --git a/apps/web/src/pages/identities/table.vue b/apps/web/src/pages/identities/table.vue
@@ -552,7 +552,12 @@ export default defineNuxtComponent({
 
     async sendTemplateMailToIdentities(
       identities,
-      data: { template?: string; subject?: string; variables?: Record<string, string>; recipientAddressSource?: string },
+      data: {
+        template?: string
+        subject?: string
+        variables?: Record<string, string>
+        recipientAddressSources?: ('principal' | 'personnel')[]
+      },
     ) {
       const ids = this.bulkIdsFromIdentities(identities)
       try {
@@ -562,7 +567,7 @@ export default defineNuxtComponent({
             template: data?.template,
             subject: data?.subject,
             variables: data?.variables,
-            ...(data?.recipientAddressSource ? { recipientAddressSource: data.recipientAddressSource } : {}),
+            ...(data?.recipientAddressSources?.length ? { recipientAddressSources: data.recipientAddressSources } : {}),
           },
         })
         const payload = (result as { _data?: { data?: { sent?: number; skipped?: number } } })._data?.data
diff --git a/apps/web/src/pages/identities/table/[_id]/index.vue b/apps/web/src/pages/identities/table/[_id]/index.vue
@@ -440,7 +440,7 @@ export default defineNuxtComponent({
                 template: data?.template,
                 subject: data?.subject,
                 variables: data?.variables,
-                ...(data?.recipientAddressSource ? { recipientAddressSource: data.recipientAddressSource } : {}),
+                ...(data?.recipientAddressSources?.length ? { recipientAddressSources: data.recipientAddressSources } : {}),
               },
             })
             this.$q.notify({
diff --git a/apps/web/src/server/routes/config/ui.get.ts b/apps/web/src/server/routes/config/ui.get.ts

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ export class MailSendController {`
`25`	`25`	`template: body.template,`
`26`	`26`	`subject: body.subject,`
`27`	`27`	`variables: body.variables,`
`28`		`- recipientAddressSource: body.recipientAddressSource,`
	`28`	`+ recipientAddressSources: body.recipientAddressSources,`
`29`	`29`	`});`
`30`	`30`	`return res.status(HttpStatus.OK).json({ statusCode: HttpStatus.OK, data: result });`
`31`	`31`	`}`