Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-02 08:40:08 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1244 from bitwarden/cleanup-master-debugs

Browse Source 
Removed verbose debug logging
This commit is contained in:
Chad Scharf 2020-05-22 17:01:27 -04:00 committed by GitHub
commit 9d621b58e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/safari/safari/SafariExtensionViewController.swift
View File

@ -65,223 +65,141 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe
return return
} }
let command = m!.command let command = m!.command
log("Command: \(command)") NSLog("Command: \(command)")
if command == "storage_get" { if command == "storage_get" {
if m!.data != nil { if m!.data != nil {
log("DEBUG - 1, \(m!.data!)")
let obj = UserDefaults.standard.string(forKey: m!.data!) let obj = UserDefaults.standard.string(forKey: m!.data!)
log("DEBUG - 2")
m!.responseData = obj m!.responseData = obj
replyMessage(message: m!) replyMessage(message: m!)
log("DEBUG - 3")
} }
} else if command == "storage_save" { } else if command == "storage_save" {
let data: StorageData? = jsonDeserialize(json: m!.data) let data: StorageData? = jsonDeserialize(json: m!.data)
log("DEBUG - 4")
if data?.key != nil { if data?.key != nil {
log("DEBUG - 5")
if data?.obj == nil { if data?.obj == nil {
log("DEBUG - 6, \(data!.key)")
UserDefaults.standard.removeObject(forKey: data!.key) UserDefaults.standard.removeObject(forKey: data!.key)
log("DEBUG - 7")
} else { } else {
log("DEBUG - 8, \(data!.key)")
UserDefaults.standard.set(data?.obj, forKey: data!.key) UserDefaults.standard.set(data?.obj, forKey: data!.key)
log("DEBUG - 9")
} }
replyMessage(message: m!) replyMessage(message: m!)
log("DEBUG - 10")
} }
} else if command == "storage_remove" { } else if command == "storage_remove" {
if m!.data != nil { if m!.data != nil {
log("DEBUG - 11, \(m!.data!)")
UserDefaults.standard.removeObject(forKey: m!.data!) UserDefaults.standard.removeObject(forKey: m!.data!)
log("DEBUG - 12")
replyMessage(message: m!) replyMessage(message: m!)
log("DEBUG - 13")
} }
} else if command == "getLocaleStrings" { } else if command == "getLocaleStrings" {
let language = m!.data ?? "en" let language = m!.data ?? "en"
log("DEBUG - 14, \(language)")
let bundleURL = Bundle.main.resourceURL!.absoluteURL let bundleURL = Bundle.main.resourceURL!.absoluteURL
log("DEBUG - 15, \(bundleURL)")
let messagesUrl = bundleURL.appendingPathComponent("app/_locales/\(language)/messages.json") let messagesUrl = bundleURL.appendingPathComponent("app/_locales/\(language)/messages.json")
log("DEBUG - 16, \(messagesUrl)")
do { do {
let json = try String(contentsOf: messagesUrl, encoding: .utf8) let json = try String(contentsOf: messagesUrl, encoding: .utf8)
log("DEBUG - 17")
webView.evaluateJavaScript("window.bitwardenLocaleStrings = \(json);", completionHandler: nil) webView.evaluateJavaScript("window.bitwardenLocaleStrings = \(json);", completionHandler: nil)
log("DEBUG - 18")
} catch { } catch {
log("DEBUG - 19, \(error)") NSLog("ERROR on getLocaleStrings, \(error)")
} }
replyMessage(message: m!) replyMessage(message: m!)
log("DEBUG - 20")
} else if command == "tabs_query" { } else if command == "tabs_query" {
let options: TabQueryOptions? = jsonDeserialize(json: m!.data) let options: TabQueryOptions? = jsonDeserialize(json: m!.data)
log("DEBUG - 21")
if options?.currentWindow ?? false { if options?.currentWindow ?? false {
log("DEBUG - 22")
SFSafariApplication.getActiveWindow { win in SFSafariApplication.getActiveWindow { win in
if win != nil { if win != nil {
log("DEBUG - 23")
processWindowsForTabs(wins: [win!], options: options, complete: { tabs in processWindowsForTabs(wins: [win!], options: options, complete: { tabs in
log("DEBUG - 24")
m!.responseData = jsonSerialize(obj: tabs) m!.responseData = jsonSerialize(obj: tabs)
log("DEBUG - 25")
self.replyMessage(message: m!) self.replyMessage(message: m!)
log("DEBUG - 26")
}) })
} else { } else {
log("DEBUG - 27")
SFSafariApplication.getAllWindows { wins in SFSafariApplication.getAllWindows { wins in
log("DEBUG - 28")
processWindowsForTabs(wins: wins, options: options, complete: { tabs in processWindowsForTabs(wins: wins, options: options, complete: { tabs in
log("DEBUG - 29")
m!.responseData = jsonSerialize(obj: tabs) m!.responseData = jsonSerialize(obj: tabs)
log("DEBUG - 30")
self.replyMessage(message: m!) self.replyMessage(message: m!)
log("DEBUG - 31")
}) })
} }
log("DEBUG - 32")
} }
} }
} else { } else {
log("DEBUG - 33")
SFSafariApplication.getAllWindows { wins in SFSafariApplication.getAllWindows { wins in
log("DEBUG - 34")
processWindowsForTabs(wins: wins, options: options, complete: { tabs in processWindowsForTabs(wins: wins, options: options, complete: { tabs in
log("DEBUG - 35")
m!.responseData = jsonSerialize(obj: tabs) m!.responseData = jsonSerialize(obj: tabs)
log("DEBUG - 36")
self.replyMessage(message: m!) self.replyMessage(message: m!)
log("DEBUG - 37")
}) })
} }
} }
} else if command == "tabs_message" { } else if command == "tabs_message" {
let tabMsg: TabMessage? = jsonDeserialize(json: m!.data) let tabMsg: TabMessage? = jsonDeserialize(json: m!.data)
log("DEBUG - 38")
SFSafariApplication.getAllWindows { wins in SFSafariApplication.getAllWindows { wins in
log("DEBUG - 39")
var theWin: SFSafariWindow? var theWin: SFSafariWindow?
var winIndex = 0 var winIndex = 0
log("DEBUG - 40")
for win in wins { for win in wins {
log("DEBUG - 40.a")
if tabMsg?.tab.windowId == winIndex { if tabMsg?.tab.windowId == winIndex {
log("DEBUG - 40.b")
theWin = win theWin = win
break break
} }
winIndex = winIndex + 1 winIndex = winIndex + 1
} }
log("DEBUG - 41")
var theTab: SFSafariTab? var theTab: SFSafariTab?
theWin?.getAllTabs { tabs in theWin?.getAllTabs { tabs in
log("DEBUG - 42")
var tabIndex = 0 var tabIndex = 0
for tab in tabs { for tab in tabs {
log("DEBUG - 43")
if tabMsg?.tab.index == tabIndex { if tabMsg?.tab.index == tabIndex {
log("DEBUG - 43.a")
theTab = tab theTab = tab
break break
} }
tabIndex = tabIndex + 1 tabIndex = tabIndex + 1
} }
log("DEBUG - 44")
theTab?.getActivePage { activePage in theTab?.getActivePage { activePage in
log("DEBUG - 45")
activePage?.dispatchMessageToScript(withName: "bitwarden", userInfo: ["msg": tabMsg!.obj]) activePage?.dispatchMessageToScript(withName: "bitwarden", userInfo: ["msg": tabMsg!.obj])
log("DEBUG - 46")
} }
log("DEBUG - 47")
} }
} }
} else if command == "hidePopover" { } else if command == "hidePopover" {
dismissPopover() dismissPopover()
log("DEBUG - 48")
replyMessage(message: m!) replyMessage(message: m!)
log("DEBUG - 49")
} else if command == "showPopover" { } else if command == "showPopover" {
if popoverOpenCount <= 0 { if popoverOpenCount <= 0 {
log("DEBUG - 50")
SFSafariApplication.getActiveWindow { win in SFSafariApplication.getActiveWindow { win in
log("DEBUG - 51")
win?.getToolbarItem(completionHandler: { item in win?.getToolbarItem(completionHandler: { item in
log("DEBUG - 52")
item?.showPopover() item?.showPopover()
log("DEBUG - 53")
}) })
} }
log("DEBUG - 54")
} }
} else if command == "isPopoverOpen" { } else if command == "isPopoverOpen" {
m!.responseData = popoverOpenCount > 0 ? "true" : "false" m!.responseData = popoverOpenCount > 0 ? "true" : "false"
log("DEBUG - 55")
replyMessage(message: m!) replyMessage(message: m!)
log("DEBUG - 56")
} else if command == "createNewTab" { } else if command == "createNewTab" {
if m!.data != nil { if m!.data != nil {
log("DEBUG - 57")
SFSafariApplication.getActiveWindow { win in SFSafariApplication.getActiveWindow { win in
log("DEBUG - 58")
win?.openTab(with: URL(string: m!.data!)!, makeActiveIfPossible: true, completionHandler: { _ in win?.openTab(with: URL(string: m!.data!)!, makeActiveIfPossible: true, completionHandler: { _ in
log("DEBUG - 59")
// Tab opened // Tab opened
}) })
log("DEBUG - 60")
} }
log("DEBUG - 61")
} }
} else if command == "reloadExtension" { } else if command == "reloadExtension" {
webView?.reload() webView?.reload()
log("DEBUG - 62")
replyMessage(message: m!) replyMessage(message: m!)
log("DEBUG - 63")
} else if command == "copyToClipboard" { } else if command == "copyToClipboard" {
let pasteboard = NSPasteboard.general let pasteboard = NSPasteboard.general
log("DEBUG - 64")
pasteboard.declareTypes([NSPasteboard.PasteboardType.string], owner: nil) pasteboard.declareTypes([NSPasteboard.PasteboardType.string], owner: nil)
log("DEBUG - 65")
pasteboard.setString(m!.data ?? "", forType: NSPasteboard.PasteboardType.string) pasteboard.setString(m!.data ?? "", forType: NSPasteboard.PasteboardType.string)
log("DEBUG - 66")
replyMessage(message: m!) replyMessage(message: m!)
log("DEBUG - 67")
} else if command == "readFromClipboard" { } else if command == "readFromClipboard" {
let pasteboard = NSPasteboard.general let pasteboard = NSPasteboard.general
log("DEBUG - 68")
m!.responseData = pasteboard.pasteboardItems?.first?.string(forType: .string) m!.responseData = pasteboard.pasteboardItems?.first?.string(forType: .string)
log("DEBUG - 69")
replyMessage(message: m!) replyMessage(message: m!)
log("DEBUG - 70")
} else if command == "downloadFile" { } else if command == "downloadFile" {
if m!.data != nil { if m!.data != nil {
log("DEBUG - 71")
if let dlMsg: DownloadFileMessage = jsonDeserialize(json: m!.data) { if let dlMsg: DownloadFileMessage = jsonDeserialize(json: m!.data) {
log("DEBUG - 72")
var data: Data? var data: Data?
if dlMsg.blobOptions?.type == "text/plain" { if dlMsg.blobOptions?.type == "text/plain" {
log("DEBUG - 73")
data = dlMsg.blobData?.data(using: .utf8) data = dlMsg.blobData?.data(using: .utf8)
log("DEBUG - 74")
} else if dlMsg.blobData != nil { } else if dlMsg.blobData != nil {
log("DEBUG - 75")
data = Data(base64Encoded: dlMsg.blobData!) data = Data(base64Encoded: dlMsg.blobData!)
log("DEBUG - 76")
} }
if data != nil { if data != nil {
log("DEBUG - 76")
let panel = NSSavePanel() let panel = NSSavePanel()
panel.canCreateDirectories = true panel.canCreateDirectories = true
panel.nameFieldStringValue = dlMsg.fileName panel.nameFieldStringValue = dlMsg.fileName
log("DEBUG - 77")
panel.begin { response in panel.begin { response in
log("DEBUG - 78")
if response == NSApplication.ModalResponse.OK { if response == NSApplication.ModalResponse.OK {
log("DEBUG - 79")
if let url = panel.url { if let url = panel.url {
do { do {
let fileManager = FileManager.default let fileManager = FileManager.default
@ -290,15 +208,13 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe
attributes: nil) attributes: nil)
} }
try data!.write(to: url) try data!.write(to: url)
log("DEBUG - 80")
} catch { } catch {
print(error) print(error)
log("DEBUG - 81, \(error)") NSLog("ERROR in downloadFile, \(error)")
} }
} }
} }
} }
log("DEBUG - 82")
} }
} }
} }
@ -420,10 +336,6 @@ func jsonDeserialize<T: Decodable>(json: String?) -> T? {
} }
} }
func log(_ message: String) {
NSLog("com.bitwarden.desktop.safari: \(message)")
}
class AppMessage: Decodable, Encodable { class AppMessage: Decodable, Encodable {
init() { init() {
id = "" id = ""