merged latest master in

Author: appinteractive

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';

package.json

@@ -56,6 +56,7 @@
     "cheerio": "^1.0.0-rc.2",
     "compression": "~1.7.1",
     "cors": "~2.8.4",
+    "cross-env": "^5.1.4",
     "crypto": "~1.0.1",
     "crypto-js": "^3.1.9-1",
     "dauria": "~2.0.0",

server/authentication.js

@@ -1,6 +1,7 @@
 const authentication = require('feathers-authentication');
 const jwt = require('feathers-authentication-jwt');
 const local = require('feathers-authentication-local');
+const { lowerCase } = require('feathers-hooks-common');
 
 module.exports = function () {
   const app = this;
@@ -17,11 +18,25 @@ module.exports = function () {
   app.service('authentication').hooks({
     before: {
       create: [
+        lowerCase('email', 'username'),
         authentication.hooks.authenticate(config.strategies)
       ],
       remove: [
         authentication.hooks.authenticate('jwt')
       ]
     }
   });
+
+  app.on('login', (result, meta) => {
+    try {
+      if (meta.connection && meta.connection.user) {
+        // update last active timestamp on loggedin user
+        app.service('users').patch(meta.connection.user, {
+          lastActiveAt: new Date()
+        });
+      }
+    } catch (err) {
+      app.error(err);
+    }
+  });
 };

server/helper/get-unique-slug.js

@@ -1,21 +1,28 @@
-const getUniqueSlug = (service, slug, count) => {
+const getUniqueSlug = (service, slug, count, id) => {
   return new Promise(resolve => {
-    const testslug = count?slug+count:slug;
+    const testSlug = count ? slug + count : slug;
 
     // Test if we already have data with this slug
+    const query = {
+      slug: testSlug
+    };
+    // ignore entry with given id (if set)
+    if (id) {
+      query._id = {
+        $ne: id
+      };
+    }
     service.find({
-      query: {
-        slug: testslug
-      }
+      query
     }).then((result) => {
-      if(result.data.length > 0) {
-        count = count?count+1:1;
+      if (result.data.length > 0) {
+        count = count ? count + 1 : 1;
         resolve(getUniqueSlug(service, slug, count));
       } else {
-        resolve(testslug);
+        resolve(testSlug);
       }
     });
   });
 };
 
-module.exports = getUniqueSlug;
+module.exports = getUniqueSlug;

server/hooks/create-excerpt.js

@@ -21,19 +21,14 @@ module.exports = function (options = {}) { // eslint-disable-line no-unused-vars
     try {
       /* eslint no-use-before-define: 0 */  // --> OFF
       const content = sanitizeHtml(hook.data[options.field], sanitizeOptions)
-      .replace(/\<br\>|\<\/br\>|\<\/ br\>|\<br\>|\<br\\\>/ig, "\n")
-      .replace(/\<p\>\<br\>\<\/p\>/ig, ' ')
+      .replace(/\<br\s*\>|\<br\s*\/\>/ig, "\n")
       .replace(/(\ ){2,}/ig, ' ')
       .trim();
       hook.data[`${options.field}Excerpt`] = trunc(content, options.length, {
         ignoreTags: ['img', 'script', 'iframe']
       }).html;
     } catch (err) {
-      if (hook.data.teaserImg) {
-        hook.data[`${options.field}Excerpt`] = '-----';
-      } else {
-        throw new Error('Text content needed!');
-      }
+      throw new Error('Text content needed!');
     }
     hook.data[options.field] = hook.data[options.field]
       .replace(/(\ ){2,}/ig, ' ')