Reorganise PIR

DuckDuckGo/DBP/DBPHomeViewController.swift

@@ -168,18 +168,6 @@ final class DBPHomeViewController: NSViewController {
     }
 }
 
-extension DBPHomeViewController: DataBrokerProtectionInviteDialogsViewModelDelegate {
-    func dataBrokerProtectionInviteDialogsViewModelDidReedemSuccessfully(_ viewModel: DataBrokerProtectionInviteDialogsViewModel) {
-        presentedWindowController?.window?.close()
-        presentedWindowController = nil
-        setupUIWithCurrentStatus()
-    }
-
-    func dataBrokerProtectionInviteDialogsViewModelDidCancel(_ viewModel: DataBrokerProtectionInviteDialogsViewModel) {
-      closeUI()
-    }
-}
-
 // MARK: - Error UI
 
 extension DBPHomeViewController {

DuckDuckGoDBPBackgroundAgent/DataBrokerAuthenticationManagerBuilder.swift

@@ -22,11 +22,9 @@ import Subscription
 
 final public class DataBrokerAuthenticationManagerBuilder {
 
-    static func buildAuthenticationManager(redeemUseCase: RedeemUseCase = RedeemUseCase(),
-                                           subscriptionManager: SubscriptionManager) -> DataBrokerProtectionAuthenticationManager {
+    static func buildAuthenticationManager(subscriptionManager: SubscriptionManager) -> DataBrokerProtectionAuthenticationManager {
         let subscriptionManager = DataBrokerProtectionSubscriptionManager(subscriptionManager: subscriptionManager)
-        return DataBrokerProtectionAuthenticationManager(redeemUseCase: redeemUseCase,
-                                                         subscriptionManager: subscriptionManager)
+        return DataBrokerProtectionAuthenticationManager(subscriptionManager: subscriptionManager)
 
     }
 }

DuckDuckGoDBPBackgroundAgent/DuckDuckGoDBPBackgroundAgentAppDelegate.swift

@@ -99,10 +99,7 @@ final class DuckDuckGoDBPBackgroundAgentAppDelegate: NSObject, NSApplicationDele
     func applicationDidFinishLaunching(_ aNotification: Notification) {
         Logger.dbpBackgroundAgent.log("DuckDuckGoAgent started")
 
-        let redeemUseCase = RedeemUseCase(authenticationService: AuthenticationService(),
-                                          authenticationRepository: KeychainAuthenticationData())
-        let authenticationManager = DataBrokerAuthenticationManagerBuilder.buildAuthenticationManager(redeemUseCase: redeemUseCase,
-                                                                                                      subscriptionManager: subscriptionManager)
+        let authenticationManager = DataBrokerAuthenticationManagerBuilder.buildAuthenticationManager(subscriptionManager: subscriptionManager)
         manager = DataBrokerProtectionAgentManagerProvider.agentManager(authenticationManager: authenticationManager,
                                                                         accountManager: subscriptionManager.accountManager)
         manager?.agentFinishedLaunching()

LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Authentication/DataBrokerProtectionAuthenticationManaging.swift

@@ -18,17 +18,21 @@
 
 import Foundation
 
+public enum AuthenticationError: Error, Equatable {
+    case noInviteCode
+    case cantGenerateURL
+    case noAuthToken
+    case issueRedeemingInviteCode(error: String)
+}
+
 public protocol DataBrokerProtectionAuthenticationManaging {
     var isUserAuthenticated: Bool { get }
     var accessToken: String? { get }
     func hasValidEntitlement() async throws -> Bool
-    func shouldAskForInviteCode() -> Bool
-    func redeem(inviteCode: String) async throws
     func getAuthHeader() -> String?
 }
 
 public final class DataBrokerProtectionAuthenticationManager: DataBrokerProtectionAuthenticationManaging {
-    private let redeemUseCase: DataBrokerProtectionRedeemUseCase
     private let subscriptionManager: DataBrokerProtectionSubscriptionManaging
 
     public var isUserAuthenticated: Bool {
@@ -39,9 +43,7 @@ public final class DataBrokerProtectionAuthenticationManager: DataBrokerProtecti
         subscriptionManager.accessToken
     }
 
-    public init(redeemUseCase: any DataBrokerProtectionRedeemUseCase,
-                subscriptionManager: any DataBrokerProtectionSubscriptionManaging) {
-        self.redeemUseCase = redeemUseCase
+    public init(subscriptionManager: any DataBrokerProtectionSubscriptionManaging) {
         self.subscriptionManager = subscriptionManager
     }
 
@@ -52,18 +54,4 @@ public final class DataBrokerProtectionAuthenticationManager: DataBrokerProtecti
     public func getAuthHeader() -> String? {
         ServicesAuthHeaderBuilder().getAuthHeader(accessToken)
     }
-
-    // MARK: - Redeem code flow
-
-    // We might want the ability to ask for invite code later on, keeping this here to make things easier
-    // https://app.asana.com/0/1204167627774280/1207270521849479/f
-
-    public func shouldAskForInviteCode() -> Bool {
-        // redeemUseCase.shouldAskForInviteCode()
-        return false
-    }
-
-    public func redeem(inviteCode: String) async throws {
-        // await redeemUseCase.redeem(inviteCode: inviteCode)
-    }
 }

LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionBackendServicePixels.swift

@@ -35,31 +35,26 @@ protocol DataBrokerProtectionBackendServicePixels {
 final class DefaultDataBrokerProtectionBackendServicePixels: DataBrokerProtectionBackendServicePixels {
     private let pixelHandler: EventMapping<DataBrokerProtectionPixels>
     private let settings: DataBrokerProtectionSettings
-    private let authRepository: AuthenticationRepository
 
     init(pixelHandler: EventMapping<DataBrokerProtectionPixels> = DataBrokerProtectionPixelsHandler(),
-         settings: DataBrokerProtectionSettings = DataBrokerProtectionSettings(),
-         authRepository: AuthenticationRepository = KeychainAuthenticationData()) {
+         settings: DataBrokerProtectionSettings = DataBrokerProtectionSettings()) {
         self.pixelHandler = pixelHandler
         self.settings = settings
-        self.authRepository = authRepository
     }
 
     func fireGenerateEmailHTTPError(statusCode: Int) {
         let environment = settings.selectedEnvironment.rawValue
-        let wasOnWaitlist = authRepository.getWaitlistTimestamp() != nil
 
         pixelHandler.fire(.generateEmailHTTPErrorDaily(statusCode: statusCode,
                                                        environment: environment,
-                                                       wasOnWaitlist: wasOnWaitlist))
+                                                       wasOnWaitlist: false))
     }
 
     func fireEmptyAccessToken(callSite: BackendServiceCallSite) {
         let environment = settings.selectedEnvironment.rawValue
-        let wasOnWaitlist = authRepository.getWaitlistTimestamp() != nil
 
         pixelHandler.fire(.emptyAccessTokenDaily(environment: environment,
-                                                 wasOnWaitlist: wasOnWaitlist,
+                                                 wasOnWaitlist: false,
                                                  callSite: callSite))
     }
 }