self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

fetchblob

Browse Source
This commit is contained in:
Laurent Cozic
2017-07-06 22:30:45 +01:00
parent 40ed3216a3
commit 8ee0c38f86
12 changed files with 130 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ReactNativeClient/lib/onedrive-api.js
View File

@ -84,6 +84,7 @@ class OneDriveApi {
try {
const json = await r.json();
this.setAuth(json);
this.dispatch('authRefreshed', this.auth());
} catch (error) {
const text = await r.text();
error.message += ': ' + text;
@ -110,6 +111,7 @@ class OneDriveApi {
if (!options) options = {};
if (!options.headers) options.headers = {};
if (!options.target) options.target = 'string';
if (method != 'GET') {
options.method = method;
@ -137,7 +139,13 @@ class OneDriveApi {
for (let i = 0; i < 5; i++) {
options.headers['Authorization'] = 'bearer ' + this.token();
let response = await shim.fetch(url, options);
let response = null;
if (options.target == 'string') {
response = await shim.fetch(url, options);
} else { // file
response = await shim.fetchBlob(url, options);
}
if (!response.ok) {
let errorResponse = await response.json();
let error = this.oneDriveErrorResponseToError(errorResponse);
@ -194,7 +202,7 @@ class OneDriveApi {
let body = new shim.FormData();
body.append('client_id', this.clientId());
body.append('client_secret', this.clientSecret());
// body.append('client_secret', this.clientSecret()); // TODO: NEEDED FOR NODE
body.append('refresh_token', this.auth_.refresh_token);
body.append('redirect_uri', 'http://localhost:1917');
body.append('grant_type', 'refresh_token');