Skip to content
This repository was archived by the owner on Aug 30, 2021. It is now read-only.

Commit f8ac701

Browse files
committed
Fixing errors style
1 parent d36b852 commit f8ac701

File tree

5 files changed

+21
-16
lines changed

5 files changed

+21
-16
lines changed

app/controllers/users.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,23 @@ exports.session = function(req, res) {
5151
*/
5252
exports.create = function(req, res) {
5353
var user = new User(req.body);
54+
var message = null;
5455

5556
user.provider = 'local';
5657
user.save(function(err) {
5758
if (err) {
59+
console.log(err);
60+
switch(err.code){
61+
case 11000:
62+
case 11001:
63+
message = 'Username already exists';
64+
break;
65+
default:
66+
message = 'Please fill all the required fields';
67+
}
68+
5869
return res.render('users/signup', {
59-
errors: err.errors,
70+
message: message,
6071
user: user
6172
});
6273
}

app/models/user.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ var UserSchema = new Schema({
1818
type: String,
1919
unique: true
2020
},
21-
provider: String,
2221
hashed_password: String,
22+
provider: String,
2323
salt: String,
2424
facebook: {},
2525
twitter: {},
@@ -116,8 +116,7 @@ UserSchema.methods = {
116116
* @api public
117117
*/
118118
encryptPassword: function(password) {
119-
if (!password) return '';
120-
if (!this.salt) return '';
119+
if (!password || !this.salt) return '';
121120
salt = new Buffer(this.salt, 'base64');
122121
return crypto.pbkdf2Sync(password, salt, 10000, 64).toString('base64');
123122
}

app/views/users/auth.jade

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@ block content
1212
a(href="/auth/google")
1313
img(src="/img/icons/google.png")
1414
.span6
15+
if message && message.length
16+
.fade.in.alert.alert-error
17+
button.close(type="button", data-dismiss="alert") ×
18+
strong #{message}
1519
block auth

app/views/users/signin.jade

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
extends auth
22

33
block auth
4-
if message.length > 0
5-
.fade.in.alert.alert-block.alert-error
6-
p #{message}
7-
a.close(data-dismiss="alert", href="javascript:void(0)") x
8-
ul
9-
each error in errors
10-
li= error
11-
12-
134
form.signin.form-horizontal(action="/users/session", method="post")
145
.control-group
156
label.control-label(for='email') Email

config/routes.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ module.exports = function(app, passport, auth) {
44
app.get('/signin', users.signin);
55
app.get('/signup', users.signup);
66
app.get('/signout', users.signout);
7+
app.get('/users/me', users.me);
78

89
//Setting up the users api
910
app.post('/users', users.create);
1011

12+
//Setting the local strategy route
1113
app.post('/users/session', passport.authenticate('local', {
1214
failureRedirect: '/signin',
13-
failureFlash: 'Invalid email or password.'
15+
failureFlash: true
1416
}), users.session);
1517

16-
app.get('/users/me', users.me);
17-
1818
//Setting the facebook oauth routes
1919
app.get('/auth/facebook', passport.authenticate('facebook', {
2020
scope: ['email', 'user_about_me'],

0 commit comments

Comments
 (0)