Add temporary survey to Passwords Settings screen

DuckDuckGo.xcodeproj/project.pbxproj

@@ -12778,7 +12778,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 144.0.1;
+				version = "144.0.1-1";
 			};
 		};
 		9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

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

@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "f34b0a63938df11ef471aa3301dcc0de09b0d31b",
-        "version" : "144.0.1"
+        "revision" : "6ceabf1d257ff1d1164afb5b9139f9f20baf0c6e",
+        "version" : "144.0.1-1"
       }
     },
     {
@@ -50,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/duckduckgo-autofill.git",
       "state" : {
-        "revision" : "6053999d6af384a716ab0ce7205dbab5d70ed1b3",
-        "version" : "11.0.1"
+        "revision" : "10aeff1ec7f533d1705233a9b14f9393a699b1c0",
+        "version" : "11.0.2"
       }
     },
     {

DuckDuckGo/Assets.xcassets/Images/Autofill/Passwords-DDG-128.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Passwords-DDG-128.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Common/Surveys/SurveyURLBuilder.swift

@@ -18,6 +18,7 @@
 
 import Foundation
 import Common
+import BrowserServicesKit
 
 final class SurveyURLBuilder {
 
@@ -95,6 +96,23 @@ final class SurveyURLBuilder {
         return components.url
     }
 
+    func buildSurveyURLWithPasswordsCountSurveyParameter(from originalURLString: String) -> URL? {
+        let surveyURLWithParameters = buildSurveyURL(from: originalURLString)
+
+        guard let surveyURLWithParametersString = surveyURLWithParameters?.absoluteString,
+                var components = URLComponents(string: surveyURLWithParametersString),
+                let bucket = passwordsCountBucket() else {
+            return surveyURLWithParameters
+        }
+
+        var queryItems = components.queryItems ?? []
+        queryItems.append(URLQueryItem(name: "saved_passwords", value: bucket))
+
+        components.queryItems = queryItems
+
+        return components.url
+    }
+
     private func queryItem(parameter: SurveyURLParameters, value: String) -> URLQueryItem {
         let urlAllowed: CharacterSet = .alphanumerics.union(.init(charactersIn: "-._~"))
         let sanitizedValue = value.addingPercentEncoding(withAllowedCharacters: urlAllowed)
@@ -105,4 +123,13 @@ final class SurveyURLBuilder {
         return URLQueryItem(name: parameter.rawValue, value: String(describing: value))
     }
 
+    private func passwordsCountBucket() -> String? {
+        guard let secureVault = try? AutofillSecureVaultFactory.makeVault(reporter: SecureVaultReporter.shared),
+              let bucket = try? secureVault.accountsCountBucket() else {
+            return nil
+        }
+
+        return bucket
+    }
+
 }

DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift

@@ -74,6 +74,7 @@ public struct UserDefaultsWrapper<T> {
         case askToSavePaymentMethods = "preferences.ask-to-save.payment-methods"
         case autolockLocksFormFilling = "preferences.lock-autofill-form-fill"
         case autofillDebugScriptEnabled = "preferences.enable-autofill-debug-script"
+        case autofillSurveyEnabled = "preferences.enable-autofill-survey"
 
         case saveAsPreferredFileType = "saveAs.selected.filetype"
 

DuckDuckGo/Menus/MainMenu.swift

@@ -584,6 +584,7 @@ import SubscriptionUI
                 }
                 NSMenuItem(title: "Reset Email Protection InContext Signup Prompt", action: #selector(MainViewController.resetEmailProtectionInContextPrompt))
                 NSMenuItem(title: "Reset Pixels Storage", action: #selector(MainViewController.resetDailyPixels))
+                NSMenuItem(title: "Reset Passwords Survey", action: #selector(enablePasswordsSurveyAction), target: self)
             }.withAccessibilityIdentifier("MainMenu.resetData")
             NSMenuItem(title: "UI Triggers") {
                 NSMenuItem(title: "Show Save Credentials Popover", action: #selector(MainViewController.showSaveCredentialsPopover))
@@ -729,6 +730,10 @@ import SubscriptionUI
         updateAutofillDebugScriptMenuItem()
     }
 
+    @objc private func enablePasswordsSurveyAction(_ sender: NSMenuItem) {
+        AutofillPreferences().autofillSurveyEnabled = true
+    }
+
     @objc private func debugLoggingMenuItemAction(_ sender: NSMenuItem) {
 #if APPSTORE
         if !OSLog.isRunningInDebugEnvironment {

DuckDuckGo/Preferences/Model/AutofillPreferences.swift

@@ -27,6 +27,7 @@ protocol AutofillPreferencesPersistor {
     var autolockLocksFormFilling: Bool { get set }
     var passwordManager: PasswordManager { get set }
     var debugScriptEnabled: Bool { get set }
+    var autofillSurveyEnabled: Bool { get set }
 }
 
 enum PasswordManager: String, CaseIterable {
@@ -149,6 +150,9 @@ final class AutofillPreferences: AutofillPreferencesPersistor {
         }
     }
 
+    @UserDefaultsWrapper(key: .autofillSurveyEnabled, defaultValue: true)
+    var autofillSurveyEnabled: Bool
+
     private var statisticsStore: StatisticsStore {
         return injectedDependencyStore ?? defaultDependencyStore
     }

DuckDuckGo/Preferences/Model/AutofillPreferencesModel.swift

@@ -17,6 +17,8 @@
 //
 
 import Foundation
+import BrowserServicesKit
+import Common
 
 final class AutofillPreferencesModel: ObservableObject {
 
@@ -59,6 +61,12 @@ final class AutofillPreferencesModel: ObservableObject {
         }
     }
 
+    @Published private(set) var autofillSurveyEnabled: Bool {
+        didSet {
+            persistor.autofillSurveyEnabled = autofillSurveyEnabled && Bundle.main.preferredLocalizations.first == "en"
+        }
+    }
+
     @MainActor
     @Published private(set) var passwordManager: PasswordManager {
         didSet {
@@ -153,6 +161,7 @@ final class AutofillPreferencesModel: ObservableObject {
         autolockLocksFormFilling = persistor.autolockLocksFormFilling
         passwordManager = persistor.passwordManager
         hasNeverPromptWebsites = !neverPromptWebsitesManager.neverPromptWebsites.isEmpty
+        autofillSurveyEnabled = persistor.autofillSurveyEnabled
     }
 
     private var persistor: AutofillPreferencesPersistor
@@ -192,4 +201,33 @@ final class AutofillPreferencesModel: ObservableObject {
         NSWorkspace.shared.open(.fullDiskAccess)
     }
 
+    func launchSurvey(statisticsStore: StatisticsStore = LocalStatisticsStore(),
+                      activationDateStore: WaitlistActivationDateStore = DefaultWaitlistActivationDateStore(source: .netP),
+                      operatingSystemVersion: String = ProcessInfo.processInfo.operatingSystemVersion.description,
+                      appVersion: String = AppVersion.shared.versionNumber,
+                      hardwareModel: String? = HardwareModel.model) {
+
+        let surveyURLBuilder = SurveyURLBuilder(
+            statisticsStore: statisticsStore,
+            operatingSystemVersion: operatingSystemVersion,
+            appVersion: appVersion,
+            hardwareModel: hardwareModel,
+            daysSinceActivation: activationDateStore.daysSinceActivation(),
+            daysSinceLastActive: activationDateStore.daysSinceLastActive()
+        )
+
+        guard let surveyUrl = surveyURLBuilder.buildSurveyURLWithPasswordsCountSurveyParameter(from: "https://selfserve.decipherinc.com/survey/selfserve/32ab/240307") else {
+            return
+        }
+
+        DispatchQueue.main.async {
+            WindowControllersManager.shared.showTab(with: .url(surveyUrl, credential: nil, source: .appOpenUrl))
+        }
+
+        disableAutofillSurvey()
+    }
+
+    func disableAutofillSurvey() {
+        autofillSurveyEnabled = false
+    }
 }

DuckDuckGo/Preferences/View/PreferencesAutofillView.swift

@@ -67,6 +67,43 @@ extension Preferences {
 
                 // Autofill Content  Button
                 PreferencePaneSection {
+
+                    // New section
+                    if model.autofillSurveyEnabled {
+                        HStack(alignment: .top, spacing: 20) {
+                            Image(.passwordsDDG128)
+                                .frame(width: 64, height: 48)
+
+                            VStack(alignment: .leading) {
+                                Text(verbatim: "Help us improve!")
+                                    .bold()
+                                Text(verbatim: "We want to make using passwords in DuckDuckGo better.")
+                                    .foregroundColor(.greyText)
+                                    .padding(.top, 1)
+
+                                HStack {
+                                    Button(action: {
+                                        model.disableAutofillSurvey()
+                                    }, label: {
+                                        Text(verbatim: "No Thanks")
+                                    })
+                                    Button(action: {
+                                        model.launchSurvey()
+                                    }, label: {
+                                        Text(verbatim: "Take Survey")
+                                    })
+                                    .buttonStyle(DefaultActionButtonStyle(enabled: true))
+                                }
+                                .padding(.top, 12)
+                            }
+
+                            Spacer()
+                        }
+                        .padding()
+                        .roundedBorder()
+                        .padding(.bottom, 24)
+                    }
+
                     Button(UserText.autofillViewContentButton) {
                         model.showAutofillPopover()
                     }

LocalPackages/DataBrokerProtection/Package.swift

@@ -29,7 +29,7 @@ let package = Package(
             targets: ["DataBrokerProtection"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "144.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "144.0.1-1"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
     ],

LocalPackages/NetworkProtectionMac/Package.swift

@@ -31,7 +31,7 @@ let package = Package(
         .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "144.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "144.0.1-1"),
         .package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.1"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions"),