Subscription stuff renamed

DuckDuckGo.xcodeproj/project.pbxproj

@@ -1183,6 +1183,10 @@
 		F15531922BF215ED0029ED04 /* SubscriptionTestingUtilities in Frameworks */ = {isa = PBXBuildFile; productRef = F15531912BF215ED0029ED04 /* SubscriptionTestingUtilities */; };
 		F15531942BF215F60029ED04 /* Subscription in Frameworks */ = {isa = PBXBuildFile; productRef = F15531932BF215F60029ED04 /* Subscription */; };
 		F15531962BF215F60029ED04 /* SubscriptionTestingUtilities in Frameworks */ = {isa = PBXBuildFile; productRef = F15531952BF215F60029ED04 /* SubscriptionTestingUtilities */; };
+		F15764C02D3E6AE60086AA21 /* Networking in Frameworks */ = {isa = PBXBuildFile; productRef = F15764BF2D3E6AE60086AA21 /* Networking */; };
+		F15764C22D3E6AF60086AA21 /* Networking in Frameworks */ = {isa = PBXBuildFile; productRef = F15764C12D3E6AF60086AA21 /* Networking */; };
+		F15764C42D3E6AF60086AA21 /* NetworkingTestingUtils in Frameworks */ = {isa = PBXBuildFile; productRef = F15764C32D3E6AF60086AA21 /* NetworkingTestingUtils */; };
+		F15764C62D3E6B010086AA21 /* Networking in Frameworks */ = {isa = PBXBuildFile; productRef = F15764C52D3E6B010086AA21 /* Networking */; };
 		F15D43201E706CC500BF2CDC /* AutocompleteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F15D431F1E706CC500BF2CDC /* AutocompleteViewController.swift */; };
 		F1617C131E572E0300DEDCAF /* TabSwitcherViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1617C121E572E0300DEDCAF /* TabSwitcherViewController.swift */; };
 		F1617C151E57336D00DEDCAF /* TabManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1617C141E57336D00DEDCAF /* TabManager.swift */; };
@@ -3294,6 +3298,7 @@
 				F1B3DEC12D2D90BB00D33FA5 /* NetworkingTestingUtils in Frameworks */,
 				F1AFDF822D2EE1D100DB313F /* PersistenceTestingUtils in Frameworks */,
 				EEFAB4672A73C230008A38E4 /* NetworkProtectionTestUtils in Frameworks */,
+				F15764C02D3E6AE60086AA21 /* Networking in Frameworks */,
 				4BE67B072B96B9B0007335F7 /* Common in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3328,6 +3333,8 @@
 				4BE67B012B96B741007335F7 /* Common in Frameworks */,
 				F15531962BF215F60029ED04 /* SubscriptionTestingUtilities in Frameworks */,
 				F15531942BF215F60029ED04 /* Subscription in Frameworks */,
+				F15764C42D3E6AF60086AA21 /* NetworkingTestingUtils in Frameworks */,
+				F15764C22D3E6AF60086AA21 /* Networking in Frameworks */,
 				4BE67B032B96B864007335F7 /* ContentBlocking in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3359,6 +3366,7 @@
 				98424A962CED4F430071C7DB /* OHHTTPStubs in Frameworks */,
 				98424A972CED4F430071C7DB /* OHHTTPStubsSwift in Frameworks */,
 				98424A982CED4F430071C7DB /* ContentBlocking in Frameworks */,
+				F15764C62D3E6B010086AA21 /* Networking in Frameworks */,
 				98424AB22CEDD6150071C7DB /* BrowserServicesKit in Frameworks */,
 				98424A992CED4F430071C7DB /* SubscriptionTestingUtilities in Frameworks */,
 				98424A9A2CED4F430071C7DB /* Subscription in Frameworks */,
@@ -7073,6 +7081,7 @@
 				F15531912BF215ED0029ED04 /* SubscriptionTestingUtilities */,
 				F1B3DEC02D2D90BB00D33FA5 /* NetworkingTestingUtils */,
 				F1AFDF812D2EE1D100DB313F /* PersistenceTestingUtils */,
+				F15764BF2D3E6AE60086AA21 /* Networking */,
 			);
 			productName = DuckDuckGoTests;
 			productReference = 84E341A61E2F7EFB00BDBA6F /* UnitTests.xctest */;
