Corrected some ESLint issues. Reworked some default settings (mainly for testing). Started adding Mocha / Chai testing with "Fixted" v3 functionality. Fixed license in package.json.

Author: neonexus

.eslintrc

@@ -22,6 +22,11 @@
     // or could use some advice, come by https://sailsjs.com/support.
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
+    "settings": {
+        "react": {
+            "version": "detect"
+        }
+    },
     "env": {
         "node": true,
         "es6": true

.mocharc.yaml

@@ -0,0 +1,6 @@
+bail: false #stop on first error
+async-only: true
+require:
+    - 'test/hooks.js'
+spec:  'test/**/*.test.js'
+timeout: 5000

api/helpers/finalize-request-log.js

@@ -46,10 +46,12 @@ module.exports = {
                 }
 
                 if (out.access_token) {
+                    // eslint-disable-next-line camelcase
                     out.access_token = bleep;
                 }
 
                 if (out.refresh_token) {
+                    // eslint-disable-next-line camelcase
                     out.refresh_token = bleep;
                 }
             }

api/helpers/is-email.js

@@ -17,6 +17,7 @@ module.exports = {
     },
 
     fn: function(inputs, exits){
+        // eslint-disable-next-line no-useless-escape
         const emailRegex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 
         return exits.success(emailRegex.test(inputs.email));

api/models/Session.js

@@ -13,7 +13,9 @@ module.exports = {
             required: true
         },
 
-
+        data: {
+            type: 'json'
+        },
 
         createdAt: {
             type: 'ref',

api/models/User.js

@@ -7,18 +7,14 @@ async function hashPassword(pass) {
     return hash.toString('base64');
 }
 
-function updatePassword(user, next) {
+async function updatePassword(password) {
     // "binary to ASCII" aka base64
     // btoa('scrypt') = c2NyeXB0
-    if (user.password && user.password.length > 1 && user.password.substr(0, 8) !== 'c2NyeXB0') {
-        return hashPassword(user.password).then((hash) => {
-            user.password = hash;
-
-            return next();
-        });
+    if (password && password.length > 1 && password.substr(0, 8) !== 'c2NyeXB0') {
+        password = await hashPassword(password);
     }
 
-    return next();
+    return password;
 }
 
 module.exports = {
@@ -68,7 +64,7 @@ module.exports = {
             columnType: 'varchar(191)',
             // see: https://sailsjs.com/documentation/reference/waterline-orm/queries/decrypt
             // You will need to "decrypt" the user object before you can check if the password is valid.
-            encrypt: true
+            // encrypt: true // currently, does not work as intended, as password is encrypted before we can hash it
         },
 
         verificationKey: {
@@ -118,7 +114,6 @@ module.exports = {
         return _.omit(this, [
             'password',
             'verificationKey',
-            'email',
             'deletedAt',
             'deletedBy'
         ]);
@@ -134,26 +129,34 @@ module.exports = {
         return scrypt.verify(hashBuffer, raw).then((isAMatch) => isAMatch);
     },
 
-    beforeCreate: (user, next) => {
+    beforeCreate: async function(user, next) {
         const email = user.email.toLowerCase().trim();
 
+        console.log(user.password);
+
         user.email = email;
         user.avatar = 'https://www.gravatar.com/avatar/' + md5(email);
-        user.firstName = user.firstName.charAt(0).toUpperCase() + user.firstName.slice(1).trim();
-        user.lastName = user.lastName.charAt(0).toUpperCase() + user.lastName.slice(1).trim();
+        user.firstName = user.firstName.trim().charAt(0).toUpperCase() + user.firstName.slice(1).trim();
+        user.lastName = user.lastName.trim().charAt(0).toUpperCase() + user.lastName.slice(1).trim();
         user.id = sails.helpers.generateUuid();
 
-        return updatePassword(user, next);
+        user.password = await updatePassword(user.password);
+
+        return next();
     },
 
-    beforeUpdate: (user, next) => {
+    beforeUpdate: async function(user, next) {
         const email = user.email.toLowerCase().trim();
 
         user.email = email;
         user.avatar = 'https://www.gravatar.com/avatar/' + md5(email);
-        user.firstName = user.firstName.charAt(0).toUpperCase() + user.firstName.slice(1).trim();
-        user.lastName = user.lastName.charAt(0).toUpperCase() + user.lastName.slice(1).trim();
+        user.firstName = user.firstName.trim().charAt(0).toUpperCase() + user.firstName.slice(1).trim();
+        user.lastName = user.lastName.trim().charAt(0).toUpperCase() + user.lastName.slice(1).trim();
+
+        if (user.password) {
+            user.password = await updatePassword(user.password);
+        }
 
-        return updatePassword(user, next);
+        return next();
     }
 };

config/custom.js

@@ -10,14 +10,14 @@
 
 module.exports.custom = {
 
-  /***************************************************************************
-  *                                                                          *
-  * Any other custom config this Sails app should use during development.    *
-  *                                                                          *
-  ***************************************************************************/
-  // mailgunDomain: 'transactional-mail.example.com',
-  // mailgunSecret: 'key-testkeyb183848139913858e8abd9a3',
-  // stripeSecret: 'sk_test_Zzd814nldl91104qor5911gjald',
-  // …
+    /***************************************************************************
+     *                                                                          *
+     * Any other custom config this Sails app should use during development.    *
+     *                                                                          *
+     ***************************************************************************/
+    // mailgunDomain: 'transactional-mail.example.com',
+    // mailgunSecret: 'key-testkeyb183848139913858e8abd9a3',
+    // stripeSecret: 'sk_test_Zzd814nldl91104qor5911gjald',
+    // …
 
 };

config/datastores.js

@@ -51,6 +51,14 @@ module.exports.datastores = {
         adapter: 'sails-mysql',
         // url: 'mysql://user:password@host:port/database',
 
+        host: process.env.DB_HOST || 'localhost',
+        user: process.env.DB_USER || 'root',
+        password: process.env.DB_PASS || 'mypass',
+        database: process.env.DB || 'myapp',
+        port: process.env.DB_PORT || 3306,
+        charset: 'utf8mb4',
+        collation: 'utf8mb4_general_ci',
+        timezone: 'UTC'
     }
 
 

config/env/production.js

@@ -50,7 +50,6 @@ module.exports = {
          *                                                                          *
          ***************************************************************************/
         default: {
-            adapter: 'sails-mysql',
             host: process.env.RDS_HOSTNAME || 'localhost',
             user: process.env.RDS_USERNAME || 'produser',
             password: process.env.RDS_PASSWORD || 'myprodpassword',

config/local.js.sample

@@ -20,7 +20,6 @@ module.exports = {
 
     datastores: {
         default: {
-            adapter: 'sails-mysql',
             host: 'localhost',
             user: 'root',
             password: 'my@w3s0m3password',