passbolt-browser-extension 5.13.0 → 5.14.2

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

@@ -19,7 +19,9 @@ import GetOrFindMetadataKeysController from "./getOrFindMetadataKeysSettingsCont
 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 { enableFetchMocks } from "jest-fetch-mock";
-import { defaultCeOrganizationSettings } from "../../model/entity/organizationSettings/organizationSettingsEntity.test.data";
+import { defaultCeSiteSettings } from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity.test.data";
+import GetOrFindSiteSettingsService from "../../service/siteSettings/getOrFindSiteSettingsService";
+import SiteSettingsEntity from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity";
 
 beforeEach(() => {
   enableFetchMocks();
@@ -43,7 +45,7 @@ describe("GetOrFindMetadataKeysSettingsController", () => {
       expect.assertions(3);
 
       const metadataKeysSettingsDto = defaultMetadataKeysSettingsDto();
-      const siteSettingsDto = defaultCeOrganizationSettings();
+      const siteSettingsDto = defaultCeSiteSettings();
       jest
         .spyOn(
           controller.getOrFindMetadaSettingsService.findAndUpdateMetadataSettingsLocalStorageService
@@ -52,12 +54,8 @@ describe("GetOrFindMetadataKeysSettingsController", () => {
         )
         .mockImplementationOnce(() => new MetadataKeysSettingsEntity(metadataKeysSettingsDto));
       jest
-        .spyOn(
-          controller.getOrFindMetadaSettingsService.findAndUpdateMetadataSettingsLocalStorageService
-            .organisationSettingsModel.organizationSettingsService,
-          "find",
-        )
-        .mockImplementation(() => siteSettingsDto);
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(siteSettingsDto));
 
       const metadataKeysSettings = await controller.exec();
 
@@ -74,7 +72,7 @@ describe("GetOrFindMetadataKeysSettingsController", () => {
         allow_usage_of_personal_keys: false,
         zero_knowledge_key_share: true,
       });
-      const siteSettingsDto = defaultCeOrganizationSettings();
+      const siteSettingsDto = defaultCeSiteSettings();
       jest
         .spyOn(
           controller.getOrFindMetadaSettingsService.findAndUpdateMetadataSettingsLocalStorageService
@@ -83,12 +81,8 @@ describe("GetOrFindMetadataKeysSettingsController", () => {
         )
         .mockImplementationOnce(() => new MetadataKeysSettingsEntity(metadataKeysSettingsDto));
       jest
-        .spyOn(
-          controller.getOrFindMetadaSettingsService.findAndUpdateMetadataSettingsLocalStorageService
-            .organisationSettingsModel.organizationSettingsService,
-          "find",
-        )
-        .mockImplementation(() => siteSettingsDto);
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(siteSettingsDto));
 
       const metadataKeysSettings = await controller.exec();
 
@@ -101,16 +95,12 @@ describe("GetOrFindMetadataKeysSettingsController", () => {
     it("get or find metadata keys settings for a v4 should have the default.", async () => {
       expect.assertions(3);
 
-      const siteSettingsDto = defaultCeOrganizationSettings();
+      const siteSettingsDto = defaultCeSiteSettings();
       // disable the plugin metadata.
       delete siteSettingsDto.passbolt.plugins.metadata;
       jest
-        .spyOn(
-          controller.getOrFindMetadaSettingsService.findAndUpdateMetadataSettingsLocalStorageService
-            .organisationSettingsModel.organizationSettingsService,
-          "find",
-        )
-        .mockImplementation(() => siteSettingsDto);
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(siteSettingsDto));
       jest
         .spyOn(
           controller.getOrFindMetadaSettingsService.findAndUpdateMetadataSettingsLocalStorageService

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

@@ -32,10 +32,18 @@ import { OpenpgpAssertion } from "../../utils/openpgp/openpgpAssertions";
 import DecryptMessageService from "../../service/crypto/decryptMessageService";
 import FindSignatureService from "../../service/crypto/findSignatureService";
 import MetadataPrivateKeyApiService from "../../service/api/metadata/metadataPrivateKeyApiService";
+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";
 
 jest.mock("../../service/passphrase/getPassphraseService");
 
 describe("ShareMetadataKeyPrivateController", () => {
+  beforeEach(() => {
+    jest
+      .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+      .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings()));
+  });
   describe("::exec", () => {
     let controller, account, apiClientOptions, keyring;
 
@@ -73,7 +81,9 @@ describe("ShareMetadataKeyPrivateController", () => {
 
       jest.spyOn(controller.verifyOrTrustMetadataKeyService, "verifyTrustedOrTrustNewMetadataKey");
       jest.spyOn(controller.getPassphraseService, "getPassphrase");
-      jest.spyOn(controller.shareMetadataKeyPrivateService.userModel, "getOrFindAll").mockImplementation(() => users);
+      jest
+        .spyOn(controller.shareMetadataKeyPrivateService.getOrFindUsersService, "getOrFindAll")
+        .mockImplementation(() => users);
       jest.spyOn(GetOrFindMetadataKeysService.prototype, "getOrFindAll").mockImplementation(() => metadataKeys);
 
       await controller.exec(pgpKeys.betty.userId);
@@ -97,7 +107,9 @@ describe("ShareMetadataKeyPrivateController", () => {
 
       jest.spyOn(controller.verifyOrTrustMetadataKeyService, "verifyTrustedOrTrustNewMetadataKey");
       jest.spyOn(controller.getPassphraseService, "getPassphrase");
-      jest.spyOn(controller.shareMetadataKeyPrivateService.userModel, "getOrFindAll").mockImplementation(() => users);
+      jest
+        .spyOn(controller.shareMetadataKeyPrivateService.getOrFindUsersService, "getOrFindAll")
+        .mockImplementation(() => users);
       jest
         .spyOn(controller.shareMetadataKeyPrivateService.getOrFindMetadataKeysService, "getOrFindAll")
         .mockImplementation(() => metadataKeys);

package/src/all/background_page/controller/move/moveFolderController.test.js

@@ -19,8 +19,16 @@ import { defaultApiClientOptions } from "passbolt-styleguide/src/shared/lib/apiC
 import { v4 as uuidv4 } from "uuid";
 import { pgpKeys } from "passbolt-styleguide/test/fixture/pgpKeys/keys";
 import MockPort from "passbolt-styleguide/src/react-extension/test/mock/MockPort";
+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("MoveFolderController", () => {
+  beforeEach(() => {
+    jest
+      .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+      .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings()));
+  });
   describe("::exec", () => {
     let worker, account, controller;
 

package/src/all/background_page/controller/move/moveResourcesController.test.js

@@ -18,8 +18,16 @@ import AccountEntity from "../../model/entity/account/accountEntity";
 import { defaultAccountDto } from "../../model/entity/account/accountEntity.test.data";
 import { v4 as uuidv4 } from "uuid";
 import MockPort from "passbolt-styleguide/src/react-extension/test/mock/MockPort";
+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("MoveResourcesController", () => {
+  beforeEach(() => {
+    jest
+      .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+      .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings()));
+  });
   it("Should ask the user's passphrase and call the move service", async () => {
     expect.assertions(3);
 

package/src/all/background_page/controller/passwordExpiry/getOrFindPasswordExpirySettingsController.test.js

@@ -21,10 +21,11 @@ import GetOrFindPasswordExpirySettingsController from "./getOrFindPasswordExpiry
 import { defaultPasswordExpirySettingsDtoFromApi } from "passbolt-styleguide/src/shared/models/entity/passwordExpiry/passwordExpirySettingsEntity.test.data";
 import PasswordExpirySettingsEntity from "passbolt-styleguide/src/shared/models/entity/passwordExpiry/passwordExpirySettingsEntity";
 import {
-  defaultCeOrganizationSettings,
-  defaultProOrganizationSettings,
-} from "../../model/entity/organizationSettings/organizationSettingsEntity.test.data";
-import OrganizationSettingsService from "../../service/api/organizationSettings/organizationSettingsService";
+  defaultCeSiteSettings,
+  defaultProSiteSettings,
+} from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity.test.data";
+import GetOrFindSiteSettingsService from "../../service/siteSettings/getOrFindSiteSettingsService";
+import SiteSettingsEntity from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity";
 import PasswordExpiryProSettingsEntity from "passbolt-styleguide/src/shared/models/entity/passwordExpiryPro/passwordExpiryProSettingsEntity";
 
 describe("GetOrFindPasswordExpirySettingsController", () => {
@@ -40,8 +41,10 @@ describe("GetOrFindPasswordExpirySettingsController", () => {
 
   describe("CE version", () => {
     beforeEach(() => {
-      const organizationSettings = defaultCeOrganizationSettings();
-      jest.spyOn(OrganizationSettingsService.prototype, "find").mockImplementation(() => organizationSettings);
+      const organizationSettings = defaultCeSiteSettings();
+      jest
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(organizationSettings));
     });
     it("Should return the value from the API", async () => {
       expect.assertions(1);
@@ -122,8 +125,10 @@ describe("GetOrFindPasswordExpirySettingsController", () => {
 
   describe("PRO version", () => {
     beforeEach(() => {
-      const organizationSettings = defaultProOrganizationSettings();
-      jest.spyOn(OrganizationSettingsService.prototype, "find").mockImplementation(() => organizationSettings);
+      const organizationSettings = defaultProSiteSettings();
+      jest
+        .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+        .mockImplementation(() => new SiteSettingsEntity(organizationSettings));
     });
     it("Should return the value from the API", async () => {
       expect.assertions(1);

package/src/all/background_page/controller/passwordExpiry/savePasswordExpirySettingsController.js

@@ -13,7 +13,7 @@
  */
 import PasswordExpirySettingsEntity from "passbolt-styleguide/src/shared/models/entity/passwordExpiry/passwordExpirySettingsEntity";
 import PasswordExpirySettingsModel from "../../model/passwordExpiry/passwordExpirySettingsModel";
-import OrganizationSettingsModel from "../../model/organizationSettings/organizationSettingsModel";
+import GetOrFindSiteSettingsService from "../../service/siteSettings/getOrFindSiteSettingsService";
 import PasswordExpiryProSettingsEntity from "passbolt-styleguide/src/shared/models/entity/passwordExpiryPro/passwordExpiryProSettingsEntity";
 
 class SavePasswordExpirySettingsController {
@@ -28,7 +28,7 @@ class SavePasswordExpirySettingsController {
     this.worker = worker;
     this.requestId = requestId;
     this.passwordExpirySettingsModel = new PasswordExpirySettingsModel(account, apiClientOptions);
-    this.organisationSettingsModel = new OrganizationSettingsModel(apiClientOptions);
+    this.getOrFindSiteSettingsService = new GetOrFindSiteSettingsService(account, apiClientOptions);
   }
 
   /**
@@ -52,8 +52,8 @@ class SavePasswordExpirySettingsController {
    * @returns {Promise<PasswordExpirySettingsEntity>}
    */
   async exec(passwordExpirySettingsDto) {
-    const organizationSettings = await this.organisationSettingsModel.getOrFind();
-    const isAdvancedSettingsEnabled = organizationSettings.isPluginEnabled("passwordExpiryPolicies");
+    const siteSettings = await this.getOrFindSiteSettingsService.getOrFind(false);
+    const isAdvancedSettingsEnabled = siteSettings.isPluginEnabled("passwordExpiryPolicies");
     const entity = isAdvancedSettingsEnabled
       ? new PasswordExpiryProSettingsEntity(passwordExpirySettingsDto)
       : new PasswordExpirySettingsEntity(passwordExpirySettingsDto);

package/src/all/background_page/controller/passwordExpiry/savePasswordExpirySettingsController.test.js

@@ -27,8 +27,9 @@ import {
   defaultPasswordExpirySettingsDtoFromApi,
 } from "passbolt-styleguide/src/shared/models/entity/passwordExpiry/passwordExpirySettingsEntity.test.data";
 import PasswordExpiryProSettingsEntity from "passbolt-styleguide/src/shared/models/entity/passwordExpiryPro/passwordExpiryProSettingsEntity";
-import { defaultCeOrganizationSettings } from "../../model/entity/organizationSettings/organizationSettingsEntity.test.data";
-import OrganizationSettingsService from "../../service/api/organizationSettings/organizationSettingsService";
+import { defaultCeSiteSettings } from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity.test.data";
+import GetOrFindSiteSettingsService from "../../service/siteSettings/getOrFindSiteSettingsService";
+import SiteSettingsEntity from "passbolt-styleguide/src/shared/models/entity/siteSettings/siteSettingsEntity";
 
 describe("SavePasswordExpirySettingsController", () => {
   let account, apiClientOptions;
@@ -47,9 +48,11 @@ describe("SavePasswordExpirySettingsController", () => {
     const dtoToSave = defaultPasswordExpirySettingsDto();
     const expectedDto = defaultPasswordExpirySettingsDtoFromApi(dtoToSave);
     const expectedEntity = new PasswordExpirySettingsEntity(expectedDto);
-    const organizationSettings = defaultCeOrganizationSettings();
+    const organizationSettings = defaultCeSiteSettings();
 
-    jest.spyOn(OrganizationSettingsService.prototype, "find").mockImplementation(() => organizationSettings);
+    jest
+      .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+      .mockImplementation(() => new SiteSettingsEntity(organizationSettings));
     fetch.doMockOnceIf(/password-expiry\/settings\.json/, async (request) => {
       const body = JSON.parse(await request.text());
       expect(body).toStrictEqual(dtoToSave);
@@ -75,12 +78,7 @@ describe("SavePasswordExpirySettingsController", () => {
     });
 
     const controller = new SavePasswordExpirySettingsController(null, null, account, apiClientOptions);
-    jest.spyOn(controller.organisationSettingsModel, "getOrFind").mockImplementation(() =>
-      Promise.resolve({
-        isPluginEnabled: () => true,
-      }),
-    );
-    jest.spyOn(controller.passwordExpirySettingsModel.organisationSettingsModel, "getOrFind").mockImplementation(() =>
+    jest.spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind").mockImplementation(() =>
       Promise.resolve({
         isPluginEnabled: () => true,
       }),

package/src/all/background_page/controller/permission/findPermissionsByIdsForShareController.js

@@ -0,0 +1,62 @@
+/**
+ * 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         5.14.0
+ */
+import FindResourcesService from "../../service/resource/findResourcesService";
+import { assertArrayUUID } from "../../utils/assertions";
+
+/**
+ * Controller for the `passbolt.permissions.find-by-ids-for-share` event.
+ * Returns the given resources with the permissions data tailored for the share process, fetched
+ * from the API in a single batched query (no metadata decryption, no passphrase prompt).
+ */
+class FindPermissionsByIdsForShareController {
+  /**
+   * Constructor.
+   * @param {Worker} worker The associated worker.
+   * @param {string} requestId The associated request id.
+   * @param {ApiClientOptions} apiClientOptions The api client options.
+   * @param {AccountEntity} account The user account.
+   */
+  constructor(worker, requestId, apiClientOptions, account) {
+    this.worker = worker;
+    this.requestId = requestId;
+    this.findResourcesService = new FindResourcesService(account, apiClientOptions);
+  }
+
+  /**
+   * Controller executor.
+   * @param {Array<string>} resourcesIds The ids of the resources to retrieve.
+   * @returns {Promise<void>}
+   */
+  async _exec(resourcesIds) {
+    try {
+      const result = await this.exec(resourcesIds);
+      this.worker.port.emit(this.requestId, "SUCCESS", result);
+    } catch (error) {
+      console.error(error);
+      this.worker.port.emit(this.requestId, "ERROR", error);
+    }
+  }
+
+  /**
+   * Find the permissions of the given resources for the share process.
+   * @param {Array<string>} resourcesIds The ids of the resources to retrieve.
+   * @returns {Promise<ResourcesCollection>}
+   */
+  async exec(resourcesIds) {
+    assertArrayUUID(resourcesIds);
+    return this.findResourcesService.findAllPermissionsByIdsForShare(resourcesIds);
+  }
+}
+
+export default FindPermissionsByIdsForShareController;

package/src/all/background_page/controller/permission/findPermissionsByIdsForShareController.test.js

@@ -0,0 +1,71 @@
+/**
+ * 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         5.14.0
+ */
+
+import AccountEntity from "../../model/entity/account/accountEntity";
+import { defaultAccountDto } from "../../model/entity/account/accountEntity.test.data";
+import { defaultApiClientOptions } from "passbolt-styleguide/src/shared/lib/apiClient/apiClientOptions.test.data";
+import FindPermissionsByIdsForShareController from "./findPermissionsByIdsForShareController";
+import ResourcesCollection from "../../model/entity/resource/resourcesCollection";
+import { defaultResourceDto } from "passbolt-styleguide/src/shared/models/entity/resource/resourceEntity.test.data";
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+
+describe("FindPermissionsByIdsForShareController", () => {
+  describe("::exec", () => {
+    it("Should retrieve the permissions of the resources matching the given ids.", async () => {
+      expect.assertions(3);
+
+      const account = new AccountEntity(defaultAccountDto());
+      const resourcesDto = [defaultResourceDto(), defaultResourceDto()];
+      const resourcesCollection = new ResourcesCollection(resourcesDto);
+      const requestedIds = resourcesDto.map((resource) => resource.id);
+      const controller = new FindPermissionsByIdsForShareController(null, null, defaultApiClientOptions(), account);
+      jest
+        .spyOn(controller.findResourcesService, "findAllPermissionsByIdsForShare")
+        .mockImplementation(() => resourcesCollection);
+
+      const result = await controller.exec(requestedIds);
+
+      expect(result).toBeInstanceOf(ResourcesCollection);
+      expect(result).toStrictEqual(resourcesCollection);
+      expect(controller.findResourcesService.findAllPermissionsByIdsForShare).toHaveBeenCalledWith(requestedIds);
+    });
+
+    it("Should let error been thrown from the service if any.", async () => {
+      expect.assertions(1);
+
+      const account = new AccountEntity(defaultAccountDto());
+      const controller = new FindPermissionsByIdsForShareController(null, null, defaultApiClientOptions(), account);
+      const requestedIds = [defaultResourceDto().id];
+      jest.spyOn(controller.findResourcesService, "findAllPermissionsByIdsForShare").mockImplementation(() => {
+        throw new Error("Something went wrong!");
+      });
+
+      await expect(() => controller.exec(requestedIds)).rejects.toThrow();
+    });
+
+    it("Should assert its parameter.", async () => {
+      expect.assertions(1);
+
+      const account = new AccountEntity(defaultAccountDto());
+      const controller = new FindPermissionsByIdsForShareController(null, null, defaultApiClientOptions(), account);
+
+      await expect(() => controller.exec(["not-a-uuid"])).rejects.toThrow(
+        "The given parameter is not a valid array of uuid",
+      );
+    });
+  });
+});

package/src/all/background_page/controller/recover/generateRecoverAccountRecoveryRequestKeyController.js

@@ -61,7 +61,7 @@ class GenerateRecoverAccountRecoveryRequestKeyController {
       email: temporaryAccount.account?.username,
       passphrase: generateGpgKeyPairDto?.passphrase,
       keySize: ACCOUNT_RECOVERY_REQUEST_KEY_SIZE,
-      date: await GetGpgKeyCreationDateService.getDate(this.apiClientOptions),
+      date: await GetGpgKeyCreationDateService.getDate(temporaryAccount.account, this.apiClientOptions),
     };
     const generateGpgKeyPairOptionsEntity = new GenerateGpgKeyPairOptionsEntity(dto);
     const externalGpgKeyPair = await GenerateGpgKeyPairService.generateKeyPair(generateGpgKeyPairOptionsEntity);

package/src/all/background_page/controller/resource/resourceCreateController.js

@@ -40,11 +40,12 @@ class ResourceCreateController {
    * Controller executor.
    * @param {object} resourceDto The resource data
    * @param {string|object} plaintextDto The secret to encrypt
+   * @param {Array<object>} [permissionChanges] Optional permission changes applied after create.
    * @returns {Promise<void>}
    */
-  async _exec(resourceDto, plaintextDto) {
+  async _exec(resourceDto, plaintextDto, permissionChanges) {
     try {
-      const resource = await this.exec(resourceDto, plaintextDto);
+      const resource = await this.exec(resourceDto, plaintextDto, permissionChanges);
       this.worker.port.emit(this.requestId, "SUCCESS", resource);
     } catch (error) {
       console.error(error);
@@ -55,16 +56,22 @@ class ResourceCreateController {
   /**
    * @param {object} resourceDto The resource data
    * @param {string|object} plaintextDto The secret to encrypt
+   * @param {Array<object>} [permissionChanges] Optional permission changes applied after create.
    * @returns {Promise<void>}
    */
-  async exec(resourceDto, plaintextDto) {
+  async exec(resourceDto, plaintextDto, permissionChanges) {
     const goals = resourceDto.folder_parent_id ? 10 : 3;
     const passphrase = await this.getPassphraseService.getPassphrase(this.worker);
     await this.verifyOrTrustMetadataKeyService.verifyTrustedOrTrustNewMetadataKey(passphrase);
     this.progressService.start(goals, i18n.t("Initializing"));
 
     try {
-      const resourceCreated = await this.resourceCreateService.create(resourceDto, plaintextDto, passphrase);
+      const resourceCreated = await this.resourceCreateService.create(
+        resourceDto,
+        plaintextDto,
+        passphrase,
+        permissionChanges,
+      );
       await this.progressService.finishStep(i18n.t("Done!"), true);
       return resourceCreated;
     } finally {

package/src/all/background_page/controller/resource/resourceCreateController.test.js

@@ -27,12 +27,18 @@ import { v4 as uuidv4 } from "uuid";
 import EncryptMessageService from "../../service/crypto/encryptMessageService";
 import ResourceTypeService from "../../service/api/resourceType/resourceTypeService";
 import { resourceTypesCollectionDto } from "passbolt-styleguide/src/shared/models/entity/resourceType/resourceTypesCollection.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";
 
 jest.mock("../../service/passphrase/getPassphraseService");
 jest.mock("../../service/progress/progressService");
 
 beforeEach(() => {
   enableFetchMocks();
+  jest
+    .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+    .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings()));
 });
 
 describe("ResourceCreateController", () => {
@@ -61,7 +67,12 @@ describe("ResourceCreateController", () => {
       await controller._exec(resourceDTO, secret);
 
       expect(controller.resourceCreateService.create).toHaveBeenCalledTimes(1);
-      expect(controller.resourceCreateService.create).toHaveBeenCalledWith(resourceDTO, secret, pgpKeys.ada.passphrase);
+      expect(controller.resourceCreateService.create).toHaveBeenCalledWith(
+        resourceDTO,
+        secret,
+        pgpKeys.ada.passphrase,
+        undefined,
+      );
       expect(controller.worker.port.emit).toHaveBeenCalledWith(null, "SUCCESS", resourceDTO);
     });
 

package/src/all/background_page/controller/resource/resourceUpdateController.js

@@ -43,11 +43,12 @@ class ResourceUpdateController {
    * Controller executor.
    * @param {object} resourceDto The resource data
    * @param {string|object} plaintextDto The secret to encrypt
+   * @param {Array<object>} [permissionChanges] Optional permission changes applied after the update.
    * @returns {Promise<void>}
    */
-  async _exec(resourceDto, plaintextDto) {
+  async _exec(resourceDto, plaintextDto, permissionChanges) {
     try {
-      const resource = await this.exec(resourceDto, plaintextDto);
+      const resource = await this.exec(resourceDto, plaintextDto, permissionChanges);
       this.worker.port.emit(this.requestId, "SUCCESS", resource);
     } catch (error) {
       console.error(error);
@@ -60,15 +61,21 @@ class ResourceUpdateController {
    *
    * @param {object} resourceDto The resource data
    * @param {null|string|object} plaintextDto The secret to encrypt
+   * @param {Array<object>} [permissionChanges] Optional permission changes applied after the update.
    * @returns {Promise<Object>} updated resource
    */
-  async exec(resourceDto, plaintextDto) {
+  async exec(resourceDto, plaintextDto, permissionChanges) {
     const passphrase = await this.getPassphraseService.getPassphrase(this.worker);
     await this.verifyOrTrustMetadataKeyService.verifyTrustedOrTrustNewMetadataKey(passphrase);
     this.progressService.start(1, i18n.t("Updating resource"));
 
     try {
-      const resourceUpdated = await this.resourceUpdateService.exec(resourceDto, plaintextDto, passphrase);
+      const resourceUpdated = await this.resourceUpdateService.exec(
+        resourceDto,
+        plaintextDto,
+        passphrase,
+        permissionChanges,
+      );
       await this.progressService.finishStep(i18n.t("Done!"), true);
       return resourceUpdated;
     } finally {

package/src/all/background_page/controller/resource/resourceUpdateController.test.js

@@ -27,12 +27,18 @@ import EncryptMessageService from "../../service/crypto/encryptMessageService";
 import ResourceTypeService from "../../service/api/resourceType/resourceTypeService";
 import { resourceTypesCollectionDto } from "passbolt-styleguide/src/shared/models/entity/resourceType/resourceTypesCollection.test.data";
 import PermissionService from "../../service/api/permission/permissionService";
+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";
 
 jest.mock("../../service/passphrase/getPassphraseService");
 jest.mock("../../service/progress/progressService");
 
 beforeEach(() => {
   enableFetchMocks();
+  jest
+    .spyOn(GetOrFindSiteSettingsService.prototype, "getOrFind")
+    .mockImplementation(() => new SiteSettingsEntity(anonymousSiteSettings()));
 });
 
 describe("ResourceUpdateController", () => {
@@ -62,7 +68,12 @@ describe("ResourceUpdateController", () => {
       await controller._exec(resourceDTO, null);
 
       expect(controller.resourceUpdateService.exec).toHaveBeenCalledTimes(1);
-      expect(controller.resourceUpdateService.exec).toHaveBeenCalledWith(resourceDTO, null, pgpKeys.ada.passphrase);
+      expect(controller.resourceUpdateService.exec).toHaveBeenCalledWith(
+        resourceDTO,
+        null,
+        pgpKeys.ada.passphrase,
+        undefined,
+      );
       expect(controller.worker.port.emit).toHaveBeenCalledWith(null, "SUCCESS", resourceDTO);
     });
 
@@ -74,7 +85,29 @@ describe("ResourceUpdateController", () => {
       await controller._exec(resourceDTO, secret);
 
       expect(controller.resourceUpdateService.exec).toHaveBeenCalledTimes(1);
-      expect(controller.resourceUpdateService.exec).toHaveBeenCalledWith(resourceDTO, secret, pgpKeys.ada.passphrase);
+      expect(controller.resourceUpdateService.exec).toHaveBeenCalledWith(
+        resourceDTO,
+        secret,
+        pgpKeys.ada.passphrase,
+        undefined,
+      );
+      expect(controller.worker.port.emit).toHaveBeenCalledWith(null, "SUCCESS", resourceDTO);
+    });
+
+    it("Should forward the permission changes to the resourceUpdateService", async () => {
+      expect.assertions(2);
+
+      const resourceDTO = defaultResourceDto();
+      const permissionChanges = [{ aro_foreign_key: "aro-id", aco_foreign_key: null, type: 1, is_new: true }];
+      jest.spyOn(controller.resourceUpdateService, "exec").mockImplementationOnce(() => resourceDTO);
+      await controller._exec(resourceDTO, secret, permissionChanges);
+
+      expect(controller.resourceUpdateService.exec).toHaveBeenCalledWith(
+        resourceDTO,
+        secret,
+        pgpKeys.ada.passphrase,
+        permissionChanges,
+      );
       expect(controller.worker.port.emit).toHaveBeenCalledWith(null, "SUCCESS", resourceDTO);
     });
 

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

@@ -12,7 +12,7 @@
  * @since         4.9.4
  */
 
-import ResourceTypeModel from "../../model/resourceType/resourceTypeModel";
+import GetOrFindResourceTypesService from "../../service/resourceType/getOrFindResourceTypesService";
 
 class GetResourceTypesController {
   /**
@@ -21,11 +21,12 @@ class GetResourceTypesController {
    * @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.resourceTypeModel = new ResourceTypeModel(apiClientOptions);
+    this.getOrFindResourceTypesService = new GetOrFindResourceTypesService(account, apiClientOptions);
   }
 
   /**
@@ -47,7 +48,7 @@ class GetResourceTypesController {
    * @returns {Promise<ResourceTypesCollection>}
    */
   async exec() {
-    return this.resourceTypeModel.getOrFindAll();
+    return this.getOrFindResourceTypesService.getOrFindAll();
   }
 }
 

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

@@ -17,6 +17,8 @@ import { defaultApiClientOptions } from "passbolt-styleguide/src/shared/lib/apiC
 import { resourceTypesCollectionDto } from "passbolt-styleguide/src/shared/models/entity/resourceType/resourceTypesCollection.test.data";
 import GetResourceTypesController from "./getResourceTypesController";
 import ResourceTypesCollection from "passbolt-styleguide/src/shared/models/entity/resourceType/resourceTypesCollection";
+import AccountEntity from "../../model/entity/account/accountEntity";
+import { defaultAccountDto } from "../../model/entity/account/accountEntity.test.data";
 
 beforeEach(() => {
   enableFetchMocks();
@@ -30,9 +32,10 @@ describe("GetResourceTypesController", () => {
       expect.assertions(2);
 
       const resourceTypesDto = resourceTypesCollectionDto();
-      const controller = new GetResourceTypesController(null, null, defaultApiClientOptions());
+      const account = new AccountEntity(defaultAccountDto());
+      const controller = new GetResourceTypesController(null, null, defaultApiClientOptions(), account);
       jest
-        .spyOn(controller.resourceTypeModel, "getOrFindAll")
+        .spyOn(controller.getOrFindResourceTypesService, "getOrFindAll")
         .mockImplementationOnce(() => new ResourceTypesCollection(resourceTypesDto));
 
       const resourceTypesCollection = await controller.exec();