Removes VPN waitlist and beta code

Sources/NetworkProtection/FeatureActivation/NetworkProtectionCodeRedemptionCoordinator.swift

@@ -19,15 +19,8 @@
 import Foundation
 import Common
 
-public protocol NetworkProtectionCodeRedeeming {
-
-    /// Redeems an invite code with the Network Protection backend and stores the resulting auth token
-    func redeem(_ code: String) async throws
-
-}
-
 /// Coordinates calls to the backend and oAuth token storage
-public final class NetworkProtectionCodeRedemptionCoordinator: NetworkProtectionCodeRedeeming {
+public final class NetworkProtectionCodeRedemptionCoordinator {
     private let networkClient: NetworkProtectionClient
     private let tokenStore: NetworkProtectionTokenStore
     private let isManualCodeRedemptionFlow: Bool
@@ -54,21 +47,4 @@ public final class NetworkProtectionCodeRedemptionCoordinator: NetworkProtection
         self.errorEvents = errorEvents
     }
 
-    public func redeem(_ code: String) async throws {
-        let result = await networkClient.redeem(inviteCode: code)
-        switch result {
-        case .success(let token):
-            try tokenStore.store(token)
-
-        case .failure(let error):
-            if case .invalidInviteCode = error, isManualCodeRedemptionFlow {
-                // Deliberately ignore cases where invalid invite codes are entered into the redemption form
-                throw error
-            } else {
-                errorEvents.fire(error.networkProtectionError)
-                throw error
-            }
-        }
-    }
-
 }

Sources/NetworkProtection/Networking/NetworkProtectionClient.swift

