Merge 98e959a into 8150687

.nycrc

@@ -1,10 +1,10 @@
 {
- "reporter": [
-   "lcov",
-   "text"
- ],
- "exclude": [
-   "src/migartions",
-   "src/helpers"
- ]
+  "reporter": [
+    "lcov",
+    "text"
+  ],
+  "exclude": [
+    "src/migrations",
+    "src/tests"
+  ]
 }

.travis.yml

@@ -1,13 +1,20 @@
 env:
   global:
-  - CC_TEST_REPORTER_ID=d570e2625aaffa20e7828eaddfbec748c525e866b6d413472bc26e188cb2bc6a
+    - SECRET_KEY=12345
+    - NODE_ENV=test
+    - CC_TEST_REPORTER_ID=d570e2625aaffa20e7828eaddfbec748c525e866b6d413472bc26e188cb2bc6a
+    - DATABASE_URL_TEST=postgres://postgres@localhost:5432/authorhavens_test
 language: node_js
 node_js:
   - "stable"
 cache:
   directories:
-  - "node_modules"
+    - "node_modules"
+services:
+  - postgresql
 before_script:
+  - psql -c 'CREATE DATABASE authorhavens_test;' -U postgres
+  - npm i sequelize-cli -g
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build

package.json

@@ -4,7 +4,7 @@
   "description": "A Social platform for the creative at heart",
   "main": "src/index.js",
   "scripts": {
-    "test": "NODE_ENV=test nyc mocha --require @babel/register src/tests/index.js",
+    "test": "NODE_ENV=test npm run db:migrate && nyc mocha --require @babel/register src/tests/index.js",
     "cover": "npm test && nyc report --reporter=text-lcov | coveralls",
     "coveralls": "cat coverage/lcov.info | coveralls",
     "start": "babel-node src/index.js",
@@ -20,6 +20,7 @@
     "@babel/node": "^7.2.2",
     "@babel/preset-env": "^7.4.3",
     "@babel/register": "^7.4.0",
+    "@hapi/joi": "^15.0.0",
     "body-parser": "^1.18.3",
     "cheke": "^1.0.2",
     "cors": "^2.8.4",

src/app.js

@@ -9,20 +9,20 @@ const app = express();
 
 dotenv.config();
 
-app.use(session({
-  secret: process.env.SECRET_KEY || 'authorshaven',
-  cookie: { maxAge: 60000 },
-  resave: true,
-  saveUninitialized: true,
-}));
+app.use(
+  session({
+    secret: process.env.SECRET_KEY || 'authorshaven',
+    cookie: { maxAge: 60000 },
+    resave: true,
+    saveUninitialized: true
+  })
+);
 
 app.use(logger('dev'));
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
 app.use(cors());
 
-// api version 1
-
 // catch 404 and forward to error handler
 app.use((req, res, next) => {
   next(createError(404));
@@ -38,7 +38,7 @@ app.use((err, req, res, next) => {
   res.status(err.status || 500);
   res.send({
     message: err.message,
-    error: err.status,
+    error: err.status
   });
   next();
 });

src/config/db-config.js

@@ -9,23 +9,23 @@ const config = {
     password: process.env.DB_PASSWORD_DEV,
     database: process.env.DB_NAME_DEV,
     host: process.env.DB_HOST_DEV,
-    dialect: 'postgres',
+    dialect: 'postgres'
   },
   test: {
     use_env_variable: 'DATABASE_URL_TEST',
     username: process.env.DB_USER_TEST,
     password: process.env.DB_PASSWORD_TEST,
     database: process.env.DB_NAME_TEST,
     host: process.env.DB_HOST_TEST,
-    dialect: 'postgres',
+    dialect: 'postgres'
   },
   production: {
     use_env_variable: 'DATABASE_URL',
     username: process.env.DB_USER,
     password: process.env.DB_PASSWORD,
     database: process.env.DB_NAME,
     host: process.env.DB_HOST,
-    dialect: 'postgres',
+    dialect: 'postgres'
   }
 };
 

src/helpers/validation/email.js

@@ -0,0 +1,33 @@
+/**
+ * @param {string} input
+ * @param {string} required
+ * @returns {array} an array of errors or an empty array if no error
+ */
+export default (input, required = '') => {
+  const errors = [];
+  const re = /[A-Z]+@[A-Z-]+\.[A-Z]{2,4}/gim;
+  const reUsername = /[\\ ,;:"!#$%&'*+/=?^`{|}~]/g;
+  const reDomainSLD = /[\d+ \\,;:"!#$%&'*+/=?^`{|}~]/g;
+  const reDomainTLD = /[\d+ \\,;:"!#$%&'*+-/=?^_`{|}~]/g;
+
+  if (!input && !required) {
+    return [];
+  }
+
+  const emailUsername = input.substring(0, input.lastIndexOf('@'));
+  const emailDomainSLD = input.substring(input.lastIndexOf('@') + 1, input.lastIndexOf('.'));
+  const emailDomainTLD = input.substring(input.lastIndexOf('.') + 1);
+
+  if (
+    re.test(input)
+    && !reUsername.test(emailUsername)
+    && !reDomainSLD.test(emailDomainSLD)
+    && !reDomainTLD.test(emailDomainTLD)
+  ) {
+    return [];
+  }
+
+  errors.push('Please provide a valid email address');
+
+  return errors;
+};

src/helpers/validation/index.js

@@ -0,0 +1,4 @@
+import email from './email';
+import password from './password';
+
+export { email, password };

src/helpers/validation/password.js

@@ -0,0 +1,24 @@
+/**
+ * @param {string} input
+ * @param {string} required
+ * @returns {array} an array of errors or an empty array if no error
+ */
+export default (input, required = '') => {
+  const errors = [];
+
+  if (!input && !required) {
+    return [];
+  }
+  if (
+    input.match(/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,25}$/)
+    && input.match(/[ \\,;:"!#$%&'+-/=?^_`{|}~]/)
+  ) {
+    return [];
+  }
+
+  errors.push(
+    'Your password should have a minimum 8 and maximum of 25 characters, it must include at least one upper case letter, one lower case letter, one numeric digit and one special character (*&^!%$@#)'
+  );
+
+  return errors;
+};

src/middlewares/validate-new-user.js

@@ -0,0 +1,31 @@
+import db from '../models';
+
+export default async (req, res, next) => {
+  const errors = {};
+  if (Object.keys(req.body).length <= 0) {
+    return res.status(400).json({
+      errors: {
+        body: ['body can not be empty']
+      }
+    });
+  }
+
+  const checkUser = await db.User.findAll({
+    where: {
+      email: req.body.email
+    },
+    logging: false
+  });
+
+  if (checkUser.length > 0) {
+    errors.email = ['sorry, this email is already used'];
+  }
+
+  if (Object.keys(errors).length > 0) {
+    return res.status(400).json({
+      errors
+    });
+  }
+
+  next();
+};

src/models/index.js

@@ -7,18 +7,14 @@ const basename = path.basename(__filename);
 const env = process.env.NODE_ENV || 'development';
 
 const db = {};
-let sequelize;
 const config = dbConfig[env];
 
-if (config.use_env_variable) {
-  sequelize = new Sequelize(process.env[config.use_env_variable], config);
-} else {
-  sequelize = new Sequelize(config.database, config.username, config.password, config);
-}
+const sequelize = config.use_env_variable
+  ? new Sequelize(process.env[config.use_env_variable], config)
+  : new Sequelize(config.database, config.username, config.password, config);
 
-fs
-  .readdirSync(__dirname)
-  .filter(file => (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js'))
+fs.readdirSync(__dirname)
+  .filter(file => file.indexOf('.') !== 0 && file !== basename && file.slice(-3) === '.js')
   .forEach((file) => {
     const model = sequelize.import(path.join(__dirname, file));
     db[model.name] = model;

src/tests/404.js

@@ -0,0 +1,19 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import chai from 'chai';
+import chaiHttp from 'chai-http';
+import app from '../app';
+
+const { expect } = chai;
+
+chai.use(chaiHttp);
+
+describe('POST /apiii', () => {
+  it('should return an error message', (done) => {
+    chai.request(app)
+      .get('/apiii')
+      .end((err, res) => {
+        expect(res.status).to.equal(404);
+        done();
+      });
+  });
+});

src/tests/index.js

@@ -1,3 +1,7 @@
 import './user-model';
 import './article-model';
 import './comment-model';
+import './404';
+import './validation/email';
+import './validation/password';
+import './validation/validate-new-user';

src/tests/validation/email.js

@@ -0,0 +1,16 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import chai from 'chai';
+import validateEmail from '../../helpers/validation/email';
+
+const { expect } = chai;
+
+describe('Email validation', () => {
+  it('should return an array of error messages', () => {
+    expect(validateEmail('abc@gmail.co/m', 'required').length).to.be.above(0);
+  });
+
+  it('should return an empty array if there is no error', () => {
+    expect(validateEmail('abc@gmail.com', 'required').length).to.be.equals(0);
+    expect(validateEmail('', false).length).to.be.equals(0);
+  });
+});

src/tests/validation/password.js

@@ -0,0 +1,16 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import chai from 'chai';
+import validatePassword from '../../helpers/validation/password';
+
+const { expect } = chai;
+
+describe('Password validation', () => {
+  it('should return an array of error messages', () => {
+    expect(validatePassword('abcde12345', 'required').length).to.be.above(0);
+  });
+
+  it('should return an empty array if there is no error', () => {
+    expect(validatePassword('Abcde12345!', 'required').length).to.be.equals(0);
+    expect(validatePassword('', false).length).to.be.equals(0);
+  });
+});