passbolt-browser-extension 5.13.0 → 5.14.2

package/src/all/background_page/service/resourceType/getSecretSchemaResourceTypeService.js

@@ -0,0 +1,44 @@
+/**
+ * Passbolt ~ Open source password manager for teams
+ * Copyright (c) Passbolt SA (https://www.passbolt.com)
+ *
+ * Licensed under GNU Affero General Public License version 3 of the or any later version.
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @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         6.0.0
+ */
+import { assertUuid } from "../../utils/assertions";
+import GetOrFindResourceTypesService from "./getOrFindResourceTypesService";
+
+/**
+ * The service aims to get users from the local storage if it is set, or retrieve them from the API and
+ * set the local storage.
+ */
+class GetSecretSchemaResourceTypeService {
+  /**
+   * Constructor.
+   * @param {AccountEntity} account The user account.
+   * @param {ApiClientOptions} apiClientOptions The api client options.
+   */
+  constructor(account, apiClientOptions) {
+    this.getOrFindResourceTypesService = new GetOrFindResourceTypesService(account, apiClientOptions);
+  }
+
+  /**
+   * Get secret schema by resource type id.
+   * @returns {Promise<object>}
+   */
+  async getByResourceTypeId(resourceTypeId) {
+    assertUuid(resourceTypeId, "The resource type id should be a valid UUID");
+
+    const resourceTypes = await this.getOrFindResourceTypesService.getOrFindAll();
+    const type = resourceTypes.getFirst("id", resourceTypeId);
+    return type?.definition?.secret;
+  }
+}
+
+export default GetSecretSchemaResourceTypeService;

package/src/all/background_page/service/resourceType/updateResourceTypesService.js

@@ -14,7 +14,7 @@
 import ResourceTypesCollection from "passbolt-styleguide/src/shared/models/entity/resourceType/resourceTypesCollection";
 import { assertType, assertUuid } from "../../utils/assertions";
 import ResourceTypeService from "../api/resourceType/resourceTypeService";
-import ResourceTypeModel from "../../model/resourceType/resourceTypeModel";
+import ResourceTypeLocalStorage from "../local_storage/resourceTypeLocalStorage";
 
 /**
  * The service aims to get resources from the local storage if it is set, or retrieve them from the API and
@@ -23,11 +23,12 @@ import ResourceTypeModel from "../../model/resourceType/resourceTypeModel";
 export default class UpdateResourceTypesService {
   /**
    * @constructor
+   * @param {AccountEntity} account The account
    * @param {ApiClientOptions} apiClientOptions The api client options
    */
