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

safariapp to cs messaging

Browse Source
This commit is contained in:
Kyle Spearrin 2019-08-16 15:07:07 -04:00
parent 7a977ebc1e
commit 0bfd65b345
2 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/browser/safariApp.ts
View File

@ -42,7 +42,7 @@ export class SafariApp {
if (message == null) {
return;
}
if (message.id == null && message.command === 'cs_message') {
if ((message.id == null || message.id === '') && message.command === 'cs_message') {
try {
const msg = JSON.parse(message.data);
SafariApp.sendMessageToListeners(msg, 'cs_message', null);

54
src/safari/app/desktop/safari/SafariExtensionViewController.swift
View File

@ -103,7 +103,43 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe
})
}
}
// SFSafariApplication.
} else if(command == "tabs_message") {
let tabMsg: TabMessage? = jsonDeserialize(json: m!.data)
SFSafariApplication.getAllWindows { (wins) in
var theWin: SFSafariWindow?
var winIndex = 0
for win in wins {
if(tabMsg?.tab.windowId == winIndex) {
theWin = win
break
}
winIndex = winIndex + 1
}
if(theWin == nil) {
// TODO: error
} else {
var theTab: SFSafariTab?
theWin!.getAllTabs { (tabs) in
var tabIndex = 0
for tab in tabs {
if(tabMsg?.tab.index == tabIndex) {
theTab = tab
break
}
tabIndex = tabIndex + 1
}
if(theTab == nil) {
// TODO: error
} else {
theTab!.getActivePage { (activePage) in
if(activePage != nil) {
activePage?.dispatchMessageToScript(withName: "bitwarden", userInfo: ["msg": tabMsg!.obj])
}
}
}
}
}
}
}
}
}
@ -153,25 +189,27 @@ func processWindowsForTabs(wins: [SFSafariWindow], options: TabQueryOptions?, co
if(activeTab != nil && activeTab == tab) {
makeTabObject(tab: tab, activeTab: activeTab, windowIndex: windowIndex, tabIndex: tabIndex, complete: { (t) in
newTabs.append(t)
tabIndex = tabIndex + 1
tabGroup.leave()
})
} else {
tabIndex = tabIndex + 1
tabGroup.leave()
}
} else {
makeTabObject(tab: tab, activeTab: activeTab, windowIndex: windowIndex, tabIndex: tabIndex, complete: { (t) in
newTabs.append(t)
tabIndex = tabIndex + 1
tabGroup.leave()
})
}
tabIndex = tabIndex + 1
}
tabGroup.notify(queue: .main){
windowIndex = windowIndex + 1
winGroup.leave()
}
}
}
windowIndex = windowIndex + 1
}
winGroup.notify(queue: .main){
complete(newTabs)
@ -260,3 +298,13 @@ class Tab : Decodable, Encodable {
var active: Bool
var url: String?
}
class TabMessage: Decodable, Encodable {
var tab: Tab
var obj: String
var options: TabMessageOptions?
}
class TabMessageOptions: Decodable, Encodable {
var frameId: Int?
}