passbolt-browser-extension 5.13.0 → 5.14.2

package/src/all/background_page/controller/resourceType/updateAllResourceTypesDeletedStatusController.js

@@ -21,11 +21,12 @@ export default class UpdateAllResourceTypesDeletedStatusController {
    * @param {Worker} worker
    * @param {string} requestId
    * @param {ApiClientOptions} apiClientOptions the api client options
+   * @param {AccountEntity} account the account
    */
-  constructor(worker, requestId, apiClientOptions) {
+  constructor(worker, requestId, apiClientOptions, account) {
     this.worker = worker;
     this.requestId = requestId;
-    this.updateResourceTypesService = new UpdateResourceTypesService(apiClientOptions);
+    this.updateResourceTypesService = new UpdateResourceTypesService(account, apiClientOptions);
   }
 
   /**

package/src/all/background_page/controller/resourceType/updateAllResourceTypesDeletedStatusController.test.js

@@ -16,13 +16,20 @@ import { resourceTypesCollectionDto } from "passbolt-styleguide/src/shared/model
 import ResourceTypesCollection from "passbolt-styleguide/src/shared/models/entity/resourceType/resourceTypesCollection";
 import UpdateAllResourceTypesDeletedStatusController from "./updateAllResourceTypesDeletedStatusController";
 import EntityValidationError from "passbolt-styleguide/src/shared/models/entity/abstract/entityValidationError";
+import AccountEntity from "../../model/entity/account/accountEntity";
+import { defaultAccountDto } from "../../model/entity/account/accountEntity.test.data";
 
 describe("UpdateAllResourceTypesDeletedStatusController", () => {
   describe("::exec", () => {
     it("Should throw an error if the given parameter is not a valid resourceTypesCollection dto.", async () => {
       expect.assertions(1);
-
-      const controller = new UpdateAllResourceTypesDeletedStatusController(null, null, defaultApiClientOptions());
+      const account = new AccountEntity(defaultAccountDto());
+      const controller = new UpdateAllResourceTypesDeletedStatusController(
+        null,
+        null,
+        defaultApiClientOptions(),
+        account,
+      );
 
       expect(() => controller.exec("42")).rejects.toThrow(EntityValidationError);
     });
@@ -30,8 +37,14 @@ describe("UpdateAllResourceTypesDeletedStatusController", () => {
     it("Should call for updating the resource types given a collection.", async () => {
       expect.assertions(2);
 
+      const account = new AccountEntity(defaultAccountDto());
       const resourceTypesDto = resourceTypesCollectionDto();
-      const controller = new UpdateAllResourceTypesDeletedStatusController(null, null, defaultApiClientOptions());
+      const controller = new UpdateAllResourceTypesDeletedStatusController(
+        null,
+        null,
+        defaultApiClientOptions(),
+        account,
+      );
 
       jest.spyOn(controller.updateResourceTypesService, "updateAllDeletedStatus").mockImplementationOnce(() => {});
 

package/src/all/background_page/controller/secret/findSecretByResourceIdController.js

@@ -13,13 +13,13 @@
  */
 import i18n from "../../sdk/i18n";
 import { assertUuid } from "../../utils/assertions";
-import ResourceTypeModel from "../../model/resourceType/resourceTypeModel";
 import ResourceModel from "../../model/resource/resourceModel";
 import GetPassphraseService from "../../service/passphrase/getPassphraseService";
 import GetDecryptedUserPrivateKeyService from "../../service/account/getDecryptedUserPrivateKeyService";
 import ProgressService from "../../service/progress/progressService";
 import DecryptAndParseResourceSecretService from "../../service/secret/decryptAndParseResourceSecretService";
 import FindSecretService from "../../service/secret/findSecretService";
+import GetSecretSchemaResourceTypeService from "../../service/resourceType/getSecretSchemaResourceTypeService";
 
 class FindSecretByResourceIdController {
   /**
@@ -35,7 +35,7 @@ class FindSecretByResourceIdController {
     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.progressService = new ProgressService(this.worker, i18n.t("Decrypting ..."));
     this.getPassphraseService = new GetPassphraseService(account);
   }
@@ -67,7 +67,7 @@ class FindSecretByResourceIdController {
     const secret = await this.findSecretService.findByResourceId(resourceId);
     const decryptedPrivateKey = await GetDecryptedUserPrivateKeyService.getKey(passphrase);
     const resource = await resourcePromise;
-    const secretSchema = await this.resourceTypeModel.getSecretSchemaById(resource.resourceTypeId);
+    const secretSchema = await this.getSecretSchemaResourceTypeService.getByResourceTypeId(resource.resourceTypeId);
 
     return DecryptAndParseResourceSecretService.decryptAndParse(secret, secretSchema, decryptedPrivateKey);
   }

package/src/all/background_page/controller/secret/findSecretByResourceIdController.test.js

@@ -75,6 +75,12 @@ describe("SecretDecryptController", () => {
 
       const controller = new FindSecretByResourceIdController(null, null, defaultApiClientOptions(), account);
       jest.spyOn(controller.resourceModel, "getById").mockImplementationOnce(() => resourceEntity);
+      jest
+        .spyOn(
+          controller.getSecretSchemaResourceTypeService.getOrFindResourceTypesService.resourceTypeLocalStorage,
+          "getData",
+        )
+        .mockImplementation(() => undefined);
       controller.getPassphraseService.getPassphrase.mockResolvedValue(pgpKeys.ada.passphrase);
 
       const plaintextSecret = await controller.exec(resourceDto.id);
@@ -109,6 +115,12 @@ describe("SecretDecryptController", () => {
 
       const controller = new FindSecretByResourceIdController(null, null, defaultApiClientOptions(), account);
       jest.spyOn(controller.resourceModel, "getById").mockImplementationOnce(() => resourceEntity);
+      jest
+        .spyOn(
+          controller.getSecretSchemaResourceTypeService.getOrFindResourceTypesService.resourceTypeLocalStorage,
+          "getData",
+        )
+        .mockImplementation(() => undefined);
       controller.getPassphraseService.getPassphrase.mockResolvedValue(pgpKeys.ada.passphrase);
 
       const plaintextSecret = await controller.exec(resourceDto.id);
@@ -143,6 +155,12 @@ describe("SecretDecryptController", () => {
 
       const controller = new FindSecretByResourceIdController(null, null, defaultApiClientOptions(), account);
       jest.spyOn(controller.resourceModel, "getById").mockImplementationOnce(() => resourceEntity);
+      jest
+        .spyOn(
+          controller.getSecretSchemaResourceTypeService.getOrFindResourceTypesService.resourceTypeLocalStorage,
+          "getData",
+        )
+        .mockImplementation(() => undefined);
       controller.getPassphraseService.getPassphrase.mockResolvedValue(pgpKeys.admin.passphrase);
 
       const plaintextSecret = await controller.exec(resourceDto.id);
@@ -182,6 +200,12 @@ describe("SecretDecryptController", () => {
 
       const controller = new FindSecretByResourceIdController(null, null, defaultApiClientOptions(), account);
       jest.spyOn(controller.resourceModel, "getById").mockImplementationOnce(() => resourceEntity);
+      jest
+        .spyOn(
+          controller.getSecretSchemaResourceTypeService.getOrFindResourceTypesService.resourceTypeLocalStorage,
+          "getData",
+        )
+        .mockImplementation(() => undefined);
       controller.getPassphraseService.getPassphrase.mockResolvedValue(pgpKeys.admin.passphrase);
 
       const plaintextSecret = await controller.exec(resourceDto.id);

package/src/all/background_page/controller/secretRevision/findResourceSecretRevisionsForDisplayController.js

@@ -22,11 +22,12 @@ export default class FindResourceSecretRevisionsForDisplayController {
    * @param {Worker} worker
    * @param {string} requestId
    * @param {ApiClientOptions} apiClientOptions the api client options
+   * @param {AccountEntity} account the account
    */
   constructor(worker, requestId, apiClientOptions, account) {
     this.worker = worker;
     this.requestId = requestId;
-    this.findAndDecryptSecretRevisionsService = new FindAndDecryptSecretRevisionsService(apiClientOptions);
+    this.findAndDecryptSecretRevisionsService = new FindAndDecryptSecretRevisionsService(account, apiClientOptions);
     this.getPassphraseService = new GetPassphraseService(account);
   }
 

package/src/all/background_page/controller/setup/generateSetupKeyPairController.js

@@ -36,7 +36,6 @@ class GenerateSetupKeyPairController {
     this.apiClientOptions = apiClientOptions;
     // The temporary account stored in the session storage
     this.temporaryAccount = null;
-    this.findUserKeyPoliciesSettingsService = new FindUserKeyPoliciesSettingsService(apiClientOptions);
   }
 
   /**
@@ -86,7 +85,11 @@ class GenerateSetupKeyPairController {
   async _buildGenerateKeyPairOptionsEntity(passphrase) {
     const userId = this.temporaryAccount.account.userId;
     const authenticationToken = this.temporaryAccount.account.authenticationTokenToken;
-    const userKeyPoliciesSettings = await this.findUserKeyPoliciesSettingsService.findSettingsAsGuest(
+    const findUserKeyPoliciesSettingsService = new FindUserKeyPoliciesSettingsService(
+      this.apiClientOptions,
+      this.temporaryAccount.account,
+    );
+    const userKeyPoliciesSettings = await findUserKeyPoliciesSettingsService.findSettingsAsGuest(
       userId,
       authenticationToken,
     );
@@ -95,7 +98,7 @@ class GenerateSetupKeyPairController {
       name: `${this.temporaryAccount.account.firstName} ${this.temporaryAccount.account.lastName}`,
       email: this.temporaryAccount.account.username,
       passphrase: passphrase,
-      date: await GetGpgKeyCreationDateService.getDate(this.apiClientOptions),
+      date: await GetGpgKeyCreationDateService.getDate(this.temporaryAccount.account, this.apiClientOptions),
     };
 
     return GenerateGpgKeyPairOptionsEntity.createForUserKeyGeneration(

package/src/all/background_page/controller/setup/generateSetupKeyPairController.test.js

@@ -25,8 +25,18 @@ import { v4 as uuidv4 } from "uuid";
 import AccountTemporaryEntity from "../../model/entity/account/accountTemporaryEntity";
 import UserKeyPoliciesSettingsEntity from "passbolt-styleguide/src/shared/models/entity/userKeyPolicies/UserKeyPoliciesSettingsEntity";
 import { defaultUserKeyPoliciesSettingsDto } from "passbolt-styleguide/src/shared/models/entity/userKeyPolicies/UserKeyPoliciesSettingsEntity.test.data";
+import FindUserKeyPoliciesSettingsService from "../../service/userKeyPolicies/findUserKeyPoliciesSettingsService";
+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";
 
 describe("GenerateSetupKeyPairController", () => {
+  beforeEach(() => {
+    jest
+      .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+      .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings()));
+  });
+
   describe("GenerateSetupKeyPairController::exec", () => {
     it("Should throw an exception if the passed DTO is not valid.", async () => {
       await MockExtension.withConfiguredAccount();
@@ -127,7 +137,7 @@ describe("GenerateSetupKeyPairController", () => {
         defaultApiClientOptions(),
       );
       jest
-        .spyOn(controller.findUserKeyPoliciesSettingsService, "findSettingsAsGuest")
+        .spyOn(FindUserKeyPoliciesSettingsService.prototype, "findSettingsAsGuest")
         .mockImplementation(() => new UserKeyPoliciesSettingsEntity(defaultUserKeyPoliciesSettingsDto()));
 
       await controller.exec(generateKeyPairDto);

package/src/all/background_page/controller/setup/getAndInitSetupLocaleController.js

@@ -27,7 +27,7 @@ class GetAndInitSetupLocaleController {
     this.worker = worker;
     this.requestId = requestId;
     this.account = account;
-    this.localeModel = new LocaleModel(apiClientOptions);
+    this.localeModel = new LocaleModel(apiClientOptions, account);
   }
 
   /**

package/src/all/background_page/controller/setup/getAndInitSetupLocaleController.test.js

@@ -15,14 +15,18 @@
 import { enableFetchMocks } from "jest-fetch-mock";
 import { defaultApiClientOptions } from "passbolt-styleguide/src/shared/lib/apiClient/apiClientOptions.test.data";
 import GetAndInitSetupLocaleController from "./getAndInitSetupLocaleController";
-import { mockApiResponse } from "../../../../../test/mocks/mockApiResponse";
-import { anonymousOrganizationSettings } from "../../model/entity/organizationSettings/organizationSettingsEntity.test.data";
+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";
 import { initialAccountSetupDto } from "../../model/entity/account/accountSetupEntity.test.data";
 import AccountSetupEntity from "../../model/entity/account/accountSetupEntity";
 
 // Reset the modules before each test.
 beforeEach(() => {
   enableFetchMocks();
+  jest
+    .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+    .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings()));
 });
 
 describe("GetAndInitSetupLocaleController", () => {
@@ -31,10 +35,6 @@ describe("GetAndInitSetupLocaleController", () => {
       const account = new AccountSetupEntity(initialAccountSetupDto({ locale: "fr-FR" }));
       const controller = new GetAndInitSetupLocaleController(null, null, defaultApiClientOptions(), account);
 
-      // Mock API fetch organization settings
-      const mockOrganizationSettings = anonymousOrganizationSettings();
-      fetch.doMockOnce(() => mockApiResponse(mockOrganizationSettings));
-
       expect.assertions(1);
       const locale = await controller.exec();
       expect(locale.toDto()).toEqual({ locale: "fr-FR" });
@@ -44,9 +44,6 @@ describe("GetAndInitSetupLocaleController", () => {
       const account = new AccountSetupEntity(initialAccountSetupDto());
       const controller = new GetAndInitSetupLocaleController(null, null, defaultApiClientOptions(), account);
 
-      // Mock API fetch organization settings
-      const mockOrganizationSettings = anonymousOrganizationSettings();
-      fetch.doMockOnce(() => mockApiResponse(mockOrganizationSettings));
       // Mock the navigator locale
       const languageGetterMock = jest.spyOn(self.navigator, "language", "get");
       languageGetterMock.mockReturnValue("de-AT");
@@ -60,9 +57,6 @@ describe("GetAndInitSetupLocaleController", () => {
       const account = new AccountSetupEntity(initialAccountSetupDto());
       const controller = new GetAndInitSetupLocaleController(null, null, defaultApiClientOptions(), account);
 
-      // Mock API fetch organization settings
-      const mockOrganizationSettings = anonymousOrganizationSettings();
-      fetch.doMockOnce(() => mockApiResponse(mockOrganizationSettings));
       // Mock the navigator locale
       const languageGetterMock = jest.spyOn(self.navigator, "language", "get");
       languageGetterMock.mockReturnValue("de-DE");
@@ -76,9 +70,10 @@ describe("GetAndInitSetupLocaleController", () => {
       const account = new AccountSetupEntity(initialAccountSetupDto());
       const controller = new GetAndInitSetupLocaleController(null, null, defaultApiClientOptions(), account);
 
-      // Mock API fetch organization settings
-      const mockOrganizationSettings = anonymousOrganizationSettings({ app: { locale: "ja-JP" } });
-      fetch.doMockOnce(() => mockApiResponse(mockOrganizationSettings));
+      // Mock the organization settings.
+      jest
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings({ app: { locale: "ja-JP" } })));
       // Mock the navigator locale
       const languageGetterMock = jest.spyOn(self.navigator, "language", "get");
       languageGetterMock.mockReturnValue("ma-MA");
@@ -92,9 +87,10 @@ describe("GetAndInitSetupLocaleController", () => {
       const account = new AccountSetupEntity(initialAccountSetupDto());
       const controller = new GetAndInitSetupLocaleController(null, null, defaultApiClientOptions(), account);
 
-      // Mock API fetch organization settings
-      const mockOrganizationSettings = anonymousOrganizationSettings({ app: { locale: null } });
-      fetch.doMockOnce(() => mockApiResponse(mockOrganizationSettings));
+      // Mock the organization settings.
+      jest
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings({ app: { locale: null } })));
       // Mock the navigator locale
       const languageGetterMock = jest.spyOn(self.navigator, "language", "get");
       languageGetterMock.mockReturnValue("ma-MA");

package/src/all/background_page/controller/setup/setSetupLocaleController.js

@@ -26,7 +26,7 @@ class SetSetupLocaleController {
   constructor(worker, requestId, apiClientOptions, account) {
     this.worker = worker;
     this.requestId = requestId;
-    this.localeModel = new LocaleModel(apiClientOptions);
+    this.localeModel = new LocaleModel(apiClientOptions, account);
     this.account = account;
   }
 

package/src/all/background_page/controller/setup/setSetupLocaleController.test.js

@@ -14,8 +14,9 @@
 
 import { enableFetchMocks } from "jest-fetch-mock";
 import { defaultApiClientOptions } from "passbolt-styleguide/src/shared/lib/apiClient/apiClientOptions.test.data";
-import { anonymousOrganizationSettings } from "../../model/entity/organizationSettings/organizationSettingsEntity.test.data";
-import { mockApiResponse } from "../../../../../test/mocks/mockApiResponse";
+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";
 import SetSetupLocaleController from "./setSetupLocaleController";
 import AccountSetupEntity from "../../model/entity/account/accountSetupEntity";
 import { initialAccountSetupDto } from "../../model/entity/account/accountSetupEntity.test.data";
@@ -23,6 +24,9 @@ import AccountTemporarySessionStorageService from "../../service/sessionStorage/
 
 beforeEach(() => {
   enableFetchMocks();
+  jest
+    .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+    .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings()));
 });
 
 describe("SetAccountLocaleController", () => {
@@ -38,10 +42,6 @@ describe("SetAccountLocaleController", () => {
         account,
       );
 
-      // Mock API fetch organization settings
-      const mockApiResult = anonymousOrganizationSettings();
-      fetch.doMockOnce(() => mockApiResponse(mockApiResult));
-
       expect.assertions(1);
       const localeDto = { locale: "fr-FR" };
       await controller.exec(localeDto);
@@ -58,10 +58,6 @@ describe("SetAccountLocaleController", () => {
         account,
       );
 
-      // Mock API fetch organization settings
-      const mockApiResult = anonymousOrganizationSettings();
-      fetch.doMockOnce(() => mockApiResponse(mockApiResult));
-
       expect.assertions(1);
       const localeDto = { locale: "ma-MA" };
       const promise = controller.exec(localeDto);

package/src/all/background_page/controller/setup/signInSetupController.js

@@ -31,8 +31,8 @@ class SignInSetupController {
   constructor(worker, requestId, apiClientOptions) {
     this.worker = worker;
     this.requestId = requestId;
+    this.apiClientOptions = apiClientOptions;
     this.authVerifyLoginChallengeService = new AuthVerifyLoginChallengeService(apiClientOptions);
-    this.updateSsoCredentialsService = new UpdateSsoCredentialsService(apiClientOptions);
     this.checkPassphraseService = new CheckPassphraseService(new Keyring());
   }
 
@@ -68,7 +68,11 @@ class SignInSetupController {
     }
 
     await this.checkPassphraseService.checkPassphrase(temporaryAccount.passphrase);
-    await this.updateSsoCredentialsService.forceUpdateSsoKit(temporaryAccount.passphrase);
+    const updateSsoCredentialsService = new UpdateSsoCredentialsService(
+      this.apiClientOptions,
+      temporaryAccount.account,
+    );
+    await updateSsoCredentialsService.forceUpdateSsoKit(temporaryAccount.passphrase);
 
     await this.authVerifyLoginChallengeService.verifyAndValidateLoginChallenge(
       temporaryAccount.account.userKeyFingerprint,

package/src/all/background_page/controller/setup/signInSetupController.test.js

@@ -21,7 +21,9 @@ import SignInSetupController from "./signInSetupController";
 import { pgpKeys } from "passbolt-styleguide/test/fixture/pgpKeys/keys";
 import InvalidMasterPasswordError from "../../error/invalidMasterPasswordError";
 import MockExtension from "../../../../../test/mocks/mockExtension";
-import { anonymousOrganizationSettings } from "../../model/entity/organizationSettings/organizationSettingsEntity.test.data";
+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";
 import { mockApiResponse } from "../../../../../test/mocks/mockApiResponse";
 import GenerateSsoKitService from "../../service/sso/generateSsoKitService";
 import SsoDataStorage from "../../service/indexedDB_storage/ssoDataStorage";
@@ -33,6 +35,9 @@ import KeepSessionAliveService from "../../service/session_storage/keepSessionAl
 
 beforeEach(() => {
   enableFetchMocks();
+  jest
+    .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+    .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings()));
 });
 
 describe("SignInSetupController", () => {
@@ -95,13 +100,13 @@ describe("SignInSetupController", () => {
 
     it("Should ask for SSO kits generation.", async () => {
       expect.assertions(6);
-      const organizationSettings = anonymousOrganizationSettings();
+      const organizationSettings = anonymousSiteSettings();
       organizationSettings.passbolt.plugins.sso = {
         enabled: true,
       };
-      fetch.doMockOnceIf(new RegExp("/settings.json"), () =>
-        mockApiResponse(organizationSettings, { servertime: Date.now() / 1000 }),
-      );
+      jest
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(organizationSettings));
       fetch.doMockOnceIf(new RegExp("/sso/settings/current.json"), () => mockApiResponse(withAzureSsoSettings()));
       jest.spyOn(browser.cookies, "get").mockImplementationOnce(() => ({ value: "csrf-token" }));
       jest.spyOn(PassphraseStorageService, "set").mockImplementation(async () => {});

package/src/all/background_page/controller/share/shareOneFolderController.test.js

@@ -24,9 +24,17 @@ import ShareOneFolderController from "./shareOneFolderController";
 import PermissionChangesCollection from "../../model/entity/permission/change/permissionChangesCollection";
 import FoldersCollection from "../../model/entity/folder/foldersCollection";
 import { defaultFolderDto } from "passbolt-styleguide/src/shared/models/entity/folder/folderEntity.test.data";
+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";
 const { pgpKeys } = require("passbolt-styleguide/test/fixture/pgpKeys/keys");
 
 describe("ShareOneFolderController", () => {
+  beforeEach(() => {
+    jest
+      .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+      .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings()));
+  });
   describe("::exec", () => {
     let account, controller;
     beforeEach(async () => {

package/src/all/background_page/controller/share/shareResourcesController.test.js

@@ -27,10 +27,18 @@ import EncryptMessageService from "../../service/crypto/encryptMessageService";
 import { defaultResourceV4Dto } from "passbolt-styleguide/src/shared/models/entity/resource/resourceEntity.test.data";
 import { plaintextSecretPasswordAndDescriptionDto } from "passbolt-styleguide/src/shared/models/entity/plaintextSecret/plaintextSecretEntity.test.data";
 import { simulateShareSecretsChangesDto } from "../../service/share/shareResourceService.test.data";
+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";
 
 const { pgpKeys } = require("passbolt-styleguide/test/fixture/pgpKeys/keys");
 
 describe("ShareResourcesController", () => {
+  beforeEach(() => {
+    jest
+      .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+      .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings()));
+  });
   describe("::exec", () => {
     let account, controller;
     beforeEach(async () => {
@@ -85,7 +93,7 @@ describe("ShareResourcesController", () => {
         .mockImplementation(() => new ResourcesCollection([resourceDto]));
       // Mock request retrieving the resource types.
       jest
-        .spyOn(controller.shareResourceService.resourceTypeModel, "getOrFindAll")
+        .spyOn(controller.shareResourceService.getOrFindResourceTypesService, "getOrFindAll")
         .mockImplementation(() => new ResourceTypesCollection(resourceTypesCollectionDto()));
       // Mock request simulating the share.
       jest

package/src/all/background_page/controller/siteSettings/getOrFindSiteSettingsController.js

@@ -0,0 +1,59 @@
+/**
+ * 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 GetOrFindSiteSettingsService from "../../service/siteSettings/getOrFindSiteSettingsService";
+
+/**
+ * Returns site settings; either from the in-memory cache or by fetching from the API.
+ * Drop-in replacement for the legacy {@link GetOrganizationSettingsController} —
+ * preserves the `refreshCache` semantics. Whether the API response is persisted to
+ * local storage is decided by the `isAuthenticated` flag passed at construction
+ * (set by the event handler based on its pagemod context).
+ */
+class GetOrFindSiteSettingsController {
+  /**
+   * @param {Worker} worker
+   * @param {string} requestId
+   * @param {ApiClientOptions} apiClientOptions
+   * @param {AccountEntity} account
+   */
+  constructor(worker, requestId, apiClientOptions, account) {
+    this.worker = worker;
+    this.requestId = requestId;
+    this.account = account;
+    this.getOrFindSiteSettingsService = new GetOrFindSiteSettingsService(account, apiClientOptions);
+  }
+
+  /**
+   * @returns {Promise<void>}
+   */
+  async _exec() {
+    try {
+      const result = await this.exec.apply(this, arguments);
+      this.worker.port.emit(this.requestId, "SUCCESS", result);
+    } catch (error) {
+      console.error(error);
+      this.worker.port.emit(this.requestId, "ERROR", error);
+    }
+  }
+
+  /**
+   * @param {boolean} [refreshCache=true] When true, bypass the in-memory cache and hit the API.
+   * @returns {Promise<SiteSettingsEntity>}
+   */
+  async exec(refreshCache = true) {
+    return this.getOrFindSiteSettingsService.getOrFind(refreshCache);
+  }
+}
+
+export default GetOrFindSiteSettingsController;