Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: lbac 2428: mise a jour de templates d email #1483

Merged
merged 5 commits into from
Sep 18, 2024
Merged

feat: lbac 2428: mise a jour de templates d email #1483

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41be62c
feat: lbac 2428: mise a jour de templates d email
remy-auricoste Sep 2, 2024
f8d14f1
Merge branch 'main' into lbac-2428-emails
remy-auricoste Sep 2, 2024
1b906a8
fix: commentaire
remy-auricoste Sep 12, 2024
8853719
Merge branch 'main' into lbac-2428-emails
remy-auricoste Sep 12, 2024
3d6e6f9
Merge branch 'main' into lbac-2428-emails
remy-auricoste Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions server/src/http/controllers/login.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export default (server: Server) => {
data: {
images: {
logoLba: `${config.publicUrl}/images/emails/logo_LBA.png?raw=true`,
logoRf: `${config.publicUrl}/images/emails/logo_rf.png?raw=true`,
},
last_name: sanitizeForEmail(removeUrlsFromText(last_name)),
first_name: sanitizeForEmail(removeUrlsFromText(first_name)),
Expand Down
16 changes: 14 additions & 2 deletions server/src/http/controllers/user.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,14 +307,21 @@ export default (server: Server) => {
}
)

const { email, last_name, first_name } = user

const newEvent = getLastStatusEvent(updatedRole.status)
if (!newEvent) {
throw internal("inattendu : aucun event sauvegardé")
}
// if user is disabled, return the user data directly
if (newEvent.status === AccessStatus.DENIED) {
const organization =
updatedRole.authorized_type === AccessEntityType.CFA
? await getDbCollection("cfas").findOne({ _id: new ObjectId(updatedRole.authorized_id) })
: await getDbCollection("entreprises").findOne({ _id: new ObjectId(updatedRole.authorized_id) })
if (!organization) {
throw internal("inattendu: organization introuvable")
remy-auricoste marked this conversation as resolved.
Show resolved Hide resolved
}
const { email, last_name, first_name, phone } = user
const { siret, raison_sociale } = organization
// send email to user to notify him his account has been disabled
await mailer.sendEmail({
to: email,
Expand All @@ -324,10 +331,15 @@ export default (server: Server) => {
images: {
accountDisabled: `${config.publicUrl}/images/image-compte-desactive.png?raw=true`,
logoLba: `${config.publicUrl}/images/emails/logo_LBA.png?raw=true`,
logoRf: `${config.publicUrl}/images/emails/logo_rf.png?raw=true`,
},
last_name: sanitizeForEmail(last_name),
first_name: sanitizeForEmail(first_name),
reason: sanitizeForEmail(newEvent.reason),
email,
siret: sanitizeForEmail(siret),
raison_sociale: sanitizeForEmail(raison_sociale),
phone: sanitizeForEmail(phone),
emailSupport: "mailto:[email protected]?subject=Compte%20pro%20non%20validé",
},
})
Expand Down
263 changes: 230 additions & 33 deletions server/static/templates/mail-compte-desactive.mjml.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,237 @@
<mjml>
<mj-head>
<mj-title>Votre compte a été désactivé sur La bonne alternance</mj-title>
<mj-font name="Work Sans" href="https://fonts.googleapis.com/css2?family=Work+Sans:wght@400;700&display=swap"></mj-font>
<mj-style inline="inline">.grey {color: #1E1E1E;}</mj-style>
<mj-preview></mj-preview>
<mj-breakpoint width="480px"></mj-breakpoint>
<mj-attributes>
<mj-text color="#242424" font-family="Work Sans, Arial" font-size="16px" line-height="24px"></mj-text>
<mj-button font-size="16px" line-height="24px" padding="8px 24px" font-family="Work Sans" height="40px"></mj-button>
<mj-all padding="0"></mj-all>
</mj-attributes>
<mj-style>
@media only screen and (max-width: 799px) {
.text > div {
text-align: inherit !important;
}

.wrapper > table > tbody > tr > td {
padding-left: 0px !important;
padding-right: 0px !important;
}

.section > table > tbody > tr > td {
padding-left: 20px !important;
padding-right: 20px !important;
}

.column > table > tbody > tr > td {
padding-left: 0px !important;
padding-right: 0px !important;
}

.padB40 {
padding-bottom: 40px !important;
}

.image {
padding-left: 0px !important;
padding-right: 0px !important;
}

.image > table {
text-align: center !important;
margin: 0 auto !important;
}

.divider {
padding-left: 0px !important;
padding-right: 0px !important;
}

.button > table {
width: 100% !important;
}

.button > table > tbody > tr > td > a {
width: 80% !important;
}
}
</mj-style>
<mj-style inline="inline">
.column > table { border-collapse: separate; }
</mj-style>
<mj-font href="https://fonts.googleapis.com/css2?family=DM+Sans:wght@400&display=swap" name="DM Sans"></mj-font>
<mj-font href="https://fonts.googleapis.com/css2?family=Public+Sans:wght@700&display=swap" name="Public Sans"></mj-font>
</mj-head>
<mj-body background-color="#F5F5FE">
<mj-section>
<mj-column>
<mj-image src="<%= data.images.logoLba %>" width="150px" alt="Logo du site La bonne alternance"></mj-image>
</mj-column>
</mj-section>
<mj-section background-color="#FFFFFF" border-radius="4px" border="1px solid #FFFFFF" padding="20px 5px">
<mj-column>
<mj-image src="<%= data.images.accountDisabled %>" alt="image compte désactivé"></mj-image>
</mj-column>
<mj-column>
<mj-text>Bonjour <%= data.first_name %> <%= data.last_name %>,</mj-text>
<mj-text>Votre compte n'a pas pu être validé pour la raison suivante :</mj-text>
<mj-text container-background-color="#f6f6f6" padding-rigth="10px"><%= data.reason %></mj-text>
</mj-column>
</mj-section>
<mj-section> </mj-section>
<mj-section background-color="#FFFFFF" border-radius="4px" border="1px solid #FFFFFF" padding="20px 10px">
<mj-column>
<mj-text>Vous pouvez contacter notre support pour plus d’information en communiquant l’email utilisé lors de la création de votre compte.</mj-text>
<mj-button color="#ffffff" background-color="#000091" href="<%= data.emailSupport %>"> Contacter le support </mj-button>
</mj-column>
</mj-section>
<mj-section>
<mj-column>
<mj-image src="https://labonnealternance.apprentissage.beta.gouv.fr/assets/logo-republique-francaise.png" width="200px" align="left"></mj-image>
</mj-column>
</mj-section>
<mj-body background-color="#f5f5fe" name="Compte désactivé" width="800px">
<mj-wrapper border-radius="0px" css-class="wrapper" padding="32px 100px 32px 100px">
<mj-section border-radius="0px" css-class="section" name="mj-section_group">
<mj-group>
<mj-column border-radius="0px" css-class="column" vertical-align="middle" width="14.83%">
<mj-image align="left" alt="Image" css-class="image" href="#" src="<%= data.images.logoRf %>" width="89px">

</mj-image>
</mj-column>
<mj-column border-radius="0px" css-class="column" padding="0px 24px 0px 24px" vertical-align="middle" width="34.83%">
<mj-image align="left" alt="Image" css-class="image" href="#" padding="17px 0px 17px 0px" src="<%= data.images.logoLba %>" width="160px">

</mj-image>
</mj-column>
<mj-column border-radius="0px" css-class="column" vertical-align="top" width="50.33%">

</mj-column>
</mj-group>
</mj-section>
<mj-spacer height="24px">

</mj-spacer>
<mj-section background-color="#ffffff" border-radius="4px" border="1px solid #e3e3fd" css-class="section" name="mj-section_group" padding="23px 22px 23px 22px">
<mj-group>
<mj-column border-radius="0px" css-class="column" vertical-align="middle" width="99.64%">
<mj-text align="left" color="#000091" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="20px" font-weight="700" line-height="22px" padding="0px 0px 12px 0px">
Votre compte a été désactivé
<br/>
</mj-text>
<mj-text align="left" color="#161616" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="16px" font-weight="400" line-height="24px" padding="0px 0px 12px 0px">
Bonjour <%= data.first_name %> <%= data.last_name %>,
<br/>
</mj-text>
<mj-text align="left" color="#161616" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="16px" font-weight="400" line-height="24px" padding="0px 0px 12px 0px">
Votre compte La bonne alternance n’a pas pu être validé pour la raison suivante :
<br/>
</mj-text>
<mj-text align="left" color="#161616" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="16px" font-weight="700" line-height="24px" padding="0px 0px 0px 0px">
<%= data.reason %>
<br/>
</mj-text>
</mj-column>
</mj-group>
</mj-section>
<mj-spacer height="24px">

</mj-spacer>
<mj-section background-color="#ffffff" border-radius="4px" border="1px solid #e3e3fd" css-class="section" name="mj-section_group" padding="23px 23px 23px 23px">
<mj-group>
<mj-text align="left" color="#000091" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="16px" font-weight="700" line-height="18px" padding="24px 0px 0px 0px">
Compte concerné
<br/>
</mj-text>
<mj-spacer height="24px" padding="0px 24px 0px 24px">

</mj-spacer>
<mj-text align="left" color="#161616" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="16px" font-weight="400" line-height="24px" padding="0px 0px 0px 0px">
SIRET :
<br/>
</mj-text>
<mj-text align="left" color="#161616" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="16px" font-weight="700" line-height="24px" padding="0px 0px 0px 0px">
<%= data.siret %>
<br/>
</mj-text>
<mj-spacer height="24px" padding="0px 24px 0px 24px">

</mj-spacer>
<mj-text align="left" color="#161616" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="16px" font-weight="400" line-height="24px" padding="0px 0px 0px 0px">
Raison sociale de l’entreprise :
<br/>
</mj-text>
<mj-text align="left" color="#161616" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="16px" font-weight="700" line-height="24px" padding="0px 0px 0px 0px">
<%= data.raison_sociale %>
<br/>
</mj-text>
<mj-spacer height="24px" padding="0px 24px 0px 24px">

</mj-spacer>
<mj-text align="left" color="#161616" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="16px" font-weight="400" line-height="24px" padding="0px 0px 0px 0px">
Email :
<br/>
</mj-text>
<mj-text align="left" color="#161616" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="16px" font-weight="700" line-height="24px" padding="0px 0px 0px 0px">
<%= data.email %>
<br/>
</mj-text>
<mj-spacer height="24px" padding="0px 24px 0px 24px">

</mj-spacer>
<mj-text align="left" color="#161616" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="16px" font-weight="400" line-height="24px" padding="0px 0px 0px 0px">
Téléphone :
<br/>
</mj-text>
<mj-text align="left" color="#161616" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="16px" font-weight="700" line-height="24px" padding="0px 0px 24px 0px">
<%= data.phone %>
<br/>
</mj-text>
</mj-group>
</mj-section>
<mj-spacer height="24px">

</mj-spacer>
<mj-section background-color="#ffffff" border-radius="4px" border="1px solid #e3e3fd" css-class="section" name="mj-section_group" padding="23px 23px 23px 23px">
<mj-group>
<mj-text align="left" color="#000091" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="20px" font-weight="700" line-height="22px" padding="24px 0px 0px 0px">
Pourquoi nous vérifions les comptes de nos utilisateurs ?
<br/>
</mj-text>
<mj-spacer height="24px" padding="0px 24px 0px 24px">

</mj-spacer>
<mj-text align="left" color="#161616" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="16px" font-weight="400" line-height="24px" padding="0px 0px 0px 0px">
La bonne alternance est un service public qui s’adresse aux étudiants. À ce titre, nous nous assurons de la validité des informations diffusées par les entreprises et les organismes de formation.
<br/>
</mj-text>
<mj-spacer height="24px" padding="0px 24px 0px 24px">

</mj-spacer>
<mj-text align="left" color="#161616" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="16px" font-weight="400" line-height="24px" padding="0px 0px 0px 0px">
Si les coordonnées que vous renseignez à la création de votre compte sont connues de nos bases de données, alors votre compte est automatiquement validé. Dans le cas inverse, nous prenons le temps de vérifier manuellement vos informations.
<br/>
</mj-text>
<mj-spacer height="24px" padding="0px 24px 0px 24px">

</mj-spacer>
<mj-text align="left" color="#161616" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="16px" font-weight="400" line-height="24px" padding="0px 0px 0px 0px">
Vous pouvez contacter notre équipe support pour plus d’information en communiquant l’email utilisé lors de la création de votre compte.
<br/>
</mj-text>
<mj-spacer height="24px" padding="0px 24px 0px 24px">

</mj-spacer>
<mj-column border-radius="0px" css-class="column" padding="0px 194px 0px 194px" vertical-align="middle" width="99.64%">
<mj-button align="center" background-color="transparent" border-radius="0px" border="1px solid #000091" color="#000091" css-class="button" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="14px" font-weight="700" href="mailto:[email protected]?subject=Recruteur%20-%20Demande%20information" inner-padding="4px 0px 4px 0px" line-height="24px" padding="10px 0px 10px 0px" width="163px">
Contacter le support
</mj-button>
</mj-column>
</mj-group>
</mj-section>
<mj-spacer height="24px">

</mj-spacer>
<mj-section border-radius="4px" css-class="section" name="mj-section_group">
<mj-group>
<mj-column border-radius="0px" css-class="column" vertical-align="middle" width="100%">
<mj-text align="left" color="#666666" css-class="text" font-family="Arial, Helvetica, Verdana, sans-serif" font-size="14px" font-weight="400" line-height="24px">
Ce courriel est généré automatiquement, vous ne pouvez pas y répondre.
<br/>Pour toute question, consultez notre <a href="https://labonnealternance.apprentissage.beta.gouv.fr/faq#recruteur" style="text-decoration: underline; color: inherit;">FAQ</a> ou écrivez-nous à <a href="mailto:[email protected]" style="text-decoration: underline; color: inherit;">[email protected]</a>
<br/>
</mj-text>
</mj-column>
</mj-group>
</mj-section>
<mj-spacer height="24px">

</mj-spacer>
<mj-section border-radius="4px" css-class="section" name="mj-section_group">
<mj-group>
<mj-column border-radius="0px" css-class="column" vertical-align="middle" width="100%">
<mj-text align="left" color="#666666" css-class="text" font-family="DM Sans, Times, Georgia, serif" font-size="14px" font-weight="400" line-height="24px">
<span style="font-family: Arial, Helvetica, Verdana, sans-serif; font-weight: 400;">La bonne alternance est un site développé par la Mission interministérielle pour l'apprentissage, au sein de l’État, conformément aux missions d’intérêt public du ministère du Travail, du Plein emploi et de l’Insertion.
</span><br/><span style="font-family: Arial, Helvetica, Verdana, sans-serif; font-weight: 400;">
</span><br/><span style="font-family: Arial, Helvetica, Verdana, sans-serif; font-weight: 400;">Nous vous contactons car votre compte a été désactivé par un administrateur de plateforme ou un référent OPCO.
</span><br/><span style="font-family: Arial, Helvetica, Verdana, sans-serif; font-weight: 400;">
</span><br/><span style="font-family: Arial, Helvetica, Verdana, sans-serif; font-weight: 400;">Nous ne faisons aucune utilisation commerciale de vos adresses e-mail. Vous bénéficiez d’un droit d’opposition que vous pouvez utiliser à tout moment via l’adresse </span><a href="mailto:[email protected]?subject=Droit%20opposition" style="font-family: Arial, Helvetica, Verdana, sans-serif; font-weight: 400; text-decoration: underline; color: inherit;">[email protected]</a><span style="font-family: Arial, Helvetica, Verdana, sans-serif; font-weight: 400;">
</span><br/><span style="font-family: Arial, Helvetica, Verdana, sans-serif; font-weight: 400;">
</span><br/><span style="font-family: Arial, Helvetica, Verdana, sans-serif; font-weight: 400;">Si vos droits ne sont pas respectés, vous pouvez à tout moment introduire une réclamation auprès de la CNIL. Pour plus d’informations sur le traitement de vos données, vous pouvez vous rendre sur la </span><a href="https://labonnealternance.apprentissage.beta.gouv.fr/politique-de-confidentialite" style="font-family: Arial, Helvetica, Verdana, sans-serif; font-weight: 400; text-decoration: underline; color: inherit;">politique de confidentialité</a><span style="font-family: Arial, Helvetica, Verdana, sans-serif; font-weight: 400;"> de La bonne alternance.</span>
<br/>
</mj-text>
</mj-column>
</mj-group>
</mj-section>
</mj-wrapper>
</mj-body>
</mjml>
Loading
Loading