passbolt-browser-extension 3.0.6 → 4.6.2

package/src/all/background_page/model/entity/group/update/groupUpdateDryRunResultEntity.test.data.js

@@ -0,0 +1,24 @@
+/**
+ * Passbolt ~ Open source password manager for teams
+ * Copyright (c) 2022 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) 2022 Passbolt SA (https://www.passbolt.com)
+ * @license       https://opensource.org/licenses/AGPL-3.0 AGPL License
+ * @link          https://www.passbolt.com Passbolt(tm)
+ * @since         3.6.0
+ */
+
+export const defaultDyRunResponse = (data = {}) => {
+  const defaultData = {
+    SecretsNeeded: [],
+    Secrets: []
+  };
+
+  return {
+    "dry-run": Object.assign(defaultData, data)
+  };
+};

package/src/all/background_page/model/entity/group/update/groupUpdateDryRunResultEntity.test.js

@@ -10,14 +10,7 @@
  * @license       https://opensource.org/licenses/AGPL-3.0 AGPL License
  * @link          https://www.passbolt.com Passbolt(tm)
  */
-import Validator from 'validator';
-import {GroupUpdateDryRunResultEntity} from "./groupUpdateDryRunResultEntity";
-
-// Reset the modules before each test.
-beforeEach(() => {
-  window.Validator = Validator;
-  jest.resetModules();
-});
+import GroupUpdateDryRunResultEntity from "./groupUpdateDryRunResultEntity";
 
 describe("Group update dry run result entity", () => {
   it("constructor works if valid minimal DTO is provided", () => {

package/src/all/background_page/model/entity/group/update/groupUpdateEntity.js

@@ -10,35 +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 {GroupEntity} = require("../groupEntity");
-const {GroupUserChangesCollection} = require("../../groupUser/change/groupUserChangesCollection");
-const {SecretsCollection} = require("../../secret/secretsCollection");
+import GroupEntity from "../groupEntity";
+import Entity from "passbolt-styleguide/src/shared/models/entity/abstract/entity";
+import SecretsCollection from "../../secret/secretsCollection";
+import GroupUserChangesCollection from "../../groupUser/change/groupUserChangesCollection";
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
 
 const ENTITY_NAME = 'GroupUpdate';
 
 class GroupUpdateEntity extends Entity {
   /**
-   * GroupUpdate entity constructor
-   *
-   * @param {Object} groupUpdateDto group update DTO
-   * @throws EntityValidationError if the dto cannot be converted into an entity
+   * @inheritDoc
    */
-  constructor(groupUpdateDto) {
+  constructor(groupUpdateDto, options = {}) {
     super(EntitySchema.validate(
       GroupUpdateEntity.ENTITY_NAME,
       groupUpdateDto,
       GroupUpdateEntity.getSchema()
-    ));
+    ), options);
 
     // Association
     if (this._props.groups_users) {
-      this._groups_users = new GroupUserChangesCollection(this._props.groups_users);
+      this._groups_users = new GroupUserChangesCollection(this._props.groups_users, {clone: false});
       delete this._props.groups_users;
     }
     if (this._props.secrets) {
-      this._secrets = new SecretsCollection(this._props.secrets);
+      this._secrets = new SecretsCollection(this._props.secrets, {clone: false});
       delete this._props.secrets;
     }
   }
@@ -62,27 +59,29 @@ class GroupUpdateEntity extends Entity {
         "groups_users": GroupUserChangesCollection.getSchema(),
         "secrets": SecretsCollection.getSchema()
       }
-    }
+    };
   }
 
   static createFromGroupsDiff(originalGroupEntity, updatedGroupEntity) {
     const id = originalGroupEntity.id;
     const name = updatedGroupEntity.name;
     const groupsUsers = GroupUserChangesCollection.createFromGroupsUsersCollectionsChanges(originalGroupEntity.groupsUsers, updatedGroupEntity.groupsUsers);
-    const groupUpdateDto = {id, name, groups_users: groupsUsers.toDto()};
+    const groupUpdateDto = {id: id, name: name, groups_users: groupsUsers.toDto()};
     return new GroupUpdateEntity(groupUpdateDto);
   }
 
-  // ==================================================
-  // Serialization
-  // ==================================================
+  /*
+   * ==================================================
+   * Serialization
+   * ==================================================
+   */
 
   /**
    * Return a DTO ready to be sent to API
    * @returns {*}
    */
   toDto() {
-    let result = Object.assign({}, this._props);
+    const result = Object.assign({}, this._props);
     if (this._groups_users) {
       result.groups_users = this._groups_users.toDto();
     }
@@ -100,9 +99,11 @@ class GroupUpdateEntity extends Entity {
     return this.toDto();
   }
 
-  // ==================================================
-  // Dynamic properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Dynamic properties getters
+   * ==================================================
+   */
 
   /**
    * Get group id
@@ -120,9 +121,11 @@ class GroupUpdateEntity extends Entity {
     return this._props.name;
   }
 
-  // ==================================================
-  // Other associated properties methods
-  // ==================================================
+  /*
+   * ==================================================
+   * Other associated properties methods
+   * ==================================================
+   */
 
   /**
    * Return groups users
@@ -145,12 +148,14 @@ class GroupUpdateEntity extends Entity {
    * @param {SecretsCollection} secrets
    */
   set secrets(secrets) {
-    return this._secrets = secrets;
+    this._secrets = secrets;
   }
 
-  // ==================================================
-  // Static properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Static properties getters
+   * ==================================================
+   */
 
   /**
    * GroupEntity.ENTITY_NAME
@@ -161,4 +166,4 @@ class GroupUpdateEntity extends Entity {
   }
 }
 
-exports.GroupUpdateEntity = GroupUpdateEntity;
+export default GroupUpdateEntity;

package/src/all/background_page/model/entity/group/update/groupUpdateEntity.test.js

@@ -10,17 +10,10 @@
  * @license       https://opensource.org/licenses/AGPL-3.0 AGPL License
  * @link          https://www.passbolt.com Passbolt(tm)
  */
-import Validator from 'validator';
-import {EntityValidationError} from "../../abstract/entityValidationError";
-import {GroupUpdateEntity} from "./groupUpdateEntity";
-import {GroupEntity} from "../groupEntity";
-import {EntitySchema} from "../../abstract/entitySchema";
-
-// Reset the modules before each test.
-beforeEach(() => {
-  window.Validator = Validator;
-  jest.resetModules();
-});
+import EntityValidationError from "passbolt-styleguide/src/shared/models/entity/abstract/entityValidationError";
+import GroupUpdateEntity from "./groupUpdateEntity";
+import GroupEntity from "../groupEntity";
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
 
 describe("Group update entity", () => {
   it("schema must validate", () => {
@@ -40,8 +33,8 @@ describe("Group update entity", () => {
 
   it("constructor works fails if not enough data is provided", () => {
     try {
-      new GroupUpdateEntity({})
-    } catch(error) {
+      new GroupUpdateEntity({});
+    } catch (error) {
       expect(error).toBeInstanceOf(EntityValidationError);
       expect(typeof error.details).toEqual("object");
       expect(error.details.id).not.toBeUndefined();

package/src/all/background_page/model/entity/groupUser/change/groupUserChangeEntity.js

@@ -10,9 +10,9 @@
  * @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 {GroupUserEntity} = require('../groupUserEntity');
+import Entity from "passbolt-styleguide/src/shared/models/entity/abstract/entity";
+import GroupUserEntity from "../groupUserEntity";
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
 
 const ENTITY_NAME = 'GroupUser';
 const GROUP_USER_CHANGE_CREATE = 'create';
@@ -21,17 +21,14 @@ const GROUP_USER_CHANGE_UPDATE = 'update';
 
 class GroupUserChangeEntity extends Entity {
   /**
-   * GroupUserChange entity constructor
-   *
-   * @param {Object} groupUserChangesDto data transfer object
-   * @throws EntityValidationError if the dto cannot be converted into an entity
+   * @inheritDoc
    */
-  constructor(groupUserChangesDto) {
+  constructor(groupUserChangesDto, options = {}) {
     super(EntitySchema.validate(
       GroupUserChangeEntity.ENTITY_NAME,
       groupUserChangesDto,
       GroupUserChangeEntity.getSchema()
-    ));
+    ), options);
   }
 
   /**
@@ -71,8 +68,8 @@ class GroupUserChangeEntity extends Entity {
     if (!groupUser || !(groupUser instanceof GroupUserEntity)) {
       throw new TypeError('GroupUserChangeEntity createFromGroupUser expect a GroupUser entity.');
     }
-    let changeDto = {};
-    switch(operation) {
+    const changeDto = {};
+    switch (operation) {
       case GroupUserChangeEntity.GROUP_USER_CHANGE_CREATE:
         if (!groupUser.userId) {
           throw new TypeError('GroupUserChangeEntity createFromGroupUser update expect a group user user_id.');
@@ -102,9 +99,11 @@ class GroupUserChangeEntity extends Entity {
     return new GroupUserChangeEntity(changeDto);
   }
 
-  // ==================================================
-  // Dynamic properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Dynamic properties getters
+   * ==================================================
+   */
 
   /**
    * Get group user id
@@ -155,9 +154,11 @@ class GroupUserChangeEntity extends Entity {
     return GroupUserChangeEntity.GROUP_USER_CHANGE_UPDATE;
   }
 
-  // ==================================================
-  // Static properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Static properties getters
+   * ==================================================
+   */
 
   /**
    * GroupUserChangeEntity.ENTITY_NAME
@@ -192,4 +193,4 @@ class GroupUserChangeEntity extends Entity {
   }
 }
 
-exports.GroupUserChangeEntity = GroupUserChangeEntity;
+export default GroupUserChangeEntity;

package/src/all/background_page/model/entity/groupUser/change/groupUserChangeEntity.test.js

@@ -10,15 +10,8 @@
  * @license       https://opensource.org/licenses/AGPL-3.0 AGPL License
  * @link          https://www.passbolt.com Passbolt(tm)
  */
-import Validator from 'validator';
-import {GroupUserChangeEntity} from "./groupUserChangeEntity";
-import {GroupUserEntity} from "../groupUserEntity";
-
-// Reset the modules before each test.
-beforeEach(() => {
-  window.Validator = Validator;
-  jest.resetModules();
-});
+import GroupUserChangeEntity from "./groupUserChangeEntity";
+import GroupUserEntity from "../groupUserEntity";
 
 describe("Group user change entity", () => {
   it("constructor works if valid minimal DTO is provided", () => {

package/src/all/background_page/model/entity/groupUser/change/groupUserChangesCollection.js

@@ -10,29 +10,28 @@
  * @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 {GroupUserChangeEntity} = require("./groupUserChangeEntity");
-const {GroupsUsersCollection} = require("../groupsUsersCollection");
+import EntityCollection from "passbolt-styleguide/src/shared/models/entity/abstract/entityCollection";
+import GroupsUsersCollection from "../groupsUsersCollection";
+import GroupUserChangeEntity from "./groupUserChangeEntity";
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
 
 const ENTITY_NAME = 'GroupUserChanges';
 
 class GroupUserChangesCollection extends EntityCollection {
   /**
-   * PermissionChanges Entity constructor
-   *
-   * @param {array} groupUserChangesDto group user changes DTO
-   * @throws EntityValidationError if the dto cannot be converted into an entity
+   * @inheritDoc
    */
-  constructor(groupUserChangesDto) {
+  constructor(groupUserChangesDto, options = {}) {
     super(EntitySchema.validate(
       GroupUserChangesCollection.ENTITY_NAME,
       groupUserChangesDto,
       GroupUserChangesCollection.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(groupUserChange => {
       this.push(groupUserChange);
     });
@@ -50,7 +49,7 @@ class GroupUserChangesCollection extends EntityCollection {
     return {
       "type": "array",
       "items": GroupUserChangeEntity.getSchema(),
-    }
+    };
   }
 
   /**
@@ -66,7 +65,7 @@ class GroupUserChangesCollection extends EntityCollection {
     const result = new GroupUserChangesCollection([]);
 
     // Find new or updated group user
-    for (let updatedGroupUser of expectedSet) {
+    for (const updatedGroupUser of expectedSet) {
       const groupUser = originalSet.getGroupUserByUserId(updatedGroupUser.userId);
       if (!groupUser) {
         const newChange = GroupUserChangeEntity.createFromGroupUser(updatedGroupUser, GroupUserChangeEntity.GROUP_USER_CHANGE_CREATE);
@@ -81,7 +80,7 @@ class GroupUserChangesCollection extends EntityCollection {
     }
 
     // Find deleted groups users
-    for (let originalGroupUser of originalSet) {
+    for (const originalGroupUser of originalSet) {
       if (!expectedSet.getById(originalGroupUser.id)) {
         const newChange = GroupUserChangeEntity.createFromGroupUser(originalGroupUser, GroupUserChangeEntity.GROUP_USER_CHANGE_DELETE);
         result.push(newChange);
@@ -91,9 +90,11 @@ class GroupUserChangesCollection extends EntityCollection {
     return result;
   }
 
-  // ==================================================
-  // Setters
-  // ==================================================
+  /*
+   * ==================================================
+   * Setters
+   * ==================================================
+   */
 
   /**
    * Push a copy of the group user change to the list
@@ -110,9 +111,11 @@ class GroupUserChangesCollection extends EntityCollection {
     super.push(groupUserChange);
   }
 
-  // ==================================================
-  // Static getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Static getters
+   * ==================================================
+   */
 
   /**
    * ActionLogsCollection.ENTITY_NAME
@@ -123,4 +126,4 @@ class GroupUserChangesCollection extends EntityCollection {
   }
 }
 
-exports.GroupUserChangesCollection = GroupUserChangesCollection;
+export default GroupUserChangesCollection;

package/src/all/background_page/model/entity/groupUser/groupUserEntity.js

@@ -11,24 +11,22 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.13.0
  */
-const {Entity} = require('../abstract/entity');
-const {EntitySchema} = require('../abstract/entitySchema');
+import Entity from "passbolt-styleguide/src/shared/models/entity/abstract/entity";
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
+import Validator from "validator";
 
 const ENTITY_NAME = 'GroupUser';
 
 class GroupUserEntity extends Entity {
   /**
-   * GroupUser entity constructor
-   *
-   * @param {Object} groupUserDto groupUser DTO
-   * @throws EntityValidationError if the dto cannot be converted into an entity
+   * @inheritDoc
    */
-  constructor(groupUserDto) {
+  constructor(groupUserDto, options = {}) {
     super(EntitySchema.validate(
       GroupUserEntity.ENTITY_NAME,
       groupUserDto,
       GroupUserEntity.getSchema()
-    ));
+    ), options);
   }
 
   /**
@@ -62,11 +60,13 @@ class GroupUserEntity extends Entity {
           "type": "string",
           "format": "date-time"
         }
-        // NO ASSOCIATIONS
-        // users or groups are omitted
-        // to avoid circular dependencies
+        /*
+         * NO ASSOCIATIONS
+         * users or groups are omitted
+         * to avoid circular dependencies
+         */
       }
-    }
+    };
   }
 
   /**
@@ -77,9 +77,11 @@ class GroupUserEntity extends Entity {
     return Object.assign({}, this._props);
   }
 
-  // ==================================================
-  // Dynamic properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Dynamic properties getters
+   * ==================================================
+   */
   /**
    * Get groupUser id
    * @returns {(string|null)} uuid
@@ -120,9 +122,11 @@ class GroupUserEntity extends Entity {
     return this._props.created || null;
   }
 
-  // ==================================================
-  // Dynamic properties setters
-  // ==================================================
+  /*
+   * ==================================================
+   * Dynamic properties setters
+   * ==================================================
+   */
 
   /**
    * Set the group user id
@@ -137,9 +141,11 @@ class GroupUserEntity extends Entity {
     this._props.id = id;
   }
 
-  // ==================================================
-  // Static properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Static properties getters
+   * ==================================================
+   */
   /**
    * GroupUserEntity.ENTITY_NAME
    * @returns {string}
@@ -157,4 +163,4 @@ class GroupUserEntity extends Entity {
   }
 }
 
-exports.GroupUserEntity = GroupUserEntity;
+export default GroupUserEntity;

package/src/all/background_page/model/entity/groupUser/groupUserEntity.test.fixtures.js

@@ -31,4 +31,4 @@ exports.GroupUserEntityFixtures = {
     "is_admin": true,
     "created": "2020-09-18T04:33:01+00:00"
   }
-}
+};

package/src/all/background_page/model/entity/groupUser/groupUserEntity.test.js

@@ -11,16 +11,9 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.13.0
  */
-import {GroupUserEntity} from "./groupUserEntity";
+import GroupUserEntity from "./groupUserEntity";
 import {GroupUserEntityFixtures} from "./groupUserEntity.test.fixtures";
-import {EntitySchema} from "../abstract/entitySchema";
-import Validator from 'validator';
-
-// Reset the modules before each test.
-beforeEach(() => {
-  window.Validator = Validator;
-  jest.resetModules();
-});
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
 
 describe("Group user entity", () => {
   it("schema must validate", () => {

package/src/all/background_page/model/entity/groupUser/groupUsersEntity.test.data.js

@@ -0,0 +1,38 @@
+/**
+ * Passbolt ~ Open source password manager for teams
+ * Copyright (c) 2022 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) 2022 Passbolt SA (https://www.passbolt.com)
+ * @license       https://opensource.org/licenses/AGPL-3.0 AGPL License
+ * @link          https://www.passbolt.com Passbolt(tm)
+ * @since         3.6.0
+ */
+import {v4 as uuidv4} from "uuid";
+
+// @deprecated since v4.5.0
+
+export const createGroupUser = (data = {}) => {
+  const defaultData = {
+    user_id:  uuidv4(),
+    group_id: uuidv4(),
+    is_admin: false
+  };
+
+  return Object.assign(defaultData, data);
+};
+
+export const defaultGroupsUser = (data = {}) => {
+  const defaultData = createGroupUser({
+    id: uuidv4(),
+    user_id: uuidv4(),
+    created_by: uuidv4(),
+    modified_by: uuidv4(),
+    created: "2022-01-13T13:19:04.661Z",
+    modified: "2022-01-13T13:19:04.661Z",
+  });
+  return Object.assign(defaultData, data);
+};