mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-27 10:32:58 +02:00
cb3e1cf1e9
commit2fb6cee901
Merge:4e303be85f
db509955f6
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 16:24:07 2020 +0100 Merge branch 'dev' into rn_63 commit4e303be85f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 16:14:39 2020 +0100 Clean up commite3a37ec2d6
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:57:55 2020 +0100 Use different script for pre-commit and manual start commitbd236648fc
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:56:45 2020 +0100 Removed RN eslint config commite7feda41c9
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:27:08 2020 +0100 Revert "Disable git hook for now" This reverts commit89263ac742
. commitcfd63fe46f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 13:02:32 2020 +0100 Ask permission to use geo-location commit66059939a3
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 12:26:20 2020 +0100 Fixed WebView race condition commit1e0d2b7b86
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 11:56:21 2020 +0100 Fixed webview issues commitf537d22d7f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 11:08:29 2020 +0100 Improve resource file watching commiteec32cf70a
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 18:40:13 2020 +0100 Removed cache package dependency and implemented one more suitable for React Native commitefa346fea4
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 14:57:21 2020 +0100 iOS: Added fonts to Info.plist although it was working without it commit572b647bc0
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 14:56:49 2020 +0100 Specify content-type header for OneDrive to prevent network error commitbcedf6c7f0
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:45:01 2020 +0100 iOS: Disable long press menu since it is already built-in commit7359dd61d1
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:37:40 2020 +0100 Removed unused react-native-device-info commit2d63ab36d3
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:35:54 2020 +0100 iOS: Fixed taking a picture commit8e2875a91c
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:11:13 2020 +0100 iOS: Restored camera roll functionality commit75f5edf2ad
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 11:40:13 2020 +0100 iOS: Fixed build settings commitb220c98419
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 11:40:03 2020 +0100 iOS: Got images to work with WebKit commitc34b43e841
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 10:24:52 2020 +0100 iOS: Restore more settings commit32997611e6
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 10:15:14 2020 +0100 iOS: Added back icons and other properties commitb5811d7f7c
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 23:53:14 2020 +0100 Got iOS build to work commitdc6d7c00e0
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 18:40:06 2020 +0100 Imported old settings in gradle build commitdff59f5603
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 18:20:00 2020 +0100 Restored sharing commit0bdb449e72
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 17:25:40 2020 +0100 Updated NoteBodyViewer commit0c0d228815
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 16:54:42 2020 +0100 Fixed networking commit6ff45ce485
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 13:11:00 2020 +0100 Fixed document picker commitcc889182b6
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 12:56:27 2020 +0100 Added back support for alarms commit040261abfa
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 22:04:49 2020 +0100 Fixed Clipboard and remove image-picker package commit1077ad8f16
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 21:54:52 2020 +0100 Fixed Select Alarm dialog and PoorManIntervals class commit8296676fd5
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 21:32:52 2020 +0100 Fixed icons and warnings commit3b0e3f6f43
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 17:02:59 2020 +0100 Got app to build again commit89263ac742
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:41:17 2020 +0100 Disable git hook for now commitd6da162f67
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:39:12 2020 +0100 Restored back all RN packages commit7f8ce3732c
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:13:12 2020 +0100 Restored base packages commitea59726eb3
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:05:17 2020 +0100 Started over from scratch
394 lines
13 KiB
JavaScript
394 lines
13 KiB
JavaScript
const shim = require('lib/shim').default;
|
|
const { stringify } = require('query-string');
|
|
const { time } = require('lib/time-utils.js');
|
|
const Logger = require('lib/Logger').default;
|
|
const { _ } = require('lib/locale');
|
|
|
|
class OneDriveApi {
|
|
// `isPublic` is to tell OneDrive whether the application is a "public" one (Mobile and desktop
|
|
// apps are considered "public"), in which case the secret should not be sent to the API.
|
|
// In practice the React Native app is public, and the Node one is not because we
|
|
// use a local server for the OAuth dance.
|
|
constructor(clientId, clientSecret, isPublic) {
|
|
this.clientId_ = clientId;
|
|
this.clientSecret_ = clientSecret;
|
|
this.auth_ = null;
|
|
this.accountProperties_ = null;
|
|
this.isPublic_ = isPublic;
|
|
this.listeners_ = {
|
|
authRefreshed: [],
|
|
};
|
|
this.logger_ = new Logger();
|
|
}
|
|
|
|
setLogger(l) {
|
|
this.logger_ = l;
|
|
}
|
|
|
|
logger() {
|
|
return this.logger_;
|
|
}
|
|
|
|
isPublic() {
|
|
return this.isPublic_;
|
|
}
|
|
|
|
dispatch(eventName, param) {
|
|
const ls = this.listeners_[eventName];
|
|
for (let i = 0; i < ls.length; i++) {
|
|
ls[i](param);
|
|
}
|
|
}
|
|
|
|
on(eventName, callback) {
|
|
this.listeners_[eventName].push(callback);
|
|
}
|
|
|
|
tokenBaseUrl() {
|
|
return 'https://login.microsoftonline.com/common/oauth2/v2.0/token';
|
|
}
|
|
|
|
nativeClientRedirectUrl() {
|
|
return 'https://login.microsoftonline.com/common/oauth2/nativeclient';
|
|
}
|
|
|
|
auth() {
|
|
return this.auth_;
|
|
}
|
|
|
|
setAuth(auth) {
|
|
this.auth_ = auth;
|
|
this.dispatch('authRefreshed', this.auth());
|
|
}
|
|
|
|
token() {
|
|
return this.auth_ ? this.auth_.access_token : null;
|
|
}
|
|
|
|
clientId() {
|
|
return this.clientId_;
|
|
}
|
|
|
|
clientSecret() {
|
|
return this.clientSecret_;
|
|
}
|
|
|
|
async appDirectory() {
|
|
const driveId = this.accountProperties_.driveId;
|
|
const r = await this.execJson('GET', `/me/drives/${driveId}/special/approot`);
|
|
return `${r.parentReference.path}/${r.name}`;
|
|
}
|
|
|
|
authCodeUrl(redirectUri) {
|
|
const query = {
|
|
client_id: this.clientId_,
|
|
scope: 'files.readwrite offline_access sites.readwrite.all',
|
|
response_type: 'code',
|
|
redirect_uri: redirectUri,
|
|
};
|
|
return `https://login.microsoftonline.com/common/oauth2/v2.0/authorize?${stringify(query)}`;
|
|
}
|
|
|
|
async execTokenRequest(code, redirectUri) {
|
|
const body = new shim.FormData();
|
|
body.append('client_id', this.clientId());
|
|
if (!this.isPublic()) body.append('client_secret', this.clientSecret());
|
|
body.append('code', code);
|
|
body.append('redirect_uri', redirectUri);
|
|
body.append('grant_type', 'authorization_code');
|
|
|
|
const r = await shim.fetch(this.tokenBaseUrl(), {
|
|
method: 'POST',
|
|
body: body,
|
|
headers: {
|
|
['Content-Type']: 'application/x-www-form-urlencoded',
|
|
},
|
|
});
|
|
|
|
if (!r.ok) {
|
|
const text = await r.text();
|
|
throw new Error(`Could not retrieve auth code: ${r.status}: ${r.statusText}: ${text}`);
|
|
}
|
|
|
|
try {
|
|
const json = await r.json();
|
|
this.setAuth(json);
|
|
} catch (error) {
|
|
this.setAuth(null);
|
|
const text = await r.text();
|
|
error.message += `: ${text}`;
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
oneDriveErrorResponseToError(errorResponse) {
|
|
if (!errorResponse) return new Error('Undefined error');
|
|
|
|
if (errorResponse.error) {
|
|
const e = errorResponse.error;
|
|
const output = new Error(e.message);
|
|
if (e.code) output.code = e.code;
|
|
if (e.innerError) output.innerError = e.innerError;
|
|
return output;
|
|
} else {
|
|
return new Error(JSON.stringify(errorResponse));
|
|
}
|
|
}
|
|
|
|
async uploadChunk(url, handle, options) {
|
|
options = Object.assign({}, options);
|
|
if (!options.method) { options.method = 'POST'; }
|
|
if (!options.headers) { options.headers = {}; }
|
|
|
|
if (!options.contentLength) throw new Error(' uploadChunk: contentLength is missing');
|
|
|
|
const chunk = await shim.fsDriver().readFileChunk(handle, options.contentLength);
|
|
const Buffer = require('buffer').Buffer;
|
|
const buffer = Buffer.from(chunk, 'base64');
|
|
delete options.contentLength;
|
|
options.body = buffer;
|
|
|
|
const response = await shim.fetch(url, options);
|
|
return response;
|
|
}
|
|
|
|
async uploadBigFile(url, options) {
|
|
const response = await shim.fetch(url, {
|
|
method: 'POST',
|
|
headers: {
|
|
'Authorization': options.headers.Authorization,
|
|
'Content-Type': 'application/json',
|
|
},
|
|
});
|
|
if (!response.ok) {
|
|
return response;
|
|
} else {
|
|
const uploadUrl = (await response.json()).uploadUrl;
|
|
// uploading file in 7.5 MiB-Fragments (except the last one) because this is the mean of 5 and 10 Mib which are the recommended lower and upper limits.
|
|
// https://docs.microsoft.com/de-de/onedrive/developer/rest-api/api/driveitem_createuploadsession?view=odsp-graph-online#best-practices
|
|
const chunkSize = 7.5 * 1024 * 1024;
|
|
const fileSize = (await shim.fsDriver().stat(options.path)).size;
|
|
const numberOfChunks = Math.ceil(fileSize / chunkSize);
|
|
const handle = await shim.fsDriver().open(options.path, 'r');
|
|
|
|
try {
|
|
for (let i = 0; i < numberOfChunks; i++) {
|
|
const startByte = i * chunkSize;
|
|
let endByte = null;
|
|
let contentLength = null;
|
|
if (i === numberOfChunks - 1) {
|
|
// Last fragment. It is not ensured that the last fragment is a multiple of 327,680 bytes as recommanded in the api doc. The reasons is that the docs are out of day for this purpose: https://github.com/OneDrive/onedrive-api-docs/issues/1200#issuecomment-597281253
|
|
endByte = fileSize - 1;
|
|
contentLength = fileSize - ((numberOfChunks - 1) * chunkSize);
|
|
} else {
|
|
endByte = (i + 1) * chunkSize - 1;
|
|
contentLength = chunkSize;
|
|
}
|
|
this.logger().debug(`${options.path}: Uploading File Fragment ${(startByte / 1048576).toFixed(2)} - ${(endByte / 1048576).toFixed(2)} from ${(fileSize / 1048576).toFixed(2)} Mbit ...`);
|
|
const headers = {
|
|
'Content-Length': contentLength,
|
|
'Content-Range': `bytes ${startByte}-${endByte}/${fileSize}`,
|
|
'Content-Type': 'application/octet-stream; charset=utf-8',
|
|
};
|
|
|
|
const response = await this.uploadChunk(uploadUrl, handle, { contentLength: contentLength, method: 'PUT', headers: headers });
|
|
|
|
if (!response.ok) {
|
|
return response;
|
|
}
|
|
}
|
|
return { ok: true };
|
|
} catch (error) {
|
|
this.logger().error('Got unhandled error:', error ? error.code : '', error ? error.message : '', error);
|
|
throw error;
|
|
} finally {
|
|
await shim.fsDriver().close(handle);
|
|
}
|
|
}
|
|
}
|
|
|
|
async exec(method, path, query = null, data = null, options = null) {
|
|
if (!path) throw new Error('Path is required');
|
|
|
|
method = method.toUpperCase();
|
|
|
|
if (!options) options = {};
|
|
if (!options.headers) options.headers = {};
|
|
if (!options.target) options.target = 'string';
|
|
|
|
if (method != 'GET') {
|
|
options.method = method;
|
|
}
|
|
|
|
if (method == 'PATCH' || method == 'POST') {
|
|
options.headers['Content-Type'] = 'application/json';
|
|
if (data) data = JSON.stringify(data);
|
|
}
|
|
|
|
let url = path;
|
|
|
|
// In general, `path` contains a path relative to the base URL, but in some
|
|
// cases the full URL is provided (for example, when it's a URL that was
|
|
// retrieved from the API).
|
|
if (url.indexOf('https://') !== 0) {
|
|
const slash = path.indexOf('/') === 0 ? '' : '/';
|
|
url = `https://graph.microsoft.com/v1.0${slash}${path}`;
|
|
}
|
|
|
|
if (query) {
|
|
url += url.indexOf('?') < 0 ? '?' : '&';
|
|
url += stringify(query);
|
|
}
|
|
|
|
if (data) options.body = data;
|
|
|
|
options.timeout = 1000 * 60 * 5; // in ms
|
|
|
|
for (let i = 0; i < 5; i++) {
|
|
options.headers['Authorization'] = `bearer ${this.token()}`;
|
|
|
|
let response = null;
|
|
try {
|
|
if (options.source == 'file' && (method == 'POST' || method == 'PUT')) {
|
|
response = path.includes('/createUploadSession') ? await this.uploadBigFile(url, options) : await shim.uploadBlob(url, options);
|
|
} else if (options.target == 'string') {
|
|
response = await shim.fetch(url, options);
|
|
} else {
|
|
// file
|
|
response = await shim.fetchBlob(url, options);
|
|
}
|
|
} catch (error) {
|
|
this.logger().error('Got unhandled error:', error ? error.code : '', error ? error.message : '', error);
|
|
throw error;
|
|
}
|
|
|
|
if (!response.ok) {
|
|
const errorResponseText = await response.text();
|
|
let errorResponse = null;
|
|
try {
|
|
errorResponse = JSON.parse(errorResponseText); // await response.json();
|
|
} catch (error) {
|
|
error.message = `OneDriveApi::exec: Cannot parse JSON error: ${errorResponseText} ${error.message}`;
|
|
throw error;
|
|
}
|
|
|
|
const error = this.oneDriveErrorResponseToError(errorResponse);
|
|
|
|
if (error.code == 'InvalidAuthenticationToken' || error.code == 'unauthenticated') {
|
|
this.logger().info('Token expired: refreshing...');
|
|
await this.refreshAccessToken();
|
|
continue;
|
|
} else if (error && ((error.error && error.error.code == 'generalException') || error.code == 'generalException' || error.code == 'EAGAIN')) {
|
|
// Rare error (one Google hit) - I guess the request can be repeated
|
|
// { error:
|
|
// { code: 'generalException',
|
|
// message: 'An error occurred in the data store.',
|
|
// innerError:
|
|
// { 'request-id': 'b4310552-c18a-45b1-bde1-68e2c2345eef',
|
|
// date: '2017-06-29T00:15:50' } } }
|
|
|
|
// { FetchError: request to https://graph.microsoft.com/v1.0/drive/root:/Apps/Joplin/.sync/7ee5dc04afcb414aa7c684bfc1edba8b.md_1499352102856 failed, reason: connect EAGAIN 65.52.64.250:443 - Local (0.0.0.0:54374)
|
|
// name: 'FetchError',
|
|
// message: 'request to https://graph.microsoft.com/v1.0/drive/root:/Apps/Joplin/.sync/7ee5dc04afcb414aa7c684bfc1edba8b.md_1499352102856 failed, reason: connect EAGAIN 65.52.64.250:443 - Local (0.0.0.0:54374)',
|
|
// type: 'system',
|
|
// errno: 'EAGAIN',
|
|
// code: 'EAGAIN' }
|
|
this.logger().info(`Got error below - retrying (${i})...`);
|
|
this.logger().info(error);
|
|
await time.sleep((i + 1) * 3);
|
|
continue;
|
|
} else if (error && (error.code === 'resourceModified' || (error.error && error.error.code === 'resourceModified'))) {
|
|
// NOTE: not tested, very hard to reproduce and non-informative error message, but can be repeated
|
|
|
|
// Error: ETag does not match current item's value
|
|
// Code: resourceModified
|
|
// Header: {"_headers":{"cache-control":["private"],"transfer-encoding":["chunked"],"content-type":["application/json"],"request-id":["d...ea47"],"client-request-id":["d99...ea47"],"x-ms-ags-diagnostic":["{\"ServerInfo\":{\"DataCenter\":\"North Europe\",\"Slice\":\"SliceA\",\"Ring\":\"2\",\"ScaleUnit\":\"000\",\"Host\":\"AGSFE_IN_13\",\"ADSiteName\":\"DUB\"}}"],"duration":["96.9464"],"date":[],"connection":["close"]}}
|
|
// Request: PATCH https://graph.microsoft.com/v1.0/drive/root:/Apps/JoplinDev/f56c5601fee94b8085524513bf3e352f.md null "{\"fileSystemInfo\":{\"lastModifiedDateTime\":\"....\"}}" {"headers":{"Content-Type":"application/json","Authorization":"bearer ...
|
|
|
|
this.logger().info(`Got error below - retrying (${i})...`);
|
|
this.logger().info(error);
|
|
await time.sleep((i + 1) * 3);
|
|
continue;
|
|
} else if (error.code == 'itemNotFound' && method == 'DELETE') {
|
|
// Deleting a non-existing item is ok - noop
|
|
return;
|
|
} else {
|
|
error.request = `${method} ${url} ${JSON.stringify(query)} ${JSON.stringify(data)} ${JSON.stringify(options)}`;
|
|
error.headers = await response.headers;
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
return response;
|
|
}
|
|
|
|
throw new Error(`Could not execute request after multiple attempts: ${method} ${url}`);
|
|
}
|
|
|
|
setAccountProperties(accountProperties) {
|
|
this.accountProperties_ = accountProperties;
|
|
}
|
|
|
|
async execAccountPropertiesRequest() {
|
|
|
|
try {
|
|
const response = await this.exec('GET','https://graph.microsoft.com/v1.0/me/drive');
|
|
const data = await response.json();
|
|
const accountProperties = { accountType: data.driveType, driveId: data.id };
|
|
return accountProperties;
|
|
} catch (error) {
|
|
throw new Error(`Could not retrieve account details (drive ID, Account type. Error code: ${error.code}, Error message: ${error.message}`);
|
|
}
|
|
}
|
|
|
|
async execJson(method, path, query, data) {
|
|
const response = await this.exec(method, path, query, data);
|
|
const errorResponseText = await response.text();
|
|
try {
|
|
const output = JSON.parse(errorResponseText); // await response.json();
|
|
return output;
|
|
} catch (error) {
|
|
error.message = `OneDriveApi::execJson: Cannot parse JSON: ${errorResponseText} ${error.message}`;
|
|
throw error;
|
|
// throw new Error('Cannot parse JSON: ' + text);
|
|
}
|
|
}
|
|
|
|
async execText(method, path, query, data) {
|
|
const response = await this.exec(method, path, query, data);
|
|
const output = await response.text();
|
|
return output;
|
|
}
|
|
|
|
async refreshAccessToken() {
|
|
if (!this.auth_ || !this.auth_.refresh_token) {
|
|
this.setAuth(null);
|
|
throw new Error(_('Cannot refresh token: authentication data is missing. Starting the synchronisation again may fix the problem.'));
|
|
}
|
|
|
|
const body = new shim.FormData();
|
|
body.append('client_id', this.clientId());
|
|
if (!this.isPublic()) body.append('client_secret', this.clientSecret());
|
|
body.append('refresh_token', this.auth_.refresh_token);
|
|
body.append('redirect_uri', 'http://localhost:1917');
|
|
body.append('grant_type', 'refresh_token');
|
|
|
|
const options = {
|
|
method: 'POST',
|
|
body: body,
|
|
};
|
|
|
|
const response = await shim.fetch(this.tokenBaseUrl(), options);
|
|
if (!response.ok) {
|
|
this.setAuth(null);
|
|
const msg = await response.text();
|
|
throw new Error(`${msg}: TOKEN: ${this.auth_}`);
|
|
}
|
|
|
|
const auth = await response.json();
|
|
this.setAuth(auth);
|
|
}
|
|
}
|
|
|
|
module.exports = { OneDriveApi };
|