passbolt-browser-extension 5.13.0 → 5.14.2

package/src/all/background_page/service/metadata/encryptMetadataService.test.js

@@ -317,7 +317,7 @@ describe("EncryptMetadataService", () => {
       const metadataKeys = new MetadataKeysCollection(metadataKeysDtos);
       const resourceTypes = new ResourceTypesCollection(resourceTypesCollectionDto());
 
-      jest.spyOn(encryptService.resourceTypesModel, "getOrFindAll").mockImplementation(() => resourceTypes);
+      jest.spyOn(encryptService.getOrFindResourceTypesService, "getOrFindAll").mockImplementation(() => resourceTypes);
       jest.spyOn(encryptService.getOrFindMetadataKeysService, "getOrFindAll").mockImplementation(() => metadataKeys);
       jest.spyOn(decryptService.getOrFindMetadataKeysService, "getOrFindAll").mockImplementation(() => metadataKeys);
       jest.spyOn(PassphraseStorageService, "get").mockImplementation(() => pgpKeys.ada.passphrase);
@@ -356,7 +356,7 @@ describe("EncryptMetadataService", () => {
       const metadataKeys = new MetadataKeysCollection(metadataKeysDtos);
       const resourceTypes = new ResourceTypesCollection(resourceTypesCollectionDto());
 
-      jest.spyOn(encryptService.resourceTypesModel, "getOrFindAll").mockImplementation(() => resourceTypes);
+      jest.spyOn(encryptService.getOrFindResourceTypesService, "getOrFindAll").mockImplementation(() => resourceTypes);
       jest.spyOn(encryptService.getOrFindMetadataKeysService, "getOrFindAll").mockImplementation(() => metadataKeys);
       jest.spyOn(decryptService.getOrFindMetadataKeysService, "getOrFindAll").mockImplementation(() => metadataKeys);
       jest.spyOn(PassphraseStorageService, "get");
@@ -392,7 +392,7 @@ describe("EncryptMetadataService", () => {
       const keyring = new Keyring();
       await keyring.importPublic(pgpKeys.ada.public, pgpKeys.ada.userId);
 
-      jest.spyOn(encryptService.resourceTypesModel, "getOrFindAll").mockImplementation(() => resourceTypes);
+      jest.spyOn(encryptService.getOrFindResourceTypesService, "getOrFindAll").mockImplementation(() => resourceTypes);
       jest.spyOn(encryptService.getOrFindMetadataKeysService, "getOrFindAll").mockImplementation(() => metadataKeys);
       jest.spyOn(decryptService.getOrFindMetadataKeysService, "getOrFindAll").mockImplementation(() => metadataKeys);
       jest.spyOn(GetDecryptedUserPrivateKeyService, "getKey").mockImplementationOnce(async () => privateKeyDecrypted);
@@ -436,7 +436,7 @@ describe("EncryptMetadataService", () => {
       const metadataKeys = new MetadataKeysCollection(metadataKeysDtos);
       const resourceTypes = new ResourceTypesCollection(resourceTypesCollectionDto());
 
-      jest.spyOn(encryptService.resourceTypesModel, "getOrFindAll").mockImplementation(() => resourceTypes);
+      jest.spyOn(encryptService.getOrFindResourceTypesService, "getOrFindAll").mockImplementation(() => resourceTypes);
       jest.spyOn(encryptService.getOrFindMetadataKeysService, "getOrFindAll").mockImplementation(() => metadataKeys);
       jest.spyOn(decryptService.getOrFindMetadataKeysService, "getOrFindAll").mockImplementation(() => metadataKeys);
       jest
@@ -469,7 +469,7 @@ describe("EncryptMetadataService", () => {
       const collection = new ResourcesCollection([personalResourceEntity, sharedResourceEntity]);
       const resourceTypes = new ResourceTypesCollection(resourceTypesCollectionDto());
 
-      jest.spyOn(encryptService.resourceTypesModel, "getOrFindAll").mockImplementation(() => resourceTypes);
+      jest.spyOn(encryptService.getOrFindResourceTypesService, "getOrFindAll").mockImplementation(() => resourceTypes);
       jest.spyOn(encryptService.getOrFindMetadataKeysService, "getOrFindAll");
       jest.spyOn(PassphraseStorageService, "get");
       jest.spyOn(
@@ -520,7 +520,7 @@ describe("EncryptMetadataService", () => {
       const metadataKeys = new MetadataKeysCollection(metadataKeysDtos);
       const resourceTypes = new ResourceTypesCollection(resourceTypesCollectionDto());
 
-      jest.spyOn(encryptService.resourceTypesModel, "getOrFindAll").mockImplementation(() => resourceTypes);
+      jest.spyOn(encryptService.getOrFindResourceTypesService, "getOrFindAll").mockImplementation(() => resourceTypes);
       jest.spyOn(encryptService.getOrFindMetadataKeysService, "getOrFindAll").mockImplementation(() => metadataKeys);
       jest.spyOn(decryptService.getOrFindMetadataKeysService, "getOrFindAll").mockImplementation(() => metadataKeys);
       jest.spyOn(GetDecryptedUserPrivateKeyService, "getKey").mockImplementationOnce(async () => privateKeyDecrypted);
@@ -555,7 +555,7 @@ describe("EncryptMetadataService", () => {
       const metadataKeys = new MetadataKeysCollection(metadataKeysDtos);
       const resourceTypes = new ResourceTypesCollection(resourceTypesCollectionDto());
 
-      jest.spyOn(encryptService.resourceTypesModel, "getOrFindAll").mockImplementation(() => resourceTypes);
+      jest.spyOn(encryptService.getOrFindResourceTypesService, "getOrFindAll").mockImplementation(() => resourceTypes);
       jest.spyOn(encryptService.getOrFindMetadataKeysService, "getOrFindAll").mockImplementation(() => metadataKeys);
       jest.spyOn(decryptService.getOrFindMetadataKeysService, "getOrFindAll").mockImplementation(() => metadataKeys);
       jest
@@ -603,7 +603,7 @@ describe("EncryptMetadataService", () => {
       const metadataKeys = new MetadataKeysCollection(metadataKeysDtos);
       const resourceTypes = new ResourceTypesCollection(resourceTypesCollectionDto());
 
-      jest.spyOn(encryptService.resourceTypesModel, "getOrFindAll").mockImplementation(() => resourceTypes);
+      jest.spyOn(encryptService.getOrFindResourceTypesService, "getOrFindAll").mockImplementation(() => resourceTypes);
       jest.spyOn(encryptService.getOrFindMetadataKeysService, "getOrFindAll").mockImplementation(() => metadataKeys);
       jest
         .spyOn(
@@ -639,7 +639,7 @@ describe("EncryptMetadataService", () => {
       const collection = new ResourcesCollection([resourceEntity]);
       const resourceTypes = new ResourceTypesCollection(resourceTypesCollectionDto());
 
-      jest.spyOn(encryptService.resourceTypesModel, "getOrFindAll").mockImplementation(() => resourceTypes);
+      jest.spyOn(encryptService.getOrFindResourceTypesService, "getOrFindAll").mockImplementation(() => resourceTypes);
       jest
         .spyOn(
           encryptService.getOrFindMetadataSettingsService.findAndUpdateMetadataSettingsLocalStorageService
@@ -669,7 +669,7 @@ describe("EncryptMetadataService", () => {
       const metadataKeys = new MetadataKeysCollection(metadataKeysDtos);
       const resourceTypes = new ResourceTypesCollection(resourceTypesCollectionDto());
 
-      jest.spyOn(encryptService.resourceTypesModel, "getOrFindAll").mockImplementation(() => resourceTypes);
+      jest.spyOn(encryptService.getOrFindResourceTypesService, "getOrFindAll").mockImplementation(() => resourceTypes);
       jest
         .spyOn(encryptService.getOrFindMetadataKeysService, "getOrFindAll")
         .mockImplementationOnce(() => metadataKeys);
@@ -702,7 +702,7 @@ describe("EncryptMetadataService", () => {
       expect.assertions(1);
       const resourceTypes = new ResourceTypesCollection(resourceTypesCollectionDto());
 
-      jest.spyOn(encryptService.resourceTypesModel, "getOrFindAll").mockImplementation(() => resourceTypes);
+      jest.spyOn(encryptService.getOrFindResourceTypesService, "getOrFindAll").mockImplementation(() => resourceTypes);
       jest
         .spyOn(
           encryptService.getOrFindMetadataSettingsService.findAndUpdateMetadataSettingsLocalStorageService

package/src/all/background_page/service/metadata/findAndUpdateMetadataSettingsLocalStorageService.js

@@ -14,7 +14,7 @@
 import MetadataTypesSettingsEntity from "passbolt-styleguide/src/shared/models/entity/metadata/metadataTypesSettingsEntity";
 import FindMetadataSettingsService from "./findMetadataSettingsService";
 import MetadataTypesSettingsLocalStorage from "../local_storage/metadataTypesSettingsLocalStorage";
-import OrganizationSettingsModel from "../../model/organizationSettings/organizationSettingsModel";
+import GetOrFindSiteSettingsService from "../siteSettings/getOrFindSiteSettingsService";
 import MetadataKeysSettingsLocalStorage from "../local_storage/metadataKeysSettingsLocalStorage";
 import MetadataKeysSettingsEntity from "passbolt-styleguide/src/shared/models/entity/metadata/metadataKeysSettingsEntity";
 
@@ -35,7 +35,7 @@ export default class FindAndUpdateMetadataSettingsLocalStorageService {
     this.findMetadataSettingsService = new FindMetadataSettingsService(apiClientOptions);
     this.metadataTypesSettingsLocalStorage = new MetadataTypesSettingsLocalStorage(account);
     this.metadataKeysSettingsLocalStorage = new MetadataKeysSettingsLocalStorage(account);
-    this.organisationSettingsModel = new OrganizationSettingsModel(apiClientOptions);
+    this.getOrFindSiteSettingsService = new GetOrFindSiteSettingsService(account, apiClientOptions);
   }
 
   /**
@@ -59,8 +59,8 @@ export default class FindAndUpdateMetadataSettingsLocalStorageService {
 
       // Lock is granted, retrieve the metadata types settings and update the local storage.
       let metadataTypesSettings;
-      const organizationSettings = await this.organisationSettingsModel.getOrFind();
-      if (organizationSettings.isPluginEnabled("metadata")) {
+      const siteSettings = await this.getOrFindSiteSettingsService.getOrFind(false);
+      if (siteSettings.isPluginEnabled("metadata")) {
         metadataTypesSettings = await this.findMetadataSettingsService.findTypesSettings();
       } else {
         // If the metadata plugin is not yet present, provide with the default v4 metadata types settings.

package/src/all/background_page/service/metadata/findAndUpdateMetadataSettingsLocalStorageService.test.js

@@ -20,10 +20,12 @@ import {
   defaultMetadataTypesSettingsV4Dto,
   defaultMetadataTypesSettingsV50FreshDto,
 } from "passbolt-styleguide/src/shared/models/entity/metadata/metadataTypesSettingsEntity.test.data";
-import { defaultCeOrganizationSettings } from "../../model/entity/organizationSettings/organizationSettingsEntity.test.data";
+import { defaultCeSiteSettings } from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity.test.data";
 import MetadataTypesSettingsEntity from "passbolt-styleguide/src/shared/models/entity/metadata/metadataTypesSettingsEntity";
 import { defaultMetadataKeysSettingsDto } from "passbolt-styleguide/src/shared/models/entity/metadata/metadataKeysSettingsEntity.test.data";
 import MetadataKeysSettingsEntity from "passbolt-styleguide/src/shared/models/entity/metadata/metadataKeysSettingsEntity";
+import GetOrFindSiteSettingsService from "../siteSettings/getOrFindSiteSettingsService";
+import SiteSettingsEntity from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity";
 
 beforeEach(() => {
   jest.clearAllMocks();
@@ -48,7 +50,7 @@ describe("FindAndUpdateMetadataSettingsLocalStorageService", () => {
     it("retrieves the metadata types settings from the API and store them into the local storage.", async () => {
       expect.assertions(2);
       const metadataTypesSettingsDto = defaultMetadataTypesSettingsV50FreshDto();
-      const siteSettingsDto = defaultCeOrganizationSettings();
+      const siteSettingsDto = defaultCeSiteSettings();
       jest
         .spyOn(
           findAndUpdateMetadataSettingsService.findMetadataSettingsService.metadataTypesSettingsApiService,
@@ -56,8 +58,8 @@ describe("FindAndUpdateMetadataSettingsLocalStorageService", () => {
         )
         .mockImplementation(() => metadataTypesSettingsDto);
       jest
-        .spyOn(findAndUpdateMetadataSettingsService.organisationSettingsModel.organizationSettingsService, "find")
-        .mockImplementation(() => siteSettingsDto);
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(siteSettingsDto));
 
       const entity = await findAndUpdateMetadataSettingsService.findAndUpdateTypesSettings();
 
@@ -69,7 +71,7 @@ describe("FindAndUpdateMetadataSettingsLocalStorageService", () => {
     it("retrieves partial metadata types settings from the API and store them marshalled into the local storage.", async () => {
       expect.assertions(2);
       const metadataTypesSettingsDto = {};
-      const siteSettingsDto = defaultCeOrganizationSettings();
+      const siteSettingsDto = defaultCeSiteSettings();
       jest
         .spyOn(
           findAndUpdateMetadataSettingsService.findMetadataSettingsService.metadataTypesSettingsApiService,
@@ -77,8 +79,8 @@ describe("FindAndUpdateMetadataSettingsLocalStorageService", () => {
         )
         .mockImplementation(() => metadataTypesSettingsDto);
       jest
-        .spyOn(findAndUpdateMetadataSettingsService.organisationSettingsModel.organizationSettingsService, "find")
-        .mockImplementation(() => siteSettingsDto);
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(siteSettingsDto));
 
       const entity = await findAndUpdateMetadataSettingsService.findAndUpdateTypesSettings();
 
@@ -91,15 +93,15 @@ describe("FindAndUpdateMetadataSettingsLocalStorageService", () => {
 
     it("with v4, retrieves default v4 metadata types settings without calling the API and store them into the local storage.", async () => {
       expect.assertions(3);
-      const siteSettingsDto = defaultCeOrganizationSettings();
+      const siteSettingsDto = defaultCeSiteSettings();
       delete siteSettingsDto.passbolt.plugins.metadata;
       jest.spyOn(
         findAndUpdateMetadataSettingsService.findMetadataSettingsService.metadataTypesSettingsApiService,
         "findSettings",
       );
       jest
-        .spyOn(findAndUpdateMetadataSettingsService.organisationSettingsModel.organizationSettingsService, "find")
-        .mockImplementation(() => siteSettingsDto);
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(siteSettingsDto));
 
       const entity = await findAndUpdateMetadataSettingsService.findAndUpdateTypesSettings();
 
@@ -116,7 +118,7 @@ describe("FindAndUpdateMetadataSettingsLocalStorageService", () => {
     it("overrides local storage with a second update call.", async () => {
       expect.assertions(2);
       const metadataTypesSettingsDto = defaultMetadataTypesSettingsV50FreshDto();
-      const siteSettingsDto = defaultCeOrganizationSettings();
+      const siteSettingsDto = defaultCeSiteSettings();
       jest
         .spyOn(
           findAndUpdateMetadataSettingsService.findMetadataSettingsService.metadataTypesSettingsApiService,
@@ -124,8 +126,8 @@ describe("FindAndUpdateMetadataSettingsLocalStorageService", () => {
         )
         .mockImplementation(() => metadataTypesSettingsDto);
       jest
-        .spyOn(findAndUpdateMetadataSettingsService.organisationSettingsModel.organizationSettingsService, "find")
-        .mockImplementation(() => siteSettingsDto);
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(siteSettingsDto));
       await findAndUpdateMetadataSettingsService.metadataTypesSettingsLocalStorage.set(
         new MetadataTypesSettingsEntity(defaultMetadataTypesSettingsV4Dto()),
       );
@@ -140,7 +142,7 @@ describe("FindAndUpdateMetadataSettingsLocalStorageService", () => {
     it("waits any on-going call to the update and returns the result of the local storage.", async () => {
       expect.assertions(4);
       const metadataTypesSettingsDto = defaultMetadataTypesSettingsV50FreshDto();
-      const siteSettingsDto = defaultCeOrganizationSettings();
+      const siteSettingsDto = defaultCeSiteSettings();
       let resolve;
       const promise = new Promise((_resolve) => (resolve = _resolve));
       jest
@@ -150,8 +152,8 @@ describe("FindAndUpdateMetadataSettingsLocalStorageService", () => {
         )
         .mockImplementation(() => promise);
       jest
-        .spyOn(findAndUpdateMetadataSettingsService.organisationSettingsModel.organizationSettingsService, "find")
-        .mockImplementation(() => siteSettingsDto);
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(siteSettingsDto));
       await findAndUpdateMetadataSettingsService.metadataTypesSettingsLocalStorage.set(
         new MetadataTypesSettingsEntity(defaultMetadataTypesSettingsV4Dto()),
       );

package/src/all/background_page/service/metadata/getOrFindMetadataSettingsService.test.js

@@ -20,10 +20,12 @@ import {
   defaultMetadataTypesSettingsV4Dto,
   defaultMetadataTypesSettingsV50FreshDto,
 } from "passbolt-styleguide/src/shared/models/entity/metadata/metadataTypesSettingsEntity.test.data";
-import { defaultCeOrganizationSettings } from "../../model/entity/organizationSettings/organizationSettingsEntity.test.data";
+import { defaultCeSiteSettings } from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity.test.data";
 import MetadataTypesSettingsEntity from "passbolt-styleguide/src/shared/models/entity/metadata/metadataTypesSettingsEntity";
 import { defaultMetadataKeysSettingsDto } from "passbolt-styleguide/src/shared/models/entity/metadata/metadataKeysSettingsEntity.test.data";
 import MetadataKeysSettingsEntity from "passbolt-styleguide/src/shared/models/entity/metadata/metadataKeysSettingsEntity";
+import GetOrFindSiteSettingsService from "../siteSettings/getOrFindSiteSettingsService";
+import SiteSettingsEntity from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity";
 
 beforeEach(() => {
   jest.clearAllMocks();
@@ -45,7 +47,7 @@ describe("GetOrFindMetadataSettingsService", () => {
     it("with empty storage, retrieves the metadata types settings from the API and store them into the local storage.", async () => {
       expect.assertions(3);
       const metadataTypesSettingsDto = defaultMetadataTypesSettingsV50FreshDto();
-      const siteSettingsDto = defaultCeOrganizationSettings();
+      const siteSettingsDto = defaultCeSiteSettings();
       jest
         .spyOn(
           getOrFindMetadataSettingsService.findAndUpdateMetadataSettingsLocalStorageService.findMetadataSettingsService
@@ -54,12 +56,8 @@ describe("GetOrFindMetadataSettingsService", () => {
         )
         .mockImplementation(() => metadataTypesSettingsDto);
       jest
-        .spyOn(
-          getOrFindMetadataSettingsService.findAndUpdateMetadataSettingsLocalStorageService.organisationSettingsModel
-            .organizationSettingsService,
-          "find",
-        )
-        .mockImplementation(() => siteSettingsDto);
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(siteSettingsDto));
 
       // Control initial storage value.
       const initialStorageValue = await getOrFindMetadataSettingsService.metadataTypesSettingsLocalStorage.get();

package/src/all/background_page/service/metadata/rotateMetadata/rotateResourcesMetadataKeyService.test.js

@@ -30,10 +30,10 @@ import PassboltApiFetchError from "passbolt-styleguide/src/shared/lib/Error/Pass
 import { defaultProgressService } from "../../progress/progressService.test.data";
 import { defaultMetadataKeysSettingsDto } from "passbolt-styleguide/src/shared/models/entity/metadata/metadataKeysSettingsEntity.test.data";
 import { enableFetchMocks } from "jest-fetch-mock";
-import ResourceTypeModel from "../../../model/resourceType/resourceTypeModel";
 import ResourceTypesCollection from "passbolt-styleguide/src/shared/models/entity/resourceType/resourceTypesCollection";
 import { resourceTypesCollectionDto } from "passbolt-styleguide/src/shared/models/entity/resourceType/resourceTypesCollection.test.data";
 import { TEST_RESOURCE_TYPE_V5_DEFAULT } from "passbolt-styleguide/src/shared/models/entity/resourceType/resourceTypeEntity.test.data";
+import GetOrFindResourceTypesService from "../../resourceType/getOrFindResourceTypesService";
 
 describe("RotateResourcesMetadataKeyService", () => {
   let account, metadataKeysDtos;
@@ -91,7 +91,7 @@ describe("RotateResourcesMetadataKeyService", () => {
           : new PassboltResponseEntity(passboltReponseWithCollectionDto(nextBatchToRotate)),
       ); //first rotate call, there is another page of resources to rotate
       jest.spyOn(service.metadataRotateKeysResourcesApiService, "findAll").mockReturnValue(rotationDetails);
-      jest.spyOn(ResourceTypeModel.prototype, "getOrFindAll").mockReturnValue(resourceTypesCollection);
+      jest.spyOn(GetOrFindResourceTypesService.prototype, "getOrFindAll").mockReturnValue(resourceTypesCollection);
       jest
         .spyOn(service.encryptMetadataService.getOrFindMetadataSettingsService, "getOrFindKeysSettings")
         .mockReturnValue(defaultMetadataKeysSettingsDto());
@@ -154,7 +154,7 @@ describe("RotateResourcesMetadataKeyService", () => {
 
       // Spy initialization
       jest.spyOn(service.metadataRotateKeysResourcesApiService, "findAll").mockReturnValue(rotationDetails);
-      jest.spyOn(ResourceTypeModel.prototype, "getOrFindAll").mockReturnValue(resourceTypesCollection);
+      jest.spyOn(GetOrFindResourceTypesService.prototype, "getOrFindAll").mockReturnValue(resourceTypesCollection);
       jest.spyOn(service, "_rotateResources");
       jest
         .spyOn(service.encryptMetadataService.getOrFindMetadataSettingsService, "getOrFindKeysSettings")
@@ -200,7 +200,7 @@ describe("RotateResourcesMetadataKeyService", () => {
         .spyOn(service.encryptMetadataService.getOrFindMetadataSettingsService, "getOrFindKeysSettings")
         .mockReturnValue(defaultMetadataKeysSettingsDto());
       jest.spyOn(service, "_rotateResources");
-      jest.spyOn(ResourceTypeModel.prototype, "getOrFindAll").mockReturnValue(resourceTypesCollection);
+      jest.spyOn(GetOrFindResourceTypesService.prototype, "getOrFindAll").mockReturnValue(resourceTypesCollection);
 
       // running process
       const replayOptions = { count: 0 };

package/src/all/background_page/service/metadata/shareMetadataKeyPrivateService.js

@@ -13,7 +13,7 @@
  */
 
 import RoleEntity from "passbolt-styleguide/src/shared/models/entity/role/roleEntity";
-import UserModel from "../../model/user/userModel";
+import GetOrFindUsersService from "../user/getOrFindUsersService";
 import { assertString, assertUuid } from "../../utils/assertions";
 import MetadataPrivateKeyApiService from "../api/metadata/metadataPrivateKeyApiService";
 import ShareMetadataPrivateKeysCollection from "passbolt-styleguide/src/shared/models/entity/metadata/shareMetadataPrivateKeysCollection";
@@ -36,7 +36,7 @@ export default class ShareMetadataKeyPrivateService {
    */
   constructor(account, apiClientOptions) {
     this.account = account;
-    this.userModel = new UserModel(apiClientOptions);
+    this.getOrFindUsersService = new GetOrFindUsersService(this.account, apiClientOptions);
     this.keyring = new Keyring();
     this.metadataPrivateKeyApiService = new MetadataPrivateKeyApiService(apiClientOptions);
     this.getOrFindMetadataKeysService = new GetOrFindMetadataKeysService(account, apiClientOptions);
@@ -62,7 +62,7 @@ export default class ShareMetadataKeyPrivateService {
     }
 
     //Users should be stored into localstorage
-    const users = await this.userModel.getOrFindAll();
+    const users = await this.getOrFindUsersService.getOrFindAll();
     const targettedUser = users.getFirst("id", userId);
     let missingMetadataKeysIds = targettedUser.missingMetadataKeysIds;
 

package/src/all/background_page/service/metadata/shareMetadataKeyPrivateService.test.js

@@ -85,7 +85,7 @@ describe("ShareMetadataKeyPrivateService", () => {
       expect.assertions(1);
 
       const users = new UsersCollection(usersWithoutMissingMetadataKeysDto());
-      jest.spyOn(service.userModel, "getOrFindAll").mockImplementationOnce(() => users);
+      jest.spyOn(service.getOrFindUsersService, "getOrFindAll").mockImplementationOnce(() => users);
       jest.spyOn(service.getOrFindMetadataKeysService, "getOrFindAll");
 
       await service.shareOneMissing(pgpKeys.betty.userId, pgpKeys.ada.passphrase);

package/src/all/background_page/service/metadata/verifyOrTrustMetadataKeyService.js

@@ -20,7 +20,7 @@ import TrustMetadataKeyService from "./trustMetadataKeyService";
 import UntrustedMetadataKeyError from "../../error/UntrustedMetadataKeyError";
 import MetadataKeysSessionStorage from "../session_storage/metadataKeysSessionStorage";
 import i18n from "../../sdk/i18n";
-import OrganizationSettingsModel from "../../model/organizationSettings/organizationSettingsModel";
+import GetOrFindSiteSettingsService from "../siteSettings/getOrFindSiteSettingsService";
 
 class VerifyOrTrustMetadataKeyService {
   /**
@@ -29,7 +29,7 @@ class VerifyOrTrustMetadataKeyService {
    * @param {ApiClientOptions} apiClientOptions the api client options
    */
   constructor(worker, account, apiClientOptions) {
-    this.organisationSettingsModel = new OrganizationSettingsModel(apiClientOptions);
+    this.getOrFindSiteSettingsService = new GetOrFindSiteSettingsService(account, apiClientOptions);
     this.getOrFindMetadataKeysService = new GetOrFindMetadataKeysService(account, apiClientOptions);
     this.metadataKeysSessionStorage = new MetadataKeysSessionStorage(account);
     this.getMetadataTrustedKeyService = new GetMetadataTrustedKeyService(account);
@@ -45,8 +45,8 @@ class VerifyOrTrustMetadataKeyService {
    * @throws {UntrustedMetadataKeyError} If user has not confirmed the new metadata key.
    */
   async verifyTrustedOrTrustNewMetadataKey(passphrase) {
-    const organizationSettings = await this.organisationSettingsModel.getOrFind();
-    const metadataIsEnabled = organizationSettings.isPluginEnabled("metadata");
+    const siteSettings = await this.getOrFindSiteSettingsService.getOrFind(false);
+    const metadataIsEnabled = siteSettings.isPluginEnabled("metadata");
     if (!metadataIsEnabled) {
       return;
     }

package/src/all/background_page/service/metadata/verifyOrTrustMetadataKeyService.test.js

@@ -25,7 +25,9 @@ import { v4 as uuidv4 } from "uuid";
 import MockExtension from "../../../../../test/mocks/mockExtension";
 import VerifyOrTrustMetadataKeyService from "./verifyOrTrustMetadataKeyService";
 import UntrustedMetadataKeyError from "../../error/UntrustedMetadataKeyError";
-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 "../siteSettings/getOrFindSiteSettingsService";
+import SiteSettingsEntity from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity";
 
 describe("VerifyOrTrustMetadataKeyService", () => {
   let account, apiClientOptions, service;
@@ -38,21 +40,21 @@ describe("VerifyOrTrustMetadataKeyService", () => {
     // Flush the storages.
     await service.metadataKeysSessionStorage.flush();
     // Mock the site settings
-    const siteSettingsDto = defaultCeOrganizationSettings();
+    const siteSettingsDto = defaultCeSiteSettings();
     jest
-      .spyOn(service.organisationSettingsModel.organizationSettingsService, "find")
-      .mockImplementation(() => siteSettingsDto);
+      .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+      .mockImplementation(() => new SiteSettingsEntity(siteSettingsDto));
   });
 
   describe("::verifyTrustedOrTrustNewMetadataKey", () => {
     it("does nothing if the plugin metadata is disabled", async () => {
       expect.assertions(1);
 
-      const siteSettingsDto = defaultCeOrganizationSettings();
+      const siteSettingsDto = defaultCeSiteSettings();
       delete siteSettingsDto.passbolt.plugins.metadata;
       jest
-        .spyOn(service.organisationSettingsModel.organizationSettingsService, "find")
-        .mockImplementation(() => siteSettingsDto);
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(siteSettingsDto));
       await expect(service.verifyTrustedOrTrustNewMetadataKey(pgpKeys.ada.passphrase)).resolves.not.toThrow();
     });
 

package/src/all/background_page/service/migrateMetadata/migrateMetadataResourcesService.js

@@ -12,13 +12,13 @@
  * @since         4.12.0
  */
 import ResourcesCollection from "../../model/entity/resource/resourcesCollection";
-import ResourceTypeModel from "../../model/resourceType/resourceTypeModel";
 import MigrateMetadataResourcesApiService from "../api/migrateMetadata/migrateMetadataResourcesApiService";
 import EncryptMetadataService from "../metadata/encryptMetadataService";
 import { V4_TO_V5_RESOURCE_TYPE_MAPPING } from "passbolt-styleguide/src/shared/models/entity/resourceType/resourceTypeSchemasDefinition";
 import ResourceEntity from "../../model/entity/resource/resourceEntity";
 import i18n from "../../sdk/i18n";
 import PermissionEntity from "passbolt-styleguide/src/shared/models/entity/permission/permissionEntity";
+import GetOrFindResourceTypesService from "../resourceType/getOrFindResourceTypesService";
 
 const MAX_PROCESS_REPLAY = 3;
 
@@ -34,7 +34,7 @@ export default class MigrateMetadataResourcesService {
   constructor(apiClientOptions, account, progressService) {
     this.account = account;
     this.migrateMetadataResourcesApiService = new MigrateMetadataResourcesApiService(apiClientOptions);
-    this.resourceTypeModel = new ResourceTypeModel(apiClientOptions);
+    this.getOrFindResourceTypesService = new GetOrFindResourceTypesService(account, apiClientOptions);
     this.encryptMetadataService = new EncryptMetadataService(apiClientOptions, account);
     this.progressService = progressService;
   }
@@ -97,7 +97,7 @@ export default class MigrateMetadataResourcesService {
     }
 
     this.progressService.finishStep(i18n.t("Retrieving resource types"));
-    const resourceTypes = await this.resourceTypeModel.getOrFindAll();
+    const resourceTypes = await this.getOrFindResourceTypesService.getOrFindAll();
     const resourceTypesMapping = this._computeResourceTypesMapping(resourceTypes);
 
     let migrationDetailsPage = await this.migrateMetadataResourcesApiService.findAll(contains, filters);
@@ -132,7 +132,7 @@ export default class MigrateMetadataResourcesService {
 
   /**
    * Computes resource types v4 id mapping to resource types v5 id mapping.
-   * @param {ResourcesTypesCollection} resourceTypes
+   * @param {ResourceTypesCollection} resourceTypes
    * @returns {Object} a map of resource types v4 uuid to resource type v5 uuid
    * @private
    */

package/src/all/background_page/service/migrateMetadata/migrateMetadataResourcesService.test.js

@@ -41,8 +41,8 @@ import {
 } from "passbolt-styleguide/src/shared/models/entity/resourceType/resourceTypeEntity.test.data";
 import { defaultResourceDto } from "passbolt-styleguide/src/shared/models/entity/resource/resourceEntity.test.data";
 import { defaultMetadataKeysSettingsDto } from "passbolt-styleguide/src/shared/models/entity/metadata/metadataKeysSettingsEntity.test.data";
-import ResourceTypeModel from "../../model/resourceType/resourceTypeModel";
 import { enableFetchMocks } from "jest-fetch-mock";
+import GetOrFindResourceTypesService from "../resourceType/getOrFindResourceTypesService";
 
 describe("MigrateMetadataResourcesService", () => {
   let account = null;
@@ -88,7 +88,7 @@ describe("MigrateMetadataResourcesService", () => {
           : new PassboltResponseEntity(passboltReponseWithCollectionDto(nextBatchToMigrate)),
       ); //first migrate call, there is another page of resources to migrate
       jest.spyOn(service.migrateMetadataResourcesApiService, "findAll").mockReturnValue(migrationDetails);
-      jest.spyOn(ResourceTypeModel.prototype, "getOrFindAll").mockReturnValue(resourceTypesCollection);
+      jest.spyOn(GetOrFindResourceTypesService.prototype, "getOrFindAll").mockReturnValue(resourceTypesCollection);
       jest
         .spyOn(service.encryptMetadataService.getOrFindMetadataSettingsService, "getOrFindKeysSettings")
         .mockReturnValue(defaultMetadataKeysSettingsDto());
@@ -145,7 +145,7 @@ describe("MigrateMetadataResourcesService", () => {
       // Spy initialization
       jest.spyOn(service.migrateMetadataResourcesApiService, "findAll").mockReturnValue(migrationDetails);
       jest
-        .spyOn(ResourceTypeModel.prototype, "getOrFindAll")
+        .spyOn(GetOrFindResourceTypesService.prototype, "getOrFindAll")
         .mockImplementation(() => new ResourceTypesCollection(resourceTypesCollectionDto()));
       jest.spyOn(service, "_migrateResources");
       jest
@@ -182,7 +182,7 @@ describe("MigrateMetadataResourcesService", () => {
 
       // Spy initialization
       jest.spyOn(service.migrateMetadataResourcesApiService, "findAll").mockReturnValue(migrationDetails);
-      jest.spyOn(ResourceTypeModel.prototype, "getOrFindAll").mockReturnValue(resourceTypesCollection);
+      jest.spyOn(GetOrFindResourceTypesService.prototype, "getOrFindAll").mockReturnValue(resourceTypesCollection);
       jest
         .spyOn(service.encryptMetadataService.getOrFindMetadataSettingsService, "getOrFindKeysSettings")
         .mockReturnValue(defaultMetadataKeysSettingsDto());
@@ -215,7 +215,7 @@ describe("MigrateMetadataResourcesService", () => {
       // Spy initialization
       jest.spyOn(service.migrateMetadataResourcesApiService, "migrate");
       jest.spyOn(service.migrateMetadataResourcesApiService, "findAll").mockReturnValue(migrationDetails);
-      jest.spyOn(ResourceTypeModel.prototype, "getOrFindAll").mockReturnValue(resourceTypesCollection);
+      jest.spyOn(GetOrFindResourceTypesService.prototype, "getOrFindAll").mockReturnValue(resourceTypesCollection);
       jest
         .spyOn(service.encryptMetadataService.getOrFindMetadataSettingsService, "getOrFindKeysSettings")
         .mockReturnValue(defaultMetadataKeysSettingsDto());
@@ -253,7 +253,7 @@ describe("MigrateMetadataResourcesService", () => {
         .spyOn(service.migrateMetadataResourcesApiService, "migrate")
         .mockImplementation(async () => new PassboltResponseEntity(passboltReponseWithCollectionDto([])));
       jest.spyOn(service.migrateMetadataResourcesApiService, "findAll").mockReturnValue(migrationDetails);
-      jest.spyOn(ResourceTypeModel.prototype, "getOrFindAll").mockReturnValue(resourceTypesCollection);
+      jest.spyOn(GetOrFindResourceTypesService.prototype, "getOrFindAll").mockReturnValue(resourceTypesCollection);
       jest
         .spyOn(service.encryptMetadataService.getOrFindMetadataSettingsService, "getOrFindKeysSettings")
         .mockReturnValue(defaultMetadataKeysSettingsDto());

package/src/all/background_page/service/rbac/findAndUpdateRbacsLocalStorageService.js

@@ -46,14 +46,14 @@ export default class FindAndUpdateRbacLocalStorageService {
         return await navigator.locks.request(
           lockKey,
           { mode: "shared" },
-          async () => new RbacsCollection(await this.rbacLocalStorage.get()),
+          async () => new RbacsCollection(await this.rbacLocalStorage.getData()),
         );
       }
 
       // Lock is granted, retrieve the current user's Rbac and update the local storage.
       const rbacsCollection = await this.findRbacService.findMe();
 
-      await this.rbacLocalStorage.set(rbacsCollection);
+      await this.rbacLocalStorage.setData(rbacsCollection);
       return rbacsCollection;
     });
   }

package/src/all/background_page/service/rbac/getOrFindRbacService.js

@@ -35,7 +35,7 @@ export default class GetOrFindRbacService {
    * @returns {Promise<RbacsCollection>}
    */
   async getOrFindMe() {
-    const collectionDto = await this.rbacsLocalStorage.get();
+    const collectionDto = await this.rbacsLocalStorage.getData();
     if (typeof collectionDto !== "undefined") {
       return new RbacsCollection(collectionDto, true);
     }