agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-14 14:13:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

ignore affiliations if v1 is not configured

Browse Source
This commit is contained in:
Tim Alby
2018-06-25 13:45:46 +02:00
parent d3b2a2650f
commit e41391fb4a
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/coffee/Features/User/UserUpdater.coffee
+2 -1
View File
@@ -132,7 +132,8 @@ removeAffiliation = (userId, email, callback = (error) ->) ->
defaultErrorMessage: "Couldn't remove affiliation"
}, callback
makeAffiliationRequest = (requestOptions, callback = (error) ->) ->
makeAffiliationRequest = (requestOptions, callback = (error) ->) ->
return callback(null) unless settings?.apis?.v1?.url # service is not configured
requestOptions.extraSuccessStatusCodes ||= []
request {
method: requestOptions.method
services/web/test/unit/coffee/User/UserUpdaterTests.coffee
+3 -3
View File
@@ -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'