From 97e801271f68b9035770b5df335ca4b2bd2fe533 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Fri, 18 Mar 2022 17:00:27 +0200 Subject: [PATCH] Revert some changes --- .gitignore | 2 - .vscode/launch.json | 11 -- .../common/browser-polyfill.min.js | 4 +- .../content/keepassxc-browser.js | 112 +++++++++--------- 4 files changed, 56 insertions(+), 73 deletions(-) delete mode 100644 .vscode/launch.json diff --git a/.gitignore b/.gitignore index e7c740d..a667390 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,3 @@ .bz2 .xz node_modules/* -test-results/ -playwright-report/ diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 471277d..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "configurations": [ - { - "type": "node-terminal", - "name": "Run Script: Playwright tests", - "request": "launch", - "command": "npx playwright test", - "cwd": "${workspaceFolder}" - } - ] -} diff --git a/keepassxc-browser/common/browser-polyfill.min.js b/keepassxc-browser/common/browser-polyfill.min.js index fe5b48a..7c65ff3 100644 --- a/keepassxc-browser/common/browser-polyfill.min.js +++ b/keepassxc-browser/common/browser-polyfill.min.js @@ -14,8 +14,8 @@ )("undefined" == typeof globalThis ? "undefined" == typeof self ? this : self : globalThis, function(a) { "use strict"; if ("undefined" == typeof browser || Object.getPrototypeOf(browser) !== Object.prototype) { - //if ("object" != typeof chrome || !chrome || !chrome.runtime || !chrome.runtime.id) - //throw new Error("This script should only be loaded in a browser extension."); + if ("object" != typeof chrome || !chrome || !chrome.runtime || !chrome.runtime.id) + throw new Error("This script should only be loaded in a browser extension."); a.exports = (a=>{ const b = { alarms: { diff --git a/keepassxc-browser/content/keepassxc-browser.js b/keepassxc-browser/content/keepassxc-browser.js index 8847fae..60db11d 100755 --- a/keepassxc-browser/content/keepassxc-browser.js +++ b/keepassxc-browser/content/keepassxc-browser.js @@ -788,62 +788,58 @@ if (document.readyState === 'complete' || (document.readyState !== 'loading' && } // These are executed in each frame. Try/catch is for tests where browser can be undefined. -try { - browser.runtime.onMessage.addListener(async function(req, sender) { - if ('action' in req) { - // Don't allow any actions if the site is ignored - if (await kpxc.siteIgnored()) { - logDebug('This site is ignored in Site Preferences.'); - return; - } - - if (req.action === 'activated_tab') { - kpxc.triggerActivatedTab(); - } else if (req.action === 'add_username_only_option') { - kpxc.addToSitePreferences(); - } else if (req.action === 'check_database_hash' && 'hash' in req) { - kpxc.detectDatabaseChange(req); - } else if (req.action === 'choose_credential_fields') { - kpxcDefine.init(); - } else if (req.action === 'clear_credentials') { - kpxc.clearAllFromPage(); - } else if (req.action === 'fill_user_pass_with_specific_login') { - kpxcFill.fillFromPopup(req.id, req.uuid); - } else if (req.action === 'fill_username_password') { - sendMessage('page_set_manual_fill', ManualFill.BOTH); - await kpxc.receiveCredentialsIfNecessary(); - kpxcFill.fillInFromActiveElement(); - } else if (req.action === 'fill_password') { - sendMessage('page_set_manual_fill', ManualFill.PASSWORD); - await kpxc.receiveCredentialsIfNecessary(); - kpxcFill.fillInFromActiveElement(true); // passOnly to true - } else if (req.action === 'fill_totp') { - await kpxc.receiveCredentialsIfNecessary(); - kpxcFill.fillFromTOTP(); - } else if (req.action === 'fill_attribute' && req.args) { - await kpxc.receiveCredentialsIfNecessary(); - kpxcFill.fillAttributeToActiveElementWith(req.args); - } else if (req.action === 'ignore_site') { - kpxc.ignoreSite(req.args); - } else if (req.action === 'redetect_fields') { - const response = await sendMessage('load_settings'); - kpxc.settings = response; - kpxc.inputs = []; - kpxc.combinations = []; - kpxc.initCredentialFields(); - } else if (req.action === 'reload_extension') { - sendMessage('reconnect'); - } else if (req.action === 'save_credentials') { - kpxc.rememberCredentialsFromContextMenu(); - } else if (req.action === 'retrive_credentials_forced') { - await kpxc.retrieveCredentials(true); - } else if (req.action === 'show_password_generator') { - kpxcPasswordDialog.trigger(); - } else if (req.action === 'request_autotype') { - sendMessage('request_autotype', [ window.location.hostname ]); - } +browser.runtime.onMessage.addListener(async function(req, sender) { + if ('action' in req) { + // Don't allow any actions if the site is ignored + if (await kpxc.siteIgnored()) { + logDebug('This site is ignored in Site Preferences.'); + return; } - }); -} catch (e) { - console.log(e.message); -} + + if (req.action === 'activated_tab') { + kpxc.triggerActivatedTab(); + } else if (req.action === 'add_username_only_option') { + kpxc.addToSitePreferences(); + } else if (req.action === 'check_database_hash' && 'hash' in req) { + kpxc.detectDatabaseChange(req); + } else if (req.action === 'choose_credential_fields') { + kpxcDefine.init(); + } else if (req.action === 'clear_credentials') { + kpxc.clearAllFromPage(); + } else if (req.action === 'fill_user_pass_with_specific_login') { + kpxcFill.fillFromPopup(req.id, req.uuid); + } else if (req.action === 'fill_username_password') { + sendMessage('page_set_manual_fill', ManualFill.BOTH); + await kpxc.receiveCredentialsIfNecessary(); + kpxcFill.fillInFromActiveElement(); + } else if (req.action === 'fill_password') { + sendMessage('page_set_manual_fill', ManualFill.PASSWORD); + await kpxc.receiveCredentialsIfNecessary(); + kpxcFill.fillInFromActiveElement(true); // passOnly to true + } else if (req.action === 'fill_totp') { + await kpxc.receiveCredentialsIfNecessary(); + kpxcFill.fillFromTOTP(); + } else if (req.action === 'fill_attribute' && req.args) { + await kpxc.receiveCredentialsIfNecessary(); + kpxcFill.fillAttributeToActiveElementWith(req.args); + } else if (req.action === 'ignore_site') { + kpxc.ignoreSite(req.args); + } else if (req.action === 'redetect_fields') { + const response = await sendMessage('load_settings'); + kpxc.settings = response; + kpxc.inputs = []; + kpxc.combinations = []; + kpxc.initCredentialFields(); + } else if (req.action === 'reload_extension') { + sendMessage('reconnect'); + } else if (req.action === 'save_credentials') { + kpxc.rememberCredentialsFromContextMenu(); + } else if (req.action === 'retrive_credentials_forced') { + await kpxc.retrieveCredentials(true); + } else if (req.action === 'show_password_generator') { + kpxcPasswordDialog.trigger(); + } else if (req.action === 'request_autotype') { + sendMessage('request_autotype', [ window.location.hostname ]); + } + } +});