Fix reset password mails if frontendUrl has a trailing slash

assemblee-virtuelle · Jan 24, 2023 · 4b16b95 · 4b16b95
1 parent cf8f2ad
commit 4b16b95
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/middleware/packages/auth/services/mail.js b/src/middleware/packages/auth/services/mail.js
@@ -1,5 +1,6 @@
-const MailService = require('moleculer-mail');
 const path = require('path');
+const urlJoin = require('url-join');
+const MailService = require('moleculer-mail');
 
 module.exports = {
   name: 'auth.mail',
@@ -24,8 +25,7 @@ module.exports = {
           locale: this.getTemplateLocale(account.preferredLocale || this.settings.defaults.locale),
           data: {
             account,
-            token,
-            frontUrl: account.preferredFrontUrl || this.settings.defaults.frontUrl
+            resetUrl: urlJoin(this.settings.defaults.frontUrl, 'login') + '?new_password=true&token=' + token
           }
         },
         {

diff --git a/src/middleware/packages/auth/templates/reset-password/en-EN/text.hbs b/src/middleware/packages/auth/templates/reset-password/en-EN/text.hbs
@@ -2,6 +2,6 @@ Hello {{account.username}},
 
 In order to reset your password, please click on the link below:
 
-{{frontUrl}}/login?new_password=true&token={{token}}
+{{resetUrl}}
 
 If you did not request a password reset, please ignore this message.
diff --git a/src/middleware/packages/auth/templates/reset-password/fr-FR/text.hbs b/src/middleware/packages/auth/templates/reset-password/fr-FR/text.hbs
@@ -2,6 +2,6 @@ Bonjour {{account.username}},
 
 Pour réinitialiser votre mot de passe, veuillez cliquer sur le lien ci-dessous:
 
-{{frontUrl}}/login?new_password=true&token={{token}}
+{{resetUrl}}
 
 Si vous n'avez pas fait une telle demande, vous pouvez ignorer ce message.