passbolt-browser-extension 3.0.6 → 4.6.2

package/src/all/background_page/model/entity/permission/actionLog/updatedPermissionEntity.js

@@ -10,36 +10,32 @@
  * @license       https://opensource.org/licenses/AGPL-3.0 AGPL License
  * @link          https://www.passbolt.com Passbolt(tm)
  */
-const {Entity} = require('../../abstract/entity');
-const {EntitySchema} = require('../../abstract/entitySchema');
-const {EntityValidationError} = require('../../abstract/entityValidationError');
-const {PermissionEntity} = require("../permissionEntity");
-const {LoggedUserEntity} = require("../../user/actionLog/loggedUserEntity");
-const {GroupEntity} = require("../../group/groupEntity");
+import GroupEntity from "../../group/groupEntity";
+import PermissionEntity from "../permissionEntity";
+import Entity from "passbolt-styleguide/src/shared/models/entity/abstract/entity";
+import LoggedUserEntity from "../../user/actionLog/loggedUserEntity";
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
 
 const ENTITY_NAME = 'UpdatedPermission';
 
 class UpdatedPermissionEntity extends Entity {
   /**
-   * Updated permission entity constructor
-   *
-   * @param {Object} updatedPermission Updated Permission DTO
-   * @throws EntityValidationError if the dto cannot be converted into an entity
+   * @inheritDoc
    */
-  constructor(updatedPermission) {
+  constructor(updatedPermission, options = {}) {
     super(EntitySchema.validate(
       UpdatedPermissionEntity.ENTITY_NAME,
       updatedPermission,
       UpdatedPermissionEntity.getSchema()
-    ));
+    ), options);
 
     // Associations
     if (this._props.user) {
-      this._user = new LoggedUserEntity(this._props.user);
+      this._user = new LoggedUserEntity(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;
     }
   }
@@ -72,7 +68,7 @@ class UpdatedPermissionEntity extends Entity {
         "user": LoggedUserEntity.getSchema(),
         "group": GroupEntity.getSchema()
       }
-    }
+    };
   }
 
   /**
@@ -81,7 +77,7 @@ class UpdatedPermissionEntity extends Entity {
    * @returns {*}
    */
   toDto(contain) {
-    let result = Object.assign({}, this._props);
+    const result = Object.assign({}, this._props);
     if (!contain) {
       return result;
     }
@@ -113,9 +109,11 @@ class UpdatedPermissionEntity extends Entity {
     return this.toDto(UpdatedPermissionEntity.ALL_CONTAIN_OPTIONS);
   }
 
-  // ==================================================
-  // Dynamic properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Dynamic properties getters
+   * ==================================================
+   */
   /**
    * Get id
    * @returns {(string|null)} uuid
@@ -132,9 +130,11 @@ class UpdatedPermissionEntity extends Entity {
     return this._props.type;
   }
 
-  // ==================================================
-  // Other associated properties methods
-  // ==================================================
+  /*
+   * ==================================================
+   * Other associated properties methods
+   * ==================================================
+   */
 
   /**
    * Get the user.
@@ -152,9 +152,11 @@ class UpdatedPermissionEntity extends Entity {
     return this._group || null;
   }
 
-  // ==================================================
-  // Static properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Static properties getters
+   * ==================================================
+   */
 
   /**
    * UpdatedPermissionEntity.ENTITY_NAME
@@ -173,4 +175,4 @@ class UpdatedPermissionEntity extends Entity {
   }
 }
 
-exports.UpdatedPermissionEntity = UpdatedPermissionEntity;
+export default UpdatedPermissionEntity;

package/src/all/background_page/model/entity/permission/actionLog/updatedPermissionEntity.test.js

@@ -10,16 +10,9 @@
  * @license       https://opensource.org/licenses/AGPL-3.0 AGPL License
  * @link          https://www.passbolt.com Passbolt(tm)
  */
-import Validator from 'validator';
-import {EntitySchema} from "../../abstract/entitySchema";
-import {EntityValidationError} from '../../abstract/entityValidationError';
-import {UpdatedPermissionEntity} from "./updatedPermissionEntity";
-
-// Reset the modules before each test.
-beforeEach(() => {
-  window.Validator = Validator;
-  jest.resetModules();
-});
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
+import EntityValidationError from "passbolt-styleguide/src/shared/models/entity/abstract/entityValidationError";
+import UpdatedPermissionEntity from "./updatedPermissionEntity";
 
 describe("Updated permission entity", () => {
   it("schema must validate", () => {
@@ -59,11 +52,11 @@ describe("Updated permission entity", () => {
 
   it("constructor works fails if not enough data is provided", () => {
     let t;
-    t = () => {new UpdatedPermissionEntity({})};
+    t = () => { new UpdatedPermissionEntity({}); };
     expect(t).toThrow(EntityValidationError);
-    t = () => {new UpdatedPermissionEntity({id: "fa5f5d7a-32cc-4c5b-9478-f58584ca4222"})};
+    t = () => { new UpdatedPermissionEntity({id: "fa5f5d7a-32cc-4c5b-9478-f58584ca4222"}); };
     expect(t).toThrow(EntityValidationError);
-    t = () => {new UpdatedPermissionEntity({"type": 15})};
+    t = () => { new UpdatedPermissionEntity({"type": 15}); };
     expect(t).toThrow(EntityValidationError);
   });
 });

package/src/all/background_page/model/entity/permission/actionLog/updatedPermissionsCollection.js

@@ -10,10 +10,10 @@
  * @license       https://opensource.org/licenses/AGPL-3.0 AGPL License
  * @link          https://www.passbolt.com Passbolt(tm)
  */
-const {EntityCollection} = require('../../abstract/entityCollection');
-const {EntitySchema} = require('../../abstract/entitySchema');
-const {EntityCollectionError} = require('../../abstract/entityCollectionError');
-const {UpdatedPermissionEntity} = require("./updatedPermissionEntity");
+import UpdatedPermissionEntity from "./updatedPermissionEntity";
+import EntityCollection from "passbolt-styleguide/src/shared/models/entity/abstract/entityCollection";
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
+import EntityCollectionError from "passbolt-styleguide/src/shared/models/entity/abstract/entityCollectionError";
 
 const ENTITY_NAME = 'UpdatedPermissions';
 
@@ -21,23 +21,23 @@ const RULE_UNIQUE_ID = 'unique_id';
 
 class UpdatedPermissionsCollection extends EntityCollection {
   /**
-   * Updated permissions collection constructor
-   *
-   * @param {Object} updatedPermissionsCollectionDto updated permissions DTO
-   * @throws EntityValidationError if the dto cannot be converted into an entity
+   * @inheritDoc
+   * @throws {EntityCollectionError} Build Rule: Ensure all items in the collection are unique by ID.
    */
-  constructor(updatedPermissionsCollectionDto) {
+  constructor(updatedPermissionsCollectionDto, options = {}) {
     super(EntitySchema.validate(
       UpdatedPermissionsCollection.ENTITY_NAME,
       updatedPermissionsCollectionDto,
       UpdatedPermissionsCollection.getSchema()
-    ));
+    ), options);
 
-    // Note: there is no "multi-item" validation
-    // Collection validation will fail at the first item that doesn't validate
+    /*
+     * Note: there is no "multi-item" validation
+     * Collection validation will fail at the first item that doesn't validate
+     */
     this._props.forEach(updatedPermissionDto => {
-      const updatePermissionEntity = new UpdatedPermissionEntity(updatedPermissionDto);
-      this.push(updatePermissionEntity)
+      const updatePermissionEntity = new UpdatedPermissionEntity(updatedPermissionDto, {clone: false});
+      this.push(updatePermissionEntity);
     });
 
     // We do not keep original props
@@ -53,7 +53,7 @@ class UpdatedPermissionsCollection extends EntityCollection {
     return {
       "type": "array",
       "items": UpdatedPermissionEntity.getSchema()
-    }
+    };
   }
 
   /**
@@ -73,9 +73,11 @@ class UpdatedPermissionsCollection extends EntityCollection {
     return this._items.map(r => r.id);
   }
 
-  // ==================================================
-  // Assertions
-  // ==================================================
+  /*
+   * ==================================================
+   * Assertions
+   * ==================================================
+   */
 
   /**
    * Assert there is no other updated permission with the same id in the collection
@@ -89,17 +91,19 @@ class UpdatedPermissionsCollection extends EntityCollection {
     }
     const length = this.updatedPermissions.length;
     let i = 0;
-    for(; i < length; i++) {
-      let existingUpdatedPermission = this.updatedPermissions[i];
+    for (; i < length; i++) {
+      const existingUpdatedPermission = this.updatedPermissions[i];
       if (existingUpdatedPermission.id && existingUpdatedPermission.id === updatedPermission.id) {
         throw new EntityCollectionError(i, UpdatedPermissionsCollection.RULE_UNIQUE_ID, `Updated permission id ${updatedPermission.id} already exists.`);
       }
     }
   }
 
-  // ==================================================
-  // Setters
-  // ==================================================
+  /*
+   * ==================================================
+   * Setters
+   * ==================================================
+   */
 
   /**
    * Push a copy of the updated permission to the list
@@ -120,9 +124,11 @@ class UpdatedPermissionsCollection extends EntityCollection {
     super.push(updatedPermissionEntity);
   }
 
-  // ==================================================
-  // Static getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Static getters
+   * ==================================================
+   */
 
   /**
    * UpdatedPermissionsCollection.ENTITY_NAME
@@ -141,4 +147,4 @@ class UpdatedPermissionsCollection extends EntityCollection {
   }
 }
 
-exports.UpdatedPermissionsCollection = UpdatedPermissionsCollection;
+export default UpdatedPermissionsCollection;

package/src/all/background_page/model/entity/permission/change/permissionChangeEntity.js

@@ -11,9 +11,10 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.13.0
  */
-const {Entity} = require('../../abstract/entity');
-const {EntitySchema} = require('../../abstract/entitySchema');
-const {PermissionEntity} = require('../permissionEntity');
+import PermissionEntity from "../permissionEntity";
+import Entity from "passbolt-styleguide/src/shared/models/entity/abstract/entity";
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
+
 
 const ENTITY_NAME = 'PermissionChange';
 const PERMISSION_CHANGE_CREATE = 'create';
@@ -22,17 +23,14 @@ const PERMISSION_CHANGE_UPDATE = 'update';
 
 class PermissionChangeEntity extends Entity {
   /**
-   * Permission entity constructor
-   *
-   * @param {Object} permissionChangesDto data transfer object
-   * @throws EntityValidationError if the dto cannot be converted into an entity
+   * @inheritDoc
    */
-  constructor(permissionChangesDto) {
+  constructor(permissionChangesDto, options = {}) {
     super(EntitySchema.validate(
       PermissionChangeEntity.ENTITY_NAME,
       permissionChangesDto,
       PermissionChangeEntity.getSchema()
-    ));
+    ), options);
   }
 
   /**
@@ -76,16 +74,16 @@ class PermissionChangeEntity extends Entity {
     if (!permission || !(permission instanceof PermissionEntity)) {
       throw new TypeError('PermissionChangeEntity createFromPermission expect a permission entity.');
     }
-    let changeDto = {
+    const changeDto = {
       aco: permission.aco,
       aro: permission.aro,
       aco_foreign_key: permission.acoForeignKey,
       aro_foreign_key: permission.aroForeignKey,
       type: permission.type,
     };
-    switch(operation) {
+    switch (operation) {
       case PermissionChangeEntity.PERMISSION_CHANGE_CREATE:
-          // nothing to do
+        // nothing to do
         break;
       case PermissionChangeEntity.PERMISSION_CHANGE_UPDATE:
         if (!permission.id) {
@@ -106,9 +104,11 @@ class PermissionChangeEntity extends Entity {
     return new PermissionChangeEntity(changeDto);
   }
 
-  // ==================================================
-  // Copy
-  // ==================================================
+  /*
+   * ==================================================
+   * Copy
+   * ==================================================
+   */
   /**
    * Create a permission change to be used by another aco
    * Useful for example when you want to reuse a permission from a folder
@@ -128,9 +128,11 @@ class PermissionChangeEntity extends Entity {
     });
   }
 
-  // ==================================================
-  // Dynamic properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Dynamic properties getters
+   * ==================================================
+   */
   /**
    * Get permission id
    * @returns {(string|null)} uuid if set
@@ -204,9 +206,11 @@ class PermissionChangeEntity extends Entity {
     return PermissionChangeEntity.PERMISSION_CHANGE_UPDATE;
   }
 
-  // ==================================================
-  // Static properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Static properties getters
+   * ==================================================
+   */
   /**
    * PermissionEntity.ENTITY_NAME
    * @returns {string}
@@ -240,4 +244,4 @@ class PermissionChangeEntity extends Entity {
   }
 }
 
-exports.PermissionChangeEntity = PermissionChangeEntity;
+export default PermissionChangeEntity;

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

@@ -11,30 +11,29 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.13.0
  */
-const {EntityCollection} = require('../../abstract/entityCollection');
-const {EntitySchema} = require('../../abstract/entitySchema');
-const {PermissionChangeEntity} = require('./permissionChangeEntity');
-const {PermissionsCollection} = require('../permissionsCollection');
-const {PermissionEntity} = require('../permissionEntity');
+import PermissionEntity from "../permissionEntity";
+import PermissionsCollection from "../permissionsCollection";
+import PermissionChangeEntity from "./permissionChangeEntity";
+import EntityCollection from "passbolt-styleguide/src/shared/models/entity/abstract/entityCollection";
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
 
 const ENTITY_NAME = 'PermissionChanges';
 
 class PermissionChangesCollection extends EntityCollection {
   /**
-   * PermissionChanges Entity constructor
-   *
-   * @param {array} permissionsDto permission changes DTO
-   * @throws EntityValidationError if the dto cannot be converted into an entity
+   * @inheritDoc
    */
-  constructor(permissionsDto) {
+  constructor(permissionsDto, options = {}) {
     super(EntitySchema.validate(
       PermissionChangesCollection.ENTITY_NAME,
       permissionsDto,
       PermissionChangesCollection.getSchema()
-    ));
+    ), options);
 
-    // Note: there is no "multi-item" validation
-    // Collection validation will fail at the first item that doesn't validate
+    /*
+     * Note: there is no "multi-item" validation
+     * Collection validation will fail at the first item that doesn't validate
+     */
     this._props.forEach(permissionChange => {
       this.push(permissionChange);
     });
@@ -52,7 +51,7 @@ class PermissionChangesCollection extends EntityCollection {
     return {
       "type": "array",
       "items": PermissionChangeEntity.getSchema(),
-    }
+    };
   }
 
   /**
@@ -63,9 +62,11 @@ class PermissionChangesCollection extends EntityCollection {
     return ENTITY_NAME;
   }
 
-  // ==================================================
-  // Filters
-  // ==================================================
+  /*
+   * ==================================================
+   * Filters
+   * ==================================================
+   */
   /**
    * Filter By Aco Foreign Key
    *
@@ -88,9 +89,11 @@ class PermissionChangesCollection extends EntityCollection {
     return new PermissionChangesCollection(permissionChanges);
   }
 
-  // ==================================================
-  // Setters
-  // ==================================================
+  /*
+   * ==================================================
+   * Setters
+   * ==================================================
+   */
   /**
    * Push a copy of the permission to the list
    * @param {PermissionChangeEntity} permissionChange DTO or PermissionChangeEntity
@@ -111,7 +114,7 @@ class PermissionChangesCollection extends EntityCollection {
    * @param {PermissionChangesCollection} permissionChangesCollection
    */
   merge(permissionChangesCollection) {
-    for (let changes of permissionChangesCollection) {
+    for (const changes of permissionChangesCollection) {
       this.push(changes);
     }
   }
@@ -125,15 +128,17 @@ class PermissionChangesCollection extends EntityCollection {
    */
   copyForAnotherAco(aco, acoForeignKey) {
     const results = new PermissionChangesCollection([]);
-    for (let change of this.items) {
-      results.push(change.copyForAnotherAco(aco, acoForeignKey))
+    for (const change of this.items) {
+      results.push(change.copyForAnotherAco(aco, acoForeignKey));
     }
     return results;
   }
 
-  // ==================================================
-  // Changes calculation
-  // ==================================================
+  /*
+   * ==================================================
+   * Changes calculation
+   * ==================================================
+   */
   /**
    * Return true if the changes can be applied
    * @param {string} aco folder or resource to reuse the changes for
@@ -147,9 +152,9 @@ class PermissionChangesCollection extends EntityCollection {
       throw new TypeError('PermissionChangesCollection reuseChanges call is missing parameter(s).');
     }
     const result = new PermissionChangesCollection([]);
-    for (let change of changes) {
-      let permission = permissions.getByAro(change.aro, change.aroForeignKey);
-      switch(change.scenario) {
+    for (const change of changes) {
+      const permission = permissions.getByAro(change.aro, change.aroForeignKey);
+      switch (change.scenario) {
         case PermissionChangeEntity.PERMISSION_CHANGE_DELETE:
           if (permission && permission.type === change.type) {
             result.push(PermissionChangeEntity.createFromPermission(
@@ -198,7 +203,7 @@ class PermissionChangesCollection extends EntityCollection {
     const result = new PermissionChangesCollection([]);
 
     // Find new or updated permissions
-    for(let expectedPermission of expectedSet) {
+    for (const expectedPermission of expectedSet) {
       const foundPermission = originalSet.getByAroMatchingPermission(expectedPermission);
       if (!foundPermission) {
         const newChange = PermissionChangeEntity.createFromPermission(expectedPermission, PermissionChangeEntity.PERMISSION_CHANGE_CREATE);
@@ -213,7 +218,7 @@ class PermissionChangesCollection extends EntityCollection {
     }
 
     // Find deleted permissions
-    for(let originalPermission of originalSet) {
+    for (const originalPermission of originalSet) {
       if (!expectedSet.getByAroMatchingPermission(originalPermission)) {
         // Aka, permissions that are in the old set and not the new one
         const newChange = PermissionChangeEntity.createFromPermission(originalPermission, PermissionChangeEntity.PERMISSION_CHANGE_DELETE);
@@ -225,4 +230,4 @@ class PermissionChangesCollection extends EntityCollection {
   }
 }
 
-exports.PermissionChangesCollection = PermissionChangesCollection;
+export default PermissionChangesCollection;