fix: remove requestOptions when key is not needed

This commit is contained in:
dannyrb committed 2019-09-09 15:49:12 -04:00
1 parent bad987a06b
commit 32bc47d315
12 files changed
+21 -48

No files matched your search

@@ -6,17 +6,21 @@ import user from '../user';
/**
* Returns the Authorization header as part of an Object.
*
* @returns {Object}
* @export
* @param {Object} [server={}]
* @param {Object} [server.requestOptions]
* @param {string} [server.requestOptions.auth]
* @returns {Object} { Authorization }
*/
export default function getAuthorizationHeader(server) {
export default function getAuthorizationHeader({ requestOptions } = {}) {
const headers = {};
// Check for OHIF.user since this can also be run on the server
const accessToken = user && user.getAccessToken && user.getAccessToken();
if (server && server.requestOptions && server.requestOptions.auth) {
if (requestOptions && requestOptions.auth) {
// HTTP Basic Auth (user:password)
headers.Authorization = `Basic ${btoa(server.requestOptions.auth)}`;
headers.Authorization = `Basic ${btoa(requestOptions.auth)}`;
} else if (accessToken) {
headers.Authorization = `Bearer ${accessToken}`;
}