Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed device duplication when Google Account cookies are deleted #25971

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

AlexeyBarabash
Copy link
Contributor

This PR disables upstream's methods

SyncServiceImpl::OnAccountsCookieDeletedByUserAction()
SyncServiceImpl::OnAccountsInCookieUpdated()
SyncServiceImpl::OnPrimaryAccountChanged()

to prevent re-creating of Sync Client ID and device duplication in a Sync chain.

Resolves brave/brave-browser#41615

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

I. Scenario with manual logout from GMail

  1. Add devices A and B into the sync chain
  2. On device B login into GMail
  3. On device B logout from GMail
  4. Restart browser on Device B
  5. Expected device B is not duplicated at A's list

II. Scenario with Delete sites data option

  1. Add devices A and B into the sync chain
  2. On device B login into GMail
  3. On device B go to brave://settings/content/siteData and choose
Delete data sites have saved to your device when you close all windows
Sites will probably work as you expect but won't remember you after you close all Brave windows
  1. Restart browser on Device B
  2. Expected device B is not duplicated at A's list

Copy link
Contributor

The security team is monitoring all repositories for certain keywords. This PR includes the word(s) "login" and so security team members have been added as reviewers to take a look.

No need to request a full security review at this stage, the security team will take a look shortly and either clear the label or request more information/changes.

Notifications have already been sent, but if this is blocking your merge feel free to reach out directly to the security team on Slack so that we can expedite this check.

Copy link
Member

@kdenhartog kdenhartog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine to me, removing the needs-security-review label

@AlexeyBarabash AlexeyBarabash force-pushed the sync_device_duplication_google_cookies branch from 56f9ed0 to a4b509c Compare October 16, 2024 11:09
@AlexeyBarabash AlexeyBarabash requested a review from a team as a code owner October 16, 2024 15:17
Copy link
Collaborator

@bridiver bridiver left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approving as code owner for chromium_src

@AlexeyBarabash AlexeyBarabash force-pushed the sync_device_duplication_google_cookies branch from 83f3830 to dc7de33 Compare October 17, 2024 20:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Sync device is duplicated when Google Account cookies are deleted
6 participants