passbolt-browser-extension 3.0.6 → 4.6.2

package/src/all/background_page/model/entity/permission/change/permissionChangesCollection.test.js

@@ -11,17 +11,10 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.13.0
  */
-import {PermissionChangesCollection} from "./permissionChangesCollection";
-import {EntitySchema} from "../../abstract/entitySchema";
-import Validator from 'validator';
-import {PermissionEntity} from "../permissionEntity";
-import {PermissionsCollection} from "../permissionsCollection";
-
-// Reset the modules before each test.
-beforeEach(() => {
-  window.Validator = Validator;
-  jest.resetModules();
-});
+import PermissionChangesCollection from "./permissionChangesCollection";
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
+import PermissionEntity from "../permissionEntity";
+import PermissionsCollection from "../permissionsCollection";
 
 describe("PermissionChangesCollection", () => {
   it("schema must validate", () => {
@@ -83,7 +76,7 @@ describe("PermissionChangesCollection", () => {
       aro: PermissionEntity.ARO_USER,
       aro_foreign_key: "54c6278e-f824-5fda-91ff-3e946b18d992",
       type: PermissionEntity.PERMISSION_READ
-    },{
+    }, {
       id: "c2c7f658-c7ac-4d73-9020-9d2c296d9103",
       aco: PermissionEntity.ACO_FOLDER,
       aco_foreign_key: "c2c7f658-c7ac-4d73-9020-9d2c296d91ff",
@@ -92,11 +85,13 @@ describe("PermissionChangesCollection", () => {
       type: PermissionEntity.PERMISSION_READ
     }]);
 
-    // Delete first one
-    // Downgrade second one
-    // Upgrade third one
-    // Let fourth one
-    // Add five one
+    /*
+     * Delete first one
+     * Downgrade second one
+     * Upgrade third one
+     * Let fourth one
+     * Add five one
+     */
     const expectedSet = new PermissionsCollection([{
       id: "c2c7f658-c7ac-4d73-9020-9d2c296d9101",
       aco: PermissionEntity.ACO_FOLDER,
@@ -118,7 +113,7 @@ describe("PermissionChangesCollection", () => {
       aro: PermissionEntity.ARO_USER,
       aro_foreign_key: "54c6278e-f824-5fda-91ff-3e946b18d993",
       type: PermissionEntity.PERMISSION_READ
-    },{
+    }, {
       aco: PermissionEntity.ACO_FOLDER,
       aco_foreign_key: "c2c7f658-c7ac-4d73-9020-9d2c296d91ff",
       aro: PermissionEntity.ARO_USER,
@@ -128,52 +123,48 @@ describe("PermissionChangesCollection", () => {
 
     const changes = PermissionChangesCollection.calculateChanges(originalSet, expectedSet);
     expect(changes.toDto()).toEqual([{
-        id: 'c2c7f658-c7ac-4d73-9020-9d2c296d9101',
-        aco: 'Folder',
-        aro: 'User',
-        aco_foreign_key: 'c2c7f658-c7ac-4d73-9020-9d2c296d91ff',
-        aro_foreign_key: '54c6278e-f824-5fda-91ff-3e946b18d991',
-        type: 1
-      }, {
-        id: 'c2c7f658-c7ac-4d73-9020-9d2c296d9102',
-        aco: 'Folder',
-        aro: 'User',
-        aco_foreign_key: 'c2c7f658-c7ac-4d73-9020-9d2c296d91ff',
-        aro_foreign_key: '54c6278e-f824-5fda-91ff-3e946b18d992',
-        type: 7
-      }, {
-        aco: 'Folder',
-        aro: 'User',
-        aco_foreign_key: 'c2c7f658-c7ac-4d73-9020-9d2c296d91ff',
-        aro_foreign_key: '54c6278e-f824-5fda-91ff-3e946b18d994',
-        type: 15
-      }, {
-        id: 'c2c7f658-c7ac-4d73-9020-9d2c296d9100',
-        delete: true,
-        aco: 'Folder',
-        aro: 'User',
-        aco_foreign_key: 'c2c7f658-c7ac-4d73-9020-9d2c296d91ff',
-        aro_foreign_key: '54c6278e-f824-5fda-91ff-3e946b18d990',
-        type: 15
-      }
+      id: 'c2c7f658-c7ac-4d73-9020-9d2c296d9101',
+      aco: 'Folder',
+      aro: 'User',
+      aco_foreign_key: 'c2c7f658-c7ac-4d73-9020-9d2c296d91ff',
+      aro_foreign_key: '54c6278e-f824-5fda-91ff-3e946b18d991',
+      type: 1
+    }, {
+      id: 'c2c7f658-c7ac-4d73-9020-9d2c296d9102',
+      aco: 'Folder',
+      aro: 'User',
+      aco_foreign_key: 'c2c7f658-c7ac-4d73-9020-9d2c296d91ff',
+      aro_foreign_key: '54c6278e-f824-5fda-91ff-3e946b18d992',
+      type: 7
+    }, {
+      aco: 'Folder',
+      aro: 'User',
+      aco_foreign_key: 'c2c7f658-c7ac-4d73-9020-9d2c296d91ff',
+      aro_foreign_key: '54c6278e-f824-5fda-91ff-3e946b18d994',
+      type: 15
+    }, {
+      id: 'c2c7f658-c7ac-4d73-9020-9d2c296d9100',
+      delete: true,
+      aco: 'Folder',
+      aro: 'User',
+      aco_foreign_key: 'c2c7f658-c7ac-4d73-9020-9d2c296d91ff',
+      aro_foreign_key: '54c6278e-f824-5fda-91ff-3e946b18d990',
+      type: 15
+    }
     ]);
   });
 
   it("reuse changes works - part1 deletion", () => {
-    let permissions;
-    let changes;
-    let original;
-    let result;
-    let resource1 = "c2c7f658-c7ac-4d73-9020-9d2c296d91ff";
-    let user1 = "54c6278e-f824-5fda-91ff-3e946b18d990";
-    let user2 = "54c6278e-f824-5fda-91ff-3e946b18d991";
-    let folder1 = "640ebc06-5ec1-5322-a1ae-6120ed2f3a74";
-    let permission1 = "c2c7f658-c7ac-4d73-9020-9d2c296d9100";
-    let permission2 = "c2c7f658-c7ac-4d73-9020-9d2c296d9101";
-    let permission3 = "c2c7f658-c7ac-4d73-9020-9d2c296d9102";
+    const resource1 = "c2c7f658-c7ac-4d73-9020-9d2c296d91ff";
+    const user1 = "54c6278e-f824-5fda-91ff-3e946b18d990";
+    const user2 = "54c6278e-f824-5fda-91ff-3e946b18d991";
+    const folder1 = "640ebc06-5ec1-5322-a1ae-6120ed2f3a74";
+    const permission1 = "c2c7f658-c7ac-4d73-9020-9d2c296d9100";
+    const permission2 = "c2c7f658-c7ac-4d73-9020-9d2c296d9101";
+    const permission3 = "c2c7f658-c7ac-4d73-9020-9d2c296d9102";
 
     // permission is not present and change is a delete
-    permissions = new PermissionsCollection([{
+    const permissions = new PermissionsCollection([{
       id: permission1,
       aco: PermissionEntity.ACO_RESOURCE,
       aco_foreign_key: resource1,
@@ -181,7 +172,7 @@ describe("PermissionChangesCollection", () => {
       aro_foreign_key: user1,
       type: PermissionEntity.PERMISSION_OWNER
     }]);
-    changes = new PermissionChangesCollection([{
+    let changes = new PermissionChangesCollection([{
       id: permission2,
       aco: PermissionEntity.ACO_FOLDER,
       aco_foreign_key: folder1,
@@ -189,7 +180,7 @@ describe("PermissionChangesCollection", () => {
       aro_foreign_key: user1,
       delete: true,
       type: PermissionEntity.PERMISSION_READ
-    },{
+    }, {
       id: permission3,
       aco: PermissionEntity.ACO_FOLDER,
       aco_foreign_key: folder1,
@@ -198,8 +189,8 @@ describe("PermissionChangesCollection", () => {
       delete: true,
       type: PermissionEntity.PERMISSION_OWNER
     }]);
-    original = new PermissionsCollection([], false);
-    result = PermissionChangesCollection.reuseChanges(
+    const original = new PermissionsCollection([], {assertAtLeastOneOwner: false});
+    let result = PermissionChangesCollection.reuseChanges(
       PermissionEntity.ACO_RESOURCE, resource1, permissions, changes, original
     );
     expect(result.length).toBe(0);
@@ -222,17 +213,13 @@ describe("PermissionChangesCollection", () => {
   });
 
   it("reuse changes works - part2 create", () => {
-    let permissions;
-    let changes;
-    let original;
-    let result;
-    let resource1 = "c2c7f658-c7ac-4d73-9020-9d2c296d91ff";
-    let user1 = "54c6278e-f824-5fda-91ff-3e946b18d990";
-    let user2 = "54c6278e-f824-5fda-91ff-3e946b18d991";
-    let folder1 = "640ebc06-5ec1-5322-a1ae-6120ed2f3a74";
-    let permission1 = "c2c7f658-c7ac-4d73-9020-9d2c296d9100";
+    const resource1 = "c2c7f658-c7ac-4d73-9020-9d2c296d91ff";
+    const user1 = "54c6278e-f824-5fda-91ff-3e946b18d990";
+    const user2 = "54c6278e-f824-5fda-91ff-3e946b18d991";
+    const folder1 = "640ebc06-5ec1-5322-a1ae-6120ed2f3a74";
+    const permission1 = "c2c7f658-c7ac-4d73-9020-9d2c296d9100";
 
-    permissions = new PermissionsCollection([{
+    const permissions = new PermissionsCollection([{
       id: permission1,
       aco: PermissionEntity.ACO_RESOURCE,
       aco_foreign_key: resource1,
@@ -240,21 +227,21 @@ describe("PermissionChangesCollection", () => {
       aro_foreign_key: user1,
       type: PermissionEntity.PERMISSION_OWNER
     }]);
-    changes = new PermissionChangesCollection([{
+    const changes = new PermissionChangesCollection([{
       aco: PermissionEntity.ACO_FOLDER,
       aco_foreign_key: folder1,
       aro: PermissionEntity.ARO_USER,
       aro_foreign_key: user1,
       type: PermissionEntity.PERMISSION_UPDATE
-    },{
+    }, {
       aco: PermissionEntity.ACO_FOLDER,
       aco_foreign_key: folder1,
       aro: PermissionEntity.ARO_USER,
       aro_foreign_key: user2,
       type: PermissionEntity.PERMISSION_OWNER
     }]);
-    original = new PermissionsCollection([], false);
-    result = PermissionChangesCollection.reuseChanges(
+    const original = new PermissionsCollection([], {assertAtLeastOneOwner: false});
+    const result = PermissionChangesCollection.reuseChanges(
       PermissionEntity.ACO_RESOURCE, resource1, permissions, changes, original
     );
     expect(result.length).toBe(1);
@@ -263,26 +250,22 @@ describe("PermissionChangesCollection", () => {
   });
 
   it("reuse changes works - part3 update - upgrade matching permission", () => {
-    let permissions;
-    let changes;
-    let original;
-    let result;
-    let resource1 = "c2c7f658-c7ac-4d73-9020-9d2c296d91ff";
-    let user1 = "54c6278e-f824-5fda-91ff-3e946b18d990";
-    let user2 = "54c6278e-f824-5fda-91ff-3e946b18d991";
-    let user3 = "54c6278e-f824-5fda-91ff-3e946b18d992";
-    let user4 = "54c6278e-f824-5fda-91ff-3e946b18d993";
+    const resource1 = "c2c7f658-c7ac-4d73-9020-9d2c296d91ff";
+    const user1 = "54c6278e-f824-5fda-91ff-3e946b18d990";
+    const user2 = "54c6278e-f824-5fda-91ff-3e946b18d991";
+    const user3 = "54c6278e-f824-5fda-91ff-3e946b18d992";
+    const user4 = "54c6278e-f824-5fda-91ff-3e946b18d993";
 
-    let folder1 = "640ebc06-5ec1-5322-a1ae-6120ed2f3a74";
-    let permission1 = "c2c7f658-c7ac-4d73-9020-9d2c296d9100";
-    let permission2 = "c2c7f658-c7ac-4d73-9020-9d2c296d9101";
-    let permission3 = "c2c7f658-c7ac-4d73-9020-9d2c296d9102";
-    let permission4 = "c2c7f658-c7ac-4d73-9020-9d2c296d9103";
-    let permission5 = "c2c7f658-c7ac-4d73-9020-9d2c296d9104";
-    let permission6 = "c2c7f658-c7ac-4d73-9020-9d2c296d9105";
-    let permission7 = "c2c7f658-c7ac-4d73-9020-9d2c296d9106";
+    const folder1 = "640ebc06-5ec1-5322-a1ae-6120ed2f3a74";
+    const permission1 = "c2c7f658-c7ac-4d73-9020-9d2c296d9100";
+    const permission2 = "c2c7f658-c7ac-4d73-9020-9d2c296d9101";
+    const permission3 = "c2c7f658-c7ac-4d73-9020-9d2c296d9102";
+    const permission4 = "c2c7f658-c7ac-4d73-9020-9d2c296d9103";
+    const permission5 = "c2c7f658-c7ac-4d73-9020-9d2c296d9104";
+    const permission6 = "c2c7f658-c7ac-4d73-9020-9d2c296d9105";
+    const permission7 = "c2c7f658-c7ac-4d73-9020-9d2c296d9106";
 
-    permissions = new PermissionsCollection([{
+    const permissions = new PermissionsCollection([{
       // permission is not in the original
       id: permission1,
       aco: PermissionEntity.ACO_RESOURCE,
@@ -290,7 +273,7 @@ describe("PermissionChangesCollection", () => {
       aro: PermissionEntity.ARO_USER,
       aro_foreign_key: user1,
       type: PermissionEntity.PERMISSION_OWNER
-    },{
+    }, {
       // permission is same than original
       id: permission2,
       aco: PermissionEntity.ACO_RESOURCE,
@@ -298,7 +281,7 @@ describe("PermissionChangesCollection", () => {
       aro: PermissionEntity.ARO_USER,
       aro_foreign_key: user2,
       type: PermissionEntity.PERMISSION_READ
-    },{
+    }, {
       // permission is more than original
       id: permission3,
       aco: PermissionEntity.ACO_RESOURCE,
@@ -306,7 +289,7 @@ describe("PermissionChangesCollection", () => {
       aro: PermissionEntity.ARO_USER,
       aro_foreign_key: user3,
       type: PermissionEntity.PERMISSION_OWNER
-    },{
+    }, {
       // permission is less than original
       id: permission4,
       aco: PermissionEntity.ACO_RESOURCE,
@@ -316,21 +299,21 @@ describe("PermissionChangesCollection", () => {
       type: PermissionEntity.PERMISSION_READ
     }]);
 
-    changes = new PermissionChangesCollection([{
+    const changes = new PermissionChangesCollection([{
       id: permission5,
       aco: PermissionEntity.ACO_FOLDER,
       aco_foreign_key: folder1,
       aro: PermissionEntity.ARO_USER,
       aro_foreign_key: user2,
       type: PermissionEntity.PERMISSION_OWNER
-    },{
+    }, {
       id: permission6,
       aco: PermissionEntity.ACO_FOLDER,
       aco_foreign_key: folder1,
       aro: PermissionEntity.ARO_USER,
       aro_foreign_key: user3,
       type: PermissionEntity.PERMISSION_UPDATE
-    },{
+    }, {
       id: permission7,
       aco: PermissionEntity.ACO_FOLDER,
       aco_foreign_key: folder1,
@@ -339,30 +322,30 @@ describe("PermissionChangesCollection", () => {
       type: PermissionEntity.PERMISSION_UPDATE
     }]);
 
-    original = new PermissionsCollection([{
+    const original = new PermissionsCollection([{
       id: permission5,
       aco: PermissionEntity.ACO_FOLDER,
       aco_foreign_key: folder1,
       aro: PermissionEntity.ARO_USER,
       aro_foreign_key: user2,
       type: PermissionEntity.PERMISSION_READ
-    },{
+    }, {
       id: permission6,
       aco: PermissionEntity.ACO_FOLDER,
       aco_foreign_key: folder1,
       aro: PermissionEntity.ARO_USER,
       aro_foreign_key: user3,
       type: PermissionEntity.PERMISSION_READ
-    },{
+    }, {
       id: permission7,
       aco: PermissionEntity.ACO_FOLDER,
       aco_foreign_key: folder1,
       aro: PermissionEntity.ARO_USER,
       aro_foreign_key: user4,
       type: PermissionEntity.PERMISSION_OWNER
-    }], false);
+    }], {assertAtLeastOneOwner: false});
 
-    result = PermissionChangesCollection.reuseChanges(
+    const result = PermissionChangesCollection.reuseChanges(
       PermissionEntity.ACO_RESOURCE, resource1, permissions, changes, original
     );
 

package/src/all/background_page/model/entity/permission/permissionEntity.js

@@ -11,10 +11,11 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.13.0
  */
-const {Entity} = require('../abstract/entity');
-const {EntitySchema} = require('../abstract/entitySchema');
-const {UserEntity} = require('../user/userEntity');
-const {GroupEntity} = require('../group/groupEntity');
+import Entity from "passbolt-styleguide/src/shared/models/entity/abstract/entity";
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
+import GroupEntity from "../group/groupEntity";
+import UserEntity from "../user/userEntity";
+import Validator from "validator";
 
 const ENTITY_NAME = 'Permission';
 const PERMISSION_OWNER = 15;
@@ -27,25 +28,22 @@ const ACO_FOLDER = 'Folder';
 
 class PermissionEntity extends Entity {
   /**
-   * Permission Entity constructor
-   *
-   * @param {Object} permissionDto permission
-   * @throws EntityValidationError if the dto cannot be converted into an entity
+   * @inheritDoc
    */
-  constructor(permissionDto) {
+  constructor(permissionDto, options = {}) {
     super(EntitySchema.validate(
       PermissionEntity.ENTITY_NAME,
       permissionDto,
       PermissionEntity.getSchema()
-    ));
+    ), options);
 
     // Associated models
     if (this._props.user) {
-      this._user = new UserEntity(this._props.user);
+      this._user = new UserEntity(this._props.user, {clone: false});
       delete this._props.user;
     }
     if (this._props.group) {
-      this._group = new GroupEntity(this._props.group);
+      this._group = new GroupEntity(this._props.group, {clone: false});
       delete this._props.group;
     }
   }
@@ -108,12 +106,14 @@ class PermissionEntity extends Entity {
         "user": UserEntity.getSchema(),
         "group": GroupEntity.getSchema()
       }
-    }
+    };
   }
 
-  // ==================================================
-  // Serialization
-  // ==================================================
+  /*
+   * ==================================================
+   * Serialization
+   * ==================================================
+   */
   /**
    * Return a DTO ready to be sent to API
    *
@@ -146,9 +146,11 @@ class PermissionEntity extends Entity {
     return this.toDto(PermissionEntity.ALL_CONTAIN_OPTIONS);
   }
 
-  // ==================================================
-  // Dynamic properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Dynamic properties getters
+   * ==================================================
+   */
   /**
    * Get permission id
    * @returns {(string|null)} uuid if set
@@ -205,9 +207,11 @@ class PermissionEntity extends Entity {
     return (this.type === PermissionEntity.PERMISSION_OWNER);
   }
 
-  // ==================================================
-  // Static properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Static properties getters
+   * ==================================================
+   */
   /**
    * PermissionEntity.ENTITY_NAME
    * @returns {string}
@@ -277,7 +281,7 @@ class PermissionEntity extends Entity {
    * @returns {object} all contain options that can be used in toDto()
    */
   static get ALL_CONTAIN_OPTIONS() {
-    return {user: {profile: {avatar: true}}, group:true};
+    return {user: {profile: {avatar: true}}, group: true};
   }
 
   /**
@@ -292,9 +296,11 @@ class PermissionEntity extends Entity {
     ];
   }
 
-  // ==================================================
-  // Associated properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Associated properties getters
+   * ==================================================
+   */
   /**
    * Get associated user data
    * @returns {(UserEntity|null)} user
@@ -311,9 +317,11 @@ class PermissionEntity extends Entity {
     return this._group || null;
   }
 
-  // ==================================================
-  // Dynamic properties setters
-  // ==================================================
+  /*
+   * ==================================================
+   * Dynamic properties setters
+   * ==================================================
+   */
   /**
    * Set the permission id
    *
@@ -340,9 +348,11 @@ class PermissionEntity extends Entity {
     this._props.type = type;
   }
 
-  // ==================================================
-  // Assertions
-  // ==================================================
+  /*
+   * ==================================================
+   * Assertions
+   * ==================================================
+   */
   /**
    * Basic type assertion helper
    *
@@ -365,9 +375,11 @@ class PermissionEntity extends Entity {
     PermissionEntity.assertIsPermission(p2);
   }
 
-  // ==================================================
-  // Permission comparison operators
-  // ==================================================
+  /*
+   * ==================================================
+   * Permission comparison operators
+   * ==================================================
+   */
   /**
    * Return true if two given permission have the same id
    *
@@ -466,9 +478,11 @@ class PermissionEntity extends Entity {
     return (p1.type > p2.type) ? p1 : p2;
   }
 
-  // ==================================================
-  // Permission factories
-  // ==================================================
+  /*
+   * ==================================================
+   * Permission factories
+   * ==================================================
+   */
   /**
    * Create a permission copy to be used by another aco
    * Useful for example when you want to reuse a permission from a folder
@@ -489,4 +503,4 @@ class PermissionEntity extends Entity {
   }
 }
 
-exports.PermissionEntity = PermissionEntity;
+export default PermissionEntity;

package/src/all/background_page/model/entity/permission/permissionEntity.test.js

@@ -11,22 +11,15 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.13.0
  */
-import {PermissionEntity} from "./permissionEntity";
-import {EntityValidationError} from "../abstract/entityValidationError";
-import {EntitySchema} from "../abstract/entitySchema";
-import Validator from 'validator';
-
-// Reset the modules before each test.
-beforeEach(() => {
-  window.Validator = Validator;
-  jest.resetModules();
-});
+import PermissionEntity from "./permissionEntity";
+import EntityValidationError from "passbolt-styleguide/src/shared/models/entity/abstract/entityValidationError";
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
 
 /**
  * getTestDto
  * @returns {object}
  */
-function getTestDto(option) {
+function getTestDto() {
   return {
     'aro': PermissionEntity.ARO_USER,
     'aco': PermissionEntity.ACO_RESOURCE,
@@ -110,8 +103,8 @@ describe("Entity permission", () => {
         'modified': 123
       });
       expect(false).toBe(true);
-    } catch(error) {
-      expect((error instanceof EntityValidationError)).toBe(true);
+    } catch (error) {
+      expect((error instanceof EntityValidationError)). toBe(true);
       expect(error.hasError('id')).toBe(true);
       expect(error.hasError('modified')).toBe(true);
       expect(error.hasError('aro')).toBe(true);
@@ -181,13 +174,13 @@ describe("Entity permission", () => {
     try {
       PermissionEntity.assertIsPermission(null);
       expect(false).toBe(true);
-    } catch(error) {
+    } catch (error) {
       expect(error instanceof TypeError).toBe(true);
     }
     try {
       PermissionEntity.assertIsPermission(getTestDto());
       expect(false).toBe(true);
-    } catch(error) {
+    } catch (error) {
       expect(error instanceof TypeError).toBe(true);
     }
     PermissionEntity.assertIsPermission(new PermissionEntity(getTestDto()));
@@ -203,6 +196,6 @@ describe("Entity permission", () => {
       'aco': PermissionEntity.ACO_FOLDER,
       'aco_foreign_key': '7f077753-0835-4054-92ee-556660ea04f0',
       'type': PermissionEntity.PERMISSION_OWNER,
-    })
+    });
   });
 });