changed responses to be like in documentation

config/database/developmentDbConfig.json

@@ -1,8 +1,8 @@
 {
-  "username": "api",
+  "username": "dev_user",
   "password": "ecp1950",
   "database": "dev_db",
-  "host": "127.0.0.1",
+  "host": "ecp_dev_db",
   "dialect": "postgres",
   "logging": false,
   "seederStorage": "json",

config/database/testDbConfig.json

@@ -1,8 +1,8 @@
 {
-  "username": "api",
-  "password": "notsetyet",
+  "username": "test_user",
+  "password": "ecp1950",
   "database": "test_db",
-  "host": "127.0.0.1",
+  "host": "ecp_test_db",
   "dialect": "postgres",
   "logging": false,
   "seederStorage": "json",

controllers/authentication/index.js

@@ -27,7 +27,7 @@ const validate = {
 
 function authenticate(req, res, next) {
   User.findOne({
-    where: { email: req.body.email },
+    where: { email: req.body.email.toLowerCase() },
     include: { model: Resource, required: false }
   })
   .then( user => {

controllers/users/changeEmail.test.js

@@ -132,8 +132,8 @@ tests('POST /users/:userId/changeEmail', changeEmail => {
             .send({ token: emailConfirmation.token })
             .end( (err, res) => {
               test.same(
-                { status: res.status, message: res.body.message },
-                { status: 200, message: lang.messages.emailConfirmed }
+                { status: res.status, email: res.body.email },
+                { status: 200, email: '[email protected]' }
               );
               test.end();
             });

controllers/users/emailConfirmation.js

@@ -13,9 +13,9 @@ const validate = {
 
 function confirm(req, res, next) {
   services.emailConfirmation.confirm(req.body.token)
-  .then( () => {
+  .then( userEmail => {
     res.status(200);
-    res.locals.message = lang.messages.emailConfirmed;
+    res.locals.email = userEmail;
     next();
   })
   .catch(err => next(err));

controllers/users/emailConfirmation.test.js

@@ -134,8 +134,8 @@ tests('POST /emailConfirm', emailConfirmation => {
           .send({ token: emailConfirmationData.token })
           .end( (err, res) => {
             test.same(
-              { status: res.status, message: res.body.message },
-              { status: 200, message: lang.messages.emailConfirmed }
+              { status: res.status, email: res.body.email },
+              { status: 200, email: '[email protected]' }
             );
             emailConfirmationData.getUser().then( user => {
               test.error(!user.confirmed, 'User not confirmed');

models/services/_generic.js

@@ -101,7 +101,7 @@ module.exports = (Model, keyword) => {
       order: ['id']
     };
 
-    _.mapKeys(optionalArguments, val => _.merge(params, val));
+    _.mapKeys(optionalArguments, (val, key) => _.merge(params, { [key]: val }));
 
     return Model.findAndCountAll(params);
   };

models/services/emailConfirmation.js

@@ -43,7 +43,11 @@ function confirm(token) {
       return user.save();
     })
     .then(function(user) {
+      this.userEmail = user.email;
       return removeEmailConfirmation(user.id);
+    })
+    .then(function() {
+      return this.userEmail;
     });
 }
 

utils/fixtures/index.js

@@ -1,31 +1,47 @@
 'use strict';
 /* eslint-disable no-console */
 const pg = require('pg');
+const Promise = require('bluebird');
 const cleaner = require('postgres-cleaner');
 
 const dbArgument = () => (process.argv[3] === 'dev')
   ? 'dev_db'
   : 'test_db';
 
+const dbUser = () => (process.argv[3] === 'dev')
+  ? 'dev_user'
+  : 'test_user';
+
 function recreateDatabase() {
-  var connectionString = 'postgres://postgres@localhost/postgres';
+  var connectionString =
+    `postgres://${dbUser()}:ecp1950@ecp_${dbArgument()}/${dbArgument()}`;
 
   pg.connect(connectionString)
-    .then( connection =>
-      connection.query(`drop database ${dbArgument()}`).then( () => connection)
-    )
-    .then( connection =>
-      connection.query(`create database ${dbArgument()}`)
-      .then( () => process.exit(0))
-    )
+    .then( connection => {
+      return connection.query(
+        'SELECT table_name FROM information_schema.tables ' +
+        'WHERE table_schema = \'public\''
+      )
+      .then( tables => {
+        if (tables.rows.length === 0) return;
+
+        let promises = tables.rows.map(table =>
+         connection.query(`DROP TABLE "${table.table_name}" CASCADE`)
+        );
+
+        return Promise.all(promises);
+      });
+    })
+    .then( () => process.exit(0))
     .catch( err => {
       console.log(err);
       process.exit(1);
     });
 }
 
 function cleanDatabase() {
-  var connectionString = `postgres://postgres@localhost/${dbArgument()}`;
+  var connectionString =
+    `postgres://${dbUser()}:ecp1950@ecp_${dbArgument()}/${dbArgument()}`;
 
   pg.connect(connectionString, (err, connection) => {
     if (err) throw err;

utils/fixtures/resources.js

@@ -4,7 +4,7 @@ const uuid = require('node-uuid');
 const populatePresets = require('../migrations').populatePresets;
 
 const preset = () => ({
-  path: uuid.v1(),
+  path: `images/${uuid.v1()}.jpg`,
   mimetype: 'image/jpeg',
   extension: 'jpg'
 });

utils/s3.js

@@ -14,10 +14,7 @@ function prependS3(model, name, keepResources = false) {
     let obj = model.toJSON();
 
     if (!keepResources) obj.resource = undefined;
-    if (img) {
-      obj[name] =
-        `${s3Prefix}/images/${model.resource.path}.${model.resource.extension}`;
-    }
+    if (img) obj[name] = `${s3Prefix}/${model.resource.path}`;
     return obj;
   }