Manage Private Email Addresses

DuckDuckGo.xcodeproj/project.pbxproj

@@ -10137,7 +10137,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 71.3.0;
+				version = 71.4.1;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {

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

@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "005949a099121192f55b4b5d33ed5d7ce4a12934",
-        "version" : "71.3.0"
+        "revision" : "aa10614509aa838d11b0b7540615eab7bd47e851",
+        "version" : "71.4.1"
       }
     },
     {
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/duckduckgo-autofill.git",
       "state" : {
-        "revision" : "44cd844b6bb5d8ccfefbd6e025817d800c26ad76",
-        "version" : "7.2.0"
+        "revision" : "b1160df954eea20cd4cdf9356afc369751981b16",
+        "version" : "8.0.0"
       }
     },
     {
@@ -129,7 +129,7 @@
     {
       "identity" : "trackerradarkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/duckduckgo/TrackerRadarKit.git",
+      "location" : "https://github.com/duckduckgo/TrackerRadarKit",
       "state" : {
         "revision" : "4684440d03304e7638a2c8086895367e90987463",
         "version" : "1.2.1"

DuckDuckGo/Assets.xcassets/Images/Alert-Color-16.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Alert-Color-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Email-16.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Email-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Email-Deactivate-16.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Email-Deactivate-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Email-Disabled-16.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "[email protected]@1x.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Email-Warning-16.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Email-Warning-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Identity-16.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Identity-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

DuckDuckGo/Autofill/ContentOverlayViewController.swift

@@ -228,7 +228,9 @@
         return true
     }
 
-    public func secureVaultManager(_: SecureVaultManager, promptUserToStoreAutofillData data: AutofillData, hasGeneratedPassword generatedPassword: Bool, withTrigger trigger: AutofillUserScript.GetTriggerType?) {
+    public func secureVaultManager(_: SecureVaultManager, 
+                                   promptUserToStoreAutofillData data: AutofillData,
+                                   withTrigger trigger: AutofillUserScript.GetTriggerType?) {
         // No-op, the content overlay view controller should not be prompting the user to store data
     }
 
@@ -250,14 +252,6 @@
         Pixel.fire(.formAutofilled(kind: type.formAutofillKind))
     }
 
-    public func secureVaultManagerShouldAutomaticallyUpdateCredentialsWithoutUsername(_: SecureVaultManager, shouldSilentlySave: Bool) -> Bool {
-        return true
-    }
-
-    public func secureVaultManagerShouldSilentlySaveGeneratedPassword(_: SecureVaultManager) -> Bool {
-        return false
-    }
-
     public func secureVaultManager(_: SecureVaultManager, didRequestAuthenticationWithCompletionHandler handler: @escaping (Bool) -> Void) {
         DeviceAuthenticator.shared.authenticateUser(reason: .autofill) { authenticationResult in
             handler(authenticationResult.authenticated)

DuckDuckGo/Common/Extensions/NSAlertExtension.swift

@@ -167,6 +167,16 @@ extension NSAlert {
         return alert
     }
 
+    static func disableEmailProtection() -> NSAlert {
+        let alert = NSAlert()
+        alert.messageText = UserText.disableEmailProtectionTitle
+        alert.informativeText = UserText.disableEmailProtectionMessage
+        alert.alertStyle = .warning
+        alert.addButton(withTitle: UserText.disable)
+        alert.addButton(withTitle: UserText.cancel)
+        return alert
+    }
+
     @discardableResult
     func runModal() async -> NSApplication.ModalResponse {
         await withCheckedContinuation { continuation in

DuckDuckGo/Common/Extensions/URLExtension.swift

@@ -323,6 +323,7 @@ extension URL {
     }
 
     static var duckDuckGoEmail = URL(string: "https://duckduckgo.com/email-protection")!
+    static var duckDuckGoEmailLogin = URL(string: "https://duckduckgo.com/email")!
 
     static var duckDuckGoMorePrivacyInfo = URL(string: "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/atb/")!
 

DuckDuckGo/Common/Localizables/UserText.swift

@@ -236,9 +236,10 @@ struct UserText {
 
     static let emailOptionsMenuItem = NSLocalizedString("email.optionsMenu", value: "Email Protection", comment: "Menu item email feature")
     static let emailOptionsMenuCreateAddressSubItem = NSLocalizedString("email.optionsMenu.createAddress", value: "Generate Private Duck Address", comment: "Create an email alias sub menu item")
-    static let emailOptionsMenuTurnOffSubItem = NSLocalizedString("email.optionsMenu.turnOff", value: "Disable Email Protection", comment: "Disable email sub menu item")
+    static let emailOptionsMenuTurnOffSubItem = NSLocalizedString("email.optionsMenu.turnOff", value: "Disable Email Protection Autofill", comment: "Disable email sub menu item")
     static let emailOptionsMenuTurnOnSubItem = NSLocalizedString("email.optionsMenu.turnOn", value: "Enable Email Protection", comment: "Enable email sub menu item")
     static let privateEmailCopiedToClipboard = NSLocalizedString("email.copied", value: "New address copied to your clipboard", comment: "Private email address was copied to clipboard message")
+    static let emailOptionsMenuManageAccountSubItem = NSLocalizedString("email.optionsMenu.manageAccount", value: "Manage Account", comment: "Manage private email account sub menu item")
 
     static let newFolder = NSLocalizedString("folder.optionsMenu.newFolder", value: "New Folder", comment: "Option for creating a new folder")
     static let renameFolder = NSLocalizedString("folder.optionsMenu.renameFolder", value: "Rename Folder", comment: "Option for renaming a folder")
@@ -788,5 +789,14 @@ struct UserText {
     static let burnerHomepageDescription2 = NSLocalizedString("burner.homepage.description.2", value: "Sign in to a site with a different account", comment: "")
     static let burnerHomepageDescription3 = NSLocalizedString("burner.homepage.description.3", value: "Troubleshoot websites", comment: "")
     static let burnerHomepageDescription4 = NSLocalizedString("burner.homepage.description.4", value: "Fire windows are isolated from other browser data, and their data is burned when you close them. They have the same tracking protection as other windows.", comment: "")
+
+    // Email Protection Management
+    static let disableEmailProtectionTitle = NSLocalizedString("disable.email.protection.title", value: "Disable Email Protection Autofill?", comment: "Title for alert shown when user disables email protection")
+    static let disableEmailProtectionMessage = NSLocalizedString("disable.email.protection.mesage", value: "This will only disable Autofill for Duck Addresses in this browser. \n\n You can still manually enter Duck Addresses and continue to receive forwarded email.", comment: "Message for alert shown when user disables email protection")
+    static let disable = NSLocalizedString("disable", value: "Disable", comment: "Email protection Disable button text")
+
+
+
+
 }
 

DuckDuckGo/Email/EmailManagerRequestDelegate.swift

@@ -20,17 +20,29 @@ import BrowserServicesKit
 
 extension EmailManagerRequestDelegate {
 
+    public var activeTask: URLSessionTask? {
+        get { return nil }
+        set {}
+    }
+
     // swiftlint:disable function_parameter_count
     func emailManager(_ emailManager: EmailManager, requested url: URL, method: String, headers: [String: String], parameters: [String: String]?, httpBody: Data?, timeoutInterval: TimeInterval) async throws -> Data {
-
         let finalURL = url.appendingParameters(parameters ?? [:])
-
         var request = URLRequest(url: finalURL, timeoutInterval: timeoutInterval)
         request.allHTTPHeaderFields = headers
         request.httpMethod = method
         request.httpBody = httpBody
 
-        return try await URLSession.default.data(for: request).0
+        activeTask?.cancel() // Cancel active request (if any)
+
+        let (data, response) = try await URLSession.shared.data(for: request)
+        activeTask = URLSession.shared.dataTask(with: request)
+
+        if let httpResponse = response as? HTTPURLResponse, httpResponse.statusCode >= 300 {
+            throw EmailManagerRequestDelegateError.serverError(statusCode: httpResponse.statusCode)
+        }
+
+        return data
     }
     // swiftlint:enable function_parameter_count
 

DuckDuckGo/Email/EmailUrlExtensions.swift

@@ -24,6 +24,7 @@ extension EmailUrls {
     private struct Url {
         static let emailProtectionLink = "https://duckduckgo.com/email"
         static let emailProtectionInContextSignupLink = "https://duckduckgo.com/email/start-incontext"
+        static let emailProtectionAccountLink = "https://duckduckgo.com/email/settings/account"
     }
 
     var emailProtectionLink: URL {
@@ -34,6 +35,10 @@ extension EmailUrls {
         return URL(string: Url.emailProtectionInContextSignupLink)!
     }
 
+    var emailProtectionAccountLink: URL {
+        return URL(string: Url.emailProtectionAccountLink)!
+    }
+
     func isDuckDuckGoEmailProtection(url: URL) -> Bool {
         return url.absoluteString.starts(with: Url.emailProtectionLink)
     }

DuckDuckGo/Menus/MainMenuActions.swift

@@ -232,6 +232,16 @@ extension AppDelegate {
     @IBAction func fireButtonAction(_ sender: NSButton) {
         FireCoordinator.fireButtonAction()
     }
+
+    @IBAction func navigateToPrivateEmail(_ sender: Any?) {
+        guard let window = NSApplication.shared.keyWindow,
+              let windowController = window.windowController as? MainWindowController else {
+            assertionFailure("No reference to main window controller")
+            return
+        }
+    windowController.mainViewController.browserTabViewController.openNewTab(with: .url(URL.duckDuckGoEmailLogin))
+    }
+
 }
 
 extension MainViewController {

DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift

@@ -341,9 +341,15 @@ final class EmailOptionsButtonSubMenu: NSMenu {
                 .targetting(self)
                 .withImage(NSImage(named: "OptionsButtonMenuEmailGenerateAddress"))
 
+            addItem(withTitle: UserText.emailOptionsMenuManageAccountSubItem, action: #selector(manageAccountAction(_:)), keyEquivalent: "")
+                .targetting(self)
+                .withImage(NSImage(named: "Identity-16"))
+
+            addItem(.separator())
+
             addItem(withTitle: UserText.emailOptionsMenuTurnOffSubItem, action: #selector(turnOffEmailAction(_:)), keyEquivalent: "")
                 .targetting(self)
-                .withImage(NSImage(named: "OptionsButtonMenuEmailDisabled"))
+                .withImage(NSImage(named: "Email-Disabled-16"))
 
         } else {
             addItem(withTitle: UserText.emailOptionsMenuTurnOnSubItem, action: #selector(turnOnEmailAction(_:)), keyEquivalent: "")
@@ -353,6 +359,11 @@ final class EmailOptionsButtonSubMenu: NSMenu {
         }
     }
 
+    @objc func manageAccountAction(_ sender: NSMenuItem) {
+        let tab = Tab(content: .url(EmailUrls().emailProtectionAccountLink), shouldLoadInBackground: true, burnerMode: tabCollectionViewModel.burnerMode)
+        tabCollectionViewModel.append(tab: tab)
+    }
+
     @objc func createAddressAction(_ sender: NSMenuItem) {
         assert(emailManager.requestDelegate != nil, "No requestDelegate on emailManager")
 
@@ -374,7 +385,11 @@ final class EmailOptionsButtonSubMenu: NSMenu {
     }
 
     @objc func turnOffEmailAction(_ sender: NSMenuItem) {
-        emailManager.signOut()
+        let alert = NSAlert.disableEmailProtection()
+        let response = alert.runModal()
+        if response == .alertFirstButtonReturn {
+            emailManager.signOut()
+        }
     }
 
     @objc func turnOnEmailAction(_ sender: NSMenuItem) {

DuckDuckGo/SecureVault/Extensions/UserText+PasswordManager.swift

@@ -49,6 +49,22 @@ extension UserText {
     static let pmLoginAdded = NSLocalizedString("pm.added", value: "Added", comment: "Label for login added data")
     static let pmLoginLastUpdated = NSLocalizedString("pm.last.updated", value: "Last Updated", comment: "Label for last updated edit field")
 
+    static let pmDeactivateAddress = NSLocalizedString("pm.deactivate.private.email", value: "Deactivate Duck Address", comment: "Deactivate private email address button")
+    static let pmActivateAddress = NSLocalizedString("pm.activate.private.email", value: "Reactivate Duck Address", comment: "Activate private email address button")
+    static let pmDeactivate = NSLocalizedString("pm.deactivate", value: "Deactivate", comment: "Deactivate button")
+    static let pmActivate = NSLocalizedString("pm.activate", value: "Reactivate", comment: "Activate button")
+    static let pmEmailMessageActive = NSLocalizedString("pm.private.email.mesage.active", value: "Duck Address Active", comment: "Mesasage displayed when a private email address is active")
+    static let pmEmailMessageInactive = NSLocalizedString("pm.private.email.mesage.inactive", value: "Duck Address Deactivated", comment: "Mesasage displayed when a private email address is inactive")
+    static let pmEmailMessageError = NSLocalizedString("pm.private.email.mesage.error", value: "Management of this address is temporarily unavailable.", comment: "Mesasage displayed when a user tries to manage a private email address but the service is not available, returns an error or network is down")
+    static let pmEmailActivateConfirmTitle = NSLocalizedString("pm.private.email.mesage.activate.confirm.title", value: "Reactivate Private Duck Address?", comment: "Title for the confirmation message  displayed when a user tries activate a Private Email Address")
+    static let pmEmailActivateConfirmContent = NSLocalizedString("pm.private.email.mesage.activate.confirm.content", value: "Emails sent to %@ will again be forwarded to your inbox.", comment: "Text for the confirmation message displayed when a user tries activate a Private Email Address")
+    static let pmEmailDeactivateConfirmTitle = NSLocalizedString("pm.private.email.mesage.deactivate.confirm.title", value: "Deactivate Private Duck Address?", comment: "Title for the confirmation message displayed when a user tries deactivate a Private Email Address")
+    static let pmEmailDeactivateConfirmContent = NSLocalizedString("pm.private.email.mesage.deactivate.confirm.content", value: "Emails sent to %@ will no longer be forwarded to your inbox.", comment: "Text for the confirmation message displayed when a user tries deactivate a Private Email Address")
+    static let pmRemovedDuckAddressTitle = NSLocalizedString("pm.removed.duck.address.title", value: "Private Duck Address username was removed", comment: "Title for the alert dialog telling the user an updated username is no longer a private email address")
+    static let pmRemovedDuckAddressContent = NSLocalizedString("pm.removed.duck.address.content", value: "You can still manage this Duck Address from emails received from it in your personal inbox.", comment: "Content for the alert dialog telling the user an updated username is no longer a private email address")
+    static let pmRemovedDuckAddressButton = NSLocalizedString("pm.removed.duck.address.button", value: "Got it", comment: "Button text for the alert dialog telling the user an updated username is no longer a private email address")
+    static let pmSignInToManageEmail = NSLocalizedString("pm.signin.to.manage", value: "%@ to manage your Duck Addresses on this device.", comment: "Message displayed to the user when they are logged out of Email protection.")
+    static let pmEnableEmailProtection = NSLocalizedString("pm.enable.email.protection", value: "Enable Email Protection", comment: "Text link to email protection website")
     static let pmCardNumber = NSLocalizedString("pm.card.number", value: "Card Number", comment: "Label for card number title")
     static let pmCardholderName = NSLocalizedString("pm.card.cardholder-name", value: "Cardholder Name", comment: "Label for cardholder name title")
     static let pmCardVerificationValue = NSLocalizedString("pm.card.cvv", value: "CVV", comment: "Label for CVV title")