Enable importing passwords from Firefox, closes brave#9292

Auditors: @darkdh
evq · Jun 14, 2017 · d3e5792 · d3e5792
1 parent 5599afc
commit d3e5792
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/app/importer.js b/app/importer.js
@@ -69,9 +69,6 @@ importer.on('update-supported-browsers', (e, detail) => {
   }
 })
 
-importer.on('add-password-form', (e, detail) => {
-})
-
 importer.on('add-history-page', (e, history, visitSource) => {
   let sites = []
   for (let i = 0; i < history.length; ++i) {

diff --git a/app/renderer/components/main/importBrowserDataPanel.js b/app/renderer/components/main/importBrowserDataPanel.js
@@ -32,6 +32,7 @@ class ImportBrowserDataPanel extends ImmutableComponent {
     this.onToggleHistory = this.onToggleSetting.bind(this, 'history')
     this.onToggleFavorites = this.onToggleSetting.bind(this, 'favorites')
     this.onToggleCookies = this.onToggleSetting.bind(this, 'cookies')
+    this.onTogglePasswords = this.onToggleSetting.bind(this, 'passwords')
     this.onImport = this.onImport.bind(this)
     this.onChange = this.onChange.bind(this)
   }
@@ -66,6 +67,14 @@ class ImportBrowserDataPanel extends ImmutableComponent {
     }
     return browserData.get('cookies')
   }
+  get supportPasswords () {
+    let browserData = this.browserData
+    if (browserData === undefined) {
+      return false
+    }
+    return browserData.get('passwords')
+  }
+
   onImport () {
     let index = this.props.importBrowserDataSelected.get('index')
     if (index === undefined) {
@@ -84,6 +93,7 @@ class ImportBrowserDataPanel extends ImmutableComponent {
     this.props.importBrowserDataSelected = this.props.importBrowserDataSelected.set('history', false)
     this.props.importBrowserDataSelected = this.props.importBrowserDataSelected.set('favorites', false)
     this.props.importBrowserDataSelected = this.props.importBrowserDataSelected.set('cookies', false)
+    this.props.importBrowserDataSelected = this.props.importBrowserDataSelected.set('passwords', false)
     let importBrowserDataSelected = this.props.importBrowserDataSelected
     if (this.supportHistory) {
       importBrowserDataSelected = importBrowserDataSelected.set('history', true)
@@ -94,6 +104,9 @@ class ImportBrowserDataPanel extends ImmutableComponent {
     if (this.supportCookies) {
       importBrowserDataSelected = importBrowserDataSelected.set('cookies', true)
     }
+    if (this.supportPasswords) {
+      importBrowserDataSelected = importBrowserDataSelected.set('passwords', true)
+    }
     windowActions.setImportBrowserDataSelected(importBrowserDataSelected)
   }
   get selectedBrowser () {
@@ -109,6 +122,9 @@ class ImportBrowserDataPanel extends ImmutableComponent {
       if (this.supportCookies) {
         this.props.importBrowserDataSelected = this.props.importBrowserDataSelected.set('cookies', true)
       }
+      if (this.supportPasswords) {
+        this.props.importBrowserDataSelected = this.props.importBrowserDataSelected.set('passwords', true)
+      }
     }
     return index !== undefined ? index : '0'
   }
@@ -151,6 +167,13 @@ class ImportBrowserDataPanel extends ImmutableComponent {
             onClick={this.onToggleCookies}
             disabled={!this.supportCookies}
           />
+          <SwitchControl
+            rightl10nId='savedPasswords'
+            checkedOn={this.props.importBrowserDataSelected.get('passwords')}
+            onClick={this.onTogglePasswords}
+            disabled={!this.supportPasswords}
+          />
+
         </CommonFormSection>
         <CommonFormSection>
           <div data-l10n-id='importDataCloseBrowserWarning' />