diff --git a/app/assets/javascripts/controllers/detailedDoc.js b/app/assets/javascripts/controllers/detailedDoc.js index 8d2d07d24..4c5a42585 100644 --- a/app/assets/javascripts/controllers/detailedDoc.js +++ b/app/assets/javascripts/controllers/detailedDoc.js @@ -14,10 +14,16 @@ angular.module('QuepidApp') $scope.linkToDoc = function() { let url = $scope.doc._url(); + let credentials = settingsSvc.applicableSettings().basicAuthCredential; + + if (credentials){ + url = url.replace('://', `://${credentials}@`); + } + if (settingsSvc.applicableSettings().proxyRequests === true) { url = caseTryNavSvc.getQuepidProxyUrl() + url; } - + return url; }; diff --git a/app/controllers/proxy_controller.rb b/app/controllers/proxy_controller.rb index ad208a0d7..cbf5eb1b5 100644 --- a/app/controllers/proxy_controller.rb +++ b/app/controllers/proxy_controller.rb @@ -43,6 +43,11 @@ def fetch end faraday.headers['Content-Type'] = 'application/json' + has_credentials = !uri.userinfo.nil? + if has_credentials + username, password = uri.userinfo.split(':') + faraday.headers['Authorization'] = "Basic #{Base64.strict_encode64("#{username}:#{password}")}" + end faraday.adapter Faraday.default_adapter end