Merge pull request brave#9085 from brave/8906

Update passwords and blacklist when deleting
NejcZdovc · Jun 9, 2017 · 66913ab · 66913ab
2 parents 902ee0d + 3fece85
commit 66913ab
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 20 deletions.
diff --git a/app/autofill.js b/app/autofill.js
@@ -5,6 +5,7 @@
 const electron = require('electron')
 const session = electron.session
 const appActions = require('../js/actions/appActions')
+const messages = require('../js/constants/messages')
 
 module.exports.init = () => {
   process.on('personal-data-changed', (profileGuids, creditCardGuids) => {
@@ -68,3 +69,19 @@ module.exports.removeLogin = (form) => {
 module.exports.clearLogins = (form) => {
   session.defaultSession.autofill.clearLogins(form)
 }
+
+module.exports.getAutofillableLogins = (tab) => {
+  session.defaultSession.autofill.getAutofillableLogins((result) => {
+    if (tab && !tab.isDestroyed()) {
+      tab.send(messages.PASSWORD_DETAILS_UPDATED, result)
+    }
+  })
+}
+
+module.exports.getBlackedlistLogins = (tab) => {
+  session.defaultSession.autofill.getBlackedlistLogins((result) => {
+    if (tab && !tab.isDestroyed()) {
+      tab.send(messages.PASSWORD_SITE_DETAILS_UPDATED, result)
+    }
+  })
+}
diff --git a/app/browser/reducers/passwordManagerReducer.js b/app/browser/reducers/passwordManagerReducer.js
@@ -176,6 +176,20 @@ const updatePassword = (username, origin, tabId) => {
   }
 }
 
+const removePassword = (form) => {
+  autofill.removeLogin(form)
+}
+
+const removePasswordSite = (form) => {
+  let newForm = form
+  delete newForm['blacklisted_by_user']
+  autofill.updateLogin(newForm)
+}
+
+const clearPasswords = () => {
+  autofill.clearLogins()
+}
+
 const migrate = (state) => {
   const passwords = state.get('passwords')
   if (passwords.size) {
@@ -230,6 +244,15 @@ const passwordManagerReducer = (state, action, immutableAction) => {
     case appConstants.APP_UPDATE_PASSWORD:
       updatePassword(action.get('username'), action.get('origin'), action.get('tabId'))
       break
+    case appConstants.APP_REMOVE_PASSWORD:
+      removePassword(action.get('passwordDetail').toJS())
+      break
+    case appConstants.APP_REMOVE_PASSWORD_SITE:
+      removePasswordSite(action.get('passwordDetail').toJS())
+      break
+    case appConstants.APP_CLEAR_PASSWORDS:
+      clearPasswords()
+      break
   }
   return state
 }

diff --git a/app/browser/tabs.js b/app/browser/tabs.js
@@ -29,6 +29,7 @@ const {cleanupWebContents, currentWebContents, getWebContents, updateWebContents
 const {FilterOptions} = require('ad-block')
 const urlParse = require('../common/urlParse')
 const {isResourceEnabled} = require('../filtering')
+const autofill = require('../autofill')
 
 let currentPartitionNumber = 0
 const incrementPartitionNumber = () => ++currentPartitionNumber
@@ -172,7 +173,6 @@ const updateAboutDetails = (tab, tabValue) => {
   const history = aboutHistoryState.getHistory(appState)
   const adblock = appState.get('adblock')
   const downloads = appState.get('downloads')
-  const passwords = appState.get('passwords')
   const trackedBlockersCount = appState.getIn(['trackingProtection', 'count'])
   const adblockCount = appState.getIn(['adblock', 'count'])
   const httpsUpgradedCount = appState.getIn(['httpsEverywhere', 'count'])
@@ -213,14 +213,9 @@ const updateAboutDetails = (tab, tabValue) => {
     tab.send(messages.DOWNLOADS_UPDATED, {
       downloads: downloads.toJS()
     })
-  } else if (location === 'about:passwords' && passwords) {
-    const defaultSession = session.defaultSession
-    defaultSession.autofill.getAutofillableLogins((result) => {
-      tab.send(messages.PASSWORD_DETAILS_UPDATED, result)
-    })
-    defaultSession.autofill.getBlackedlistLogins((result) => {
-      tab.send(messages.PASSWORD_SITE_DETAILS_UPDATED, result)
-    })
+  } else if (location === 'about:passwords') {
+    autofill.getAutofillableLogins(tab)
+    autofill.getBlackedlistLogins(tab)
   } else if (location === 'about:flash') {
     tab.send(messages.BRAVERY_DEFAULTS_UPDATED, braveryDefaults.toJS())
   } else if (location === 'about:newtab') {

diff --git a/js/stores/appStore.js b/js/stores/appStore.js
@@ -436,17 +436,6 @@ const handleAppAction = (action) => {
     case appConstants.APP_NEW_WINDOW:
       createWindow(action)
       break
-    case appConstants.APP_REMOVE_PASSWORD:
-      autofill.removeLogin(action.passwordDetail.toJS())
-      break
-    case appConstants.APP_REMOVE_PASSWORD_SITE:
-      let newPasswordDetail = action.passwordDetail.toJS()
-      delete newPasswordDetail['blacklisted_by_user']
-      autofill.updateLogin(newPasswordDetail)
-      break
-    case appConstants.APP_CLEAR_PASSWORDS:
-      autofill.clearLogins()
-      break
     case appConstants.APP_CHANGE_NEW_TAB_DETAIL:
       appState = aboutNewTabState.mergeDetails(appState, action)
       if (action.refresh) {