Skip to content
Snippets Groups Projects
Verified Commit daedb563 authored by Tim Alby's avatar Tim Alby Committed by David Mehren
Browse files

ignore affiliations if v1 is not configured

parent 94d9c01f
No related branches found
No related tags found
No related merge requests found
......@@ -133,6 +133,7 @@ removeAffiliation = (userId, email, callback = (error) ->) ->
}, callback
makeAffiliationRequest = (requestOptions, callback = (error) ->) ->
return callback(null) unless settings?.apis?.v1?.url # service is not configured
requestOptions.extraSuccessStatusCodes ||= []
request {
method: requestOptions.method
......
......@@ -19,7 +19,7 @@ describe "UserUpdater", ->
getUserByAnyEmail: sinon.stub()
ensureUniqueEmailAddress: sinon.stub()
@logger = err: sinon.stub(), log: ->
settings = apis: { v1: { url: '', user: '', pass: '' } }
settings = apis: { v1: { url: 'v1.url', user: '', pass: '' } }
@request = sinon.stub()
@UserUpdater = SandboxedModule.require modulePath, requires:
"logger-sharelatex": @logger
......@@ -90,7 +90,7 @@ describe "UserUpdater", ->
should.not.exist(err)
@request.calledOnce.should.equal true
requestOptions = @request.lastCall.args[0]
expectedUrl = "/api/v2/users/#{@stubbedUser._id}/affiliations"
expectedUrl = "v1.url/api/v2/users/#{@stubbedUser._id}/affiliations"
requestOptions.url.should.equal expectedUrl
requestOptions.method.should.equal 'POST'
......@@ -138,7 +138,7 @@ describe "UserUpdater", ->
should.not.exist(err)
@request.calledOnce.should.equal true
requestOptions = @request.lastCall.args[0]
expectedUrl = "/api/v2/users/#{@stubbedUser._id}/affiliations/"
expectedUrl = "v1.url/api/v2/users/#{@stubbedUser._id}/affiliations/"
expectedUrl += encodeURIComponent(@newEmail)
requestOptions.url.should.equal expectedUrl
requestOptions.method.should.equal 'DELETE'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment