From 885dd9da2d0295290a61b9b591a4238387e88725 Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.sweed@gmail.com>
Date: Thu, 19 Jul 2018 16:08:06 +0200
Subject: [PATCH] fix(dicomweb) Fix basic authentication for DICOMWeb requests

---
 Packages/ohif-dicomweb-client/package.js         | 1 +
 Packages/ohif-dicomweb-client/src/makeRequest.js | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Packages/ohif-dicomweb-client/package.js b/Packages/ohif-dicomweb-client/package.js
index c4c806088..60999009f 100644
--- a/Packages/ohif-dicomweb-client/package.js
+++ b/Packages/ohif-dicomweb-client/package.js
@@ -7,6 +7,7 @@ Package.describe({
 Npm.depends({
     'url-parse': '1.4.1',
     'isomorphic-fetch': '2.2.1',
+    'isomorphic-base64': '1.0.2'
 });
 
 Package.onUse(function(api) {
diff --git a/Packages/ohif-dicomweb-client/src/makeRequest.js b/Packages/ohif-dicomweb-client/src/makeRequest.js
index 9d6f5ec1e..708c23c5c 100644
--- a/Packages/ohif-dicomweb-client/src/makeRequest.js
+++ b/Packages/ohif-dicomweb-client/src/makeRequest.js
@@ -1,6 +1,7 @@
 import { Meteor } from "meteor/meteor";
 import URL from 'url-parse';
 import 'isomorphic-fetch';
+import { btoa } from 'isomorphic-base64';
 import getAccessToken from './getAccessToken.js';
 
 async function makeRequest(url, options) {
@@ -16,9 +17,9 @@ async function makeRequest(url, options) {
         requestOpt.headers = {
             Authorization: `Bearer ${accessToken}`
         };
-    } else if (requestOpt.auth) {
+    } else if (options.auth) {
         requestOpt.headers = {
-            Authorization: requestOpt.auth
+            Authorization: `Basic ${btoa(options.auth)}`
         };
     }
 
@@ -38,8 +39,6 @@ async function makeRequest(url, options) {
             url = Meteor.absoluteUrl(parsed.href);
         }
 
-        console.warn(url);
-
         fetch(url, requestOpt).then((response) => {
             if (response.status >= 400) {
                 reject(new Error(response.status));