Integrate native callback

DuckDuckGo/DBP/DataBrokerProtectionManager.swift

@@ -70,4 +70,8 @@ extension DataBrokerProtectionManager: DataBrokerProtectionDataManagerDelegate {
     public func dataBrokerProtectionDataManagerDidDeleteData() {
         loginItemInterface.dataDeleted()
     }
+
+    public func dataBrokerProtectionDataManagerWillOpenSendFeedbackForm() {
+        NotificationCenter.default.post(name: .OpenUnifiedFeedbackForm, object: nil, userInfo: UnifiedFeedbackSource.userInfo(source: .pir))
+    }
 }

DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift

@@ -419,8 +419,9 @@ final class NavigationBarViewController: NSViewController {
     }
 
     func listenToFeedbackFormNotifications() {
-        feedbackFormCancellable = NotificationCenter.default.publisher(for: .OpenUnifiedFeedbackForm).receive(on: DispatchQueue.main).sink { _ in
-            WindowControllersManager.shared.showShareFeedbackModal(source: .ppro)
+        feedbackFormCancellable = NotificationCenter.default.publisher(for: .OpenUnifiedFeedbackForm).receive(on: DispatchQueue.main).sink { notification in
+            let source = UnifiedFeedbackSource(userInfo: notification.userInfo)
+            WindowControllersManager.shared.showShareFeedbackModal(source: source)
         }
     }
 

DuckDuckGo/Preferences/View/PreferencesRootView.swift

@@ -139,7 +139,9 @@ enum Preferences {
                         PixelKit.fire(PrivacyProPixel.privacyProVPNSettings)
                         NotificationCenter.default.post(name: .ToggleNetworkProtectionInMainWindow, object: self, userInfo: nil)
                     case .openFeedback:
-                        NotificationCenter.default.post(name: .OpenUnifiedFeedbackForm, object: self, userInfo: nil)
+                        NotificationCenter.default.post(name: .OpenUnifiedFeedbackForm,
+                                                        object: self,
+                                                        userInfo: UnifiedFeedbackSource.userInfo(source: .ppro))
                     case .openDB:
                         PixelKit.fire(PrivacyProPixel.privacyProPersonalInformationRemovalSettings)
                         WindowControllersManager.shared.showTab(with: .dataBrokerProtection)

DuckDuckGo/Tab/UserScripts/IdentityTheftRestorationPagesUserScript.swift

@@ -71,6 +71,7 @@ extension IdentityTheftRestorationPagesUserScript: WKScriptMessageHandler {
 ///
 final class IdentityTheftRestorationPagesFeature: Subfeature {
     weak var broker: UserScriptMessageBroker?
+    private let subscriptionFeatureAvailability: SubscriptionFeatureAvailability
 
     var featureName = "useIdentityTheftRestoration"
 
@@ -79,13 +80,19 @@ final class IdentityTheftRestorationPagesFeature: Subfeature {
         .exact(hostname: "abrown.duckduckgo.com")
     ])
 
+    init(subscriptionFeatureAvailability: SubscriptionFeatureAvailability = DefaultSubscriptionFeatureAvailability()) {
+        self.subscriptionFeatureAvailability = subscriptionFeatureAvailability
+    }
+
     func with(broker: UserScriptMessageBroker) {
         self.broker = broker
     }
 
     func handler(forMethodNamed methodName: String) -> Subfeature.Handler? {
         switch methodName {
         case "getAccessToken": return getAccessToken
+        case "getFeatureConfig": return getFeatureConfig
+        case "openSendFeedbackModal": return openSendFeedbackModal
         default:
             return nil
         }
@@ -98,4 +105,13 @@ final class IdentityTheftRestorationPagesFeature: Subfeature {
             return [String: String]()
         }
     }
+
+    func getFeatureConfig(params: Any, original: WKScriptMessage) async throws -> Encodable? {
+        [PrivacyProSubfeature.useUnifiedFeedback.rawValue: subscriptionFeatureAvailability.usesUnifiedFeedbackForm]
+    }
+
+    func openSendFeedbackModal(params: Any, original: WKScriptMessage) async throws -> Encodable? {
+        NotificationCenter.default.post(name: .OpenUnifiedFeedbackForm, object: nil, userInfo: UnifiedFeedbackSource.userInfo(source: .itr))
+        return nil
+    }
 }

DuckDuckGo/UnifiedFeedbackForm/UnifiedFeedbackSender.swift

@@ -22,6 +22,20 @@ import PixelKit
 enum UnifiedFeedbackSource: String, StringRepresentable {
     case settings, ppro, vpn, pir, itr, unknown
     static var `default` = UnifiedFeedbackSource.unknown
+
+    private static let sourceKey = "source"
+
+    static func userInfo(source: UnifiedFeedbackSource) -> [String: Any] {
+        return [sourceKey: source.rawValue]
+    }
+
+    init(userInfo: [AnyHashable: Any]?) {
+        if let userInfo = userInfo as? [String: Any], let source = userInfo[Self.sourceKey] as? String {
+            self = UnifiedFeedbackSource(rawValue: source) ?? .default
+        } else {
+            self = .default
+        }
+    }
 }
 
 protocol UnifiedFeedbackSender {

LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift

@@ -37,6 +37,7 @@ public protocol DataBrokerProtectionDataManaging {
 public protocol DataBrokerProtectionDataManagerDelegate: AnyObject {
     func dataBrokerProtectionDataManagerDidUpdateData()
     func dataBrokerProtectionDataManagerDidDeleteData()
+    func dataBrokerProtectionDataManagerWillOpenSendFeedbackForm()
 }
 
 public class DataBrokerProtectionDataManager: DataBrokerProtectionDataManaging {
@@ -132,11 +133,16 @@ extension DataBrokerProtectionDataManager: InMemoryDataCacheDelegate {
 
         delegate?.dataBrokerProtectionDataManagerDidDeleteData()
     }
+
+    public func willOpenSendFeedbackForm() {
+        delegate?.dataBrokerProtectionDataManagerWillOpenSendFeedbackForm()
+    }
 }
 
 public protocol InMemoryDataCacheDelegate: AnyObject {
     func saveCachedProfileToDatabase(_ profile: DataBrokerProtectionProfile) async throws
     func removeAllData() throws
+    func willOpenSendFeedbackForm()
 }
 
 public final class InMemoryDataCache {
@@ -340,4 +346,8 @@ extension InMemoryDataCache: DBPUICommunicationDelegate {
 
         return mapper.mapToUIDebugMetadata(metadata: metadata, brokerProfileQueryData: brokerProfileQueryData)
     }
+
+    func openSendFeedbackModal() async {
+        delegate?.willOpenSendFeedbackForm()
+    }
 }

LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DBPUICommunicationLayer.swift

@@ -39,6 +39,7 @@ protocol DBPUICommunicationDelegate: AnyObject {
     func getMaintananceScanState() async -> DBPUIScanAndOptOutMaintenanceState
     func getDataBrokers() async -> [DBPUIDataBroker]
     func getBackgroundAgentMetadata() async -> DBPUIDebugMetadata
+    func openSendFeedbackModal() async
 }
 
 enum DBPUIReceivedMethodName: String {
@@ -58,6 +59,8 @@ enum DBPUIReceivedMethodName: String {
     case maintenanceScanStatus
     case getDataBrokers
     case getBackgroundAgentMetadata
+    case getFeatureConfig
+    case openSendFeedbackModal
 }
 
 enum DBPUISendableMethodName: String {
@@ -66,6 +69,7 @@ enum DBPUISendableMethodName: String {
 
 struct DBPUICommunicationLayer: Subfeature {
     private let webURLSettings: DataBrokerProtectionWebUIURLSettingsRepresentable
+    private let privacyConfig: PrivacyConfigurationManaging
 
     var messageOriginPolicy: MessageOriginPolicy
     var featureName: String = "dbpuiCommunication"
@@ -74,11 +78,13 @@ struct DBPUICommunicationLayer: Subfeature {
     weak var delegate: DBPUICommunicationDelegate?
 
     private enum Constants {
-        static let version = 4
+        static let version = 5
     }
 
-    internal init(webURLSettings: DataBrokerProtectionWebUIURLSettingsRepresentable) {
+    internal init(webURLSettings: DataBrokerProtectionWebUIURLSettingsRepresentable,
+                  privacyConfig: PrivacyConfigurationManaging) {
         self.webURLSettings = webURLSettings
+        self.privacyConfig = privacyConfig
         self.messageOriginPolicy = .only(rules: [
             .exact(hostname: webURLSettings.selectedURLHostname)
         ])
@@ -107,6 +113,8 @@ struct DBPUICommunicationLayer: Subfeature {
         case .maintenanceScanStatus: return maintenanceScanStatus
         case .getDataBrokers: return getDataBrokers
         case .getBackgroundAgentMetadata: return getBackgroundAgentMetadata
+        case .getFeatureConfig: return getFeatureConfig
+        case .openSendFeedbackModal: return openSendFeedbackModal
         }
 
     }
@@ -291,4 +299,13 @@ struct DBPUICommunicationLayer: Subfeature {
     func sendMessageToUI(method: DBPUISendableMethodName, params: DBPUISendableMessage, into webView: WKWebView) {
         broker?.push(method: method.rawValue, params: params, for: self, into: webView)
     }
+
+    func getFeatureConfig(params: Any, original: WKScriptMessage) async throws -> Encodable? {
+        [PrivacyProSubfeature.useUnifiedFeedback.rawValue: privacyConfig.privacyConfig.isSubfeatureEnabled(PrivacyProSubfeature.useUnifiedFeedback)]
+    }
+
+    func openSendFeedbackModal(params: Any, original: WKScriptMessage) async throws -> Encodable? {
+        await delegate?.openSendFeedbackModal()
+        return nil
+    }
 }

LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DBPUIWebConfiguration.swift

@@ -70,7 +70,7 @@ final class DBPUIUserScript: UserScriptsProvider {
         self.webUISettings = webUISettings
         contentScopeUserScriptIsolated = ContentScopeUserScript(privacyConfig, properties: prefs, isIsolated: false)
         contentScopeUserScriptIsolated.messageNames = ["dbpui"]
-        dbpUICommunicationLayer = DBPUICommunicationLayer(webURLSettings: webUISettings)
+        dbpUICommunicationLayer = DBPUICommunicationLayer(webURLSettings: webUISettings, privacyConfig: privacyConfig)
         dbpUICommunicationLayer.delegate = delegate
         dbpUICommunicationLayer.broker = contentScopeUserScriptIsolated.broker
         contentScopeUserScriptIsolated.registerSubfeature(delegate: dbpUICommunicationLayer)