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

Hide NTP VPN card when its group policy is disabled #26689

Merged
merged 1 commit into from
Nov 22, 2024

Conversation

simonhong
Copy link
Member

@simonhong simonhong commented Nov 22, 2024

fix brave/brave-browser#42446

Resolves

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:

See the linked issue

@simonhong simonhong self-assigned this Nov 22, 2024
Copy link
Contributor

The security team is monitoring all repositories for certain keywords. This PR includes the word(s) "policy" 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

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

++

@simonhong simonhong merged commit b3b3bea into master Nov 22, 2024
18 checks passed
@simonhong simonhong deleted the vpn_card_group_policy branch November 22, 2024 06:47
@github-actions github-actions bot added this to the 1.75.x - Nightly milestone Nov 22, 2024
simonhong added a commit that referenced this pull request Nov 22, 2024
Hide NTP VPN card when its group policy is disabled
simonhong added a commit that referenced this pull request Nov 22, 2024
Hide NTP VPN card when its group policy is disabled
@brave-builds
Copy link
Collaborator

Released in v1.75.44

@MadhaviSeelam
Copy link

MadhaviSeelam commented Dec 3, 2024

Verification PASSED using

Brave | 1.75.55 Chromium: 131.0.6778.85 (Official Build) nightly (64-bit)
-- | --
Revision | 3cc3ba11608e3bbbf9e053bdd032ec05e2a4db7f
OS | Windows 11 Version 24H2 (Build 26100.2314)

Please see additional steps on how to add/remove templates: brave/brave-browser#26502

  1. Installed .175.55
  2. launched Brave
  3. logged into VPN as a new user (brave3vpn@mailinator)
  4. enabled and disabled VPN
  5. closed Brave
  6. Follow steps 3-12 on how to download latest templates from Make Brave-specific options configurable through Windows Group Policy templates brave-browser#26502
  7. navigate to Classic Administrative Templates >> Brave >> Brave Software settings folder
  8. confirmed the actual policies are listed
  9. navigated to Disable Brave VPN setting
  10. confirmed Not configured is shown
  11. edit the settings to Disabled Brave VPN to Enabled
  12. relaunched Brave and confirmed Brave VPN card widget is not shown
  13. edit the settings for Disabled Brave VPN again to Disabled
  14. relaunched Brave and confirmed Brave VPN card widget is shown in disconnected state as expected.
step 4a step 4b step 8-9 step 10 step 11 step 12 step 13
image image image image image image image

kjozwiak pushed a commit that referenced this pull request Dec 4, 2024
* Merge pull request #26189 from brave/brave_vpn_ntp_widget_demo

Brave VPN card widget in NTP

* Merge pull request #26496 from brave/follow_up_brave_vpn_card

F/U vpn card widgets in NTP

* Merge pull request #26689 from brave/vpn_card_group_policy

Hide NTP VPN card when its group policy is disabled

* Merge pull request #26743 from brave/update_vpn_card_option_image

Updated vpn card option image in NTP

* Merge pull request #26745 from brave/update_vpn_product_title

Update VPN product title at vpn panel

* Merge pull request #26746 from brave/update_trial_url_from_vpn_card

Updated trial url from vpn card

* Merge pull request #26765 from brave/fix_vpn_icon_size_vpn_card

Fixed bottom of vpn icon of vpn card was clipped
kjozwiak pushed a commit that referenced this pull request Dec 4, 2024
* Merge pull request #26299 from brave/introduce_brave_vpn_controller

Added BraveVPNController to BrowserWindowFeatures

* Make vpn bubble start with server selection (#26310)

fix brave/brave-browser#41991

NTP VPN Widget card will use this.

* Merge pull request #26189 from brave/brave_vpn_ntp_widget_demo

Brave VPN card widget in NTP

* Merge pull request #26496 from brave/follow_up_brave_vpn_card

F/U vpn card widgets in NTP

* Fixed build failure

* Merge pull request #26689 from brave/vpn_card_group_policy

Hide NTP VPN card when its group policy is disabled

* Merge pull request #26743 from brave/update_vpn_card_option_image

Updated vpn card option image in NTP

* Merge pull request #26745 from brave/update_vpn_product_title

Update VPN product title at vpn panel

* Merge pull request #26746 from brave/update_trial_url_from_vpn_card

Updated trial url from vpn card

* Merge pull request #26765 from brave/fix_vpn_icon_size_vpn_card

Fixed bottom of vpn icon of vpn card was clipped
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.

VPN Card in NTP is not hidden when its group policy is disabled
6 participants