From 55597b9279fe2574d811f339dec4c62ca1460cfc Mon Sep 17 00:00:00 2001
From: hugh-obrien <hugh.obrien@overleaf.com>
Date: Thu, 2 Aug 2018 16:19:23 +0100
Subject: [PATCH] inform v1 when confirming affiliation emails

---
 .../app/coffee/Features/Institutions/InstitutionsAPI.coffee   | 4 ++--
 services/web/app/coffee/Features/User/UserUpdater.coffee      | 2 +-
 .../test/unit/coffee/Institutions/InstitutionsAPITests.coffee | 4 +++-
 services/web/test/unit/coffee/User/UserUpdaterTests.coffee    | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/services/web/app/coffee/Features/Institutions/InstitutionsAPI.coffee b/services/web/app/coffee/Features/Institutions/InstitutionsAPI.coffee
index 8ce39d68e3..c285ba89ff 100644
--- a/services/web/app/coffee/Features/Institutions/InstitutionsAPI.coffee
+++ b/services/web/app/coffee/Features/Institutions/InstitutionsAPI.coffee
@@ -25,11 +25,11 @@ module.exports = InstitutionsAPI =
 			callback = affiliationOptions
 			affiliationOptions = {}
 
-		{ university, department, role } = affiliationOptions
+		{ university, department, role, confirmed } = affiliationOptions
 		makeAffiliationRequest {
 			method: 'POST'
 			path: "/api/v2/users/#{userId.toString()}/affiliations"
-			body: { email, university, department, role }
+			body: { email, university, department, role, confirmed }
 			defaultErrorMessage: "Couldn't create affiliation"
 		}, callback
 
diff --git a/services/web/app/coffee/Features/User/UserUpdater.coffee b/services/web/app/coffee/Features/User/UserUpdater.coffee
index 9ee81c1ca3..119bf07285 100644
--- a/services/web/app/coffee/Features/User/UserUpdater.coffee
+++ b/services/web/app/coffee/Features/User/UserUpdater.coffee
@@ -166,7 +166,7 @@ module.exports = UserUpdater =
 		email = EmailHelper.parseEmail(email)
 		return callback(new Error('invalid email')) if !email?
 		logger.log {userId, email}, 'confirming user email'
-		addAffiliation userId, email, (error) =>
+		addAffiliation userId, email, { confirmed: true }, (error) =>
 			if error?
 				logger.err error: error, 'problem adding affiliation while confirming email'
 				return callback(error)
diff --git a/services/web/test/unit/coffee/Institutions/InstitutionsAPITests.coffee b/services/web/test/unit/coffee/Institutions/InstitutionsAPITests.coffee
index 7500e46e40..79859aa93d 100644
--- a/services/web/test/unit/coffee/Institutions/InstitutionsAPITests.coffee
+++ b/services/web/test/unit/coffee/Institutions/InstitutionsAPITests.coffee
@@ -74,6 +74,7 @@ describe "InstitutionsAPI", ->
 				university: { id: 1 }
 				role: 'Prof'
 				department: 'Math'
+				confirmed: true
 			@InstitutionsAPI.addAffiliation @stubbedUser._id, @newEmail, affiliationOptions, (err)=>
 				should.not.exist(err)
 				@request.calledOnce.should.equal true
@@ -83,11 +84,12 @@ describe "InstitutionsAPI", ->
 				requestOptions.method.should.equal 'POST'
 
 				body = requestOptions.body
-				Object.keys(body).length.should.equal 4
+				Object.keys(body).length.should.equal 5
 				body.email.should.equal @newEmail
 				body.university.should.equal affiliationOptions.university
 				body.department.should.equal affiliationOptions.department
 				body.role.should.equal affiliationOptions.role
+				body.confirmed.should.equal affiliationOptions.confirmed
 				done()
 
 		it 'handle error', (done)->
diff --git a/services/web/test/unit/coffee/User/UserUpdaterTests.coffee b/services/web/test/unit/coffee/User/UserUpdaterTests.coffee
index 17f691edba..5ce5e1fc6a 100644
--- a/services/web/test/unit/coffee/User/UserUpdaterTests.coffee
+++ b/services/web/test/unit/coffee/User/UserUpdaterTests.coffee
@@ -241,7 +241,7 @@ describe "UserUpdater", ->
 			@UserUpdater.confirmEmail @stubbedUser._id, @newEmail, (err)=>
 				should.not.exist(err)
 				@addAffiliation.calledOnce.should.equal true
-				sinon.assert.calledWith(@addAffiliation, @stubbedUser._id, @newEmail)
+				sinon.assert.calledWith(@addAffiliation, @stubbedUser._id, @newEmail, { confirmed: true } )
 				done()
 
 		it 'handle error', (done)->
@@ -264,7 +264,7 @@ describe "UserUpdater", ->
 				done()
 
 		it 'handle affiliation error', (done)->
-			@addAffiliation.callsArgWith(2, new Error('nope'))
+			@addAffiliation.callsArgWith(3, new Error('nope'))
 			@UserUpdater.confirmEmail @stubbedUser._id, @newEmail, (err)=>
 				should.exist(err)
 				@UserUpdater.updateUser.called.should.equal false