PB-18657 Service worker should explicitly used our version of the bro…

…wser webextension polyfill/api Signed-off-by: Cedric Alfonsi <cedric@passbolt.com>
passbolt · Sep 30, 2022 · 7d556e5 · 7d556e5
1 parent 52ce05f
commit 7d556e5
Show file tree

Hide file tree

Showing 26 changed files with 25 additions and 25 deletions.
diff --git a/src/all/background_page/controller/auth/authSignInController.js b/src/all/background_page/controller/auth/authSignInController.js
@@ -11,7 +11,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         3.6.0
  */
-import browser from "webextension-polyfill";
+import browser from "../../sdk/polyfill/browserPolyfill";
 import AuthModel from "../../model/auth/authModel";
 
 

diff --git a/src/all/background_page/controller/extension/OnExtensionInstalledController.js b/src/all/background_page/controller/extension/OnExtensionInstalledController.js
@@ -13,7 +13,7 @@
  *
  * On extension installed controller
  */
-import browser from 'webextension-polyfill';
+import browser from '../../sdk/polyfill/browserPolyfill';
 
 class OnExtensionInstalledController {
   /**

diff --git a/src/all/background_page/controller/group/groupUpdateController.test.js b/src/all/background_page/controller/group/groupUpdateController.test.js
@@ -16,7 +16,7 @@ import Keyring from "../../model/keyring";
 import DecryptMessageService from "../../service/crypto/decryptMessageService";
 import User from "../../model/user";
 import GroupsUpdateController from "./groupUpdateController";
-import browser from "webextension-polyfill";
+import browser from "../../sdk/polyfill/browserPolyfill";
 import {PassphraseController} from "../passphrase/passphraseController";
 import MockExtension from "../../../../../test/mocks/mockExtension";
 

diff --git a/...l/background_page/controller/informCallToActionController/informCallToActionController.js b/...l/background_page/controller/informCallToActionController/informCallToActionController.js
@@ -12,7 +12,7 @@
  * @since         3.3.0
  */
 import GpgAuth from "../../model/gpgauth";
-import browser from "webextension-polyfill";
+import browser from "../../sdk/polyfill/browserPolyfill";
 import User from "../../model/user";
 import ResourceModel from "../../model/resource/resourceModel";
 import {QuickAccessService} from "../../service/ui/quickAccess.service";

diff --git a/src/all/background_page/controller/setup/signInSetupController.js b/src/all/background_page/controller/setup/signInSetupController.js
@@ -11,7 +11,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         3.6.0
  */
-import browser from "webextension-polyfill";
+import browser from "../../sdk/polyfill/browserPolyfill";
 import AuthModel from "../../model/auth/authModel";
 
 class SignInSetupController {

diff --git a/src/all/background_page/controller/toolbarController.js b/src/all/background_page/controller/toolbarController.js
@@ -11,7 +11,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.0.0
  */
-import browser from "webextension-polyfill";
+import browser from "../sdk/polyfill/browserPolyfill";
 import User from "../model/user";
 import {BrowserExtensionIconService} from "../service/ui/browserExtensionIcon.service";
 import ResourceModel from "../model/resource/resourceModel";

diff --git a/src/all/background_page/event/browser/browserEvents.js b/src/all/background_page/event/browser/browserEvents.js
@@ -13,7 +13,7 @@
  *
  * Background script for browser listener
  */
-import browser from 'webextension-polyfill';
+import browser from '../../sdk/polyfill/browserPolyfill';
 import OnExtensionInstalledController from "../../controller/extension/OnExtensionInstalledController";
 
 /**

diff --git a/src/all/background_page/event/quickAccessEvents.js b/src/all/background_page/event/quickAccessEvents.js
@@ -4,7 +4,7 @@
  * @copyright (c) 2019 Passbolt SA
  * @licence GNU Affero General Public License http://www.gnu.org/licenses/agpl-3.0.en.html
  */
-import browser from "webextension-polyfill";
+import browser from "../sdk/polyfill/browserPolyfill";
 import User from "../model/user";
 import {Worker} from "../model/worker";
 import {BrowserTabService} from "../service/ui/browserTab.service";

diff --git a/src/all/background_page/model/user.js b/src/all/background_page/model/user.js
@@ -4,7 +4,7 @@
  * @copyright (c) 2017 Passbolt SARL
  * @licence GNU Affero General Public License http://www.gnu.org/licenses/agpl-3.0.en.html
  */
-import browser from "webextension-polyfill";
+import browser from "../sdk/polyfill/browserPolyfill";
 import UserService from "../service/api/user/userService";
 import {Config} from "./config";
 import UserSettings from "./userSettings/userSettings";

diff --git a/src/all/background_page/sdk/page-mod.js b/src/all/background_page/sdk/page-mod.js
@@ -11,7 +11,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.0.0
  */
-import browser from "webextension-polyfill";
+import browser from "../sdk/polyfill/browserPolyfill";
 import {Worker as Workers} from "../model/worker";
 import ScriptExecution from "../sdk/scriptExecution";
 import Worker from "../sdk/worker";

diff --git a/.../background_page/sdk/polyfill/polyfill.js → ...ound_page/sdk/polyfill/browserPolyfill.js b/.../background_page/sdk/polyfill/polyfill.js → ...ound_page/sdk/polyfill/browserPolyfill.js
@@ -16,6 +16,6 @@
  * This code provides polyfills for the need of Passbolt.
  */
 import browser from "webextension-polyfill";
-import "./scripting-polyfill"; //mv3 scripting API for mv2
+import "./scriptingPolyfill"; //mv3 scripting API for mv2
 
 export default browser;
diff --git a/...d_page/sdk/polyfill/scripting-polyfill.js → ...nd_page/sdk/polyfill/scriptingPolyfill.js b/...d_page/sdk/polyfill/scripting-polyfill.js → ...nd_page/sdk/polyfill/scriptingPolyfill.js
diff --git a/src/all/background_page/sdk/scriptExecution.js b/src/all/background_page/sdk/scriptExecution.js
@@ -5,7 +5,7 @@
  * @copyright (c) 2017 Passbolt SARL
  * @licence GNU Affero General Public License http://www.gnu.org/licenses/agpl-3.0.en.html
  */
-import browser from "./polyfill/polyfill";
+import browser from "./polyfill/browserPolyfill";
 
 /**
  * Used to set the portname.

diff --git a/src/all/background_page/service/local_storage/AccountLocalStorage.test.js b/src/all/background_page/service/local_storage/AccountLocalStorage.test.js
@@ -15,7 +15,7 @@ import {v4 as uuidv4} from 'uuid';
 import AccountLocalStorage from "./accountLocalStorage";
 import {defaultAccountDto} from "../../model/entity/account/accountEntity.test.data";
 import AccountEntity from "../../model/entity/account/accountEntity";
-import browser from "webextension-polyfill";
+import browser from "../../sdk/polyfill/browserPolyfill";
 
 describe("AccountLocalStorage", () => {
   describe("AccountLocalStorage::get", () => {

diff --git a/src/all/background_page/service/local_storage/accountLocalStorage.js b/src/all/background_page/service/local_storage/accountLocalStorage.js
@@ -11,7 +11,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         3.6.0
  */
-import browser from "webextension-polyfill";
+import browser from "../../sdk/polyfill/browserPolyfill";
 import AbstractAccountEntity from "../../model/entity/account/abstractAccountEntity";
 import AwaitLock from "await-lock";
 

diff --git a/src/all/background_page/service/local_storage/authStatusLocalStorage.js b/src/all/background_page/service/local_storage/authStatusLocalStorage.js
@@ -11,7 +11,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.13.4
  */
-import browser from "webextension-polyfill";
+import browser from "../../sdk/polyfill/browserPolyfill";
 import Log from "../../model/log";
 import Lock from "../../utils/lock";
 const lock = new Lock();

diff --git a/src/all/background_page/service/local_storage/folderLocalStorage.js b/src/all/background_page/service/local_storage/folderLocalStorage.js
@@ -11,7 +11,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.13.0
  */
-import browser from "webextension-polyfill";
+import browser from "../../sdk/polyfill/browserPolyfill";
 import Log from "../../model/log";
 import FolderEntity from "../../model/entity/folder/folderEntity";
 import FoldersCollection from "../../model/entity/folder/foldersCollection";

diff --git a/src/all/background_page/service/local_storage/groupLocalStorage.js b/src/all/background_page/service/local_storage/groupLocalStorage.js
@@ -11,7 +11,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.13.0
  */
-import browser from "webextension-polyfill";
+import browser from "../../sdk/polyfill/browserPolyfill";
 import Log from "../../model/log";
 import GroupsCollection from "../../model/entity/group/groupsCollection";
 import GroupEntity from "../../model/entity/group/groupEntity";

diff --git a/src/all/background_page/service/local_storage/passwordGeneratorLocalStorage.js b/src/all/background_page/service/local_storage/passwordGeneratorLocalStorage.js
@@ -11,7 +11,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         3.3.0
  */
-import browser from "webextension-polyfill";
+import browser from "../../sdk/polyfill/browserPolyfill";
 import Log from "../../model/log";
 import Lock from "../../utils/lock";
 const lock = new Lock();

diff --git a/src/all/background_page/service/local_storage/resourceLocalStorage.js b/src/all/background_page/service/local_storage/resourceLocalStorage.js
@@ -11,7 +11,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.11.0
  */
-import browser from "webextension-polyfill";
+import browser from "../../sdk/polyfill/browserPolyfill";
 import Log from "../../model/log";
 import ResourcesCollection from "../../model/entity/resource/resourcesCollection";
 import ResourceEntity from "../../model/entity/resource/resourceEntity";

diff --git a/src/all/background_page/service/local_storage/resourceTypeLocalStorage.js b/src/all/background_page/service/local_storage/resourceTypeLocalStorage.js
@@ -11,7 +11,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         3.0.0
  */
-import browser from "webextension-polyfill";
+import browser from "../../sdk/polyfill/browserPolyfill";
 import Log from "../../model/log";
 import ResourceTypeEntity from "../../model/entity/resourceType/resourceTypeEntity";
 import ResourceTypesCollection from "../../model/entity/resourceType/resourceTypesCollection";

diff --git a/src/all/background_page/service/local_storage/rolesLocalStorage.js b/src/all/background_page/service/local_storage/rolesLocalStorage.js
@@ -11,7 +11,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         3.0.0
  */
-import browser from "webextension-polyfill";
+import browser from "../../sdk/polyfill/browserPolyfill";
 import Log from "../../model/log";
 import RoleEntity from "../../model/entity/role/roleEntity";
 import RolesCollection from "../../model/entity/role/rolesCollection";

diff --git a/src/all/background_page/service/local_storage/userLocalStorage.js b/src/all/background_page/service/local_storage/userLocalStorage.js
@@ -11,7 +11,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.13.0
  */
-import browser from "webextension-polyfill";
+import browser from "../../sdk/polyfill/browserPolyfill";
 import Log from "../../model/log";
 import UserEntity from "../../model/entity/user/userEntity";
 import UsersCollection from "../../model/entity/user/usersCollection";

diff --git a/src/all/background_page/service/ui/browserExtensionIcon.service.js b/src/all/background_page/service/ui/browserExtensionIcon.service.js
@@ -12,7 +12,7 @@
  * @since         3.3
  */
 
-import browser from "webextension-polyfill";
+import browser from "../../sdk/polyfill/browserPolyfill";
 
 /** Default Passbolt browser extension icon file path  */
 const DEFAULT_BROWSER_EXTENSION_ICON_FILEPATH = '/webAccessibleResources/img/icons/icon-32.png';

diff --git a/src/all/background_page/service/ui/browserTab.service.js b/src/all/background_page/service/ui/browserTab.service.js
@@ -11,7 +11,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         3.4.0
  */
-import browser from "webextension-polyfill";
+import browser from "../../sdk/polyfill/browserPolyfill";
 
 /**
  * Get the current tab

diff --git a/src/all/background_page/service/ui/quickAccess.service.js b/src/all/background_page/service/ui/quickAccess.service.js
@@ -11,7 +11,7 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         3.4
  */
-import browser from "webextension-polyfill";
+import browser from "../../sdk/polyfill/browserPolyfill";
 
 /** The default quickaccesss window height */
 const QUICKACCESS_WINDOW_HEIGHT = 400;