From ce587a00ba64d3680aee0a505d7d828e72d67540 Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 17 Nov 2014 14:35:07 +0000 Subject: [PATCH] Send web requests with HTTP auth --- services/real-time/app/coffee/WebApiManager.coffee | 4 ++++ services/real-time/config/settings.defaults.coffee | 2 ++ .../real-time/test/unit/coffee/WebApiManagerTests.coffee | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/services/real-time/app/coffee/WebApiManager.coffee b/services/real-time/app/coffee/WebApiManager.coffee index f18f25c492..63bb6604e0 100644 --- a/services/real-time/app/coffee/WebApiManager.coffee +++ b/services/real-time/app/coffee/WebApiManager.coffee @@ -9,6 +9,10 @@ module.exports = WebApiManager = request.post { url: url qs: {user_id} + auth: + user: settings.apis.web.user + pass: settings.apis.web.pass + sendImmediately: true json: true jar: false }, (error, response, data) -> diff --git a/services/real-time/config/settings.defaults.coffee b/services/real-time/config/settings.defaults.coffee index ccaa02e523..ffc64cabf7 100644 --- a/services/real-time/config/settings.defaults.coffee +++ b/services/real-time/config/settings.defaults.coffee @@ -13,6 +13,8 @@ module.exports = apis: web: url: "http://localhost:3000" + user: "sharelatex" + pass: "password" documentupdater: url: "http://localhost:3003" trackchanges: diff --git a/services/real-time/test/unit/coffee/WebApiManagerTests.coffee b/services/real-time/test/unit/coffee/WebApiManagerTests.coffee index 4cc949dc9c..8ca08547df 100644 --- a/services/real-time/test/unit/coffee/WebApiManagerTests.coffee +++ b/services/real-time/test/unit/coffee/WebApiManagerTests.coffee @@ -15,6 +15,8 @@ describe 'WebApiManager', -> apis: web: url: "http://web.example.com" + user: "username" + pass: "password" "logger-sharelatex": @logger = { log: sinon.stub(), error: sinon.stub() } describe "joinProject", -> @@ -33,6 +35,10 @@ describe 'WebApiManager', -> url: "#{@settings.apis.web.url}/project/#{@project_id}/join" qs: user_id: @user_id + auth: + user: @settings.apis.web.user + pass: @settings.apis.web.pass + sendImmediately: true json: true jar: false })