Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: should cleanup userauthLoginReferer on session #34

Merged
merged 1 commit into from
Apr 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,11 @@ function login(options) {
*/

function loginCallback(options) {
return function *loginCallbackHandler() {
return function* loginCallbackHandler() {
var referer = this.session.userauthLoginReferer || options.rootPath;
debug('loginReferer in session: %j', this.session.userauthLoginReferer);
debug('[loginCallbackHandler] loginReferer in session: %j', this.session.userauthLoginReferer);
// cleanup the userauthLoginReferer on session
this.session.userauthLoginReferer = undefined;
var user = this.session[options.userField];
if (user) {
// already login
Expand Down
3 changes: 2 additions & 1 deletion test/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ module.exports = function(match, ignore) {
app.use(function* (next) {
this.body = {
user: this.session.user || null,
message: this.method + ' ' + this.url
message: this.method + ' ' + this.url,
userauthLoginReferer: this.session.userauthLoginReferer,
};
});
return app.callback();
Expand Down
45 changes: 26 additions & 19 deletions test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -421,35 +421,42 @@ describe('test/index.test.js', function () {

it('should return 200 status and user info after user logined', function (done) {
request(app)
.get('/login/callback')
.set('mocklogin', 1)
.expect('Location', '/')
.get('/login?redirect=%2Fuser%2Ffoo')
.expect(302, function (err, res) {
should.not.exist(err);
var cookie = res.headers['set-cookie'].join(';');

request(app)
.get('/')
.get('/login/callback')
.set('mocklogin', 1)
.set({ Cookie: 'cookie2=1234; ' + cookie })
.expect({
user: {
nick: 'mock user',
userid: 1234
},
message: 'GET /'
})
.expect(200, function (err, res) {
// logout
.expect('Location', '/user/foo')
.expect(302, function (err, res) {
should.not.exist(err);
request(app)
.get('/logout')
.get('/user/foo')
.set({ Cookie: 'cookie2=1234; ' + cookie })
.expect('Location', '/')
.expect(302, function () {
.expect({
user: {
nick: 'mock user',
userid: 1234
},
message: 'GET /user/foo'
})
.expect(200, function (err, res) {
// logout
should.not.exist(err);
request(app)
.get('/logout')
.set({ referer: '/login' })
.expect('Location', '/login')
.expect(302, done);
.set({ Cookie: 'cookie2=1234; ' + cookie })
.expect('Location', '/')
.expect(302, function () {
request(app)
.get('/logout')
.set({ referer: '/login' })
.expect('Location', '/login')
.expect(302, done);
});
});
});
});
Expand Down