Merge branch 'develop' of github.com:getinsomnia/insomnia into develop

This commit is contained in:
Gregory Schier committed 2017-07-10 15:34:29 -07:00
commit fcd901109d
2 files changed
+5 -2

No files matched your search

+1
View File
@@ -63,6 +63,7 @@ export default [
'application/shf+xml',
'application/timestamped-data',
'application/vnd.android.package-archive',
'application/vnd.api+json',
'application/vnd.apple.installer+xml',
'application/vnd.apple.mpegurl',
'application/vnd.apple.pkpass',
+4 -2
View File
@@ -1,7 +1,7 @@
import * as querystring from '../../common/querystring';
import * as c from './constants';
import {responseToObject} from './misc';
import {getBasicAuthHeader} from '../../common/misc';
import {getBasicAuthHeader, setDefaultProtocol} from '../../common/misc';
export default async function (accessTokenUrl,
credentialsInBody,
@@ -36,7 +36,9 @@ export default async function (accessTokenUrl,
headers: headers
};
const response = await window.fetch(accessTokenUrl, config);
const url = setDefaultProtocol(accessTokenUrl);
const response = await window.fetch(url, config);
const body = await response.text();
const results = responseToObject(body, [
c.P_ACCESS_TOKEN,