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

Set channel specific vpn entry name #16854

Merged
merged 2 commits into from
Jan 26, 2023
Merged

Set channel specific vpn entry name #16854

merged 2 commits into from
Jan 26, 2023

Conversation

simonhong
Copy link
Member

@simonhong simonhong commented Jan 25, 2023

fix brave/brave-browser#28028

Resolves

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • 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 lint, 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:

See the linked issue

@simonhong simonhong self-assigned this Jan 25, 2023
@@ -432,6 +434,8 @@ BraveBrowserProcessImpl::brave_vpn_os_connection_api() {

brave_vpn_os_connection_api_ = brave_vpn::CreateBraveVPNOSConnectionAPI(
shared_url_loader_factory(), local_state());
brave_vpn_os_connection_api_->SetTargetVpnEntryName(
Copy link
Contributor

Choose a reason for hiding this comment

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

wdyt about to pass chrome::GetChannel() to CreateBraveVPNOSConnectionAPI to avoid additional calls and simplify interfaces?

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

@@ -84,6 +85,22 @@ bool IsBraveVPNEnabled() {
base::FeatureList::IsEnabled(skus::features::kSkusFeature);
}

std::string GetBraveVPNEntryName(version_info::Channel channel) {
const std::string entry_name(kBraveVPNEntryName);
Copy link
Contributor

@spylogsster spylogsster Jan 25, 2023

Choose a reason for hiding this comment

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

I think we have to make kBraveVPNEntryName internal constant for this function because it can be mistakenly used by anyone from the header. From now on, only this function can be used to determine the name of the connection.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

@simonhong simonhong merged commit 885d512 into master Jan 26, 2023
@simonhong simonhong deleted the brave_vpn_entry_name branch January 26, 2023 07:56
@github-actions github-actions bot added this to the 1.49.x - Nightly milestone Jan 26, 2023
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.

Create OS VPN entry per channel
2 participants