othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(dicomweb) Fix basic authentication for DICOMWeb requests

Browse Source
This commit is contained in:
Erik Ziegler 2018-07-19 16:08:06 +02:00
parent 33755f7b8b
commit 885dd9da2d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Packages/ohif-dicomweb-client/package.js
View File

@ -7,6 +7,7 @@ Package.describe({
Npm.depends({ Npm.depends({
'url-parse': '1.4.1', 'url-parse': '1.4.1',
'isomorphic-fetch': '2.2.1', 'isomorphic-fetch': '2.2.1',
'isomorphic-base64': '1.0.2'
}); });
Package.onUse(function(api) { Package.onUse(function(api) {

7
Packages/ohif-dicomweb-client/src/makeRequest.js
View File

@ -1,6 +1,7 @@
import { Meteor } from "meteor/meteor"; import { Meteor } from "meteor/meteor";
import URL from 'url-parse'; import URL from 'url-parse';
import 'isomorphic-fetch'; import 'isomorphic-fetch';
import { btoa } from 'isomorphic-base64';
import getAccessToken from './getAccessToken.js'; import getAccessToken from './getAccessToken.js';
async function makeRequest(url, options) { async function makeRequest(url, options) {
@ -16,9 +17,9 @@ async function makeRequest(url, options) {
requestOpt.headers = { requestOpt.headers = {
Authorization: `Bearer ${accessToken}` Authorization: `Bearer ${accessToken}`
}; };
} else if (requestOpt.auth) { } else if (options.auth) {
requestOpt.headers = { requestOpt.headers = {
Authorization: requestOpt.auth Authorization: `Basic ${btoa(options.auth)}`
}; };
} }
@ -38,8 +39,6 @@ async function makeRequest(url, options) {
url = Meteor.absoluteUrl(parsed.href); url = Meteor.absoluteUrl(parsed.href);
} }
console.warn(url);
fetch(url, requestOpt).then((response) => { fetch(url, requestOpt).then((response) => {
if (response.status >= 400) { if (response.status >= 400) {
reject(new Error(response.status)); reject(new Error(response.status));