self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-12-02 22:49:09 +02:00
Code Issues Releases Activity

Make fetch and FormData work in both RN and node

Browse Source
This commit is contained in:
Laurent Cozic
2017-07-06 18:58:01 +00:00
parent 9e3a2a894e
commit bdb250de8a
6 changed files with 224 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,4 @@
const fetch = require('node-fetch');
const tcpPortUsed = require('tcp-port-used');
const http = require("http");
const urlParser = require("url");
const FormData = require('form-data');
const enableServerDestroy = require('server-destroy');
import { shim } from 'lib/shim.js';
import { stringify } from 'query-string';
class OneDriveApi {
@@ -32,6 +27,10 @@ class OneDriveApi {
return 'https://login.microsoftonline.com/common/oauth2/v2.0/token';
}
auth() {
return this.auth_;
}
setAuth(auth) {
this.auth_ = auth;
}
@@ -48,9 +47,9 @@ class OneDriveApi {
return this.clientSecret_;
}
possibleOAuthDancePorts() {
return [1917, 9917, 8917];
}
// possibleOAuthDancePorts() {
// return [1917, 9917, 8917];
// }
async appDirectory() {
let r = await this.execJson('GET', '/drive/special/approot');
@@ -122,7 +121,7 @@ class OneDriveApi {
for (let i = 0; i < 5; i++) {
options.headers['Authorization'] = 'bearer ' + this.token();
let response = await fetch(url, options);
let response = await shim.fetch(url, options);
if (!response.ok) {
let errorResponse = await response.json();
let error = this.oneDriveErrorResponseToError(errorResponse);
@@ -157,7 +156,7 @@ class OneDriveApi {
async refreshAccessToken() {
if (!this.auth_) throw new Error('Cannot refresh token: authentication data is missing');
let body = new FormData();
let body = new shim.FormData();
body.append('client_id', this.clientId());
body.append('client_secret', this.clientSecret());
body.append('refresh_token', this.auth_.refresh_token);
@@ -171,7 +170,7 @@ class OneDriveApi {
this.auth_ = null;
let response = await fetch(this.tokenBaseUrl(), options);
let response = await shim.fetch(this.tokenBaseUrl(), options);
if (!response.ok) {
let msg = await response.text();
throw new Error(msg);
@@ -182,89 +181,89 @@ class OneDriveApi {
this.dispatch('authRefreshed', this.auth_);
}
async oauthDance(targetConsole = null) {
if (targetConsole === null) targetConsole = console;
// async oauthDance(targetConsole = null) {
// if (targetConsole === null) targetConsole = console;
this.auth_ = null;
// this.auth_ = null;
let ports = this.possibleOAuthDancePorts();
let port = null;
for (let i = 0; i < ports.length; i++) {
let inUse = await tcpPortUsed.check(ports[i]);
if (!inUse) {
port = ports[i];
break;
}
}
// let ports = this.possibleOAuthDancePorts();
// let port = null;
// for (let i = 0; i < ports.length; i++) {
// let inUse = await tcpPortUsed.check(ports[i]);
// if (!inUse) {
// port = ports[i];
// break;
// }
// }
if (!port) throw new Error('All potential ports are in use - please report the issue at https://github.com/laurent22/joplin');
// if (!port) throw new Error('All potential ports are in use - please report the issue at https://github.com/laurent22/joplin');
let authCodeUrl = this.authCodeUrl('http://localhost:' + port);
// let authCodeUrl = this.authCodeUrl('http://localhost:' + port);
return new Promise((resolve, reject) => {
let server = http.createServer();
let errorMessage = null;
// return new Promise((resolve, reject) => {
// let server = http.createServer();
// let errorMessage = null;
server.on('request', (request, response) => {
const query = urlParser.parse(request.url, true).query;
// server.on('request', (request, response) => {
// const query = urlParser.parse(request.url, true).query;
function writeResponse(code, message) {
response.writeHead(code, {"Content-Type": "text/html"});
response.write(message);
response.end();
}
// function writeResponse(code, message) {
// response.writeHead(code, {"Content-Type": "text/html"});
// response.write(message);
// response.end();
// }
if (!query.code) return writeResponse(400, '"code" query parameter is missing');
// if (!query.code) return writeResponse(400, '"code" query parameter is missing');
let body = new FormData();
body.append('client_id', this.clientId());
body.append('client_secret', this.clientSecret());
body.append('code', query.code ? query.code : '');
body.append('redirect_uri', 'http://localhost:' + port.toString());
body.append('grant_type', 'authorization_code');
// let body = new shim.FormData();
// body.append('client_id', this.clientId());
// body.append('client_secret', this.clientSecret());
// body.append('code', query.code ? query.code : '');
// body.append('redirect_uri', 'http://localhost:' + port.toString());
// body.append('grant_type', 'authorization_code');
let options = {
method: 'POST',
body: body,
};
// let options = {
// method: 'POST',
// body: body,
// };
fetch(this.tokenBaseUrl(), options).then((r) => {
if (!r.ok) {
errorMessage = 'Could not retrieve auth code: ' + r.status + ': ' + r.statusText;
writeResponse(400, errorMessage);
targetConsole.log('');
targetConsole.log(errorMessage);
server.destroy();
return;
}
// fetch(this.tokenBaseUrl(), options).then((r) => {
// if (!r.ok) {
// errorMessage = 'Could not retrieve auth code: ' + r.status + ': ' + r.statusText;
// writeResponse(400, errorMessage);
// targetConsole.log('');
// targetConsole.log(errorMessage);
// server.destroy();
// return;
// }
return r.json().then((json) => {
this.auth_ = json;
writeResponse(200, 'The application has been authorised - you may now close this browser tab.');
targetConsole.log('');
targetConsole.log('The application has been successfully authorised.');
server.destroy();
});
});
});
// return r.json().then((json) => {
// this.auth_ = json;
// writeResponse(200, 'The application has been authorised - you may now close this browser tab.');
// targetConsole.log('');
// targetConsole.log('The application has been successfully authorised.');
// server.destroy();
// });
// });
// });
server.on('close', () => {
if (errorMessage) {
reject(new Error(errorMessage));
} else {
resolve(this.auth_);
}
});
// server.on('close', () => {
// if (errorMessage) {
// reject(new Error(errorMessage));
// } else {
// resolve(this.auth_);
// }
// });
server.listen(port);
// server.listen(port);
enableServerDestroy(server);
// enableServerDestroy(server);
targetConsole.log('Please open this URL in your browser to authentify the application:');
targetConsole.log('');
targetConsole.log(authCodeUrl);
});
}
// targetConsole.log('Please open this URL in your browser to authentify the application:');
// targetConsole.log('');
// targetConsole.log(authCodeUrl);
// });
// }
}