Upgrades (#574)

* Added security fixes

* More updates to apis

* Added inoreader refresh token

Author: mrgodhani

package.json

@@ -27,7 +27,8 @@
     "axios": "^0.21.1",
     "bootstrap": "^4.0.0",
     "bootstrap-vue": "^2.16.0",
-    "core-js": "^3.8.1",
+    "btoa": "^1.2.1",
+    "core-js": "^3.13.1",
     "cross-fetch": "^3.1.3-alpha.6",
     "crypto-js": "^4.0.0",
     "dayjs": "^1.8.31",
@@ -39,6 +40,7 @@
     "electron-util": "^0.16.0",
     "fast-xml-parser": "^3.18.0",
     "feather-icons": "^4.28.0",
+    "form-data": "^4.0.0",
     "fuse.js": "^6.4.1",
     "global-agent": "^2.1.12",
     "i18next": "^20.1.0",
@@ -47,7 +49,7 @@
     "i18next-electron-language-detector": "^0.0.10",
     "i18next-fs-backend": "^1.0.8",
     "jquery": "^3.6.0",
-    "js-yaml": "^4.0.0",
+    "js-yaml": "^4.1.0",
     "lovefield": "^2.1.12",
     "md5": "^2.3.0",
     "node-schedule": "^2.0.0",
@@ -83,7 +85,7 @@
     "@vue/eslint-config-standard": "^6.0.0",
     "babel-eslint": "^10.1.0",
     "devtron": "^1.4.0",
-    "electron": "12.0.0",
+    "electron": "^12.0.9",
     "electron-builder-notarize": "^1.2.0",
     "electron-devtools-installer": "^3.1.0",
     "electron-icon-builder": "^2.0.1",

public/locales/en-US/translation.missing.json

@@ -1 +1 @@
-{"Connect Feedbin":"Connect Feedbin","Log into Feedbin":"Log into Feedbin","Connect Self-hosted (Google Reader API)":"Connect Self-hosted (Google Reader API)","Log into Self Hosted RSS Service":"Log into Self Hosted RSS Service","Enter username":"Enter username","Connect Fever":"Connect Fever","Log into Fever":"Log into Fever","No categories available":"No categories available","Feed in this categories would not be deleted":"Feed in this categories would not be deleted","Please select atleast one feed":"Please select atleast one feed","Title":"Title","Feed":"Feed","Articles":"Articles","Action":"Action","Unsubscribe":"Unsubscribe","Articles inside this feed would be deleted":"Articles inside this feed would be deleted","Category cannot be empty":{"":"Category cannot be empty."},"Category":"Category","Manage Categories":"Manage Categories","Manage Feeds":"Manage Feeds","Please subscribe to atleast one feed to add category":"Please subscribe to atleast one feed to add category","No feeds available":"No feeds available","Add new feed":"Add new feed","Disconnect Fever":"Disconnect Fever"}
+{"Connect Feedbin":"Connect Feedbin","Log into Feedbin":"Log into Feedbin","Connect Self-hosted (Google Reader API)":"Connect Self-hosted (Google Reader API)","Log into Self Hosted RSS Service":"Log into Self Hosted RSS Service","Enter username":"Enter username","Connect Fever":"Connect Fever","Log into Fever":"Log into Fever","No categories available":"No categories available","Feed in this categories would not be deleted":"Feed in this categories would not be deleted","Please select atleast one feed":"Please select atleast one feed","Title":"Title","Feed":"Feed","Articles":"Articles","Action":"Action","Unsubscribe":"Unsubscribe","Articles inside this feed would be deleted":"Articles inside this feed would be deleted","Category cannot be empty":{"":"Category cannot be empty."},"Category":"Category","Manage Categories":"Manage Categories","Manage Feeds":"Manage Feeds","Please subscribe to atleast one feed to add category":"Please subscribe to atleast one feed to add category","No feeds available":"No feeds available","Add new feed":"Add new feed","Disconnect Fever":"Disconnect Fever","Disconnect Self-hosted (Google Reader API)":"Disconnect Self-hosted (Google Reader API)","Copy link":"Copy link","Remove from favourite":"Remove from favourite","Edit Feedbin":"Edit Feedbin","Disconnect Feedbin":"Disconnect Feedbin","Disconnect pocket":"Disconnect pocket","Disconnect Instapaper":"Disconnect Instapaper"}

src/background.js

@@ -23,9 +23,14 @@ import contextMenu from 'electron-context-menu'
 import { autoUpdater } from 'electron-updater'
 import fs from 'fs'
 import path from 'path'
-import { URL } from 'url'
+import { URL, URLSearchParams } from 'url'
 import dayjs from 'dayjs'
 import i18nextMainBackend from './i18nmain.config'
+import {
+  parseArticle
+} from './main/article'
+const btoa = require('btoa')
+const FormData = require('form-data')
 const i18nextBackend = require('i18next-electron-fs-backend')
 
 const isDevelopment = process.env.NODE_ENV !== 'production'
@@ -67,7 +72,6 @@ async function createWindow () {
       // Use pluginOptions.nodeIntegration, leave this alone
       // See nklayman.github.io/vue-cli-plugin-electron-builder/guide/security.html#node-integration for more info
       webviewTag: true,
-      webSecurity: false,
       nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION,
       preload: path.join(__dirname, 'preload.js'),
       disableBlinkFeatures: 'Auxclick'
@@ -496,6 +500,139 @@ ipcMain.handle('context-menu', (event, arg) => {
   }
 })
 
+ipcMain.handle('parse-article', async (event, url) => {
+  return await parseArticle(url)
+})
+
+ipcMain.handle('instapaper-login', async (event, data) => {
+  const result = await axios.post('https://www.instapaper.com/api/authenticate', {}, {
+    auth: data
+  })
+  return result.data
+})
+
+ipcMain.handle('instapaper-save', async (event, data) => {
+  const result = await axios.post(`https://www.instapaper.com/api/add?url=${data.url}`, {}, {
+    auth: {
+      username: data.username,
+      password: data.password
+    }
+  })
+  return result.data
+})
+
+ipcMain.handle('save-pocket', async (event, data) => {
+  const result = await axios.post('https://getpocket.com/v3/add', {
+    url: data.url,
+    access_token: data.credential.access_token,
+    consumer_key: data.credential.consumer_key
+  })
+  return result.data
+})
+
+ipcMain.handle('fever-login', async (event, data) => {
+  const formData = new FormData()
+  formData.append('api_key', data.formData)
+  const config = {
+    url: `${data.endpoint}?api`,
+    method: 'post',
+    data: formData,
+    headers: {
+      ...formData.getHeaders()
+    }
+  }
+  const result = await axios(config)
+  return result.data
+})
+
+ipcMain.handle('fever-endpoint-execute', async (event, data) => {
+  const formData = new FormData()
+  formData.append('api_key', data.formData)
+  const result = await axios.post(data.endpoint, formData, {
+    headers: {
+      ...formData.getHeaders()
+    }
+  })
+  return result.data
+})
+
+ipcMain.handle('google-login', async (event, data) => {
+  const params = new URLSearchParams(data.formData)
+  const result = await axios.post(data.endpoint, params.toString())
+  return result.data
+})
+
+ipcMain.handle('inoreader-endpoint-fetch', async (event, data) => {
+  const result = await axios.get(data.endpoint, {
+    headers: {
+      Authorization: `Bearer ${data.access_token}`
+    }
+  })
+  return result.data
+})
+
+ipcMain.handle('inoreader-endpoint-refresh', async (event, data) => {
+  const result = axios.post(data.endpoint, data.formData)
+  return result.data
+})
+
+ipcMain.handle('inoreader-endpoint-execute', async (event, data) => {
+  const result = await axios.post(data.endpoint, data.formData, {
+    headers: {
+      Authorization: `Bearer ${data.access_token}`
+    }
+  })
+  return result.data
+})
+
+ipcMain.handle('google-endpoint-fetch', async (event, data) => {
+  const result = await axios.get(data.endpoint, {
+    headers: {
+      Authorization: `GoogleLogin auth=${data.formData.auth}`
+    }
+  })
+  return result.data
+})
+
+ipcMain.handle('google-endpoint-execute', async (event, data) => {
+  const result = await axios.post(data.endpoint, data.formData.data, {
+    headers: {
+      Authorization: `GoogleLogin auth=${data.formData.auth}`
+    }
+  })
+  return result.data
+})
+
+ipcMain.handle('feedbin-login', async (event, data) => {
+  const result = await axios.get(data.endpoint, {
+    auth: {
+      username: data.creds.email,
+      password: data.creds.password
+    }
+  })
+  return result.data
+})
+
+ipcMain.handle('feedbin-endpoint-fetch', async (event, data) => {
+  const result = await axios.get(data.endpoint, {
+    auth: {
+      username: data.creds.email,
+      password: data.creds.password
+    }
+  })
+  return result.data
+})
+
+ipcMain.handle('feedbin-endpoint-execute', async (event, data) => {
+  const result = await axios.post(data.endpoint, data.formData, {
+    auth: {
+      username: data.creds.email,
+      password: data.creds.password
+    }
+  })
+  return result.data
+})
+
 powerMonitor.on('resume', () => {
   win.webContents.send('power-resume')
 })

src/bridge/feedbin.js

@@ -0,0 +1,34 @@
+import {
+  ipcRenderer
+} from 'electron'
+
+export default {
+  login: async (endpoint, creds) => {
+    return await ipcRenderer.invoke('feedbin-login', {
+      endpoint: endpoint,
+      creds: {
+        email: creds.email,
+        password: creds.password
+      }
+    })
+  },
+  fetch: async (endpoint, creds) => {
+    return await ipcRenderer.invoke('feedbin-endpoint-fetch', {
+      endpoint: endpoint,
+      creds: {
+        email: creds.email,
+        password: creds.password
+      }
+    })
+  },
+  post: async (endpoint, formData, creds) => {
+    return await ipcRenderer.invoke('feedbin-endpoint-execute', {
+      endpoint: endpoint,
+      formData: formData,
+      creds: {
+        email: creds.email,
+        password: creds.password
+      }
+    })
+  }
+}

src/bridge/fever.js

@@ -0,0 +1,18 @@
+import {
+  ipcRenderer
+} from 'electron'
+
+export default {
+  login: async (endpoint, formData) => {
+    return await ipcRenderer.invoke('fever-login', {
+      endpoint: endpoint,
+      formData: formData
+    })
+  },
+  post: async (endpoint, formData) => {
+    return await ipcRenderer.invoke('fever-endpoint-execute', {
+      endpoint: endpoint,
+      formData: formData
+    })
+  }
+}

src/bridge/greader.js

@@ -0,0 +1,24 @@
+import {
+  ipcRenderer
+} from 'electron'
+
+export default {
+  login: async (endpoint, formData) => {
+    return await ipcRenderer.invoke('google-login', {
+      endpoint: endpoint,
+      formData: formData
+    })
+  },
+  fetch: async (endpoint, formData) => {
+    return await ipcRenderer.invoke('google-endpoint-fetch', {
+      endpoint: endpoint,
+      formData: formData
+    })
+  },
+  post: async (endpoint, formData) => {
+    return await ipcRenderer.invoke('google-endpoint-execute', {
+      endpoint: endpoint,
+      formData: formData
+    })
+  }
+}

src/bridge/inoreader.js

@@ -0,0 +1,25 @@
+import {
+  ipcRenderer
+} from 'electron'
+
+export default {
+  fetch: async (endpoint, accessToken) => {
+    return await ipcRenderer.invoke('inoreader-endpoint-fetch', {
+      endpoint: endpoint,
+      access_token: accessToken.access_token
+    })
+  },
+  refresh: async (endpoint, formData) => {
+    return await ipcRenderer.invoke('inoreader-endpoint-refresh', {
+      endpoint: endpoint,
+      formData: formData
+    })
+  },
+  post: async (endpoint, formData, accessToken) => {
+    return await ipcRenderer.invoke('inoreader-endpoint-execute', {
+      endpoint: endpoint,
+      formData: formData,
+      access_token: accessToken.access_token
+    })
+  }
+}

src/bridge/instapaper.js

@@ -0,0 +1,19 @@
+import {
+  ipcRenderer
+} from 'electron'
+
+export default {
+  login: async (username, password) => {
+    return await ipcRenderer.invoke('instapaper-login', {
+      username: username,
+      password: password
+    })
+  },
+  save: async (url, username, password) => {
+    return await ipcRenderer.invoke('instapaper-save', {
+      url: url,
+      username: username,
+      password: password
+    })
+  }
+}

src/bridge/mercury.js

@@ -0,0 +1,9 @@
+import {
+  ipcRenderer
+} from 'electron'
+
+export default {
+  parseArticle: async (url) => {
+    return await ipcRenderer.invoke('parse-article', url)
+  }
+}

src/bridge/pocket.js

@@ -0,0 +1,12 @@
+import {
+  ipcRenderer
+} from 'electron'
+
+export default {
+  save: async (url, credential) => {
+    return await ipcRenderer.invoke('save-pocket', {
+      url: url,
+      credential: credential
+    })
+  }
+}