lib udpate

Author: joostory

package-lock.json

@@ -65,6 +65,7 @@
     "@material-ui/icons": "^4.11.2",
     "@tinymce/tinymce-react": "^3.9.0",
     "autobind-decorator": "^2.4.0",
+    "axios": "^0.21.4",
     "cheerio": "^1.0.0-rc.5",
     "classnames": "^2.2.6",
     "codemirror": "^5.59.2",

package.json

@@ -2,7 +2,7 @@
 
 const Promise = require('pinkie-promise');
 const queryString = require('querystring');
-const fetch = require('node-fetch');
+const axios = require('axios')
 const objectAssign = require('object-assign');
 const nodeUrl = require('url');
 const { BrowserWindow } = require('electron');
@@ -111,8 +111,8 @@ module.exports = function (oauthInfo, windowParams, tokenMethod = 'POST') {
       fetchOptions['body'] = queryString.stringify(data);
     }
 
-    return fetch(url, fetchOptions)
-      .then(res => res.json());
+    return axios(url, fetchOptions)
+      .then(res => res.data);
   }
 
   function getAccessToken(opts) {

src/main/oauth/ElectronOauth2.js

@@ -1,5 +1,5 @@
 const queryString = require('querystring');
-const fetch = require('node-fetch');
+const axios = require('axios')
 const electron = require('electron');
 const AuthUtils = require('../lib/AuthUtils')
 
@@ -62,8 +62,8 @@ class ExternalOAuth2 {
       fetchOptions['body'] = queryString.stringify(tokenRequestData);
     }
 
-    return fetch(url, fetchOptions)
-      .then(res => res.json())
+    return axios(url, fetchOptions)
+      .then(res => res.data)
   }
 }
 

src/main/oauth/ExternalOAuth2.js

@@ -53,6 +53,7 @@ function setWindowWebContents() {
 
   mainWindow.webContents.on('will-navigate', handleRedirect)
   mainWindow.webContents.on('new-window', handleRedirect)
+  require('@electron/remote/main').enable(mainWindow.webContents)
 }
 
 function setWindowMenu() {