fix password reset email

Author: visualjerk

config/local.example.json

@@ -4,14 +4,9 @@
   "baseURL": "http://localhost:3030",
   "frontURL": "http://localhost:3000",
   "smtpConfig": {
-    "host": "localhost",
+    "host": "0.0.0.0",
     "port": 1025,
-    "secure": false,
-    "ignoreTLS": true,
-    "auth": {
-      "user": "",
-      "pass": ""
-    }
+    "ignoreTLS": true
   },
   "thumbor": {
     "url": "",

email-templates/account/password-reset/de/style.scss

@@ -1 +1 @@
-@import '../../layout/common';
+@import '../../../layout/common';

email-templates/account/password-reset/en/style.scss

@@ -1 +1 @@
-@import '../../layout/common';
+@import '../../../layout/common';

email-templates/account/reset-password/de/html.hbs

@@ -20,12 +20,12 @@
 			</tr>
 			<tr>
 				<td class="aligncenter content-block">
-					Wenn du diese Nachricht ignorierst bleibt dein passwort wie es ist.
+					Wenn du diese Nachricht ignorierst bleibt dein Passwort, wie es ist.
 				</td>
 			</tr>
 			<tr>
 				<td class="aligncenter content-block" itemprop="handler" itemscope itemtype="http://schema.org/HttpActionHandler">
-          Wenn du es nicht warst der dein Passwort zurücksetzen wollte <a href='mailto:{{returnEmail}}?subject=I did not reset my password&body=Someone unauthorized sent this reset password request.'>lass es uns wissen!</a>
+          Wenn du es nicht warst, der dein Passwort zurücksetzen wollte <a href='mailto:{{returnEmail}}?subject=I did not reset my password&body=Someone unauthorized sent this reset password request.'>lass es uns wissen!</a>
 				</td>
 			</tr>
 			<tr>

email-templates/account/reset-password/de/style.scss

@@ -1 +1 @@
-@import '../../layout/common';
+@import '../../../layout/common';

email-templates/account/reset-password/en/style.scss

@@ -1 +1 @@
-@import '../../layout/common';
+@import '../../../layout/common';

server/services/auth-management/notifier.js

@@ -44,7 +44,8 @@ module.exports = function (app) {
       user.language || 'en'
     );
 
-    const hashLink = getLink(linktype, user.verifyToken || null);
+    const token = user.verifyToken || user.resetToken || user.changeToken;
+    const hashLink = getLink(linktype, token || null);
     const frontURL = app.get('frontURL');
     const backURL = app.get('baseURL');
 
@@ -132,15 +133,19 @@ module.exports = function (app) {
           'verify',
           user
         );
-      case 'resetPwd':
-        return buildEmail('reset-password', 'Password reset', 'reset', user);
       case 'sendResetPwd':
         return buildEmail(
-          'password-was-reset',
-          'Your password was reset',
+          'reset-password',
+          'Password reset',
           'reset',
           user
         );
+      case 'resetPwd':
+        return buildEmail(
+          'password-reset',
+          'Your password was reset',
+          'reset',
+          user);
       case 'passwordChange':
         return buildEmail(
           'password-change',