passbolt-browser-extension 5.13.0 → 5.14.2

package/src/all/background_page/controller/autofill/AutofillController.js

@@ -13,7 +13,6 @@
  */
 
 import ResourceModel from "../../model/resource/resourceModel";
-import ResourceTypeModel from "../../model/resourceType/resourceTypeModel";
 import GetPassphraseService from "../../service/passphrase/getPassphraseService";
 import WorkerService from "../../service/worker/workerService";
 import GetDecryptedUserPrivateKeyService from "../../service/account/getDecryptedUserPrivateKeyService";
@@ -21,6 +20,7 @@ import DecryptAndParseResourceSecretService from "../../service/secret/decryptAn
 import InformMenuPagemod from "../../pagemod/informMenuPagemod";
 import QuickAccessPagemod from "../../pagemod/quickAccessPagemod";
 import FindSecretService from "../../service/secret/findSecretService";
+import GetSecretSchemaResourceTypeService from "../../service/resourceType/getSecretSchemaResourceTypeService";
 
 class AutofillController {
   /**
@@ -35,7 +35,7 @@ class AutofillController {
     this.requestId = requestId;
     this.resourceModel = new ResourceModel(apiClientOptions, account);
     this.findSecretService = new FindSecretService(account, apiClientOptions);
-    this.resourceTypeModel = new ResourceTypeModel(apiClientOptions);
+    this.getSecretSchemaResourceTypeService = new GetSecretSchemaResourceTypeService(account, apiClientOptions);
     this.getPassphraseService = new GetPassphraseService(account);
   }
 
@@ -71,7 +71,7 @@ class AutofillController {
       // Get the resource, decrypt the resources password and requests to fill the credentials
       const resource = await this.resourceModel.getById(resourceId);
       const secret = await this.findSecretService.findByResourceId(resourceId);
-      const secretSchema = await this.resourceTypeModel.getSecretSchemaById(resource.resourceTypeId);
+      const secretSchema = await this.getSecretSchemaResourceTypeService.getByResourceTypeId(resource.resourceTypeId);
       const privateKey = await GetDecryptedUserPrivateKeyService.getKey(passphrase);
       const plaintextSecret = await DecryptAndParseResourceSecretService.decryptAndParse(
         secret,

package/src/all/background_page/controller/autofill/AutofillController.test.js

@@ -76,7 +76,7 @@ describe("AutofillController", () => {
       jest.spyOn(controller.getPassphraseService, "getPassphrase").mockResolvedValue(pgpKeys.ada.passphrase);
       jest.spyOn(controller.resourceModel, "getById").mockResolvedValue(resource);
       jest.spyOn(controller.findSecretService, "findByResourceId").mockResolvedValue(new SecretEntity(secretDto));
-      jest.spyOn(controller.resourceTypeModel, "getSecretSchemaById").mockResolvedValue(schema);
+      jest.spyOn(controller.getSecretSchemaResourceTypeService, "getByResourceTypeId").mockResolvedValue(schema);
 
       await controller.exec(resource.id, worker.tabId);
 
@@ -88,8 +88,10 @@ describe("AutofillController", () => {
       expect(controller.findSecretService.findByResourceId).toHaveBeenCalledTimes(1);
       expect(controller.findSecretService.findByResourceId).toHaveBeenCalledWith(resource.id);
 
-      expect(controller.resourceTypeModel.getSecretSchemaById).toHaveBeenCalledTimes(1);
-      expect(controller.resourceTypeModel.getSecretSchemaById).toHaveBeenCalledWith(resource.resourceTypeId);
+      expect(controller.getSecretSchemaResourceTypeService.getByResourceTypeId).toHaveBeenCalledTimes(1);
+      expect(controller.getSecretSchemaResourceTypeService.getByResourceTypeId).toHaveBeenCalledWith(
+        resource.resourceTypeId,
+      );
 
       expect(portWrapper.emit).toHaveBeenCalledTimes(2);
       expect(portWrapper.emit).toHaveBeenCalledWith("passbolt.web-integration.fill-credentials", {
@@ -119,7 +121,7 @@ describe("AutofillController", () => {
       jest.spyOn(controller.getPassphraseService, "getPassphrase").mockResolvedValue(pgpKeys.ada.passphrase);
       jest.spyOn(controller.resourceModel, "getById").mockResolvedValue(resource);
       jest.spyOn(controller.findSecretService, "findByResourceId").mockResolvedValue(new SecretEntity(secretDto));
-      jest.spyOn(controller.resourceTypeModel, "getSecretSchemaById").mockResolvedValue(schema);
+      jest.spyOn(controller.getSecretSchemaResourceTypeService, "getByResourceTypeId").mockResolvedValue(schema);
 
       await controller.exec(resource.id, worker.tabId);
 
@@ -133,8 +135,10 @@ describe("AutofillController", () => {
       expect(controller.findSecretService.findByResourceId).toHaveBeenCalledTimes(1);
       expect(controller.findSecretService.findByResourceId).toHaveBeenCalledWith(resource.id);
 
-      expect(controller.resourceTypeModel.getSecretSchemaById).toHaveBeenCalledTimes(1);
-      expect(controller.resourceTypeModel.getSecretSchemaById).toHaveBeenCalledWith(resource.resourceTypeId);
+      expect(controller.getSecretSchemaResourceTypeService.getByResourceTypeId).toHaveBeenCalledTimes(1);
+      expect(controller.getSecretSchemaResourceTypeService.getByResourceTypeId).toHaveBeenCalledWith(
+        resource.resourceTypeId,
+      );
 
       expect(portWrapper.emit).toHaveBeenCalledTimes(1);
       expect(portWrapper.request).toHaveBeenCalledTimes(1);
@@ -165,7 +169,7 @@ describe("AutofillController", () => {
       jest.spyOn(controller.getPassphraseService, "getPassphrase").mockResolvedValue(pgpKeys.ada.passphrase);
       jest.spyOn(controller.resourceModel, "getById").mockResolvedValue(resource);
       jest.spyOn(controller.findSecretService, "findByResourceId").mockResolvedValue(new SecretEntity(secretDto));
-      jest.spyOn(controller.resourceTypeModel, "getSecretSchemaById").mockResolvedValue(schema);
+      jest.spyOn(controller.getSecretSchemaResourceTypeService, "getByResourceTypeId").mockResolvedValue(schema);
 
       await controller.exec(resource.id, worker.tabId);
 
@@ -180,8 +184,10 @@ describe("AutofillController", () => {
       expect(controller.findSecretService.findByResourceId).toHaveBeenCalledTimes(1);
       expect(controller.findSecretService.findByResourceId).toHaveBeenCalledWith(resource.id);
 
-      expect(controller.resourceTypeModel.getSecretSchemaById).toHaveBeenCalledTimes(1);
-      expect(controller.resourceTypeModel.getSecretSchemaById).toHaveBeenCalledWith(resource.resourceTypeId);
+      expect(controller.getSecretSchemaResourceTypeService.getByResourceTypeId).toHaveBeenCalledTimes(1);
+      expect(controller.getSecretSchemaResourceTypeService.getByResourceTypeId).toHaveBeenCalledWith(
+        resource.resourceTypeId,
+      );
 
       expect(portWrapper.emit).not.toHaveBeenCalledWith("passbolt.web-integration.fill-credentials", {
         username: resource.username,
@@ -215,7 +221,7 @@ describe("AutofillController", () => {
       jest.spyOn(controller.getPassphraseService, "getPassphrase").mockResolvedValue(pgpKeys.ada.passphrase);
       jest.spyOn(controller.resourceModel, "getById").mockResolvedValue(resource);
       jest.spyOn(controller.findSecretService, "findByResourceId").mockResolvedValue(new SecretEntity(secretDto));
-      jest.spyOn(controller.resourceTypeModel, "getSecretSchemaById").mockResolvedValue(schema);
+      jest.spyOn(controller.getSecretSchemaResourceTypeService, "getByResourceTypeId").mockResolvedValue(schema);
 
       await controller.exec(resource.id, worker.tabId);
 
@@ -229,8 +235,10 @@ describe("AutofillController", () => {
       expect(controller.findSecretService.findByResourceId).toHaveBeenCalledTimes(1);
       expect(controller.findSecretService.findByResourceId).toHaveBeenCalledWith(resource.id);
 
-      expect(controller.resourceTypeModel.getSecretSchemaById).toHaveBeenCalledTimes(1);
-      expect(controller.resourceTypeModel.getSecretSchemaById).toHaveBeenCalledWith(resource.resourceTypeId);
+      expect(controller.getSecretSchemaResourceTypeService.getByResourceTypeId).toHaveBeenCalledTimes(1);
+      expect(controller.getSecretSchemaResourceTypeService.getByResourceTypeId).toHaveBeenCalledWith(
+        resource.resourceTypeId,
+      );
 
       expect(portWrapper.emit).not.toHaveBeenCalledWith("passbolt.web-integration.fill-credentials", {
         username: "",

package/src/all/background_page/controller/export/exportResourcesFileController.js

@@ -52,7 +52,7 @@ class ExportResourcesFileController {
 
   /**
    * Main execution function.
-   * @return {Promise<ExportResourcesFileEntity>}
+   * @return {Promise<{customFieldsConflicts: Array}>} The custom fields renamed to avoid conflicting with reserved field names
    */
   async exec(exportResourcesFileDto) {
     //Assert the param through the entity
@@ -61,7 +61,10 @@ class ExportResourcesFileController {
     try {
       const passphrase = await this.getPassphraseService.getPassphrase(this.worker);
       await this.exportResourcesService.prepareExportContent(exportResourcesFileEntity, passphrase);
-      await this.exportResourcesService.exportToFile(exportResourcesFileEntity, passphrase);
+      const customFieldsConflicts = await this.exportResourcesService.exportToFile(
+        exportResourcesFileEntity,
+        passphrase,
+      );
       const date = new Date().toISOString().slice(0, 10);
       const filename = `passbolt-export-${date}.${exportResourcesFileEntity.fileType}`;
       const mimeType =
@@ -69,7 +72,7 @@ class ExportResourcesFileController {
       const blobFile = exportResourcesFileEntity.toBlob(mimeType);
       await FileService.saveFile(filename, blobFile, mimeType, this.worker.tab.id);
       this.progressService.finishStep(i18n.t("Done"), true);
-      return exportResourcesFileEntity;
+      return { customFieldsConflicts: customFieldsConflicts || [] };
     } finally {
       this.progressService.close();
     }

package/src/all/background_page/controller/export/exportResourcesFileController.test.js

@@ -51,6 +51,7 @@ import { defaultDecryptedSharedMetadataKeysDtos } from "passbolt-styleguide/src/
 import MetadataKeysCollection from "passbolt-styleguide/src/shared/models/entity/metadata/metadataKeysCollection";
 import GetOrFindMetadataKeysService from "../../service/metadata/getOrFindMetadataKeysService";
 import { mockPassboltResponse } from "passbolt-styleguide/test/mocks/mockApiResponse";
+import GetOrFindResourceTypesService from "../../service/resourceType/getOrFindResourceTypesService";
 
 beforeEach(async () => {
   await MockExtension.withConfiguredAccount();
@@ -118,10 +119,10 @@ describe("ExportResourcesFileController", () => {
             .mockImplementation(() => mockPassboltResponse(resourceCollectionV4));
           const result = await controller.exec(file);
 
-          const blobFile = new Blob([result.file], { type: "text/csv" });
+          const blobFile = new Blob([KdbxCsvFile], { type: "text/csv" });
 
           expect(FileService.saveFile).toHaveBeenCalledWith(filename, blobFile, "text/csv", 1);
-          expect(result.file).toEqual(KdbxCsvFile);
+          expect(result).toEqual({ customFieldsConflicts: [] });
         });
       });
     });
@@ -179,11 +180,40 @@ describe("ExportResourcesFileController", () => {
 
           const result = await controller.exec(file);
 
-          expect(result.file).toEqual(exportResourcesFileEntity.file);
+          expect(result).toEqual({ customFieldsConflicts: [] });
         });
       });
     });
 
