From b925791ce81abe64d5d83edae86bc5c9ae6e3905 Mon Sep 17 00:00:00 2001 From: Nicholas Mata Date: Wed, 5 Jul 2017 14:08:57 -0700 Subject: [PATCH 1/2] Fixed OAuth 2.0 Refresh Token (#346) --- app/network/o-auth-2/refresh-token.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/network/o-auth-2/refresh-token.js b/app/network/o-auth-2/refresh-token.js index 4d8e811003..d6b5661fe5 100644 --- a/app/network/o-auth-2/refresh-token.js +++ b/app/network/o-auth-2/refresh-token.js @@ -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, From 1cbf1ac0ad6e217d5af705dfb9f6a3656338f244 Mon Sep 17 00:00:00 2001 From: synthtech Date: Sat, 8 Jul 2017 18:22:49 -0400 Subject: [PATCH 2/2] Add JSON API mimetype to content types (#349) --- app/datasets/content-types.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/datasets/content-types.js b/app/datasets/content-types.js index 15f98cfbcf..4805bd76cf 100644 --- a/app/datasets/content-types.js +++ b/app/datasets/content-types.js @@ -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',