From 8644f1af883c6e685290a15689a9ffeb8b0f9bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20DA=20ROCHA?= Date: Thu, 5 Nov 2020 15:01:01 +0100 Subject: [PATCH 1/3] Admins can reply to the user by answering the email --- src/legacy/legacy.service.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/legacy/legacy.service.ts b/src/legacy/legacy.service.ts index 7412c41..58b208c 100644 --- a/src/legacy/legacy.service.ts +++ b/src/legacy/legacy.service.ts @@ -543,6 +543,7 @@ export class LegacyService { await Promise.all([ this.sendEmail({ html: adminEmail, + reply-to : [token.email], to: [this.conf.userSupportMailbox], subject: 'Demande d’accès aux données', }), @@ -643,6 +644,7 @@ export class LegacyService { await Promise.all([ this.sendEmail({ html: adminEmail, + reply-to : [token.email], to: [this.conf.userSupportMailbox], subject: 'Demande de renouvellement d’accès aux données', }), @@ -747,6 +749,7 @@ export class LegacyService { await Promise.all([ this.sendEmail({ html: adminEmail, + reply-to : [token.email], to: [this.conf.userSupportMailbox], subject: 'Demande de suppression d’accès aux données', }), @@ -834,4 +837,4 @@ export class LegacyService { handleError(error, new InternalServerErrorException('Couldn\'t send email.')); } } -} \ No newline at end of file +} -- GitLab From 2fdf695156b9189ffd144b2c74514fbb995c16e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20DA=20ROCHA?= Date: Fri, 13 Nov 2020 09:36:16 +0100 Subject: [PATCH 2/3] Revert "Merge branch 'feat/9579_admin_reply_to_user_by_email' into 'development'" This reverts merge request !13 --- src/legacy/legacy.service.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/legacy/legacy.service.ts b/src/legacy/legacy.service.ts index 58b208c..7412c41 100644 --- a/src/legacy/legacy.service.ts +++ b/src/legacy/legacy.service.ts @@ -543,7 +543,6 @@ export class LegacyService { await Promise.all([ this.sendEmail({ html: adminEmail, - reply-to : [token.email], to: [this.conf.userSupportMailbox], subject: 'Demande d’accès aux données', }), @@ -644,7 +643,6 @@ export class LegacyService { await Promise.all([ this.sendEmail({ html: adminEmail, - reply-to : [token.email], to: [this.conf.userSupportMailbox], subject: 'Demande de renouvellement d’accès aux données', }), @@ -749,7 +747,6 @@ export class LegacyService { await Promise.all([ this.sendEmail({ html: adminEmail, - reply-to : [token.email], to: [this.conf.userSupportMailbox], subject: 'Demande de suppression d’accès aux données', }), @@ -837,4 +834,4 @@ export class LegacyService { handleError(error, new InternalServerErrorException('Couldn\'t send email.')); } } -} +} \ No newline at end of file -- GitLab From da10fd5a6123b802a6bf10de374d88c14df56eb1 Mon Sep 17 00:00:00 2001 From: Chakib BENHABIB Date: Tue, 5 Jan 2021 16:24:39 +0100 Subject: [PATCH 3/3] Feat/admin reply email to user --- src/legacy/legacy.model.ts | 3 ++- src/legacy/legacy.service.ts | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/legacy/legacy.model.ts b/src/legacy/legacy.model.ts index 48975cb..4949391 100644 --- a/src/legacy/legacy.model.ts +++ b/src/legacy/legacy.model.ts @@ -520,4 +520,5 @@ export class Email { to: string[]; subject: string; html: string; // As html -} \ No newline at end of file + replyTo?: string; //optional +} diff --git a/src/legacy/legacy.service.ts b/src/legacy/legacy.service.ts index 7412c41..9f90509 100644 --- a/src/legacy/legacy.service.ts +++ b/src/legacy/legacy.service.ts @@ -543,6 +543,7 @@ export class LegacyService { await Promise.all([ this.sendEmail({ html: adminEmail, + replyTo: token.email, to: [this.conf.userSupportMailbox], subject: 'Demande d’accès aux données', }), @@ -643,6 +644,7 @@ export class LegacyService { await Promise.all([ this.sendEmail({ html: adminEmail, + replyTo: token.email, to: [this.conf.userSupportMailbox], subject: 'Demande de renouvellement d’accès aux données', }), @@ -747,6 +749,7 @@ export class LegacyService { await Promise.all([ this.sendEmail({ html: adminEmail, + replyTo: token.email, to: [this.conf.userSupportMailbox], subject: 'Demande de suppression d’accès aux données', }), @@ -834,4 +837,4 @@ export class LegacyService { handleError(error, new InternalServerErrorException('Couldn\'t send email.')); } } -} \ No newline at end of file +} -- GitLab