Merge pull request brave#4215 from darkdh/autofill-guid-migration

Autofill guid migration
darkdh · Sep 23, 2016 · 5cf9c4b · 5cf9c4b
2 parents bb799de + cdd785a
commit 5cf9c4b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/app/sessionStore.js b/app/sessionStore.js
@@ -341,6 +341,28 @@ module.exports.loadAppState = () => {
           })
           data.autofill.creditCards = creditCards
         }
+        if (data.autofill.addresses.guid) {
+          let guids = []
+          data.autofill.addresses.guid.forEach((guid) => {
+            if (typeof guid === 'object') {
+              guids.push(guid['persist:default'])
+            } else {
+              guids.push(guid)
+            }
+          })
+          data.autofill.addresses.guid = guids
+        }
+        if (data.autofill.creditCards.guid) {
+          let guids = []
+          data.autofill.creditCards.guid.forEach((guid) => {
+            if (typeof guid === 'object') {
+              guids.push(guid['persist:default'])
+            } else {
+              guids.push(guid)
+            }
+          })
+          data.autofill.creditCards.guid = guids
+        }
       }
       // xml migration
       if (data.settings) {

diff --git a/js/components/frame.js b/js/components/frame.js
@@ -119,7 +119,6 @@ class Frame extends ImmutableComponent {
         const guids = this.props.autofillAddresses.get('guid')
         let list = []
         guids.forEach((entry) => {
-          console.log(entry)
           const address = currentWindow.webContents.session.autofill.getProfile(entry)
           const valid = Object.getOwnPropertyNames(address).length > 0
           let addressDetail = {