verdnatura-mirror
/
loopback
mirror of https://github.com/strongloop/loopback.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #394 from strongloop/feature/fix-issue-377 

Report error for User.confirm()
This commit is contained in:
Raymond Feng 2014-07-22 10:50:14 -07:00
parent 070f3d9583 335bae4b46
commit d567c4d009
2 changed files with 77 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/models/user.js
View File

@ -358,18 +358,25 @@ User.confirm = function (uid, token, redirect, fn) {
if(err) {
fn(err);
} else {
if(user.verificationToken === token) {
if(user && user.verificationToken === token) {
user.verificationToken = undefined;
user.emailVerified = true;
user.save(function (err) {
if(err) {
fn(err)
fn(err);
} else {
fn();
}
});
} else {
fn(new Error('invalid token'));
if (user) {
err = new Error('Invalid token: ' + token);
err.statusCode = 400;
} else {
err = new Error('User not found: ' + uid);
err.statusCode = 404;
}
fn(err);
}
}
});

74
test/user.test.js
View File

@ -454,8 +454,6 @@ describe('User', function(){
assert(result.email);
assert(result.email.response);
assert(result.token);
assert(~result.email.response.toString('utf-8').indexOf('To: bar@bat.com'));
done();
});
@ -473,11 +471,13 @@ describe('User', function(){
});
describe('User.confirm(options, fn)', function () {
it('Confirm a user verification', function(done) {
var options;
function testConfirm(testFunc, done) {
User.afterRemote('create', function (ctx, user, next) {
assert(user, 'afterRemote should include result');
var options = {
options = {
type: 'email',
to: user.email,
from: 'noreply@myapp.org',
@ -487,16 +487,10 @@ describe('User', function(){
};
user.verify(options, function (err, result) {
if(err) return done(err);
request(app)
.get('/users/confirm?uid=' + result.uid + '&token=' + encodeURIComponent(result.token) + '&redirect=' + encodeURIComponent(options.redirect))
.expect(302)
.expect('location', options.redirect)
.end(function(err, res){
if(err) return done(err);
done();
});
if (err) {
return done(err);
}
testFunc(result, done);
});
});
@ -506,8 +500,58 @@ describe('User', function(){
.expect(302)
.send({email: 'bar@bat.com', password: 'bar'})
.end(function (err, res) {
if(err) return done(err);
if (err) {
return done(err);
}
});
}
it('Confirm a user verification', function (done) {
testConfirm(function (result, done) {
request(app)
.get('/users/confirm?uid=' + (result.uid )
+ '&token=' + encodeURIComponent(result.token)
+ '&redirect=' + encodeURIComponent(options.redirect))
.expect(302)
.end(function (err, res) {
if (err) {
return done(err);
}
done();
});
}, done);
});
it('Report error for invalid user id during verification', function (done) {
testConfirm(function (result, done) {
request(app)
.get('/users/confirm?uid=' + (result.uid + '_invalid')
+ '&token=' + encodeURIComponent(result.token)
+ '&redirect=' + encodeURIComponent(options.redirect))
.expect(404)
.end(function (err, res) {
if (err) {
return done(err);
}
assert(res.body.error);
done();
});
}, done);
});
it('Report error for invalid token during verification', function (done) {
testConfirm(function (result, done) {
request(app)
.get('/users/confirm?uid=' + result.uid
+ '&token=' + encodeURIComponent(result.token) + '_invalid'
+ '&redirect=' + encodeURIComponent(options.redirect))
.expect(400)
.end(function (err, res) {
if (err) return done(err);
assert(res.body.error);
done();
});
}, done);
});
});
});