From b247c0295b3fb46701c73675051e12f77c2abf67 Mon Sep 17 00:00:00 2001 From: Lucas Gabriel Lima <lgl15@inf.ufpr.br> Date: Mon, 26 Sep 2016 11:56:34 -0300 Subject: [PATCH] rename signup route to user --- src/libs/models/user.js | 5 +++-- src/libs/routes/api.js | 4 ++-- src/libs/routes/{signup.js => user.js} | 9 +++------ 3 files changed, 8 insertions(+), 10 deletions(-) rename src/libs/routes/{signup.js => user.js} (80%) diff --git a/src/libs/models/user.js b/src/libs/models/user.js index d04331e2..01124ec2 100644 --- a/src/libs/models/user.js +++ b/src/libs/models/user.js @@ -1,6 +1,7 @@ const mongoose = require('mongoose'); const bcrypt = require('bcrypt'); - +const libs = `${process.cwd()}/libs`; +const log = require(`${libs}/log`)(module); const Schema = mongoose.Schema; // set up a mongoose model @@ -19,7 +20,7 @@ var UserSchema = new Schema({ UserSchema.pre('save', function (next) { var user = this; if (this.isModified('password') || this.isNew) { - bcrypt.genSalt(128, function (err, salt) { + bcrypt.genSalt(10, function (err, salt) { if (err) { return next(err); } diff --git a/src/libs/routes/api.js b/src/libs/routes/api.js index 6826d98c..a1805696 100644 --- a/src/libs/routes/api.js +++ b/src/libs/routes/api.js @@ -12,7 +12,7 @@ const city = require('./city'); const school = require('./school'); -const signup = require('./signup'); +const user = require('./user'); api.get('/', (req, res) => { res.json({ msg: 'SimCAQ API is running' }); @@ -24,6 +24,6 @@ api.use('/api/v1/state', state); api.use('/api/v1/region', region); api.use('/api/v1/city', city); api.use('/api/v1/school', school); -api.use('/api/v1/signup', signup); +api.use('/api/v1/user', user); module.exports = api; diff --git a/src/libs/routes/signup.js b/src/libs/routes/user.js similarity index 80% rename from src/libs/routes/signup.js rename to src/libs/routes/user.js index 806b5a75..629ec095 100644 --- a/src/libs/routes/signup.js +++ b/src/libs/routes/user.js @@ -1,6 +1,6 @@ const express = require('express'); -const signupApp = express(); +const userApp = express(); const libs = `${process.cwd()}/libs`; @@ -9,10 +9,8 @@ const log = require(`${libs}/log`)(module); const User = require('../models/user'); -signupApp.post('/', (req, res) => { - log.debug('kapo'); +userApp.post('/', (req, res) => { if (!req.body.email || !req.body.password) { - log.info('kelpo'); res.json({success: false, msg: 'Please pass email and password.'}); } else { var newUser = new User({ @@ -22,7 +20,6 @@ signupApp.post('/', (req, res) => { log.debug(newUser.email); // save the user newUser.save((err) => { - log.info('pepe'); if (err) { return res.json({success: false, msg: 'Email already in use.'}); } @@ -31,4 +28,4 @@ signupApp.post('/', (req, res) => { } }); -module.exports = signupApp; +module.exports = userApp; -- GitLab