-
Notifications
You must be signed in to change notification settings - Fork 429
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Extract NetP access management out into its own type.
- Loading branch information
Showing
9 changed files
with
176 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| // | ||
| // NetworkProtectionAccessController.swift | ||
| // DuckDuckGo | ||
| // | ||
| // Copyright © 2023 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import Foundation | ||
| import BrowserServicesKit | ||
| import ContentBlocking | ||
| import Core | ||
| import NetworkProtection | ||
| import Waitlist | ||
|
|
||
| enum NetworkProtectionAccessType { | ||
| /// Used if the user does not have waitlist feature flag access | ||
| case none | ||
|
|
||
| /// Used if the user has waitlist feature flag access, but has not joined the waitlist | ||
| case waitlistAvailable | ||
|
|
||
| /// Used if the user has waitlist feature flag access, and has joined the waitlist | ||
| case waitlistJoined | ||
|
|
||
| /// Used if the user has been invited via the waitlist, but needs to accept the Privacy Policy and Terms of Service | ||
| case waitlistInvitedPendingTermsAcceptance | ||
|
|
||
| /// Used if the user has been invited via the waitlist and has accepted the Privacy Policy and Terms of Service | ||
| case waitlistInvited | ||
|
|
||
| /// Used if the user has been invited to test Network Protection directly | ||
| case inviteCodeInvited | ||
| } | ||
|
|
||
| protocol NetworkProtectionAccess { | ||
| func networkProtectionAccessType() -> NetworkProtectionAccessType | ||
| } | ||
|
|
||
| struct NetworkProtectionAccessController: NetworkProtectionAccess { | ||
|
|
||
| private let networkProtectionActivation: NetworkProtectionFeatureActivation | ||
| private let networkProtectionWaitlistStorage: WaitlistStorage | ||
| private let networkProtectionTermsAndConditionsStore: NetworkProtectionTermsAndConditionsStore | ||
| private let privacyConfigurationManager: PrivacyConfigurationManaging | ||
|
|
||
| init( | ||
| networkProtectionActivation: NetworkProtectionFeatureActivation = NetworkProtectionKeychainTokenStore(), | ||
| networkProtectionWaitlistStorage: WaitlistStorage = VPNWaitlist.shared.waitlistStorage, | ||
| networkProtectionTermsAndConditionsStore: NetworkProtectionTermsAndConditionsStore = NetworkProtectionTermsAndConditionsUserDefaultsStore(), | ||
| privacyConfigurationManager: PrivacyConfigurationManaging = ContentBlocking.shared.privacyConfigurationManager | ||
| ) { | ||
| self.networkProtectionActivation = networkProtectionActivation | ||
| self.networkProtectionWaitlistStorage = networkProtectionWaitlistStorage | ||
| self.networkProtectionTermsAndConditionsStore = networkProtectionTermsAndConditionsStore | ||
| self.privacyConfigurationManager = privacyConfigurationManager | ||
| } | ||
|
|
||
| func networkProtectionAccessType() -> NetworkProtectionAccessType { | ||
| // First, check for users who have activated the VPN via an invite code: | ||
| if networkProtectionActivation.isFeatureActivated && !networkProtectionWaitlistStorage.isInvited { | ||
| return .inviteCodeInvited | ||
| } | ||
|
|
||
| // Next, check if the waitlist is still active; if not, the user has no access. | ||
| let isWaitlistActive = privacyConfigurationManager.privacyConfig.isSubfeatureEnabled(NetworkProtectionSubfeature.waitlistBetaActive) | ||
| if !isWaitlistActive { | ||
| return .none | ||
| } | ||
|
|
||
| // Next, check if a waitlist user has NetP access and whether they need to accept T&C. | ||
| if networkProtectionActivation.isFeatureActivated && networkProtectionWaitlistStorage.isInvited { | ||
| if networkProtectionTermsAndConditionsStore.networkProtectionWaitlistTermsAndConditionsAccepted { | ||
| return .waitlistInvited | ||
| } else { | ||
| return .waitlistInvitedPendingTermsAcceptance | ||
| } | ||
| } | ||
|
|
||
| // Next, check if the user has waitlist access at all and whether they've already joined. | ||
| let hasWaitlistAccess = privacyConfigurationManager.privacyConfig.isSubfeatureEnabled(NetworkProtectionSubfeature.waitlist) | ||
| if hasWaitlistAccess { | ||
| if networkProtectionWaitlistStorage.isOnWaitlist { | ||
| return .waitlistJoined | ||
| } else { | ||
| return .waitlistAvailable | ||
| } | ||
| } | ||
|
|
||
| return .none | ||
| } | ||
|
|
||
| func refreshNetworkProtectionAccess() { | ||
| guard networkProtectionActivation.isFeatureActivated else { | ||
| return | ||
| } | ||
|
|
||
| if !privacyConfigurationManager.privacyConfig.isSubfeatureEnabled(NetworkProtectionSubfeature.waitlistBetaActive) { | ||
| networkProtectionWaitlistStorage.deleteWaitlistState() | ||
| try? NetworkProtectionKeychainTokenStore().deleteToken() | ||
|
|
||
| Task { | ||
| let controller = NetworkProtectionTunnelController() | ||
| await controller.stop() | ||
| await controller.removeVPN() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| // | ||
| // NetworkProtectionTermsAndConditionsStore.swift | ||
| // DuckDuckGo | ||
| // | ||
| // Copyright © 2023 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import Foundation | ||
| import Core | ||
|
|
||
| protocol NetworkProtectionTermsAndConditionsStore { | ||
| var networkProtectionWaitlistTermsAndConditionsAccepted: Bool { get set } | ||
| } | ||
|
|
||
| struct NetworkProtectionTermsAndConditionsUserDefaultsStore: NetworkProtectionTermsAndConditionsStore { | ||
|
|
||
| @UserDefaultsWrapper(key: .networkProtectionWaitlistTermsAndConditionsAccepted, defaultValue: false) | ||
| var networkProtectionWaitlistTermsAndConditionsAccepted: Bool | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters