Post international Privacy Pro launch cleanup (#3714)

Task/Issue URL: https://app.asana.com/0/1203936086921904/1208836865988474/f CC: @federicocappelli **Description**: Post launch remove isLaunchedROW and isLaunchedROWOverride feature flags and clean related business logic **Steps to test this PR**: - Verify purchase paths for both US and non-US Privacy Pro variants work correctly (no functional changes expected) **Definition of Done**: * [ ] Does this PR satisfy our [Definition of Done](https://app.asana.com/0/1202500774821704/1207634633537039/f)? --- ###### Internal references: [Pull Request Review Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f) [Software Engineering Expectations](https://app.asana.com/0/59792373528535/199064865822552) [Technical Design Template](https://app.asana.com/0/59792373528535/184709971311943) [Pull Request Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)
duckduckgo · Jan 9, 2025 · 2f9cf27 · 2f9cf27
1 parent b160924
commit 2f9cf27
Show file tree

Hide file tree

Showing 29 changed files with 64 additions and 150 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -15342,7 +15342,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 223.0.0;
+				version = "223.0.0-1";
 			};
 		};
 		9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "e8f94cf597f4a447f86f39f461b736ac9ea280ce",
-        "version" : "223.0.0"
+        "revision" : "a87790835c140e4399ac85bb5b3c39d4c5f4ff03",
+        "version" : "223.0.0-1"
       }
     },
     {

diff --git a/DuckDuckGo/Menus/MainMenuActions.swift b/DuckDuckGo/Menus/MainMenuActions.swift
@@ -909,21 +909,6 @@ extension MainViewController {
         guard let internalUserDecider = NSApp.delegateTyped.internalUserDecider as? DefaultInternalUserDecider else { return }
         let state = internalUserDecider.isInternalUser
         internalUserDecider.debugSetInternalUserState(!state)
-
-        if !DefaultSubscriptionFeatureAvailability().isFeatureAvailable {
-            // We only clear PPro state when it's not available, as otherwise
-            // there should be no state to clear.  Clearing PPro state can
-            // trigger notifications which we want to avoid unless
-            // necessary.
-            clearPrivacyProState()
-        }
-    }
-
-    /// Clears the PrivacyPro state to make testing easier.
-    ///
-    private func clearPrivacyProState() {
-        Application.appDelegate.subscriptionManager.accountManager.signOut()
-        UserDefaults.netP.networkProtectionEntitlementsExpired = false
     }
 
     @objc func resetDailyPixels(_ sender: Any?) {

diff --git a/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift b/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift
@@ -421,14 +421,13 @@ final class AddressBarTextField: NSTextField {
         }
 #endif
 
-        if DefaultSubscriptionFeatureAvailability().isFeatureAvailable {
-            let baseURL = Application.appDelegate.subscriptionManager.url(for: .baseURL)
-            let identityTheftRestorationURL = Application.appDelegate.subscriptionManager.url(for: .identityTheftRestoration)
-            if providedUrl.isChild(of: baseURL) || providedUrl.isChild(of: identityTheftRestorationURL) {
-                self.updateValue(selectedTabViewModel: nil, addressBarString: nil) // reset
-                self.window?.makeFirstResponder(nil)
-                return
-            }
+        // Prevent typing in subscription URLs directly in the address bar
+        let baseURL = Application.appDelegate.subscriptionManager.url(for: .baseURL)
+        let identityTheftRestorationURL = Application.appDelegate.subscriptionManager.url(for: .identityTheftRestoration)
+        if providedUrl.isChild(of: baseURL) || providedUrl.isChild(of: identityTheftRestorationURL) {
+            self.updateValue(selectedTabViewModel: nil, addressBarString: nil) // reset
+            self.window?.makeFirstResponder(nil)
+            return
         }
 
         self.window?.makeFirstResponder(nil)

diff --git a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
@@ -419,8 +419,6 @@ final class MoreOptionsMenu: NSMenu, NSMenuDelegate {
 
     @MainActor
     private func addSubscriptionItems() {
-        guard subscriptionFeatureAvailability.isFeatureAvailable else { return }
-
         func shouldHideDueToNoProduct() -> Bool {
             let platform = subscriptionManager.currentEnvironment.purchasePlatform
             return platform == .appStore && subscriptionManager.canPurchase == false
@@ -966,7 +964,7 @@ final class SubscriptionSubMenu: NSMenu, NSMenuDelegate {
     }
 
     private func refreshAvailabilityBasedOnEntitlements() {
-        guard subscriptionFeatureAvailability.isFeatureAvailable, subscriptionManager.accountManager.isUserAuthenticated else { return }
+        guard subscriptionManager.accountManager.isUserAuthenticated else { return }
 
         @Sendable func hasEntitlement(for productName: Entitlement.ProductName) async -> Bool {
             switch await self.subscriptionManager.accountManager.hasEntitlement(forProductName: productName) {

diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
@@ -331,8 +331,7 @@ final class NavigationBarViewController: NSViewController {
     }
 
     private func toggleNetworkProtectionPopover() {
-        guard DefaultSubscriptionFeatureAvailability().isFeatureAvailable,
-              NetworkProtectionKeychainTokenStore().isFeatureActivated else {
+        guard NetworkProtectionKeychainTokenStore().isFeatureActivated else {
             return
         }
 

diff --git a/DuckDuckGo/Preferences/Model/PreferencesSection.swift b/DuckDuckGo/Preferences/Model/PreferencesSection.swift
@@ -65,24 +65,22 @@ struct PreferencesSection: Hashable, Identifiable {
             .init(id: .about, panes: otherPanes)
         ]
 
-        if DefaultSubscriptionFeatureAvailability().isFeatureAvailable {
-            let subscriptionManager = Application.appDelegate.subscriptionManager
-            let platform = subscriptionManager.currentEnvironment.purchasePlatform
-            var shouldHidePrivacyProDueToNoProducts = platform == .appStore && subscriptionManager.canPurchase == false
+        let subscriptionManager = Application.appDelegate.subscriptionManager
+        let platform = subscriptionManager.currentEnvironment.purchasePlatform
+        var shouldHidePrivacyProDueToNoProducts = platform == .appStore && subscriptionManager.canPurchase == false
 
-            if subscriptionManager.accountManager.isUserAuthenticated {
-                shouldHidePrivacyProDueToNoProducts = false
-            }
-
-            if !shouldHidePrivacyProDueToNoProducts {
-                var subscriptionPanes: [PreferencePaneIdentifier] = [.subscription]
+        if subscriptionManager.accountManager.isUserAuthenticated {
+            shouldHidePrivacyProDueToNoProducts = false
+        }
 
-                if includingVPN {
-                    subscriptionPanes.append(.vpn)
-                }
+        if !shouldHidePrivacyProDueToNoProducts {
+            var subscriptionPanes: [PreferencePaneIdentifier] = [.subscription]
 
-                sections.insert(.init(id: .privacyPro, panes: subscriptionPanes), at: 1)
+            if includingVPN {
+                subscriptionPanes.append(.vpn)
             }
+
+            sections.insert(.init(id: .privacyPro, panes: subscriptionPanes), at: 1)
         }
 
         return sections

diff --git a/DuckDuckGo/Subscription/SubscriptionManager+StandardConfiguration.swift b/DuckDuckGo/Subscription/SubscriptionManager+StandardConfiguration.swift
@@ -53,10 +53,6 @@ extension DefaultSubscriptionManager {
             }
 
             switch feature {
-            case .isLaunchedROW:
-                return featureFlagger.isFeatureOn(.isPrivacyProLaunchedROW)
-            case .isLaunchedROWOverride:
-                return featureFlagger.isFeatureOn(.isPrivacyProLaunchedROWOverride)
             case .usePrivacyProUSARegionOverride:
                 return (featureFlagger.internalUserDecider.isInternalUser &&
                         subscriptionEnvironment.serviceEnvironment == .staging &&
@@ -76,15 +72,13 @@ extension DefaultSubscriptionManager {
                       subscriptionEndpointService: subscriptionEndpointService,
                       authEndpointService: authEndpointService,
                       subscriptionFeatureMappingCache: subscriptionFeatureMappingCache,
-                      subscriptionEnvironment: subscriptionEnvironment,
-                      subscriptionFeatureFlagger: subscriptionFeatureFlagger)
+                      subscriptionEnvironment: subscriptionEnvironment)
         } else {
             self.init(accountManager: accountManager,
                       subscriptionEndpointService: subscriptionEndpointService,
                       authEndpointService: authEndpointService,
                       subscriptionFeatureMappingCache: subscriptionFeatureMappingCache,
-                      subscriptionEnvironment: subscriptionEnvironment,
-                      subscriptionFeatureFlagger: subscriptionFeatureFlagger)
+                      subscriptionEnvironment: subscriptionEnvironment)
         }
 
         accountManager.delegate = self

diff --git a/DuckDuckGo/Subscription/SubscriptionRedirectManager.swift b/DuckDuckGo/Subscription/SubscriptionRedirectManager.swift
@@ -26,16 +26,13 @@ protocol SubscriptionRedirectManager: AnyObject {
 
 final class PrivacyProSubscriptionRedirectManager: SubscriptionRedirectManager {
 
-    private let featureAvailabiltyProvider: () -> Bool
     private let subscriptionEnvironment: SubscriptionEnvironment
     private let canPurchase: () -> Bool
     private let baseURL: URL
 
-    init(featureAvailabiltyProvider: @escaping @autoclosure () -> Bool = DefaultSubscriptionFeatureAvailability().isFeatureAvailable,
-         subscriptionEnvironment: SubscriptionEnvironment,
+    init(subscriptionEnvironment: SubscriptionEnvironment,
          baseURL: URL,
          canPurchase: @escaping () -> Bool) {
-        self.featureAvailabiltyProvider = featureAvailabiltyProvider
         self.subscriptionEnvironment = subscriptionEnvironment
         self.canPurchase = canPurchase
         self.baseURL = baseURL
@@ -45,9 +42,8 @@ final class PrivacyProSubscriptionRedirectManager: SubscriptionRedirectManager {
         guard url.isPart(ofDomain: "duckduckgo.com") else { return nil }
 
         if url.pathComponents == URL.privacyPro.pathComponents {
-            let isFeatureAvailable = featureAvailabiltyProvider()
             let shouldHidePrivacyProDueToNoProducts = subscriptionEnvironment.purchasePlatform == .appStore && canPurchase() == false
-            let isPurchasePageRedirectActive = isFeatureAvailable && !shouldHidePrivacyProDueToNoProducts
+            let isPurchasePageRedirectActive = !shouldHidePrivacyProDueToNoProducts
             // Redirect the `/pro` URL to `/subscriptions` URL. If there are any query items in the original URL it appends to the `/subscriptions` URL.
             return isPurchasePageRedirectActive ? baseURL.addingQueryItems(from: url) : nil
         }

diff --git a/DuckDuckGo/Tab/Navigation/RedirectNavigationResponder.swift b/DuckDuckGo/Tab/Navigation/RedirectNavigationResponder.swift
@@ -36,20 +36,4 @@ struct RedirectNavigationResponder: NavigationResponder {
             navigator.load(request)
         }
     }
-
-//    private func redirectURL(for url: URL) -> URL? {
-//        guard url.isPart(ofDomain: "duckduckgo.com") else { return nil }
-//
-//        if url.pathComponents == URL.privacyPro.pathComponents {
-//            let isFeatureAvailable = DefaultSubscriptionFeatureAvailability().isFeatureAvailable
-//            let subscriptionManager = Application.appDelegate.subscriptionManager
-//            let platform = subscriptionManager.currentEnvironment.purchasePlatform
-//            let shouldHidePrivacyProDueToNoProducts = platform == .appStore && subscriptionManager.canPurchase == false
-//            let isPurchasePageRedirectActive = isFeatureAvailable && !shouldHidePrivacyProDueToNoProducts
-//            let url = SubscriptionURL.baseURL.subscriptionURL(environment: subscriptionManager.currentEnvironment.serviceEnvironment)
-//            return isPurchasePageRedirectActive ? url : nil
-//        }
-//
-//        return nil
-//    }
 }
diff --git a/DuckDuckGo/Tab/UserScripts/UserScripts.swift b/DuckDuckGo/Tab/UserScripts/UserScripts.swift
@@ -125,22 +125,20 @@ final class UserScripts: UserScriptsProvider {
             userScripts.append(specialPages)
         }
 
-        if DefaultSubscriptionFeatureAvailability().isFeatureAvailable {
-            let subscriptionManager = Application.appDelegate.subscriptionManager
-            let stripePurchaseFlow = DefaultStripePurchaseFlow(subscriptionEndpointService: subscriptionManager.subscriptionEndpointService,
-                                                               authEndpointService: subscriptionManager.authEndpointService,
-                                                               accountManager: subscriptionManager.accountManager)
-            let freemiumDBPPixelExperimentManager = FreemiumDBPPixelExperimentManager(subscriptionManager: subscriptionManager)
-            let delegate = SubscriptionPagesUseSubscriptionFeature(subscriptionManager: subscriptionManager,
-                                                                   stripePurchaseFlow: stripePurchaseFlow,
-                                                                   uiHandler: Application.appDelegate.subscriptionUIHandler,
-                                                                   freemiumDBPPixelExperimentManager: freemiumDBPPixelExperimentManager)
-            subscriptionPagesUserScript.registerSubfeature(delegate: delegate)
-            userScripts.append(subscriptionPagesUserScript)
-
-            identityTheftRestorationPagesUserScript.registerSubfeature(delegate: IdentityTheftRestorationPagesFeature())
-            userScripts.append(identityTheftRestorationPagesUserScript)
-        }
+        let subscriptionManager = Application.appDelegate.subscriptionManager
+        let stripePurchaseFlow = DefaultStripePurchaseFlow(subscriptionEndpointService: subscriptionManager.subscriptionEndpointService,
+                                                           authEndpointService: subscriptionManager.authEndpointService,
+                                                           accountManager: subscriptionManager.accountManager)
+        let freemiumDBPPixelExperimentManager = FreemiumDBPPixelExperimentManager(subscriptionManager: subscriptionManager)
+        let delegate = SubscriptionPagesUseSubscriptionFeature(subscriptionManager: subscriptionManager,
+                                                               stripePurchaseFlow: stripePurchaseFlow,
+                                                               uiHandler: Application.appDelegate.subscriptionUIHandler,
+                                                               freemiumDBPPixelExperimentManager: freemiumDBPPixelExperimentManager)
+        subscriptionPagesUserScript.registerSubfeature(delegate: delegate)
+        userScripts.append(subscriptionPagesUserScript)
+
+        identityTheftRestorationPagesUserScript.registerSubfeature(delegate: IdentityTheftRestorationPagesFeature())
+        userScripts.append(identityTheftRestorationPagesUserScript)
     }
 
     lazy var userScripts: [UserScript] = [

diff --git a/DuckDuckGo/Waitlist/VPNFeatureGatekeeper.swift b/DuckDuckGo/Waitlist/VPNFeatureGatekeeper.swift
@@ -65,10 +65,6 @@ struct DefaultVPNFeatureGatekeeper: VPNFeatureGatekeeper {
     /// For subscription users this means they have entitlements.
     ///
     func canStartVPN() async throws -> Bool {
-        guard subscriptionFeatureAvailability.isFeatureAvailable else {
-            return false
-        }
-
         switch await subscriptionManager.accountManager.hasEntitlement(forProductName: .networkProtection) {
         case .success(let hasEntitlement):
             return hasEntitlement
@@ -83,22 +79,13 @@ struct DefaultVPNFeatureGatekeeper: VPNFeatureGatekeeper {
     /// For subscription users this means they are authenticated.
     ///
     func isVPNVisible() -> Bool {
-        guard subscriptionFeatureAvailability.isFeatureAvailable else {
-            return false
-        }
-        return subscriptionManager.accountManager.isUserAuthenticated
-    }
-
-    /// We've had to add this method because accessing the singleton in app delegate is crashing the integration tests.
-    ///
-    var subscriptionFeatureAvailability: DefaultSubscriptionFeatureAvailability {
-        DefaultSubscriptionFeatureAvailability()
+        subscriptionManager.accountManager.isUserAuthenticated
     }
 
     /// Returns whether the VPN should be uninstalled automatically.
     /// This is only true when the user is not an Easter Egg user, the waitlist test has ended, and the user is onboarded.
     func shouldUninstallAutomatically() -> Bool {
-        return subscriptionFeatureAvailability.isFeatureAvailable && !subscriptionManager.accountManager.isUserAuthenticated && LoginItem.vpnMenu.status.isInstalled
+        !subscriptionManager.accountManager.isUserAuthenticated && LoginItem.vpnMenu.status.isInstalled
     }
 
     /// Whether the user is fully onboarded

diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
@@ -29,7 +29,7 @@ let package = Package(
             targets: ["DataBrokerProtection"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "223.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "223.0.0-1"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../AppKitExtensions"),
         .package(path: "../XPCHelper"),

diff --git a/LocalPackages/FeatureFlags/Package.swift b/LocalPackages/FeatureFlags/Package.swift
@@ -32,7 +32,7 @@ let package = Package(
             targets: ["FeatureFlags"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "223.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "223.0.0-1"),
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.

diff --git a/LocalPackages/FeatureFlags/Sources/FeatureFlags/FeatureFlag.swift b/LocalPackages/FeatureFlags/Sources/FeatureFlags/FeatureFlag.swift
@@ -47,17 +47,13 @@ public enum FeatureFlag: String, CaseIterable {
     /// https://app.asana.com/0/72649045549333/1208241266421040/f
     case htmlNewTabPage
 
-    case isPrivacyProLaunchedROW
-    case isPrivacyProLaunchedROWOverride
-
     case autofillPartialFormSaves
 }
 
 extension FeatureFlag: FeatureFlagDescribing {
     public var supportsLocalOverriding: Bool {
         switch self {
-        case .htmlNewTabPage,
-             .isPrivacyProLaunchedROWOverride:
+        case .htmlNewTabPage:
             return true
         case .maliciousSiteProtection:
             return true
@@ -71,8 +67,7 @@ extension FeatureFlag: FeatureFlagDescribing {
              .unknownUsernameCategorization,
              .credentialsImportPromotionForExistingUsers,
              .networkProtectionUserTips,
-             .networkProtectionEnforceRoutes,
-             .isPrivacyProLaunchedROW:
+             .networkProtectionEnforceRoutes:
             return false
         }
     }
@@ -101,10 +96,6 @@ extension FeatureFlag: FeatureFlagDescribing {
             return .remoteDevelopment(.subfeature(NetworkProtectionSubfeature.enforceRoutes))
         case .htmlNewTabPage:
             return .disabled
-        case .isPrivacyProLaunchedROW:
-            return .remoteReleasable(.subfeature(PrivacyProSubfeature.isLaunchedROW))
-        case .isPrivacyProLaunchedROWOverride:
-            return .remoteReleasable(.subfeature(PrivacyProSubfeature.isLaunchedROWOverride))
         case .autofillPartialFormSaves:
             return .remoteReleasable(.subfeature(AutofillSubfeature.partialFormSaves))
         }

diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -33,7 +33,7 @@ let package = Package(
         .library(name: "VPNAppLauncher", targets: ["VPNAppLauncher"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "223.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "223.0.0-1"),
         .package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.3"),
         .package(path: "../AppLauncher"),
         .package(path: "../UDSHelper"),

diff --git a/LocalPackages/NewTabPage/Package.swift b/LocalPackages/NewTabPage/Package.swift
@@ -32,7 +32,7 @@ let package = Package(
             targets: ["NewTabPage"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "223.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "223.0.0-1"),
         .package(path: "../WebKitExtensions"),
         .package(path: "../Utilities"),
     ],

diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
@@ -13,7 +13,7 @@ let package = Package(
             targets: ["SubscriptionUI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "223.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "223.0.0-1"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../FeatureFlags")
     ],

diff --git a/...ages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionModel.swift b/...ages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionModel.swift
@@ -43,7 +43,6 @@ public final class PreferencesSubscriptionModel: ObservableObject {
     var hasEmail: Bool { !(email?.isEmpty ?? true) }
 
     let featureFlagger: FeatureFlagger
-    var isROWLaunched: Bool = false
 
     private var subscriptionPlatform: Subscription.Platform?
 
@@ -165,7 +164,6 @@ public final class PreferencesSubscriptionModel: ObservableObject {
         } else {
             self.subscriptionStorefrontRegion = currentStorefrontRegion()
         }
-        isROWLaunched = featureFlagger.isFeatureOn(.isPrivacyProLaunchedROW) || featureFlagger.isFeatureOn(.isPrivacyProLaunchedROWOverride)
     }
 
     private func updateUserAuthenticatedState(_ isUserAuthenticated: Bool) {