From 9fb80823ba0879941ec97f2227886d742c484598 Mon Sep 17 00:00:00 2001 From: Hinton Date: Fri, 11 Dec 2020 16:13:50 +0100 Subject: [PATCH] Remove safari only code from autofill. --- src/content/autofill.js | 29 ------------ src/content/autofiller.ts | 54 +++++------------------ src/content/notificationBar.ts | 1 - src/content/shortcuts.ts | 7 +-- src/popup/services/popup-utils.service.ts | 2 - 5 files changed, 12 insertions(+), 81 deletions(-) diff --git a/src/content/autofill.js b/src/content/autofill.js index ca6c75ae08..956708fe3e 100644 --- a/src/content/autofill.js +++ b/src/content/autofill.js @@ -989,35 +989,6 @@ End 1Password Extension */ - if ((typeof safari !== 'undefined') && navigator.userAgent.indexOf(' Safari/') !== -1 && - navigator.userAgent.indexOf('Chrome') === -1) { - if (window.__bitwardenFrameId == null) { - window.__bitwardenFrameId = Math.floor(Math.random() * Math.floor(99999999)); - } - safari.self.addEventListener('message', function (msgEvent) { - var msg = JSON.parse(msgEvent.message.msg); - if (msg.bitwardenFrameId != null && window.__bitwardenFrameId !== msg.bitwardenFrameId) { - return; - } - - if (msg.command === 'collectPageDetails') { - var pageDetails = collect(document); - var pageDetailsObj = JSON.parse(pageDetails); - safari.extension.dispatchMessage('bitwarden', { - command: 'collectPageDetailsResponse', - tab: msg.tab, - details: pageDetailsObj, - sender: msg.sender, - bitwardenFrameId: window.__bitwardenFrameId - }); - } - else if (msg.command === 'fillForm') { - fill(document, msg.fillScript); - } - }, false); - return; - } - chrome.runtime.onMessage.addListener(function (msg, sender, sendResponse) { if (msg.command === 'collectPageDetails') { var pageDetails = collect(document); diff --git a/src/content/autofiller.ts b/src/content/autofiller.ts index 253c82603c..1d756b8451 100644 --- a/src/content/autofiller.ts +++ b/src/content/autofiller.ts @@ -3,44 +3,17 @@ document.addEventListener('DOMContentLoaded', (event) => { let filledThisHref = false; let delayFillTimeout: number; - const isSafari = (typeof safari !== 'undefined') && navigator.userAgent.indexOf(' Safari/') !== -1 && - navigator.userAgent.indexOf('Chrome') === -1; - - if (isSafari) { - if ((window as any).__bitwardenFrameId == null) { - (window as any).__bitwardenFrameId = Math.floor(Math.random() * Math.floor(99999999)); + const enabledKey = 'enableAutoFillOnPageLoad'; + chrome.storage.local.get(enabledKey, (obj: any) => { + if (obj != null && obj[enabledKey] === true) { + setInterval(() => doFillIfNeeded(), 500); } - const responseCommand = 'autofillerAutofillOnPageLoadEnabledResponse'; - safari.extension.dispatchMessage('bitwarden', { - command: 'bgGetDataForTab', - responseCommand: responseCommand, - bitwardenFrameId: (window as any).__bitwardenFrameId, - }); - safari.self.addEventListener('message', (msgEvent: any) => { - const msg = JSON.parse(msgEvent.message.msg); - if (msg.bitwardenFrameId != null && (window as any).__bitwardenFrameId !== msg.bitwardenFrameId) { - return; - } - if (msg.command === responseCommand && msg.data.autofillEnabled === true) { - setInterval(() => doFillIfNeeded(), 500); - } else if (msg.command === 'fillForm' && pageHref === msg.url) { - filledThisHref = true; - } - }, false); - return; - } else { - const enabledKey = 'enableAutoFillOnPageLoad'; - chrome.storage.local.get(enabledKey, (obj: any) => { - if (obj != null && obj[enabledKey] === true) { - setInterval(() => doFillIfNeeded(), 500); - } - }); - chrome.runtime.onMessage.addListener((msg: any, sender: any, sendResponse: Function) => { - if (msg.command === 'fillForm' && pageHref === msg.url) { - filledThisHref = true; - } - }); - } + }); + chrome.runtime.onMessage.addListener((msg: any, sender: any, sendResponse: Function) => { + if (msg.command === 'fillForm' && pageHref === msg.url) { + filledThisHref = true; + } + }); function doFillIfNeeded(force: boolean = false) { if (force || pageHref !== window.location.href) { @@ -64,12 +37,7 @@ document.addEventListener('DOMContentLoaded', (event) => { sender: 'autofiller', }; - if (isSafari) { - msg.bitwardenFrameId = (window as any).__bitwardenFrameId; - safari.extension.dispatchMessage('bitwarden', msg); - } else { - chrome.runtime.sendMessage(msg); - } + chrome.runtime.sendMessage(msg); } } }); diff --git a/src/content/notificationBar.ts b/src/content/notificationBar.ts index f199cb1e94..70fbd5e413 100644 --- a/src/content/notificationBar.ts +++ b/src/content/notificationBar.ts @@ -20,7 +20,6 @@ document.addEventListener('DOMContentLoaded', (event) => { let disabledAddLoginNotification = false; let disabledChangedPasswordNotification = false; - chrome.storage.local.get('neverDomains', (ndObj: any) => { const domains = ndObj.neverDomains; if (domains != null && domains.hasOwnProperty(window.location.hostname)) { diff --git a/src/content/shortcuts.ts b/src/content/shortcuts.ts index f2d8de67dc..fe9699ac52 100644 --- a/src/content/shortcuts.ts +++ b/src/content/shortcuts.ts @@ -45,11 +45,6 @@ document.addEventListener('DOMContentLoaded', (event) => { shortcut: shortcut, }; - if (isSafari) { - msg.bitwardenFrameId = (window as any).__bitwardenFrameId; - safari.extension.dispatchMessage('bitwarden', msg); - } else { - chrome.runtime.sendMessage(msg); - } + chrome.runtime.sendMessage(msg); } }); diff --git a/src/popup/services/popup-utils.service.ts b/src/popup/services/popup-utils.service.ts index 8f694c87b4..297c6c1470 100644 --- a/src/popup/services/popup-utils.service.ts +++ b/src/popup/services/popup-utils.service.ts @@ -68,8 +68,6 @@ export class PopupUtilsService { chrome.tabs.create({ url: href, }); - } else if ((typeof safari !== 'undefined')) { - // Safari can't open popup in full page tab :( } } }