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

Remove VPN waitlist code #2795

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Conversation

diegoreymendez
Copy link
Contributor

@diegoreymendez diegoreymendez commented Apr 26, 2024

Task/Issue URL: https://app.asana.com/0/414235014887631/1207178910368620/f

macOS: https://github.com/duckduckgo/macos-browser/pull/2776
BSK: duckduckgo/BrowserServicesKit#801

Description

Let's remove the VPN waitlist code from iOS.

Testing

  1. Test starting and stopping the VPN.
  2. Make sure at all steps the VPN status is correct, visibility in settings is correct.
  3. Test seeing the VPN metadata looks good.
  4. Add and remove the subscription, and ensure the state is fine at all steps.
  5. Try revoking entitlements and ensure all is good.

Internal references:

Software Engineering Expectations
Technical Design Template

Copy link

github-actions bot commented Apr 26, 2024

Warnings
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS against 0279fc3

@diegoreymendez diegoreymendez changed the title WIP Remove VPN waitlist code Apr 26, 2024
@diegoreymendez diegoreymendez marked this pull request as ready for review April 26, 2024 11:55
@@ -179,7 +175,6 @@ struct RemoteMessaging {
favoritesCount: favoritesCount,
appTheme: AppUserDefaults().currentThemeName.rawValue,
isWidgetInstalled: isWidgetInstalled,
isNetPWaitlistUser: isNetworkProtectionWaitlistUser,
daysSinceNetPEnabled: daysSinceNetworkProtectionEnabled),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do I need to remove this too, @samsymons ?

Copy link
Contributor

Choose a reason for hiding this comment

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

Let's keep these since they'll be used for RMF attribute matching on Privacy Pro subscribers

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I want to make sure I understand correctly here.

I was asking about daysSinceNetPEnabled but now I wonder if your answer includes isNetPWaitlistUser too.

Copy link
Contributor

Choose a reason for hiding this comment

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

No, we no longer need isNetPWaitlistUser, it's just daysSinceNetPEnabled that will be needed going forward.

@duckduckgo duckduckgo deleted a comment from Dalian991 Apr 28, 2024
Copy link
Member

@quanganhdo quanganhdo left a comment

Choose a reason for hiding this comment

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

Tested & worked well on my device in prod env

@@ -91,7 +76,7 @@ struct NetworkProtectionAccessController: NetworkProtectionAccess {
}

// Check for users who have activated the VPN via an invite code:
if networkProtectionActivation.isFeatureActivated && !networkProtectionWaitlistStorage.isInvited {
if networkProtectionActivation.isFeatureActivated {
return .inviteCodeInvited
Copy link
Member

Choose a reason for hiding this comment

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

Do we still need this? cc @samsymons

Copy link
Contributor

Choose a reason for hiding this comment

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

Nah, this can be removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@samsymons - Should I remove the entire file? I was about to remove it but decided to ask in case there's a plan to add PPro support here.

Copy link
Contributor

Choose a reason for hiding this comment

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

If we're managing access elsewhere this can be removed, sure. Access control is super simple now thanks to PPro.

Copy link

This PR has been inactive for more than 7 days and will be automatically closed 7 days from now.

@github-actions github-actions bot added stale and removed stale labels May 10, 2024
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.

None yet

3 participants