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

Fix "User.confirm" to always call afterRemote hook 

Make the "redirect" parameter optional. When the parameter is not
specified, the server responds with an empty response (204). This allows
API clients to call the method without the need to handle redirects
and HTML responses.

Even when the "redirect" parameter is included, the builtin afterRemote
hook still calls next(), so that user-provided afterRemote hooks
are executed too.
This commit is contained in:
Pradnya Baviskar 2015-02-23 15:25:25 +05:30 committed by Miroslav Bajtoš
parent c7bead4107
commit 8766d4a68d
3 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/models/user.js
View File

@ -561,7 +561,7 @@ module.exports = function(User) {
accepts: [
{arg: 'uid', type: 'string', required: true},
{arg: 'token', type: 'string', required: true},
{arg: 'redirect', type: 'string', required: true}
{arg: 'redirect', type: 'string'}
],
http: {verb: 'get', path: '/confirm'}
}
@ -580,21 +580,14 @@ module.exports = function(User) {
UserModel.on('attached', function() {
UserModel.afterRemote('confirm', function(ctx, inst, next) {
if (ctx.req) {
// replacement for deprecated req.param()
var params = ctx.req.params;
var body = ctx.req.body;
var query = ctx.req.query;
var redirectUrl =
params && params.redirect !== undefined ? params.redirect :
body && body.redirect !== undefined ? body.redirect :
query && query.redirect !== undefined ? query.redirect :
undefined;
ctx.res.redirect(redirectUrl);
} else {
next(new Error('transport unsupported'));
if (ctx.args.redirect !== undefined) {
if (!ctx.res) {
return next(new Error('The transport does not support HTTP redirects.'));
}
ctx.res.location(ctx.args.redirect);
ctx.res.status(302);
}
next();
});
});

2
package.json
View File

@ -47,7 +47,7 @@
"nodemailer-stub-transport": "~0.1.4",
"serve-favicon": "^2.1.6",
"stable": "^0.1.5",
"strong-remoting": "^2.11.0",
"strong-remoting": "^2.13.2",
"uid2": "0.0.3",
"underscore.string": "~2.3.3"
},

22
test/user.test.js
View File

@ -858,6 +858,28 @@ describe('User', function() {
}, done);
});
it('Should report 302 when redirect url is set', function(done) {
testConfirm(function(result, done) {
request(app)
.get('/users/confirm?uid=' + (result.uid) +
'&token=' + encodeURIComponent(result.token) +
'&redirect=http://foo.com/bar')
.expect(302)
.expect('Location', 'http://foo.com/bar')
.end(done);
}, done);
});
it('Should report 204 when redirect url is not set', function(done) {
testConfirm(function(result, done) {
request(app)
.get('/users/confirm?uid=' + (result.uid) +
'&token=' + encodeURIComponent(result.token))
.expect(204)
.end(done);
}, done);
});
it('Report error for invalid user id during verification', function(done) {
testConfirm(function(result, done) {
request(app)