+    it("should return the custom fields renamed to avoid conflicting with reserved field names", async () => {
+      expect.assertions(1);
+      const conflicts = [{ resourceName: "GitHub", originalKey: "Password", newKey: "Password (1)" }];
+      jest.spyOn(ResourcesKdbxExporter.prototype, "export").mockImplementation(async function () {
+        this.exportEntity.file = new ArrayBuffer(0);
+        return conflicts;
+      });
+      const resourceType = resourceTypeCollection.find(
+        (resourceType) => resourceType.slug === RESOURCE_TYPE_V5_DEFAULT_TOTP_SLUG,
+      );
+      const file = {
+        format: FORMAT_KDBX,
+        resources_ids: [uuidv4()],
+        folders_ids: [foldersDto[0].id],
+      };
+      const resourceCollectionV4 = await resourceCollectionV4ToExport({
+        resourceType: resourceType,
+        folder_parent_id: foldersDto[0].id,
+        totp: defaultTotpDto({ secret_key: "THISISASECRET" }),
+      });
+      jest
+        .spyOn(ResourceService.prototype, "findAll")
+        .mockImplementation(() => mockPassboltResponse(resourceCollectionV4));
+
+      const result = await controller.exec(file);
+
+      expect(result).toEqual({ customFieldsConflicts: conflicts });
+    });
+
     describe.each([
       { scenario: "xls", format: "xls" },
       { scenario: "xlsx", format: "xlsx" },
@@ -243,7 +273,7 @@ describe("ExportResourcesFileController", () => {
       expect.assertions(1);
 
       jest.spyOn(controller.progressService, "close");
-      jest.spyOn(ResourceTypeService.prototype, "findAll").mockImplementation(() => {
+      jest.spyOn(GetOrFindResourceTypesService.prototype, "getOrFindAll").mockImplementation(() => {
         throw new Error("API error");
       });
       const file = {

package/src/all/background_page/controller/extension/onExtensionInstalledController.js

@@ -25,6 +25,8 @@ import storage from "../../sdk/storage";
 import { Config } from "../../model/config";
 import AuthModel from "../../model/auth/authModel";
 import AppBootstrapPagemod from "../../pagemod/appBootstrapPagemod";
+import GetActiveAccountService from "../../service/account/getActiveAccountService";
+import BuildApiClientOptionsService from "../../service/account/buildApiClientOptionsService";
 
 class OnExtensionInstalledController {
   /**
@@ -87,7 +89,9 @@ class OnExtensionInstalledController {
     }
     let authStatus;
     try {
-      const checkAuthStatusService = new CheckAuthStatusService();
+      const account = await GetActiveAccountService.get();
+      const apiClientOptions = BuildApiClientOptionsService.buildFromAccount(account);
+      const checkAuthStatusService = new CheckAuthStatusService(account, apiClientOptions);
       // use the cached data as the worker could wake up every 30 secondes.
       authStatus = await checkAuthStatusService.checkAuthStatus(false);
     } catch (error) {
@@ -130,7 +134,9 @@ class OnExtensionInstalledController {
 
     let authStatus;
     try {
-      const checkAuthStatusService = new CheckAuthStatusService();
+      const account = await GetActiveAccountService.get();
+      const apiClientOptions = BuildApiClientOptionsService.buildFromAccount(account);
+      const checkAuthStatusService = new CheckAuthStatusService(account, apiClientOptions);
       // use the cached data as the worker could wake up every 30 secondes.
       authStatus = await checkAuthStatusService.checkAuthStatus(false);
     } catch (error) {

package/src/all/background_page/controller/extension/onExtensionInstalledController.test.js

@@ -19,6 +19,9 @@ import AuthModel from "../../model/auth/authModel";
 import CheckAuthStatusService from "../../service/auth/checkAuthStatusService";
 import GetActiveAccountService from "../../service/account/getActiveAccountService";
 import User from "../../model/user";
+import OnlineSessionEntity from "passbolt-styleguide/src/shared/models/entity/session/onlineSessionEntity";
+import AccountEntity from "../../model/entity/account/accountEntity";
+import { defaultAccountDto } from "../../model/entity/account/accountEntity.test.data";
 
 // Reset the modules before each test.
 beforeEach(() => {
@@ -149,12 +152,13 @@ describe("OnExtensionInstalledController", () => {
       jest.spyOn(OnExtensionInstalledController, "onBrowserUpdate");
       jest.spyOn(User.getInstance(), "isValid").mockImplementation(() => true);
       jest.spyOn(UserSettings.prototype, "getDomain").mockImplementation(() => "https://passbolt.dev");
+      jest.spyOn(GetActiveAccountService, "get").mockImplementation(() => new AccountEntity(defaultAccountDto()));
       jest.spyOn(AuthModel.prototype, "logout").mockImplementation(() => {});
       jest.spyOn(browser.tabs, "query").mockImplementation(() => Promise.resolve(tabs));
       jest.spyOn(browser.tabs, "reload");
       jest
         .spyOn(CheckAuthStatusService.prototype, "checkAuthStatus")
-        .mockImplementation(() => ({ isAuthenticated: true }));
+        .mockImplementation(() => new OnlineSessionEntity({ is_authenticated: true }));
       // process
       await OnExtensionInstalledController.exec(details);
       // expectation

package/src/all/background_page/controller/group/{getOrFindGroupsController.js → findGroupsByIdsForShareController.js}

@@ -9,27 +9,26 @@
  * @copyright     Copyright (c) Passbolt SA (https://www.passbolt.com)
  * @license       https://opensource.org/licenses/AGPL-3.0 AGPL License
  * @link          https://www.passbolt.com Passbolt(tm)
- * @since         5.13.0
+ * @since         5.14.0
  */
-import GetOrFindGroupsService from "../../service/group/getOrFindGroupsService";
+import FindGroupsService from "../../service/group/findGroupsService";
 import { assertArrayUUID } from "../../utils/assertions";
 
 /**
- * Controller for the `passbolt.groups.get-by-ids` event. Returns the groups matching the given ids,
- * served from the local storage cache when available and otherwise fetched from the API.
+ * Controller for the `passbolt.groups.find-by-ids-for-share` event.
+ * Returns the groups matching the given ids fetched from the API.
  */
-class GetOrFindGroupsController {
+class FindGroupsByIdsForShareController {
   /**
    * Constructor.
    * @param {Worker} worker The associated worker.
    * @param {string} requestId The associated request id.
    * @param {ApiClientOptions} apiClientOptions The api client options.
-   * @param {AccountEntity} account The user account.
    */
-  constructor(worker, requestId, apiClientOptions, account) {
+  constructor(worker, requestId, apiClientOptions) {
     this.worker = worker;
     this.requestId = requestId;
-    this.getOrFindGroupsService = new GetOrFindGroupsService(account, apiClientOptions);
+    this.findGroupsService = new FindGroupsService(apiClientOptions);
   }
 
   /**
@@ -54,8 +53,8 @@ class GetOrFindGroupsController {
    */
   async exec(groupIds) {
     assertArrayUUID(groupIds);
-    return this.getOrFindGroupsService.getOrFindByIds(groupIds);
+    return this.findGroupsService.findAllByIdsForShare(groupIds);
   }
 }
 
-export default GetOrFindGroupsController;
+export default FindGroupsByIdsForShareController;

package/src/all/background_page/controller/group/{getOrFindGroupsController.test.js → findGroupsByIdsForShareController.test.js}

@@ -15,7 +15,7 @@
 import AccountEntity from "../../model/entity/account/accountEntity";
 import { defaultAccountDto } from "../../model/entity/account/accountEntity.test.data";
 import { defaultApiClientOptions } from "passbolt-styleguide/src/shared/lib/apiClient/apiClientOptions.test.data";
-import GetOrFindGroupsController from "./getOrFindGroupsController";
+import FindGroupsByIdsForShareController from "./findGroupsByIdsForShareController";
 import GroupsCollection from "passbolt-styleguide/src/shared/models/entity/group/groupsCollection";
 import { defaultGroupsDtos } from "passbolt-styleguide/src/shared/models/entity/group/groupsCollection.test.data";
 
@@ -23,7 +23,7 @@ beforeEach(() => {
   jest.clearAllMocks();
 });
 
-describe("GetOrFindGroupsController", () => {
+describe("FindGroupsByIdsForShareController", () => {
   describe("::exec", () => {
     it("Should retrieve the groups matching the given ids.", async () => {
       expect.assertions(3);
@@ -32,23 +32,23 @@ describe("GetOrFindGroupsController", () => {
       const groupsDto = defaultGroupsDtos();
       const groupsCollection = new GroupsCollection(groupsDto);
       const requestedIds = [groupsDto[1].id, groupsDto[3].id];
-      const controller = new GetOrFindGroupsController(null, null, defaultApiClientOptions(), account);
-      jest.spyOn(controller.getOrFindGroupsService, "getOrFindByIds").mockImplementation(() => groupsCollection);
+      const controller = new FindGroupsByIdsForShareController(null, null, defaultApiClientOptions(), account);
+      jest.spyOn(controller.findGroupsService, "findAllByIdsForShare").mockImplementation(() => groupsCollection);
 
       const result = await controller.exec(requestedIds);
 
       expect(result).toBeInstanceOf(GroupsCollection);
       expect(result).toStrictEqual(groupsCollection);
-      expect(controller.getOrFindGroupsService.getOrFindByIds).toHaveBeenCalledWith(requestedIds);
+      expect(controller.findGroupsService.findAllByIdsForShare).toHaveBeenCalledWith(requestedIds);
     });
 
     it("Should let error been thrown from the service if any.", async () => {
       expect.assertions(1);
 
       const account = new AccountEntity(defaultAccountDto());
-      const controller = new GetOrFindGroupsController(null, null, defaultApiClientOptions(), account);
+      const controller = new FindGroupsByIdsForShareController(null, null, defaultApiClientOptions(), account);
       const requestedIds = [defaultGroupsDtos()[0].id];
-      jest.spyOn(controller.getOrFindGroupsService, "getOrFindByIds").mockImplementation(() => {
+      jest.spyOn(controller.findGroupsService, "findAllByIdsForShare").mockImplementation(() => {
         throw new Error("Something went wrong!");
       });
 
@@ -59,7 +59,7 @@ describe("GetOrFindGroupsController", () => {
       expect.assertions(1);
 
       const account = new AccountEntity(defaultAccountDto());
-      const controller = new GetOrFindGroupsController(null, null, defaultApiClientOptions(), account);
+      const controller = new FindGroupsByIdsForShareController(null, null, defaultApiClientOptions(), account);
 
       await expect(() => controller.exec(["not-a-uuid"])).rejects.toThrow(
         "The given parameter is not a valid array of uuid",

package/src/all/background_page/controller/group/groupUpdateController.test.js

@@ -96,6 +96,7 @@ describe("GroupsUpdateController", () => {
     it("Add 2 users in a group with 1 secret being unknown for both users and 2 other secrets known by only one user each", async () => {
       expect.assertions(20);
 
+      chrome.runtime.getManifest.mockImplementation(() => ({ manifest_version: 2 }));
       const getResourceId = (data, index) => data["dry-run"].Secrets[index].Secret[0].resource_id;
       const findSecret = (secrets, userId, resource1Id) => {
         for (const i in secrets) {

package/src/all/background_page/controller/import/importResourcesFileController.test.js

@@ -68,10 +68,17 @@ import {
   RESOURCE_TYPE_V5_DEFAULT_TOTP_SLUG,
 } from "passbolt-styleguide/src/shared/models/entity/resourceType/resourceTypeSchemasDefinition";
 import GetOrFindMetadataSettingsService from "../../service/metadata/getOrFindMetadataSettingsService";
+import GetOrFindResourceTypesService from "../../service/resourceType/getOrFindResourceTypesService";
+import { anonymousSiteSettings } from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity.test.data";
+import SiteSettingsEntity from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity";
+import GetOrFindSiteSettingsService from "../../service/siteSettings/getOrFindSiteSettingsService";
 
 beforeEach(async () => {
   await MockExtension.withConfiguredAccount();
   jest.clearAllMocks();
+  jest
+    .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+    .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings()));
 });
 
 describe("ImportResourcesFileController", () => {
@@ -808,7 +815,7 @@ describe("ImportResourcesFileController", () => {
       expect.assertions(1);
 
       jest.spyOn(controller.progressService, "close");
-      jest.spyOn(ResourceTypeService.prototype, "findAll").mockImplementation(() => {
+      jest.spyOn(GetOrFindResourceTypesService.prototype, "getOrFindAll").mockImplementationOnce(() => {
         throw new Error("API error");
       });
       const file = btoa(BinaryConvert.toBinary(defaultCsvData));

package/src/all/background_page/controller/informCallToActionController/informCallToActionController.js

@@ -31,7 +31,7 @@ class InformCallToActionController {
   constructor(worker, apiClientOptions, account) {
     this.worker = worker;
     this.resourceModel = new ResourceModel(apiClientOptions, account);
-    this.checkAuthStatusService = new CheckAuthStatusService();
+    this.checkAuthStatusService = new CheckAuthStatusService(account, apiClientOptions);
     this.getOrFindResourcesService = new GetOrFindResourcesService(account, apiClientOptions);
     this.openTrustedDomainTabService = new OpenTrustedDomainTabService();
   }
@@ -65,7 +65,7 @@ class InformCallToActionController {
         const queryParameters = [{ name: "feature", value: "login" }];
         await QuickAccessService.open(queryParameters);
         this.worker.port.emit(requestId, "SUCCESS");
-      } else if (status.isMfaRequired) {
+      } else if (!status.isMfaAuthenticated) {
         await this.openTrustedDomainTabService.openTab();
         this.worker.port.emit(requestId, "SUCCESS");
       } else {

package/src/all/background_page/controller/informCallToActionController/informCallToActionController.test.js

@@ -22,6 +22,7 @@ import WorkerService from "../../service/worker/workerService";
 import { readWorker } from "../../model/entity/worker/workerEntity.test.data";
 import MockPort from "passbolt-styleguide/src/react-extension/test/mock/MockPort";
 import { defaultResourceDtosCollection } from "passbolt-styleguide/src/shared/models/entity/resource/resourcesCollection.test.data";
+import OnlineSessionEntity from "passbolt-styleguide/src/shared/models/entity/session/onlineSessionEntity";
 
 describe("InformCallToActionController", () => {
   let requestId, worker, port, controller, suggestedResources;
@@ -123,7 +124,7 @@ describe("InformCallToActionController", () => {
 
       jest
         .spyOn(controller.checkAuthStatusService, "checkAuthStatus")
-        .mockResolvedValue({ isAuthenticated: true, isMfaRequired: false });
+        .mockResolvedValue(new OnlineSessionEntity({ is_authenticated: true, is_mfa_authenticated: true }));
       jest.spyOn(WorkerService, "get").mockResolvedValue({ port });
 
       await controller.execute(requestId);
@@ -150,7 +151,9 @@ describe("InformCallToActionController", () => {
       expect.assertions(1);
 
       const error = new Error();
-      jest.spyOn(controller.checkAuthStatusService, "checkAuthStatus").mockResolvedValue({ isAuthenticated: false });
+      jest
+        .spyOn(controller.checkAuthStatusService, "checkAuthStatus")
+        .mockResolvedValue(new OnlineSessionEntity({ is_authenticated: false }));
       jest.spyOn(QuickAccessService, "open").mockRejectedValue(error);
 
       await controller.execute();
@@ -164,7 +167,7 @@ describe("InformCallToActionController", () => {
       const error = new Error();
       jest
         .spyOn(controller.checkAuthStatusService, "checkAuthStatus")
-        .mockResolvedValue({ isAuthenticated: true, isMfaRequired: true });
+        .mockResolvedValue(new OnlineSessionEntity({ is_authenticated: true, is_mfa_authenticated: false }));
       jest.spyOn(controller.openTrustedDomainTabService, "openTab").mockRejectedValue(error);
 
       await controller.execute();
@@ -178,7 +181,7 @@ describe("InformCallToActionController", () => {
       const error = new Error();
       jest
         .spyOn(controller.checkAuthStatusService, "checkAuthStatus")
-        .mockResolvedValue({ isAuthenticated: true, isMfaRequired: false });
+        .mockResolvedValue(new OnlineSessionEntity({ is_authenticated: true, is_mfa_authenticated: true }));
       jest.spyOn(WorkerService, "get").mockRejectedValue(error);
 
       await controller.execute();

package/src/all/background_page/controller/locale/getLocaleController.js

@@ -23,10 +23,11 @@ class GetLocaleController {
    * GetLocaleController constructor.
    * @param {Worker} worker
    * @param {ApiClientOptions} apiClientOptions The api client options.
+   * @param {AccountEntity} [account] The account, used to read the organization locale from the site settings.
    */
-  constructor(worker, apiClientOptions) {
+  constructor(worker, apiClientOptions, account) {
     this.worker = worker;
-    this.localeModel = new LocaleModel(apiClientOptions);
+    this.localeModel = new LocaleModel(apiClientOptions, account);
   }
 
   /**

package/src/all/background_page/controller/metadata/findMetadataTypesSettingsController.test.js

@@ -22,7 +22,9 @@ import {
 } from "passbolt-styleguide/src/shared/models/entity/metadata/metadataTypesSettingsEntity.test.data";
 import MetadataTypesSettingsEntity from "passbolt-styleguide/src/shared/models/entity/metadata/metadataTypesSettingsEntity";
 import { enableFetchMocks } from "jest-fetch-mock";
-import { defaultCeOrganizationSettings } from "../../model/entity/organizationSettings/organizationSettingsEntity.test.data";
+import { defaultCeSiteSettings } from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity.test.data";
+import GetOrFindSiteSettingsService from "../../service/siteSettings/getOrFindSiteSettingsService";
+import SiteSettingsEntity from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity";
 
 beforeEach(() => {
   enableFetchMocks();
@@ -46,7 +48,7 @@ describe("FindMetadataTypesSettingsController", () => {
       expect.assertions(3);
 
       const metadataTypesSettingsDto = defaultMetadataTypesSettingsV50FreshDto();
-      const siteSettingsDto = defaultCeOrganizationSettings();
+      const siteSettingsDto = defaultCeSiteSettings();
       jest
         .spyOn(
           controller.findAndUpdateMetadataSettingsLocalStorageService.findMetadataSettingsService,
@@ -54,12 +56,8 @@ describe("FindMetadataTypesSettingsController", () => {
         )
         .mockImplementationOnce(() => new MetadataTypesSettingsEntity(metadataTypesSettingsDto));
       jest
-        .spyOn(
-          controller.findAndUpdateMetadataSettingsLocalStorageService.organisationSettingsModel
-            .organizationSettingsService,
-          "find",
-        )
-        .mockImplementation(() => siteSettingsDto);
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(siteSettingsDto));
 
       const metadataTypesSettings = await controller.exec();
 
@@ -73,16 +71,12 @@ describe("FindMetadataTypesSettingsController", () => {
     it("get or find metadata types settings for a v4.", async () => {
       expect.assertions(3);
 
-      const siteSettingsDto = defaultCeOrganizationSettings();
+      const siteSettingsDto = defaultCeSiteSettings();
       // disable the plugin metadata.
       delete siteSettingsDto.passbolt.plugins.metadata;
       jest
-        .spyOn(
-          controller.findAndUpdateMetadataSettingsLocalStorageService.organisationSettingsModel
-            .organizationSettingsService,
-          "find",
-        )
-        .mockImplementation(() => siteSettingsDto);
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(siteSettingsDto));
 
       const metadataTypesSettings = await controller.exec();
 

package/src/all/background_page/controller/metadata/getMetadataTypesSettingsController.test.js

@@ -22,7 +22,9 @@ import {
 } from "passbolt-styleguide/src/shared/models/entity/metadata/metadataTypesSettingsEntity.test.data";
 import MetadataTypesSettingsEntity from "passbolt-styleguide/src/shared/models/entity/metadata/metadataTypesSettingsEntity";
 import { enableFetchMocks } from "jest-fetch-mock";
-import { defaultCeOrganizationSettings } from "../../model/entity/organizationSettings/organizationSettingsEntity.test.data";
+import { defaultCeSiteSettings } from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity.test.data";
+import GetOrFindSiteSettingsService from "../../service/siteSettings/getOrFindSiteSettingsService";
+import SiteSettingsEntity from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity";
 
 beforeEach(() => {
   enableFetchMocks();
@@ -46,7 +48,7 @@ describe("GetResourceTypesController", () => {
       expect.assertions(3);
 
       const metadataTypesSettingsDto = defaultMetadataTypesSettingsV50FreshDto();
-      const siteSettingsDto = defaultCeOrganizationSettings();
+      const siteSettingsDto = defaultCeSiteSettings();
       jest
         .spyOn(
           controller.getOrFindMetadaSettingsService.findAndUpdateMetadataSettingsLocalStorageService
@@ -55,12 +57,8 @@ describe("GetResourceTypesController", () => {
         )
         .mockImplementationOnce(() => new MetadataTypesSettingsEntity(metadataTypesSettingsDto));
       jest
-        .spyOn(
-          controller.getOrFindMetadaSettingsService.findAndUpdateMetadataSettingsLocalStorageService
-            .organisationSettingsModel.organizationSettingsService,
-          "find",
-        )
-        .mockImplementation(() => siteSettingsDto);
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(siteSettingsDto));
 
       const metadataTypesSettings = await controller.exec();
 
@@ -73,16 +71,12 @@ describe("GetResourceTypesController", () => {
     it("get or find metadata types settings for a v4.", async () => {
       expect.assertions(3);
 
-      const siteSettingsDto = defaultCeOrganizationSettings();
+      const siteSettingsDto = defaultCeSiteSettings();
       // disable the plugin metadata.
       delete siteSettingsDto.passbolt.plugins.metadata;
       jest
-        .spyOn(
-          controller.getOrFindMetadaSettingsService.findAndUpdateMetadataSettingsLocalStorageService
-            .organisationSettingsModel.organizationSettingsService,
-          "find",
-        )
-        .mockImplementation(() => siteSettingsDto);
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(siteSettingsDto));
 
       const metadataTypesSettings = await controller.exec();