-  constructor(apiClientOptions) {
+  constructor(account, apiClientOptions) {
     this.resourceTypeService = new ResourceTypeService(apiClientOptions);
-    this.resourceTypeModel = new ResourceTypeModel(apiClientOptions);
+    this.resourceTypeLocalStorage = new ResourceTypeLocalStorage(account);
   }
 
   /**
@@ -103,6 +104,7 @@ export default class UpdateResourceTypesService {
     await this.deleteAll(new ResourceTypesCollection(resourceTypesToDelete, { validate: false }));
     await this.undeleteAll(new ResourceTypesCollection(resourceTypesToUndelete, { validate: false }));
 
-    await this.resourceTypeModel.updateLocalStorage();
+    const resourceTypeDtos = await this.resourceTypeService.findAll();
+    await this.resourceTypeLocalStorage.setData(new ResourceTypesCollection(resourceTypeDtos));
   }
 }

package/src/all/background_page/service/resourceType/updateResourceTypesService.test.js

@@ -17,23 +17,26 @@ import UpdateResourceTypesService from "./updateResourceTypesService";
 import { v4 as uuidV4 } from "uuid";
 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 AccountEntity from "../../model/entity/account/accountEntity";
+import { defaultAccountDto } from "../../model/entity/account/accountEntity.test.data";
 
 beforeEach(() => {
   jest.clearAllMocks();
 });
 
 describe("UpdateResourceTypesService", () => {
-  let apiClientOptions;
+  let account, apiClientOptions;
 
   beforeEach(async () => {
     apiClientOptions = defaultApiClientOptions();
+    account = new AccountEntity(defaultAccountDto());
   });
 
   describe("::delete", () => {
     it("should assert its parameters", async () => {
       expect.assertions(1);
 
-      const service = new UpdateResourceTypesService(apiClientOptions);
+      const service = new UpdateResourceTypesService(account, apiClientOptions);
       expect(() => service.delete("test")).rejects.toThrow("The given parameter is not a valid UUID");
     });
 
@@ -41,7 +44,7 @@ describe("UpdateResourceTypesService", () => {
       expect.assertions(2);
 
       const expectedId = uuidV4();
-      const service = new UpdateResourceTypesService(apiClientOptions);
+      const service = new UpdateResourceTypesService(account, apiClientOptions);
       jest.spyOn(service.resourceTypeService, "delete").mockImplementation(() => {});
 
       await service.delete(expectedId);
@@ -55,7 +58,7 @@ describe("UpdateResourceTypesService", () => {
     it("should assert its parameters", async () => {
       expect.assertions(1);
 
-      const service = new UpdateResourceTypesService(apiClientOptions);
+      const service = new UpdateResourceTypesService(account, apiClientOptions);
       expect(() => service.undelete("test")).rejects.toThrow("The given parameter is not a valid UUID");
     });
 
@@ -63,7 +66,7 @@ describe("UpdateResourceTypesService", () => {
       expect.assertions(2);
 
       const expectedId = uuidV4();
-      const service = new UpdateResourceTypesService(apiClientOptions);
+      const service = new UpdateResourceTypesService(account, apiClientOptions);
       jest.spyOn(service.resourceTypeService, "undelete").mockImplementation(() => {});
 
       await service.undelete(expectedId);
@@ -77,7 +80,7 @@ describe("UpdateResourceTypesService", () => {
     it("should assert its parameters", async () => {
       expect.assertions(1);
 
-      const service = new UpdateResourceTypesService(apiClientOptions);
+      const service = new UpdateResourceTypesService(account, apiClientOptions);
       expect(() => service.deleteAll("test")).rejects.toThrow(
         "The resourceTypesCollection parameter should be a valid ResourceTypesCollection",
       );
@@ -89,7 +92,7 @@ describe("UpdateResourceTypesService", () => {
       expect.assertions(1 + resourceTypesDto.length);
 
       const resourcesTypesCollection = new ResourceTypesCollection(resourceTypesDto);
-      const service = new UpdateResourceTypesService(apiClientOptions);
+      const service = new UpdateResourceTypesService(account, apiClientOptions);
 
       jest.spyOn(service.resourceTypeService, "delete").mockImplementation(() => {});
 
@@ -106,7 +109,7 @@ describe("UpdateResourceTypesService", () => {
     it("should assert its parameters", async () => {
       expect.assertions(1);
 
-      const service = new UpdateResourceTypesService(apiClientOptions);
+      const service = new UpdateResourceTypesService(account, apiClientOptions);
       expect(() => service.undeleteAll("test")).rejects.toThrow(
         "The resourceTypesCollection parameter should be a valid ResourceTypesCollection",
       );
@@ -118,7 +121,7 @@ describe("UpdateResourceTypesService", () => {
       expect.assertions(1 + resourceTypesDto.length);
 
       const resourcesTypesCollection = new ResourceTypesCollection(resourceTypesDto);
-      const service = new UpdateResourceTypesService(apiClientOptions);
+      const service = new UpdateResourceTypesService(account, apiClientOptions);
 
       jest.spyOn(service.resourceTypeService, "undelete").mockImplementation(() => {});
 
@@ -135,14 +138,14 @@ describe("UpdateResourceTypesService", () => {
     it("should assert its parameters", async () => {
       expect.assertions(1);
 
-      const service = new UpdateResourceTypesService(apiClientOptions);
+      const service = new UpdateResourceTypesService(account, apiClientOptions);
       expect(() => service.updateAllDeletedStatus("test")).rejects.toThrow(
         "The resourceTypesCollection parameter should be a valid ResourceTypesCollection",
       );
     });
 
     it("should call for the right service with the right arguments.", async () => {
-      expect.assertions(14);
+      expect.assertions(15);
       const resourceTypesDto = resourceTypesCollectionDto();
       for (let i = 0; i < resourceTypesDto.length; i += 2) {
         resourceTypesDto[i].deleted = "2025-02-24T09:00:00+00:00";
@@ -150,10 +153,11 @@ describe("UpdateResourceTypesService", () => {
 
       const resourcesTypesCollection = new ResourceTypesCollection(resourceTypesDto);
 
-      const service = new UpdateResourceTypesService(apiClientOptions);
+      const service = new UpdateResourceTypesService(account, apiClientOptions);
       jest.spyOn(service.resourceTypeService, "delete").mockImplementation(() => {});
       jest.spyOn(service.resourceTypeService, "undelete").mockImplementation(() => {});
-      jest.spyOn(service.resourceTypeModel, "updateLocalStorage").mockImplementation(() => {});
+      jest.spyOn(service.resourceTypeService, "findAll").mockImplementation(() => {});
+      jest.spyOn(service.resourceTypeLocalStorage, "setData").mockImplementation(() => {});
 
       await service.updateAllDeletedStatus(resourcesTypesCollection);
 
@@ -172,7 +176,8 @@ describe("UpdateResourceTypesService", () => {
       expect(service.resourceTypeService.undelete).toHaveBeenCalledWith(resourceTypesDto[9].id);
       expect(service.resourceTypeService.delete).toHaveBeenCalledWith(resourceTypesDto[10].id);
 
-      expect(service.resourceTypeModel.updateLocalStorage).toHaveBeenCalledTimes(1);
+      expect(service.resourceTypeService.findAll).toHaveBeenCalledTimes(1);
+      expect(service.resourceTypeLocalStorage.setData).toHaveBeenCalledTimes(1);
     });
   });
 });

package/src/all/background_page/service/secretRevisions/findAndDecryptSecretRevisionsService.js

@@ -12,20 +12,21 @@
  * @since         5.7.0
  */
 
-import ResourceTypeModel from "../../model/resourceType/resourceTypeModel";
 import { assertString, assertUuid } from "../../utils/assertions";
 import GetDecryptedUserPrivateKeyService from "../account/getDecryptedUserPrivateKeyService";
 import DecryptSecretsService from "../crypto/decryptSecretsService";
 import FindSecretRevisionsService from "./findSecretRevisionsService";
+import GetOrFindResourceTypesService from "../resourceType/getOrFindResourceTypesService";
 
 export default class FindAndDecryptSecretRevisionsService {
   /**
    * @constructor
+   * @param {AccountEntity} account
    * @param {ApiClientOptions} apiClientOptions
    */
-  constructor(apiClientOptions) {
+  constructor(account, apiClientOptions) {
     this.findSecretRevisionsService = new FindSecretRevisionsService(apiClientOptions);
-    this.resourceTypeModel = new ResourceTypeModel(apiClientOptions);
+    this.getOrFindResourceTypesService = new GetOrFindResourceTypesService(account, apiClientOptions);
   }
 
   /**
@@ -42,7 +43,7 @@ export default class FindAndDecryptSecretRevisionsService {
     assertString(passphrase);
 
     const decryptedKey = await GetDecryptedUserPrivateKeyService.getKey(passphrase);
-    const resourceTypesCollection = await this.resourceTypeModel.getOrFindAll();
+    const resourceTypesCollection = await this.getOrFindResourceTypesService.getOrFindAll();
     const contains = {
       secret: true,
       creator: true,

package/src/all/background_page/service/secretRevisions/findAndDecryptSecretRevisionsService.test.js

@@ -25,6 +25,8 @@ import FindAndDecryptSecretRevisionsService from "./findAndDecryptSecretRevision
 import { v4 as uuidv4 } from "uuid";
 import DecryptMessageService from "../crypto/decryptMessageService";
 import { OpenpgpAssertion } from "../../utils/openpgp/openpgpAssertions";
+import AccountEntity from "../../model/entity/account/accountEntity";
+import { defaultAccountDto } from "../../model/entity/account/accountEntity.test.data";
 
 describe("FindAndDecryptSecretRevisionsService", () => {
   describe("::findAllByResourceIdAndDecryptForDisplay", () => {
@@ -32,6 +34,7 @@ describe("FindAndDecryptSecretRevisionsService", () => {
       expect.assertions(8);
 
       await MockExtension.withConfiguredAccount(pgpKeys.ada);
+      const account = new AccountEntity(defaultAccountDto());
 
       const encryptedSecretDto = minimalDto().data;
       const pgpMessage = await OpenpgpAssertion.readMessageOrFail(encryptedSecretDto);
@@ -57,8 +60,8 @@ describe("FindAndDecryptSecretRevisionsService", () => {
       const resourceSecretRevisions = new ResourceSecretRevisionsCollection(
         defaultResourceSecretRevisionsDtos({ resource_id }, { count: 4, withSecrets: true, withCreator: true }),
       );
-      const service = new FindAndDecryptSecretRevisionsService(defaultApiClientOptions());
-      jest.spyOn(service.resourceTypeModel, "getOrFindAll").mockReturnValue(resourceTypesCollection);
+      const service = new FindAndDecryptSecretRevisionsService(account, defaultApiClientOptions());
+      jest.spyOn(service.getOrFindResourceTypesService, "getOrFindAll").mockReturnValue(resourceTypesCollection);
       jest.spyOn(service.findSecretRevisionsService, "findAllByResourceId").mockReturnValue(resourceSecretRevisions);
       jest.spyOn(OpenpgpAssertion, "readMessageOrFail").mockReturnValue(pgpMessage);
 
@@ -83,14 +86,15 @@ describe("FindAndDecryptSecretRevisionsService", () => {
       expect.assertions(2);
 
       await MockExtension.withConfiguredAccount(pgpKeys.ada);
+      const account = new AccountEntity(defaultAccountDto());
 
       const resource_id = uuidv4();
       const encryptedSecretDto = minimalDto().data;
       const resourceSecretRevisions = new ResourceSecretRevisionsCollection([]);
 
-      const service = new FindAndDecryptSecretRevisionsService(defaultApiClientOptions());
+      const service = new FindAndDecryptSecretRevisionsService(account, defaultApiClientOptions());
       jest
-        .spyOn(service.resourceTypeModel, "getOrFindAll")
+        .spyOn(service.getOrFindResourceTypesService, "getOrFindAll")
         .mockReturnValue(new ResourceTypesCollection(resourceTypesCollectionDto()));
       jest.spyOn(service.findSecretRevisionsService, "findAllByResourceId").mockReturnValue(resourceSecretRevisions);
       jest.spyOn(DecryptMessageService, "decrypt").mockImplementation(() => encryptedSecretDto);
@@ -107,6 +111,7 @@ describe("FindAndDecryptSecretRevisionsService", () => {
       expect.assertions(2);
 
       await MockExtension.withConfiguredAccount(pgpKeys.ada);
+      const account = new AccountEntity(defaultAccountDto());
 
       const resource_id = uuidv4();
       const encryptedSecretDto = minimalDto().data;
@@ -114,9 +119,9 @@ describe("FindAndDecryptSecretRevisionsService", () => {
         defaultResourceSecretRevisionsDtos({ resource_id }, { count: 4, withSecrets: true, withCreator: true }),
       );
 
-      const service = new FindAndDecryptSecretRevisionsService(defaultApiClientOptions());
+      const service = new FindAndDecryptSecretRevisionsService(account, defaultApiClientOptions());
       jest
-        .spyOn(service.resourceTypeModel, "getOrFindAll")
+        .spyOn(service.getOrFindResourceTypesService, "getOrFindAll")
         .mockReturnValue(new ResourceTypesCollection(resourceTypesCollectionDto()));
       jest.spyOn(service.findSecretRevisionsService, "findAllByResourceId").mockReturnValue(resourceSecretRevisions);
       jest.spyOn(DecryptMessageService, "decrypt").mockImplementation(() => encryptedSecretDto);
@@ -133,6 +138,7 @@ describe("FindAndDecryptSecretRevisionsService", () => {
       expect.assertions(1);
 
       await MockExtension.withConfiguredAccount(pgpKeys.ada);
+      const account = new AccountEntity(defaultAccountDto());
       const passphrase = pgpKeys.admin.passphrase;
 
       const resource_id = uuidv4();
@@ -141,9 +147,9 @@ describe("FindAndDecryptSecretRevisionsService", () => {
         defaultResourceSecretRevisionsDtos({ resource_id }, { count: 4, withSecrets: true, withCreator: true }),
       );
 
-      const service = new FindAndDecryptSecretRevisionsService(defaultApiClientOptions());
+      const service = new FindAndDecryptSecretRevisionsService(account, defaultApiClientOptions());
       jest
-        .spyOn(service.resourceTypeModel, "getOrFindAll")
+        .spyOn(service.getOrFindResourceTypesService, "getOrFindAll")
         .mockReturnValue(new ResourceTypesCollection(resourceTypesCollectionDto()));
       jest.spyOn(service.findSecretRevisionsService, "findAllByResourceId").mockReturnValue(resourceSecretRevisions);
       jest.spyOn(DecryptMessageService, "decrypt").mockImplementation(() => encryptedSecretDto);
@@ -154,7 +160,8 @@ describe("FindAndDecryptSecretRevisionsService", () => {
     it("should assert its parameters", async () => {
       expect.assertions(4);
 
-      const service = new FindAndDecryptSecretRevisionsService(defaultApiClientOptions());
+      const account = new AccountEntity(defaultAccountDto());
+      const service = new FindAndDecryptSecretRevisionsService(account, defaultApiClientOptions());
 
       await expect(() => service.findAllByResourceIdAndDecryptForDisplay(42, "passphrase")).rejects.toThrow();
       await expect(() => service.findAllByResourceIdAndDecryptForDisplay(null, "passphrase")).rejects.toThrow();

package/src/all/background_page/service/share/shareResourceService.js

@@ -29,7 +29,6 @@ import {
 } from "../../utils/assertions";
 import DecryptPrivateKeyService from "../crypto/decryptPrivateKeyService";
 import PermissionChangesCollection from "../../model/entity/permission/change/permissionChangesCollection";
-import ResourceTypeModel from "../../model/resourceType/resourceTypeModel";
 import ResourceService from "../api/resource/resourceService";
 import ResourceLocalStorage from "../local_storage/resourceLocalStorage";
 import EncryptMetadataService from "../metadata/encryptMetadataService";
@@ -39,6 +38,7 @@ import { RESOURCE_TYPE_VERSION_5 } from "passbolt-styleguide/src/shared/models/e
 import ExecuteConcurrentlyService from "../execute/executeConcurrentlyService";
 import NeededSecretsCollection from "../../model/entity/secret/needed/neededSecretsCollection";
 import SecretsCollection from "passbolt-styleguide/src/shared/models/entity/secret/secretsCollection";
+import GetOrFindResourceTypesService from "../resourceType/getOrFindResourceTypesService";
 
 export const PROGRESS_STEPS_SHARE_RESOURCES_SHARE_ALL = 8;
 
@@ -55,7 +55,7 @@ class ShareResourceService {
     this.shareApiService = new ShareApiService(apiClientOptions);
     this.findResourcesService = new FindResourcesService(account, apiClientOptions);
     this.findAndUpdateResourcesLocalStorage = new FindAndUpdateResourcesLocalStorage(account, apiClientOptions);
-    this.resourceTypeModel = new ResourceTypeModel(apiClientOptions);
+    this.getOrFindResourceTypesService = new GetOrFindResourceTypesService(account, apiClientOptions);
     this.resourceService = new ResourceService(apiClientOptions);
     this.encryptMetadataService = new EncryptMetadataService(apiClientOptions, account);
     this.getOrFindResourcesService = new GetOrFindResourcesService(account, apiClientOptions);
@@ -107,7 +107,7 @@ class ShareResourceService {
   async updatePersonalMetadataToSharedMetadata(resourcesIds, permissionChanges, passphrase) {
     this.progressService.finishStep(i18n.t("Updating resources metadata"), true);
     const resourcesToUpdate = await this.getOrFindResourcesService.getOrFindByIds(resourcesIds);
-    const resourceTypes = await this.resourceTypeModel.getOrFindAll();
+    const resourceTypes = await this.getOrFindResourceTypesService.getOrFindAll();
     const resourceIdMetadataToShare = permissionChanges.items
       .filter((permissionChange) => !permissionChange.isDeleted)
       .map((permissionChange) => permissionChange.acoForeignKey);
@@ -154,7 +154,7 @@ class ShareResourceService {
    * @private
    */
   async simulateShare(permissionChanges) {
-    this.progressService.finishStep(i18n.t("Calculating secrets"), true);
+    await this.progressService.finishStep(i18n.t("Calculating secrets"), true);
     const concurrentlyExecutionService = new ExecuteConcurrentlyService();
     const neededSecretsDto = [];
     const resourceIds = [...new Set(permissionChanges.extract("aco_foreign_key"))];

package/src/all/background_page/service/share/shareResourceService.test.js

@@ -54,12 +54,12 @@ import PermissionChangesCollection from "../../model/entity/permission/change/pe
 import MockPort from "passbolt-styleguide/src/react-extension/test/mock/MockPort";
 import ProgressService from "../progress/progressService";
 import { METADATA_KEY_TYPE_METADATA_KEY, METADATA_KEY_TYPE_USER_KEY } from "../../model/entity/resource/resourceEntity";
-import ResourceTypeModel from "../../model/resourceType/resourceTypeModel";
 import { defaultMetadataKeysSettingsDto } from "passbolt-styleguide/src/shared/models/entity/metadata/metadataKeysSettingsEntity.test.data";
 import { defaultMetadataPrivateKeyDto } from "passbolt-styleguide/src/shared/models/entity/metadata/metadataPrivateKeyEntity.test.data";
 import { defaultMetadataKeyDto } from "passbolt-styleguide/src/shared/models/entity/metadata/metadataKeyEntity.test.data";
 import MetadataKeysCollection from "passbolt-styleguide/src/shared/models/entity/metadata/metadataKeysCollection";
 import MetadataKeysSettingsEntity from "passbolt-styleguide/src/shared/models/entity/metadata/metadataKeysSettingsEntity";
+import GetOrFindResourceTypesService from "../resourceType/getOrFindResourceTypesService";
 
 beforeEach(() => {
   MetadataKeysSessionStorage._runtimeCachedData = {};
@@ -165,7 +165,7 @@ describe("ShareResourceService", () => {
 
         // Mock request retrieving the resource types.
         jest
-          .spyOn(service.resourceTypeModel, "getOrFindAll")
+          .spyOn(GetOrFindResourceTypesService.prototype, "getOrFindAll")
           .mockImplementation(() => new ResourceTypesCollection(resourceTypesCollectionDto()));
 
         // Mock the share request.
@@ -302,7 +302,7 @@ describe("ShareResourceService", () => {
 
         // Mock request retrieving the resource types.
         jest
-          .spyOn(service.resourceTypeModel, "getOrFindAll")
+          .spyOn(GetOrFindResourceTypesService.prototype, "getOrFindAll")
           .mockImplementation(() => new ResourceTypesCollection(resourceTypesCollectionDto()));
 
         // Mock the share request.
@@ -410,7 +410,7 @@ describe("ShareResourceService", () => {
 
         // Mock service retrieving the resource types.
         jest
-          .spyOn(ResourceTypeModel.prototype, "getOrFindAll")
+          .spyOn(GetOrFindResourceTypesService.prototype, "getOrFindAll")
           .mockImplementation(() => new ResourceTypesCollection(resourceTypesCollectionDto()));
 
         // Mock service retrieving metadata keys settings.
@@ -670,7 +670,7 @@ describe("ShareResourceService", () => {
 
       // Mock service retrieving the resource types.
       jest
-        .spyOn(ResourceTypeModel.prototype, "getOrFindAll")
+        .spyOn(GetOrFindResourceTypesService.prototype, "getOrFindAll")
         .mockImplementation(() => new ResourceTypesCollection(resourceTypesCollectionDto()));
 
       // Mock service retrieving metadata keys settings.
@@ -750,7 +750,7 @@ describe("ShareResourceService", () => {
 
       // Mock request retrieving the resource types.
       jest
-        .spyOn(service.resourceTypeModel, "getOrFindAll")
+        .spyOn(GetOrFindResourceTypesService.prototype, "getOrFindAll")
         .mockImplementation(() => new ResourceTypesCollection(resourceTypesCollectionDto()));
 
       // Mock the share request.

package/src/all/background_page/service/siteSettings/findAndUpdateSiteSettingsLocalStorageService.js

@@ -0,0 +1,77 @@
+/**
+ * Passbolt ~ Open source password manager for teams
+ * Copyright (c) Passbolt SA (https://www.passbolt.com)
+ *
+ * Licensed under GNU Affero General Public License version 3 of the or any later version.
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @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         6.0.0
+ */
+import SiteSettingsEntity from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity";
+import SiteSettingsLocalStorage from "../local_storage/siteSettingsLocalStorage";
+import FindSiteSettingsService from "./findSiteSettingsService";
+import SiteSettingsRuntimeCache from "./siteSettingsRuntimeCache";
+import CheckAuthStatusService from "../auth/checkAuthStatusService";
+
+const FIND_AND_UPDATE_SITE_SETTINGS_LS_LOCK_PREFIX = "FIND_AND_UPDATE_SITE_SETTINGS_LS_LOCK-";
+
+/**
+ * Fetches site settings from the API. Always updates the in-memory SiteSettingsRuntimeCache.
+ * For authenticated sessions, also writes to SiteSettingsLocalStorage (the offline-mode
+ * store). Unauthenticated sessions never touch SiteSettingsLocalStorage.
+ *
+ * Concurrent calls coalesce via navigator.locks — only the first hits the API, the rest
+ * wait and return what the leader wrote to SiteSettingsRuntimeCache.
+ */
+export default class FindAndUpdateSiteSettingsLocalStorageService {
+  /**
+   * @param {AccountEntity} account
+   * @param {ApiClientOptions} apiClientOptions
+   */
+  constructor(account, apiClientOptions) {
+    this.account = account;
+    this.findSiteSettingsService = new FindSiteSettingsService(apiClientOptions);
+    this.siteSettingsLocalStorage = new SiteSettingsLocalStorage(account);
+    this.checkAuthStatusService = new CheckAuthStatusService(account, apiClientOptions);
+  }
+
+  /**
+   * @returns {Promise<SiteSettingsEntity|null>} the leader returns the freshly fetched
+   * entity; coalesced waiters return the entity from SiteSettingsRuntimeCache (or null
+   * if the leader failed before writing).
+   */
+  async findAndUpdateAll() {
+    const lockKey = `${FIND_AND_UPDATE_SITE_SETTINGS_LS_LOCK_PREFIX}${this.account.id}`;
+
+    return await navigator.locks.request(lockKey, { ifAvailable: true }, async (lock) => {
+      // Another caller is already refreshing: wait on a shared lock and return what they wrote.
+      if (!lock) {
+        return await navigator.locks.request(lockKey, { mode: "shared" }, async () => {
+          const dto = SiteSettingsRuntimeCache.get();
+          return dto ? new SiteSettingsEntity(dto) : null;
+        });
+      }
+
+      const siteSettings = await this.findSiteSettingsService.findSiteSettings();
+
+      // Authenticated sessions persist to SiteSettingsLocalStorage (the offline-mode store);
+      // Anonymous sessions only get the in-memory runtime cache below.
+      const activeSession = await this.checkAuthStatusService.checkAuthStatus();
+      if (activeSession.isAuthenticated) {
+        await this.siteSettingsLocalStorage.set(siteSettings);
+      }
+      /*
+       * PB-53134:
+       * Set a cache of site setting without account id as a key to get the cache in AppEmailValidatorService
+       * This is very sensitive as the AppEmailValidatorService valid the username of account entity.
+       */
+      SiteSettingsRuntimeCache.set(siteSettings);
+
+      return siteSettings;
+    });
+  }
+}

package/src/all/background_page/service/siteSettings/findAndUpdateSiteSettingsLocalStorageService.test.js

@@ -0,0 +1,130 @@
+/**
+ * Passbolt ~ Open source password manager for teams
+ * Copyright (c) Passbolt SA (https://www.passbolt.com)
+ *
+ * Licensed under GNU Affero General Public License version 3 of the or any later version.
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @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         6.0.0
+ */
+import SiteSettingsEntity from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity";
+import { defaultApiClientOptions } from "passbolt-styleguide/src/shared/lib/apiClient/apiClientOptions.test.data";
+import AccountEntity from "../../model/entity/account/accountEntity";
+import { defaultAccountDto } from "../../model/entity/account/accountEntity.test.data";
+import { defaultProSiteSettings } from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity.test.data";
+import SiteSettingsLocalStorage from "../local_storage/siteSettingsLocalStorage";
+import SiteSettingsRuntimeCache from "./siteSettingsRuntimeCache";
+import FindAndUpdateSiteSettingsLocalStorageService from "./findAndUpdateSiteSettingsLocalStorageService";
+import OnlineSessionEntity from "passbolt-styleguide/src/shared/models/entity/session/onlineSessionEntity";
+
+const readBrowserStorage = async (storageKey) => {
+  const data = await browser.storage.local.get([storageKey]);
+  return data[storageKey];
+};
+
+beforeEach(() => {
+  jest.clearAllMocks();
+  SiteSettingsRuntimeCache.flushAll();
+  SiteSettingsLocalStorage._runtimeCachedData = {};
+});
+
+describe("FindAndUpdateSiteSettingsLocalStorageService", () => {
+  let account, apiClientOptions, service;
+
+  beforeEach(async () => {
+    account = new AccountEntity(defaultAccountDto());
+    apiClientOptions = defaultApiClientOptions();
+    service = new FindAndUpdateSiteSettingsLocalStorageService(account, apiClientOptions);
+    await service.siteSettingsLocalStorage.flush();
+  });
+
+  describe("::findAndUpdateAll — runtime cache", () => {
+    it("always updates SiteSettingsRuntimeCache regardless of auth status", async () => {
+      expect.assertions(2);
+      const dto = defaultProSiteSettings();
+      jest
+        .spyOn(service.checkAuthStatusService, "checkAuthStatus")
+        .mockResolvedValue(new OnlineSessionEntity({ is_authenticated: false }));
+      jest.spyOn(service.findSiteSettingsService, "findSiteSettings").mockResolvedValue(new SiteSettingsEntity(dto));
+
+      const result = await service.findAndUpdateAll();
+
+      expect(result.toDto()).toEqual(dto);
+      expect(SiteSettingsRuntimeCache.get(account.id)).toEqual(dto);
+    });
+  });
+
+  describe("::findAndUpdateAll — local storage gate", () => {
+    it("writes SiteSettingsLocalStorage when authenticated", async () => {
+      expect.assertions(2);
+      const dto = defaultProSiteSettings();
+      jest
+        .spyOn(service.checkAuthStatusService, "checkAuthStatus")
+        .mockResolvedValue(new OnlineSessionEntity({ is_authenticated: true }));
+      jest.spyOn(service.findSiteSettingsService, "findSiteSettings").mockResolvedValue(new SiteSettingsEntity(dto));
+
+      await service.findAndUpdateAll();
+
+      expect(await readBrowserStorage(service.siteSettingsLocalStorage.storageKey)).toEqual(dto);
+      expect(SiteSettingsLocalStorage._runtimeCachedData[account.id]).toEqual(dto);
+    });
+
+    it("does not touch SiteSettingsLocalStorage when not authenticated", async () => {
+      expect.assertions(2);
+      const dto = defaultProSiteSettings();
+      jest
+        .spyOn(service.checkAuthStatusService, "checkAuthStatus")
+        .mockResolvedValue(new OnlineSessionEntity({ is_authenticated: false }));
+
+      jest.spyOn(service.findSiteSettingsService, "findSiteSettings").mockResolvedValue(new SiteSettingsEntity(dto));
+
+      await service.findAndUpdateAll();
+
+      expect(await readBrowserStorage(service.siteSettingsLocalStorage.storageKey)).toBeUndefined();
+      expect(SiteSettingsLocalStorage._runtimeCachedData[account.id]).toBeUndefined();
+    });
+  });
+
+  describe("::findAndUpdateAll — concurrency", () => {
+    it("coalesces concurrent calls into one API hit per account", async () => {
+      expect.assertions(4);
+      const dto = defaultProSiteSettings();
+      jest
+        .spyOn(service.checkAuthStatusService, "checkAuthStatus")
+        .mockResolvedValue(new OnlineSessionEntity({ is_authenticated: true }));
+
+      const apiSpy = jest
+        .spyOn(service.findSiteSettingsService, "findSiteSettings")
+        .mockResolvedValue(new SiteSettingsEntity(dto));
+
+      const results = await Promise.all([
+        service.findAndUpdateAll(),
+        service.findAndUpdateAll(),
+        service.findAndUpdateAll(),
+      ]);
+
+      expect(apiSpy).toHaveBeenCalledTimes(1);
+      results.forEach((r) => expect(r?.toDto()).toEqual(dto));
+    });
+  });
+
+  describe("::findAndUpdateAll — error propagation", () => {
+    it("propagates API errors and leaves both caches untouched", async () => {
+      expect.assertions(4);
+      jest
+        .spyOn(service.checkAuthStatusService, "checkAuthStatus")
+        .mockResolvedValue(new OnlineSessionEntity({ is_authenticated: true }));
+
+      jest.spyOn(service.findSiteSettingsService, "findSiteSettings").mockRejectedValue(new Error("API down"));
+
+      await expect(service.findAndUpdateAll()).rejects.toThrow("API down");
+      expect(await readBrowserStorage(service.siteSettingsLocalStorage.storageKey)).toBeUndefined();
+      expect(SiteSettingsLocalStorage._runtimeCachedData[account.id]).toBeUndefined();
+      expect(SiteSettingsRuntimeCache.get(account.id)).toBeNull();
+    });
+  });
+});