Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Productionize DBP web ui code #1769

Merged
merged 6 commits into from
Oct 20, 2023
Merged

Productionize DBP web ui code #1769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c798108
Productionize DBP web ui code
SlayterDev Oct 18, 2023
5c481e6
Change dev url
SlayterDev Oct 18, 2023
0cdb9ff
Support open in new tab for DBP web ui
SlayterDev Oct 19, 2023
0f1f18e
Set the delegate
SlayterDev Oct 19, 2023
4c2f777
lint
SlayterDev Oct 19, 2023
c3f24b7
PR comments
SlayterDev Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions DuckDuckGo/DBP/DBPHomeViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,11 @@ final class DBPHomeViewController: NSViewController {

return DataBrokerProtectionViewController(scheduler: dataBrokerProtectionManager.scheduler,
dataManager: dataBrokerProtectionManager.dataManager,
notificationCenter: NotificationCenter.default,
privacyConfig: privacyConfigurationManager,
prefs: prefs)
prefs: prefs,
openURLHandler: { url in
WindowControllersManager.shared.show(url: url, newTab: true)
})
}()

init(dataBrokerProtectionManager: DataBrokerProtectionManager) {
Expand Down
187 changes: 25 additions & 162 deletions ...BrokerProtection/Sources/DataBrokerProtection/UI/DataBrokerProtectionViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,165 +23,33 @@ import WebKit
import Combine

final public class DataBrokerProtectionViewController: NSViewController {
private let navigationViewModel: ContainerNavigationViewModel
private let profileViewModel: ProfileViewModel

private enum Constants {
static let dbpUiUrl = "https://duckduckgo.com/dbp"
}

private let dataManager: DataBrokerProtectionDataManaging
private let resultsViewModel: ResultsViewModel
private let containerViewModel: ContainerViewModel
private let scheduler: DataBrokerProtectionScheduler
private let notificationCenter: NotificationCenter
private var webView: WKWebView?

private let webUIViewModel: DBPUIViewModel

private let debugPage: String = """
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
</head>
<body>
<form>
<input type="button" value="Add Name" onclick="addName()">
<input type="button" value="Add Address" onclick="addAddress()">
<input type="button" value="Set Birth Year" onclick="setBirthYear()">
<input type="button" value="Set State" onclick="handshake()">
<input type="button" value="Get Profile" onclick="getProfile()">
<input type="button" value="Start Scan" onclick="startScan()">
<input type="button" value="Initial Scan Data" onclick="initialScanStatus()">
<input type="button" value="Remove All Data" onclick="removeAllData()">
</form>

<p id="output"></p>

<script type="text/javascript">
function addName() {
window.webkit.messageHandlers.dbpui.postMessage({
"context": "dbpui",
"featureName": "dbpuiCommunication",
"method": "addNameToCurrentUserProfile",
"id": "abc123",
"params": {
"first": "Bradley",
"middle": "Curtis",
"last": "Slayter"
}
})
}

function addAddress() {
window.webkit.messageHandlers.dbpui.postMessage({
"context": "dbpui",
"featureName": "dbpuiCommunication",
"method": "addAddressToCurrentUserProfile",
"id": "abc123",
"params": {
"street": "3003 Lake Ridge Dr",
"city": "Sanger",
"state": "TX"
}
})
}

function setBirthYear() {
window.webkit.messageHandlers.dbpui.postMessage({
"context": "dbpui",
"featureName": "dbpuiCommunication",
"method": "setBirthYearForCurrentUserProfile",
"params": {
"year": 1993
}
})
}

function startScan() {
window.webkit.messageHandlers.dbpui.postMessage({
"context": "dbpui",
"featureName": "dbpuiCommunication",
"method": "startScanAndOptOut"
})
}

function removeAllData() {
window.webkit.messageHandlers.dbpui.postMessage({
"context": "dbpui",
"featureName": "dbpuiCommunication",
"method": "deleteUserProfileData"
})
}

function handshake() {
window.webkit.messageHandlers.dbpui.postMessage({
"context": "dbpui",
"featureName": "dbpuiCommunication",
"method": "setState",
"id": "abc123",
"params": {
"state": "ProfileReview"
}
})
}

function handshake() {
window.webkit.messageHandlers.dbpui.postMessage({
"context": "dbpui",
"featureName": "dbpuiCommunication",
"method": "setState",
"id": "abc123",
"params": {
"state": "ProfileReview"
}
})
}

function getProfile() {
window.webkit.messageHandlers.dbpui.postMessage({
"context": "dbpui",
"featureName": "dbpuiCommunication",
"method": "getCurrentUserProfile",
"id": "abc123",
}).then(data => {
document.getElementById('output').textContent = JSON.stringify(data, null, 4)
})
}

function initialScanStatus() {
window.webkit.messageHandlers.dbpui.postMessage({
"context": "dbpui",
"featureName": "dbpuiCommunication",
"method": "initialScanStatus",
"id": "abc123",
}).then(data => {
document.getElementById('output').textContent = JSON.stringify(data, null, 4)
})
}
</script>
</body>
</html>
"""
private let openURLHandler: (URL?) -> Void

public init(scheduler: DataBrokerProtectionScheduler,
dataManager: DataBrokerProtectionDataManaging,
notificationCenter: NotificationCenter = .default,
privacyConfig: PrivacyConfigurationManaging? = nil, prefs: ContentScopeProperties? = nil) {
privacyConfig: PrivacyConfigurationManaging? = nil,
prefs: ContentScopeProperties? = nil,
openURLHandler: @escaping (URL?) -> Void) {
self.scheduler = scheduler
self.dataManager = dataManager
self.notificationCenter = notificationCenter
self.openURLHandler = openURLHandler

self.webUIViewModel = DBPUIViewModel(dataManager: dataManager, scheduler: scheduler, privacyConfig: privacyConfig, prefs: prefs, webView: webView)

navigationViewModel = ContainerNavigationViewModel(dataManager: dataManager)
profileViewModel = ProfileViewModel(dataManager: dataManager)

resultsViewModel = ResultsViewModel(dataManager: dataManager,
notificationCenter: notificationCenter)

containerViewModel = ContainerViewModel(scheduler: scheduler,
dataManager: dataManager)

dataManager.fetchProfile(ignoresCache: true)
Task {
_ = dataManager.fetchProfile(ignoresCache: true)
}

super.init(nibName: nil, bundle: nil)
}
Expand All @@ -191,25 +59,20 @@ final public class DataBrokerProtectionViewController: NSViewController {
}

override public func loadView() {
let containerView = DataBrokerProtectionContainerView(
containerViewModel: containerViewModel,
navigationViewModel: navigationViewModel,
profileViewModel: profileViewModel,
resultsViewModel: resultsViewModel)
guard let configuration = webUIViewModel.setupCommunicationLayer() else { return }

let hostingController = NSHostingController(rootView: containerView)
view = hostingController.view
webView = WKWebView(frame: CGRect(x: 0, y: 0, width: 1024, height: 768), configuration: configuration)
webView?.uiDelegate = self
view = webView!

// guard let configuration = webUIViewModel.setupCommunicationLayer() else { return }
//
// webView = WKWebView(frame: CGRect(x: 0, y: 0, width: 1024, height: 768), configuration: configuration)
// view = webView!

// FOR LOCAL WEB UI DEVELOPMENT:
// Comment this line 👇
// webView?.loadHTMLString(debugPage, baseURL: nil)
// Uncomment this line and add your dev URL 👇
// webView?.load(URL(string: "https://<your url>")!)
webView?.load(URL(string: Constants.dbpUiUrl)!)
}

}

extension DataBrokerProtectionViewController: WKUIDelegate {
public func webView(_ webView: WKWebView, createWebViewWith configuration: WKWebViewConfiguration, for navigationAction: WKNavigationAction, windowFeatures: WKWindowFeatures) -> WKWebView? {
openURLHandler(navigationAction.request.url)
return nil
}
}