github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1775 from overleaf/ta-fetch-user-before-confirm

Browse source 
Check User Exists Before Confirming Email

GitOrigin-RevId: 3622044f31f78e8499ccd084ca99297ca297ca97
This commit is contained in:
Timothée Alby 2019-05-16 09:24:25 +02:00 committed by sharelatex
parent 276310bd23
commit 0e38ca1fd7
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
services/web/app/coffee/Features/User/UserEmailsConfirmationHandler.coffee
View file

@ -5,6 +5,7 @@ settings = require 'settings-sharelatex'
Errors = require "../Errors/Errors" Errors = require "../Errors/Errors"
logger = require "logger-sharelatex" logger = require "logger-sharelatex"
UserUpdater = require "./UserUpdater" UserUpdater = require "./UserUpdater"
UserGetter = require "./UserGetter"
ONE_YEAR_IN_S = 365 * 24 * 60 * 60 ONE_YEAR_IN_S = 365 * 24 * 60 * 60
@ -34,4 +35,8 @@ module.exports = UserEmailsConfirmationHandler =
logger.log {data, user_id, email, token_start: token.slice(0,8)}, 'found data for email confirmation' logger.log {data, user_id, email, token_start: token.slice(0,8)}, 'found data for email confirmation'
if !user_id? or email != EmailHelper.parseEmail(email) if !user_id? or email != EmailHelper.parseEmail(email)
return callback(new Errors.NotFoundError('invalid data')) return callback(new Errors.NotFoundError('invalid data'))
UserGetter.getUser user_id, {}, (error, user) ->
return callback(error) if error?
unless user?._id
return callback(new Errors.NotFoundError('user not found'))
UserUpdater.confirmEmail user_id, email, callback UserUpdater.confirmEmail user_id, email, callback

14
services/web/test/unit/coffee/User/UserEmailsConfirmationHandlerTests.coffee
View file

@ -17,9 +17,12 @@ describe "UserEmailsConfirmationHandler", ->
"../Security/OneTimeTokenHandler": @OneTimeTokenHandler = {} "../Security/OneTimeTokenHandler": @OneTimeTokenHandler = {}
"../Errors/Errors": Errors "../Errors/Errors": Errors
"./UserUpdater": @UserUpdater = {} "./UserUpdater": @UserUpdater = {}
"./UserGetter": @UserGetter =
getUser: sinon.stub().yields(null, @mockUser)
"../Email/EmailHandler": @EmailHandler = {} "../Email/EmailHandler": @EmailHandler = {}
"../Helpers/EmailHelper": EmailHelper "../Helpers/EmailHelper": EmailHelper
@user_id = "mock-user-id" @mockUser = _id: "mock-user-id"
@user_id = @mockUser._id
@email = "mock@example.com" @email = "mock@example.com"
@callback = sinon.stub() @callback = sinon.stub()
@ -124,3 +127,12 @@ describe "UserEmailsConfirmationHandler", ->
it "should call the callback with a NotFoundError", -> it "should call the callback with a NotFoundError", ->
@callback.calledWith(sinon.match.instanceOf(Errors.NotFoundError)).should.equal true @callback.calledWith(sinon.match.instanceOf(Errors.NotFoundError)).should.equal true
describe 'with no user found', ->
beforeEach ->
@UserGetter.getUser.yields(null, null)
@UserEmailsConfirmationHandler.confirmEmailFromToken @token = 'mock-token', @callback
it "should call the callback with a NotFoundError", ->
@callback.calledWith(sinon.match.instanceOf(Errors.NotFoundError)).should.equal true