@@ -7138,6 +7147,8 @@
 				4BE67B022B96B864007335F7 /* ContentBlocking */,
 				F15531932BF215F60029ED04 /* Subscription */,
 				F15531952BF215F60029ED04 /* SubscriptionTestingUtilities */,
+				F15764C12D3E6AF60086AA21 /* Networking */,
+				F15764C32D3E6AF60086AA21 /* NetworkingTestingUtils */,
 			);
 			productName = IntegrationTests;
 			productReference = 85D33FCB25C97B6E002B91A6 /* IntegrationTests.xctest */;
@@ -7210,6 +7221,7 @@
 				98424AB32CEDD61C0071C7DB /* BrowserServicesKitTestsUtils */,
 				F1B3DEC22D2D90D500D33FA5 /* NetworkingTestingUtils */,
 				F1AFDF7F2D2EE10A00DB313F /* PersistenceTestingUtils */,
+				F15764C52D3E6B010086AA21 /* Networking */,
 			);
 			productName = DuckDuckGoTests;
 			productReference = 98424AA92CED4F430071C7DB /* WebViewUnitTests.xctest */;
@@ -12304,6 +12316,26 @@
 			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = SubscriptionTestingUtilities;
 		};
+		F15764BF2D3E6AE60086AA21 /* Networking */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = Networking;
+		};
+		F15764C12D3E6AF60086AA21 /* Networking */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = Networking;
+		};
+		F15764C32D3E6AF60086AA21 /* NetworkingTestingUtils */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = NetworkingTestingUtils;
+		};
+		F15764C52D3E6B010086AA21 /* Networking */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = Networking;
+		};
 		F1AFDF7F2D2EE10A00DB313F /* PersistenceTestingUtils */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -33,16 +33,16 @@
       "location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
       "state" : {
         "branch" : "fcappelli/subscription_oauth_api_v2",
-        "revision" : "c51c7b960e047f6903daf4dadc09a8fe49648f01"
+        "revision" : "8bed092b8ca59d0d947b4a5b4da6daf2386cf3d5"
       }
     },
     {
       "identity" : "content-scope-scripts",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/content-scope-scripts",
       "state" : {
-        "revision" : "0502ed7de4130bd8705daebaca9aeb20d3e62d15",
-        "version" : "7.5.0"
+        "revision" : "7958ddab724c26326333cae13fe81478290607fa",
+        "version" : "7.6.0"
       }
     },
     {
@@ -203,8 +203,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/sync_crypto",
       "state" : {
-        "revision" : "0c8bf3c0e75591bc366407b9d7a73a9fcfc7736f",
-        "version" : "0.3.0"
+        "revision" : "cc726cebb67367466bc31ced4784e16d44ac68d1",
+        "version" : "0.4.0"
       }
     },
     {

DuckDuckGo/AppLifecycle/AppStates/Active.swift

@@ -452,7 +452,7 @@ struct Active: AppState {
     @MainActor
     func presentNetworkProtectionStatusSettingsModal() {
         Task {
-            if await AppDependencyProvider.shared.subscriptionManager.isFeatureActive(.networkProtection) {
+            if await AppDependencyProvider.shared.subscriptionManager.isFeatureAvailableForUser(.networkProtection) {
                 Task { @MainActor in
                     (window.rootViewController as? MainViewController)?.segueToVPN()
                 }

DuckDuckGo/AppServices/UNService.swift

@@ -59,7 +59,7 @@ extension UNService: UNUserNotificationCenterDelegate {
 
     private func presentNetworkProtectionStatusSettingsModal() {
         Task {
-            if await AppDependencyProvider.shared.subscriptionManager.isFeatureActive(.networkProtection) {
+            if await AppDependencyProvider.shared.subscriptionManager.isFeatureAvailableForUser(.networkProtection) {
                 Task { @MainActor in
                     (window.rootViewController as? MainViewController)?.segueToVPN()
                 }

DuckDuckGo/AppShortcuts.swift

@@ -24,7 +24,7 @@ extension UIApplication {
 
     func refreshVPNShortcuts(vpnFeatureVisibility: DefaultNetworkProtectionVisibility, subscriptionManager: any SubscriptionManager) async {
         guard vpnFeatureVisibility.shouldShowVPNShortcut(),
-              await AppDependencyProvider.shared.subscriptionManager.isFeatureActive(.networkProtection)
+              await AppDependencyProvider.shared.subscriptionManager.isFeatureAvailableForUser(.networkProtection)
         else {
             shortcutItems = nil
             return

DuckDuckGo/Feedback/VPNMetadataCollector.swift

@@ -244,7 +244,7 @@ final class DefaultVPNMetadataCollector: VPNMetadataCollector {
     func collectPrivacyProInfo() async -> VPNMetadata.PrivacyProInfo {
         return .init(
             hasPrivacyProAccount: subscriptionManager.isUserAuthenticated,
-            hasVPNEntitlement: await subscriptionManager.isFeatureActive(.networkProtection)
+            hasVPNEntitlement: await subscriptionManager.isFeatureAvailableForUser(.networkProtection)
         )
     }
 }

DuckDuckGo/OldAppDelegate.swift

@@ -1154,7 +1154,7 @@ final class OldAppDelegate: NSObject, UIApplicationDelegate, DDGApp {
             return
         }
 
-        if await AppDependencyProvider.shared.subscriptionManager.isFeatureActive(.networkProtection) {
+        if await AppDependencyProvider.shared.subscriptionManager.isFeatureAvailableForUser(.networkProtection) {
             let items = [
                 UIApplicationShortcutItem(type: AppDelegate.ShortcutKey.openVPNSettings,
                                           localizedTitle: UserText.netPOpenVPNQuickAction,
@@ -1234,7 +1234,7 @@ extension OldAppDelegate: UNUserNotificationCenterDelegate {
 
     func presentNetworkProtectionStatusSettingsModal() {
         Task {
-            if await AppDependencyProvider.shared.subscriptionManager.isFeatureActive(.networkProtection) {
+            if await AppDependencyProvider.shared.subscriptionManager.isFeatureAvailableForUser(.networkProtection) {
                 Task { @MainActor in
                     (window?.rootViewController as? MainViewController)?.segueToVPN()
                 }

DuckDuckGo/SettingsViewModel.swift

@@ -775,7 +775,7 @@ extension SettingsViewModel {
             state.subscription.hasActiveSubscription = subscription.isActive
             let features = await subscriptionManager.currentSubscriptionFeatures(forceRefresh: false)
             state.subscription.entitlements = features.compactMap({ feature in
-                if feature.enabled {
+                if feature.availableForUser {
                     return feature.entitlement
                 } else {
                     return nil

DuckDuckGo/Subscription/Feedback/UnifiedFeedbackFormViewModel.swift

@@ -168,14 +168,14 @@ final class UnifiedFeedbackFormViewModel: ObservableObject {
         let itrFeature = features.first { $0.entitlement == .identityTheftRestoration }
         let itrgFeature = features.first { $0.entitlement == .identityTheftRestorationGlobal }
 
-        if vpnFeature?.enabled ?? false {
+        if vpnFeature?.availableForUser ?? false {
             availableCategories.append(.vpn)
         }
-        if dbpFeature?.enabled ?? false {
+        if dbpFeature?.availableForUser ?? false {
             availableCategories.append(.pir)
         }
-        let idpEnabled = itrFeature?.enabled ?? false
-        let idpgEnabled = itrgFeature?.enabled ?? false
+        let idpEnabled = itrFeature?.availableForUser ?? false
+        let idpgEnabled = itrgFeature?.availableForUser ?? false
         if idpEnabled || idpgEnabled {
             availableCategories.append(.itr)
         }

PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift

@@ -518,7 +518,7 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider {
 
         let entitlementsCheck: (() async -> Result<Bool, Error>) = {
             Logger.networkProtection.log("Subscription Entitlements check...")
-            let isNetworkProtectionEnabled = await subscriptionManager.isFeatureActive(.networkProtection)
+            let isNetworkProtectionEnabled = await subscriptionManager.isFeatureAvailableForUser(.networkProtection)
             Logger.networkProtection.log("NetworkProtectionEnabled if: \( isNetworkProtectionEnabled ? "Enabled" : "Disabled", privacy: .public)")
             return .success(isNetworkProtectionEnabled)
         }