@@ -19,7 +19,6 @@
 import Foundation
 
 protocol NetworkProtectionClient {
-    func redeem(inviteCode: String) async -> Result<String, NetworkProtectionClientError>
     func getLocations(authToken: String) async -> Result<[NetworkProtectionLocation], NetworkProtectionClientError>
     func getServers(authToken: String) async -> Result<[NetworkProtectionServer], NetworkProtectionClientError>
     func register(authToken: String,
@@ -189,10 +188,6 @@ final class NetworkProtectionBackendClient: NetworkProtectionClient {
         endpointURL.appending("/register")
     }
 
-    var redeemURL: URL {
-        endpointURL.appending("/redeem")
-    }
-
     private let decoder: JSONDecoder = {
         let formatter = ISO8601DateFormatter()
         formatter.formatOptions = [.withFullDate, .withFullTime, .withFractionalSeconds]
@@ -381,11 +376,6 @@ final class NetworkProtectionBackendClient: NetworkProtectionClient {
         }
     }
 
-    public func redeem(inviteCode: String) async -> Result<String, NetworkProtectionClientError> {
-        let requestBody = RedeemInviteCodeRequestBody(code: inviteCode)
-        return await retrieveAuthToken(requestBody: requestBody, endpoint: redeemURL)
-    }
-
     private func retrieveAuthToken<RequestBody: Encodable>(
         requestBody: RequestBody,
         endpoint: URL

Sources/NetworkProtection/Settings/Extensions/UserDefaults+showMessaging.swift

@@ -85,24 +85,3 @@ extension UserDefaults {
 public extension Notification.Name {
     static let vpnEntitlementMessagingDidChange = Notification.Name("com.duckduckgo.network-protection.entitlement-messaging-changed")
 }
-
-extension UserDefaults {
-    private var vpnEarlyAccessOverAlertAlreadyShownKey: String {
-        "vpnEarlyAccessOverAlertAlreadyShown"
-    }
-
-    @objc
-    public dynamic var vpnEarlyAccessOverAlertAlreadyShown: Bool {
-        get {
-            value(forKey: vpnEarlyAccessOverAlertAlreadyShownKey) as? Bool ?? false
-        }
-
-        set {
-            set(newValue, forKey: vpnEarlyAccessOverAlertAlreadyShownKey)
-        }
-    }
-
-    public func resetThankYouMessaging() {
-        removeObject(forKey: vpnEarlyAccessOverAlertAlreadyShownKey)
-    }
-}

Sources/RemoteMessaging/Mappers/JsonToRemoteMessageModelMapper.swift

@@ -36,7 +36,6 @@ private enum AttributesKey: String, CaseIterable {
     case favorites
     case appTheme
     case daysSinceInstalled
-    case isNetPWaitlistUser
     case daysSinceNetPEnabled
 
     func matchingAttribute(jsonMatchingAttribute: AnyDecodable) -> MatchingAttribute {
@@ -56,7 +55,6 @@ private enum AttributesKey: String, CaseIterable {
         case .favorites: return FavoritesMatchingAttribute(jsonMatchingAttribute: jsonMatchingAttribute)
         case .appTheme: return AppThemeMatchingAttribute(jsonMatchingAttribute: jsonMatchingAttribute)
         case .daysSinceInstalled: return DaysSinceInstalledMatchingAttribute(jsonMatchingAttribute: jsonMatchingAttribute)
-        case .isNetPWaitlistUser: return IsNetPWaitlistUserMatchingAttribute(jsonMatchingAttribute: jsonMatchingAttribute)
         case .daysSinceNetPEnabled: return DaysSinceNetPEnabledMatchingAttribute(jsonMatchingAttribute: jsonMatchingAttribute)
         }
     }

Sources/RemoteMessaging/Matchers/UserAttributeMatcher.swift

@@ -29,7 +29,6 @@ public struct UserAttributeMatcher: AttributeMatcher {
     private let bookmarksCount: Int
     private let favoritesCount: Int
     private let isWidgetInstalled: Bool
-    private let isNetPWaitlistUser: Bool
     private let daysSinceNetPEnabled: Int
 
     public init(statisticsStore: StatisticsStore,
@@ -39,7 +38,6 @@ public struct UserAttributeMatcher: AttributeMatcher {
                 favoritesCount: Int,
                 appTheme: String,
                 isWidgetInstalled: Bool,
-                isNetPWaitlistUser: Bool,
                 daysSinceNetPEnabled: Int
 	) {
         self.statisticsStore = statisticsStore
@@ -49,11 +47,10 @@ public struct UserAttributeMatcher: AttributeMatcher {
         self.bookmarksCount = bookmarksCount
         self.favoritesCount = favoritesCount
         self.isWidgetInstalled = isWidgetInstalled
-        self.isNetPWaitlistUser = isNetPWaitlistUser
         self.daysSinceNetPEnabled = daysSinceNetPEnabled
     }
 
-    // swiftlint:disable:next cyclomatic_complexity function_body_length
+    // swiftlint:disable:next cyclomatic_complexity
     func evaluate(matchingAttribute: MatchingAttribute) -> EvaluationResult? {
         switch matchingAttribute {
         case let matchingAttribute as AppThemeMatchingAttribute:
@@ -97,12 +94,6 @@ public struct UserAttributeMatcher: AttributeMatcher {
             }
 
             return BooleanMatchingAttribute(value).matches(value: isWidgetInstalled)
-        case let matchingAttribute as IsNetPWaitlistUserMatchingAttribute:
-            guard let value = matchingAttribute.value else {
-                return .fail
-            }
-
-            return BooleanMatchingAttribute(value).matches(value: isNetPWaitlistUser)
         case let matchingAttribute as DaysSinceNetPEnabledMatchingAttribute:
             if matchingAttribute.value != MatchingAttributeDefaults.intDefaultValue {
                 return IntMatchingAttribute(matchingAttribute.value).matches(value: daysSinceNetPEnabled)

Sources/RemoteMessaging/Model/MatchingAttributes.swift

@@ -608,31 +608,6 @@ struct RangeStringNumericMatchingAttribute: Equatable {
     }
 }
 
-struct IsNetPWaitlistUserMatchingAttribute: MatchingAttribute, Equatable {
-    var value: Bool?
-    var fallback: Bool?
-
-    init(jsonMatchingAttribute: AnyDecodable) {
-        guard let jsonMatchingAttribute = jsonMatchingAttribute.value as? [String: Any] else { return }
-
-        if let value = jsonMatchingAttribute[RuleAttributes.value] as? Bool {
-            self.value = value
-        }
-        if let fallback = jsonMatchingAttribute[RuleAttributes.fallback] as? Bool {
-            self.fallback = fallback
-        }
-    }
-
-    init(value: Bool?, fallback: Bool?) {
-        self.value = value
-        self.fallback = fallback
-    }
-
-    static func == (lhs: IsNetPWaitlistUserMatchingAttribute, rhs: IsNetPWaitlistUserMatchingAttribute) -> Bool {
-        return lhs.value == rhs.value && lhs.fallback == rhs.fallback
-    }
-}
-
 struct DaysSinceNetPEnabledMatchingAttribute: MatchingAttribute, Equatable {
     var min: Int = MatchingAttributeDefaults.intDefaultValue
     var max: Int = MatchingAttributeDefaults.intDefaultMaxValue

Tests/BrowserServicesKitTests/RemoteMessaging/Mappers/JsonToRemoteConfigModelMapperTests.swift

@@ -127,14 +127,10 @@
 
         let rule8 = config.rules.filter { $0.key == 8 }.first
         XCTAssertNotNil(rule8)
         XCTAssertTrue(rule8?.value.count == 2)
         attribs = rule8?.value.filter { $0 is DaysSinceNetPEnabledMatchingAttribute }
         XCTAssertEqual(attribs?.count, 1)
         XCTAssertEqual(attribs?.first as? DaysSinceNetPEnabledMatchingAttribute, DaysSinceNetPEnabledMatchingAttribute(min: 5, fallback: nil))
-
-        attribs = rule8?.value.filter { $0 is IsNetPWaitlistUserMatchingAttribute }
-        XCTAssertEqual(attribs?.count, 1)
-        XCTAssertEqual(attribs?.first as? IsNetPWaitlistUserMatchingAttribute, IsNetPWaitlistUserMatchingAttribute(value: true, fallback: nil))
     }
 
     func testWhenJsonMessagesHaveUnknownTypesThenMessagesNotMappedIntoConfig() throws {

Tests/BrowserServicesKitTests/RemoteMessaging/Matchers/UserAttributeMatcherTests.swift

@@ -53,7 +53,6 @@ class UserAttributeMatcherTests: XCTestCase {
                                                     favoritesCount: 88,
                                                     appTheme: "default",
                                                     isWidgetInstalled: true,
-                                                    isNetPWaitlistUser: true,
                                                     daysSinceNetPEnabled: 3)
     }
 
@@ -207,16 +206,6 @@ class UserAttributeMatcherTests: XCTestCase {
 
     // MARK: - Network Protection Waitlist
 
-    func testWhenIsNetPWaitlistUserMatchesThenReturnMatch() throws {
-        XCTAssertEqual(userAttributeMatcher.evaluate(matchingAttribute: IsNetPWaitlistUserMatchingAttribute(value: true, fallback: nil)),
-                       .match)
-    }
-
-    func testWhenIsNetPWaitlistUserDoesNotMatchThenReturnFail() throws {
-        XCTAssertEqual(userAttributeMatcher.evaluate(matchingAttribute: IsNetPWaitlistUserMatchingAttribute(value: false, fallback: nil)),
-                       .fail)
-    }
-
     func testWhenDaysSinceNetPEnabledMatchesThenReturnMatch() throws {
         XCTAssertEqual(userAttributeMatcher.evaluate(matchingAttribute: DaysSinceNetPEnabledMatchingAttribute(min: 1, fallback: nil)),
                        .match)

Tests/BrowserServicesKitTests/RemoteMessaging/RemoteMessagingConfigMatcherTests.swift

@@ -43,7 +43,6 @@ class RemoteMessagingConfigMatcherTests: XCTestCase {
                                                            favoritesCount: 0,
                                                            appTheme: "light",
                                                            isWidgetInstalled: false,
-                                                           isNetPWaitlistUser: false,
                                                            daysSinceNetPEnabled: -1),
                 dismissedMessageIds: []
         )
@@ -113,7 +112,6 @@ class RemoteMessagingConfigMatcherTests: XCTestCase {
                                                            favoritesCount: 0,
                                                            appTheme: "light",
                                                            isWidgetInstalled: false,
-                                                           isNetPWaitlistUser: false,
                                                            daysSinceNetPEnabled: -1),
                 dismissedMessageIds: [])
 
@@ -182,7 +180,6 @@ class RemoteMessagingConfigMatcherTests: XCTestCase {
                                                            favoritesCount: 0,
                                                            appTheme: "light",
                                                            isWidgetInstalled: false,
-                                                           isNetPWaitlistUser: false,
                                                            daysSinceNetPEnabled: -1),
                 dismissedMessageIds: ["1"])
 
@@ -212,7 +209,6 @@ class RemoteMessagingConfigMatcherTests: XCTestCase {
                                                            favoritesCount: 0,
                                                            appTheme: "light",
                                                            isWidgetInstalled: false,
-                                                           isNetPWaitlistUser: false,
                                                            daysSinceNetPEnabled: -1),
                 dismissedMessageIds: [])
 

Tests/BrowserServicesKitTests/RemoteMessaging/RemoteMessagingConfigProcessorTests.swift

@@ -36,7 +36,6 @@ class RemoteMessagingConfigProcessorTests: XCTestCase {
                                                        favoritesCount: 0,
                                                        appTheme: "light",
                                                        isWidgetInstalled: false,
-                                                       isNetPWaitlistUser: false,
                                                        daysSinceNetPEnabled: -1),
             dismissedMessageIds: []
         )
@@ -64,7 +63,6 @@ class RemoteMessagingConfigProcessorTests: XCTestCase {
                                                            favoritesCount: 0,
                                                            appTheme: "light",
                                                            isWidgetInstalled: false,
-                                                           isNetPWaitlistUser: false,
                                                            daysSinceNetPEnabled: -1),
                 dismissedMessageIds: [])
 

Tests/BrowserServicesKitTests/Resources/remote-messaging-config.json

@@ -237,9 +237,6 @@
     {
       "id": 8,
       "attributes": {
-        "isNetPWaitlistUser": {
-          "value": true
-        },
         "daysSinceNetPEnabled": {
           "min": 5
         }

Tests/NetworkProtectionTests/NetworkProtectionClientTests.swift

@@ -52,7 +52,7 @@ final class NetworkProtectionClientTests: XCTestCase {
 
     func testRegister401Response_ThrowsInvalidTokenError() async {
         let emptyData = "".data(using: .utf8)!
-        MockURLProtocol.stubs[client.redeemURL] = (response: HTTPURLResponse(url: client.registerKeyURL, statusCode: 401)!,
+        MockURLProtocol.stubs[client.registerKeyURL] = (response: HTTPURLResponse(url: client.registerKeyURL, statusCode: 401)!,
                                                    .success(emptyData))
 
         let body = RegisterKeyRequestBody(publicKey: .testData, serverSelection: .server(name: "MockServer"))
@@ -68,7 +68,7 @@ final class NetworkProtectionClientTests: XCTestCase {
 
     func testGetServer401Response_ThrowsInvalidTokenError() async {
         let emptyData = "".data(using: .utf8)!
-        MockURLProtocol.stubs[client.redeemURL] = (response: HTTPURLResponse(url: client.serversURL, statusCode: 401)!,
+        MockURLProtocol.stubs[client.serversURL] = (response: HTTPURLResponse(url: client.serversURL, statusCode: 401)!,
                                                    .success(emptyData))
 
         let result = await client.getServers(authToken: "anAuthToken")
@@ -79,74 +79,11 @@ final class NetworkProtectionClientTests: XCTestCase {
         }
     }
 
-    // MARK: redeem(inviteCode:)
-
-    func testRedeemSuccess() async {
-        let token = "a6s7ad6ad76aasa7s6a"
-        let successData = redeemSuccessData(token: token)
-        MockURLProtocol.stubs[client.redeemURL] = (response: HTTPURLResponse(url: client.redeemURL, statusCode: 200)!,
-                                                   .success(successData))
-
-        let result = await client.redeem(inviteCode: "DH76F8S")
-
-        XCTAssertEqual(try? result.get(), token)
-    }
-
-    func testRedeem400Response() async {
-        let emptyData = "".data(using: .utf8)!
-        MockURLProtocol.stubs[client.redeemURL] = (response: HTTPURLResponse(url: client.redeemURL, statusCode: 400)!,
-                                                   .success(emptyData))
-
-        let result = await client.redeem(inviteCode: "DH76F8S")
-
-        guard case .failure(let error) = result, case .invalidInviteCode = error else {
-            XCTFail("Expected an invalidInviteCode error to be thrown")
-            return
-        }
-    }
-
-    func testRedeemNon200Or400Response() async {
-        let emptyData = "".data(using: .utf8)!
-
-        for code in [401, 304, 500] {
-            MockURLProtocol.stubs[client.redeemURL] = (response: HTTPURLResponse(url: client.redeemURL, statusCode: code)!,
-                                                       .success(emptyData))
-
-            let result = await client.redeem(inviteCode: "DH76F8S")
-
-            guard case .failure(let error) = result, case .failedToRedeemInviteCode = error else {
-                XCTFail("Expected a failedToRedeemInviteCode error to be thrown")
-                return
-            }
-        }
-    }
-
-    func testRedeemDecodeFailure() async {
-        let undecodableData = "sdfghj".data(using: .utf8)!
-        MockURLProtocol.stubs[client.redeemURL] = (response: HTTPURLResponse(url: client.redeemURL, statusCode: 200)!,
-                                                   .success(undecodableData))
-
-        let result = await client.redeem(inviteCode: "DH76F8S")
-
-        guard case .failure(let error) = result, case .failedToParseRedeemResponse = error else {
-            XCTFail("Expected a failedToRedeemInviteCode error to be thrown")
-            return
-        }
-    }
-
-    private func redeemSuccessData(token: String) -> Data {
-        return """
-        {
-            "token": "\(token)"
-        }
-        """.data(using: .utf8)!
-    }
-
     // MARK: locations(authToken:)
 
     func testLocationsSuccess() async {
         let successData = TestData.mockLocations
-        MockURLProtocol.stubs[client.locationsURL] = (response: HTTPURLResponse(url: client.redeemURL, statusCode: 200)!,
+        MockURLProtocol.stubs[client.locationsURL] = (response: HTTPURLResponse(url: client.locationsURL, statusCode: 200)!,
                                                    .success(successData))
 
         let result = await client.getLocations(authToken: "DH76F8S")
@@ -185,7 +122,7 @@ final class NetworkProtectionClientTests: XCTestCase {
 
     func testLocationsDecodeFailure() async {
         let undecodableData = "sdfghj".data(using: .utf8)!
-        MockURLProtocol.stubs[client.locationsURL] = (response: HTTPURLResponse(url: client.redeemURL, statusCode: 200)!,
+        MockURLProtocol.stubs[client.locationsURL] = (response: HTTPURLResponse(url: client.locationsURL, statusCode: 200)!,
                                                    .success(undecodableData))
 
         let result = await client.getLocations(authToken: "DH76F8S")