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

Merge branch 'master' of github.com:bitwarden/browser

Browse Source
This commit is contained in:
Kyle Spearrin 2019-08-16 10:44:30 -04:00
commit 15d62e2d97
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/browser/safariApp.ts
View File

@ -39,10 +39,17 @@ export class SafariApp {
} }
private static receiveMessageFromApp(message: any) { private static receiveMessageFromApp(message: any) {
if (message == null || message.id == null || !(window as any).bitwardenSafariAppRequests.has(message.id)) { if (message == null) {
return; return;
} }
const p = (window as any).bitwardenSafariAppRequests.get(message.id); if (message.id == null && message.command === 'cs_message') {
p.resolve(message.responseData); try {
const msg = JSON.parse(message.data);
SafariApp.sendMessageToListeners(msg, 'cs_message', null);
} catch { }
} else if (message.id != null && (window as any).bitwardenSafariAppRequests.has(message.id)) {
const p = (window as any).bitwardenSafariAppRequests.get(message.id);
p.resolve(message.responseData);
}
} }
} }