github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

add affiliation before confirming email

Browse source
This commit is contained in:
Tim Alby 2018-07-04 15:47:49 +02:00
parent 9d4df4271a
commit cfd5c65be4
2 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
services/web/app/coffee/Features/User/UserUpdater.coffee
View file

@ -59,7 +59,7 @@ module.exports = UserUpdater =
addAffiliation userId, newEmail, affiliationOptions, (error) =>
if error?
logger.err error: error, 'problem adding affiliation'
logger.err error: error, 'problem adding affiliation while adding email'
return callback(error)
update = $push: emails: email: newEmail, createdAt: new Date()
@ -110,18 +110,23 @@ module.exports = UserUpdater =
email = EmailHelper.parseEmail(email)
return callback(new Error('invalid email')) if !email?
logger.log {userId, email}, 'confirming user email'
query =
_id: userId
'emails.email': email
update =
$set:
'emails.$.confirmedAt': new Date()
@updateUser query, update, (error, res) ->
return callback(error) if error?
logger.log {res, userId, email}, "tried to confirm email"
if res.n == 0
return callback(new Errors.NotFoundError('user id and email do no match'))
callback()
addAffiliation userId, email, (error) =>
if error?
logger.err error: error, 'problem adding affiliation while confirming email'
return callback(error)
query =
_id: userId
'emails.email': email
update =
$set:
'emails.$.confirmedAt': new Date()
@updateUser query, update, (error, res) ->
return callback(error) if error?
logger.log {res, userId, email}, "tried to confirm email"
if res.n == 0
return callback(new Errors.NotFoundError('user id and email do no match'))
callback()
[
'updateUser'

19
services/web/test/unit/coffee/User/UserUpdaterTests.coffee
View file

@ -19,7 +19,7 @@ describe "UserUpdater", ->
getUserByAnyEmail: sinon.stub()
ensureUniqueEmailAddress: sinon.stub()
@logger = err: sinon.stub(), log: ->
@addAffiliation = sinon.stub().callsArgWith(3, null)
@addAffiliation = sinon.stub().yields()
@removeAffiliation = sinon.stub().callsArgWith(2, null)
@UserUpdater = SandboxedModule.require modulePath, requires:
"logger-sharelatex": @logger
@ -201,9 +201,10 @@ describe "UserUpdater", ->
done()
describe 'confirmEmail', ->
it 'should update the email record', (done)->
beforeEach ->
@UserUpdater.updateUser = sinon.stub().callsArgWith(2, null, n: 1)
it 'should update the email record', (done)->
@UserUpdater.confirmEmail @stubbedUser._id, @newEmail, (err)=>
should.not.exist(err)
@UserUpdater.updateUser.calledWith(
@ -212,6 +213,13 @@ describe "UserUpdater", ->
).should.equal true
done()
it 'add affiliation', (done)->
@UserUpdater.confirmEmail @stubbedUser._id, @newEmail, (err)=>
should.not.exist(err)
@addAffiliation.calledOnce.should.equal true
sinon.assert.calledWith(@addAffiliation, @stubbedUser._id, @newEmail)
done()
it 'handle error', (done)->
@UserUpdater.updateUser = sinon.stub().callsArgWith(2, new Error('nope'))
@ -230,3 +238,10 @@ describe "UserUpdater", ->
@UserUpdater.confirmEmail @stubbedUser._id, '@', (err)=>
should.exist(err)
done()
it 'handle affiliation error', (done)->
@addAffiliation.callsArgWith(2, new Error('nope'))
@UserUpdater.confirmEmail @stubbedUser._id, @newEmail, (err)=>
should.exist(err)
@UserUpdater.updateUser.called.should.equal false
done()