github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-02-23 14:23:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

clear sessions on password reset

Browse source
This commit is contained in:
Shane Kilkelly 2016-07-05 14:19:59 +01:00
parent bec3d2ad42
commit 6e282ab308
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
services/web/app/coffee/Features/PasswordReset/PasswordResetController.coffee
View file

@ -2,6 +2,7 @@ PasswordResetHandler = require("./PasswordResetHandler")
RateLimiter = require("../../infrastructure/RateLimiter") RateLimiter = require("../../infrastructure/RateLimiter")
AuthenticationController = require("../Authentication/AuthenticationController") AuthenticationController = require("../Authentication/AuthenticationController")
UserGetter = require("../User/UserGetter") UserGetter = require("../User/UserGetter")
UserSessionsManager = require("../User/UserSessionsManager")
logger = require "logger-sharelatex" logger = require "logger-sharelatex"
module.exports = module.exports =
@ -47,11 +48,13 @@ module.exports =
PasswordResetHandler.setNewUserPassword passwordResetToken?.trim(), password?.trim(), (err, found, user_id) -> PasswordResetHandler.setNewUserPassword passwordResetToken?.trim(), password?.trim(), (err, found, user_id) ->
return next(err) if err? return next(err) if err?
if found if found
if req.body.login_after UserSessionsManager.revokeAllUserSessions {_id: user_id}, [], (err) ->
UserGetter.getUser user_id, {email: 1}, (err, user) -> return next(err) if err?
return next(err) if err? if req.body.login_after
AuthenticationController.doLogin {email:user.email, password: password}, req, res, next UserGetter.getUser user_id, {email: 1}, (err, user) ->
else return next(err) if err?
res.sendStatus 200 AuthenticationController.doLogin {email:user.email, password: password}, req, res, next
else
res.sendStatus 200
else else
res.sendStatus 404 res.sendStatus 404

12
services/web/test/UnitTests/coffee/PasswordReset/PasswordResetControllerTests.coffee
View file

@ -17,6 +17,8 @@ describe "PasswordResetController", ->
setNewUserPassword:sinon.stub() setNewUserPassword:sinon.stub()
@RateLimiter = @RateLimiter =
addCount: sinon.stub() addCount: sinon.stub()
@UserSessionsManager =
revokeAllUserSessions: sinon.stub().callsArgWith(2, null)
@PasswordResetController = SandboxedModule.require modulePath, requires: @PasswordResetController = SandboxedModule.require modulePath, requires:
"settings-sharelatex":@settings "settings-sharelatex":@settings
"./PasswordResetHandler":@PasswordResetHandler "./PasswordResetHandler":@PasswordResetHandler
@ -24,6 +26,7 @@ describe "PasswordResetController", ->
"../../infrastructure/RateLimiter":@RateLimiter "../../infrastructure/RateLimiter":@RateLimiter
"../Authentication/AuthenticationController": @AuthenticationController = {} "../Authentication/AuthenticationController": @AuthenticationController = {}
"../User/UserGetter": @UserGetter = {} "../User/UserGetter": @UserGetter = {}
"../User/UserSessionsManager": @UserSessionsManager
@email = "bob@bob.com " @email = "bob@bob.com "
@token = "my security token that was emailed to me" @token = "my security token that was emailed to me"
@ -134,7 +137,14 @@ describe "PasswordResetController", ->
@req.session.should.not.have.property 'resetToken' @req.session.should.not.have.property 'resetToken'
done() done()
@PasswordResetController.setNewUserPassword @req, @res @PasswordResetController.setNewUserPassword @req, @res
it 'should clear sessions', (done) ->
@PasswordResetHandler.setNewUserPassword.callsArgWith(2, null, true)
@res.sendStatus = (code)=>
@UserSessionsManager.revokeAllUserSessions.callCount.should.equal 1
done()
@PasswordResetController.setNewUserPassword @req, @res
it "should login user if login_after is set", (done) -> it "should login user if login_after is set", (done) ->
@UserGetter.getUser = sinon.stub().callsArgWith(2, null, { email: "joe@example.com" }) @UserGetter.getUser = sinon.stub().callsArgWith(2, null, { email: "joe@example.com" })
@PasswordResetHandler.setNewUserPassword.callsArgWith(2, null, true, @user_id = "user-id-123") @PasswordResetHandler.setNewUserPassword.callsArgWith(2, null, true, @user_id = "user-id-123")