Merge pull request #11405 from brave/issue-11401

Bypass cookie mismatch error on google login

app/importer.js

@@ -222,6 +222,17 @@ importer.on('add-keywords', (e, templateUrls, uniqueOnHostAndPath) => {
 importer.on('add-autofill-form-data-entries', (e, detail) => {
 })
 
+const shouldSkipCookie = (cookie) => {
+  // Bypassing cookie mismatch error in
+  // https://github.com/brave/browser-laptop/issues/11401
+  if (cookie.domain === '.google.com' &&
+      ['https://notifications.google.com', 'https://accounts.google.com'].includes(cookie.url)) {
+    return true
+  }
+  return false
+}
+module.exports.shouldSkipCookie = shouldSkipCookie
+
 importer.on('add-cookies', (e, cookies) => {
   for (let i = 0; i < cookies.length; ++i) {
     const cookie = {
@@ -234,9 +245,13 @@ importer.on('add-cookies', (e, cookies) => {
       httpOnly: cookies[i].httponly,
       expirationDate: cookies[i].expiry_date
     }
+    if (shouldSkipCookie(cookie)) {
+      continue
+    }
     session.defaultSession.cookies.set(cookie, (error) => {
       if (error) {
         console.error(error)
+        console.error(cookie)
       }
     })
   }

test/unit/app/importerTest.js

@@ -0,0 +1,35 @@
+/* global describe, before, after, it */
+const mockery = require('mockery')
+const assert = require('assert')
+
+require('../braveUnit')
+
+describe('importer unit tests', function () {
+  let importer
+  const fakeElectron = require('../lib/fakeElectron')
+
+  before(function () {
+    mockery.enable({
+      warnOnReplace: false,
+      warnOnUnregistered: false,
+      useCleanCache: true
+    })
+    mockery.registerMock('electron', fakeElectron)
+    mockery.registerMock('./adBlock', {adBlockResourceName: 'adblock'})
+    importer = require('../../../app/importer')
+  })
+
+  after(function () {
+    mockery.disable()
+  })
+
+  describe('shouldSkipCookie', function () {
+    it('returns true if domain is google and URL is one which has a mismatch', function () {
+      assert.equal(importer.shouldSkipCookie({domain: '.google.com', url: 'https://notifications.google.com'}), true)
+    })
+
+    it('returns false for other cases', function () {
+      assert.equal(importer.shouldSkipCookie({domain: '.brave.com', url: 'https://brave.com'}), false)
+    })
+  })
+})

test/unit/lib/fakeElectron.js

@@ -93,7 +93,10 @@ const fakeElectron = {
   extensions: {
     createTab: function () {}
   },
-  autoUpdater: new EventEmitter()
+  autoUpdater: new EventEmitter(),
+  importer: {
+    on: () => {}
+  }
 }
 
 module.exports = fakeElectron