passbolt-browser-extension 3.0.6 → 4.6.2

package/src/all/background_page/model/entity/user/userEntity.js

@@ -11,47 +11,54 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.13.0
  */
-const {Entity} = require('../abstract/entity');
-const {EntitySchema} = require('../abstract/entitySchema');
-const {RoleEntity} = require('../role/roleEntity');
-const {ProfileEntity} = require('../profile/profileEntity');
-const {GpgkeyEntity} = require('../gpgkey/gpgkeyEntity');
-const {GroupsUsersCollection} = require('../groupUser/groupsUsersCollection');
+import Entity from "passbolt-styleguide/src/shared/models/entity/abstract/entity";
+import RoleEntity from "passbolt-styleguide/src/shared/models/entity/role/roleEntity";
+import ProfileEntity from "../profile/profileEntity";
+import GpgkeyEntity from "../gpgkey/gpgkeyEntity";
+import GroupsUsersCollection from "../groupUser/groupsUsersCollection";
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
+import AccountRecoveryUserSettingEntity from "../accountRecovery/accountRecoveryUserSettingEntity";
+import AppEmailValidatorService from "../../../service/validator/appEmailValidatorService";
+import PendingAccountRecoveryRequestEntity from "../accountRecovery/pendingAccountRecoveryRequestEntity";
 
 const ENTITY_NAME = 'User';
 
 class UserEntity extends Entity {
   /**
-   * User entity constructor
-   *
-   * @param {Object} userDto user DTO
-   * @param {Object} [associations] optional {groups_users: <boolean>}
-   * @throws EntityValidationError if the dto cannot be converted into an entity
+   * @inheritDoc
    */
-  constructor(userDto, associations) {
+  constructor(userDto, options = {}) {
     super(EntitySchema.validate(
       UserEntity.ENTITY_NAME,
       UserEntity._cleanupLastLoginDate(userDto),
-      UserEntity.getSchema(associations)
-    ));
+      UserEntity.getSchema()
+    ), options);
 
     // Associations
     if (this._props.profile) {
-      this._profile = new ProfileEntity(this._props.profile);
+      this._profile = new ProfileEntity(this._props.profile, {clone: false});
       delete this._props.profile;
     }
     if (this._props.role) {
-      this._role = new RoleEntity(this._props.role);
+      this._role = new RoleEntity(this._props.role, {clone: false});
       delete this._props.role;
     }
     if (this._props.gpgkey) {
-      this._gpgkey = new GpgkeyEntity(this._props.gpgkey);
+      this._gpgkey = new GpgkeyEntity(this._props.gpgkey, {clone: false});
       delete this._props.gpgkey;
     }
     if (this._props.groups_users) {
-      this._groups_users = new GroupsUsersCollection(this._props.groups_users);
+      this._groups_users = new GroupsUsersCollection(this._props.groups_users, {clone: false});
       delete this._props.groups_users;
     }
+    if (this._props.account_recovery_user_setting) {
+      this._account_recovery_user_setting = new AccountRecoveryUserSettingEntity(this._props.account_recovery_user_setting, {clone: false});
+      delete this._props.account_recovery_user_setting;
+    }
+    if (this._props.pending_account_recovery_request) {
+      this._pending_account_recovery_request = new PendingAccountRecoveryRequestEntity(this._props.pending_account_recovery_request, {clone: false});
+      delete this._props.pending_account_recovery_request;
+    }
   }
 
   /**
@@ -76,7 +83,7 @@ class UserEntity extends Entity {
         },
         "username": {
           "type": "string",
-          "format": "email"
+          "custom": AppEmailValidatorService.validate
         },
         "active": {
           "type": "boolean"
@@ -84,6 +91,14 @@ class UserEntity extends Entity {
         "deleted": {
           "type": "boolean"
         },
+        "disabled": {
+          "anyOf": [{
+            "type": "string",
+            "format": "date-time"
+          }, {
+            "type": "null"
+          }]
+        },
         "created": {
           "type": "string",
           "format": "date-time"
@@ -107,12 +122,23 @@ class UserEntity extends Entity {
             "type": "null"
           }]
         },
+        "locale": {
+          "anyOf": [{
+            "type": "string",
+            "pattern": /^[a-z]{2}-[A-Z]{2}$/,
+          }, {
+            "type": "null"
+          }]
+        },
+        // Associated models
         "role": RoleEntity.getSchema(),
         "profile": ProfileEntity.getSchema(),
         "gpgkey": GpgkeyEntity.getSchema(),
-        "groups_users": GroupsUsersCollection.getSchema()
+        "groups_users": GroupsUsersCollection.getSchema(),
+        "account_recovery_user_setting": AccountRecoveryUserSettingEntity.getSchema(),
+        "pending_account_recovery_request": PendingAccountRecoveryRequestEntity.getSchema()
       }
-    }
+    };
   }
 
   /**
@@ -128,9 +154,11 @@ class UserEntity extends Entity {
     return dto;
   }
 
-  // ==================================================
-  // Sanitization
-  // ==================================================
+  /*
+   * ==================================================
+   * Sanitization
+   * ==================================================
+   */
   /**
    * Sanitize user dto:
    * - Remove group users which don't validate if any.
@@ -143,23 +171,25 @@ class UserEntity extends Entity {
       return dto;
     }
 
-    if (dto.hasOwnProperty('groups_users')) {
+    if (Object.prototype.hasOwnProperty.call(dto, 'groups_users')) {
       dto.groups_users = GroupsUsersCollection.sanitizeDto(dto.groups_users);
     }
 
     return dto;
   }
 
-  // ==================================================
-  // Serialization
-  // ==================================================
+  /*
+   * ==================================================
+   * Serialization
+   * ==================================================
+   */
   /**
    * Return a DTO ready to be sent to API
    * @param {object} [contain] optional for example {profile: {avatar:true}}
    * @returns {*}
    */
   toDto(contain) {
-    let result = Object.assign({}, this._props);
+    const result = Object.assign({}, this._props);
     if (!contain) {
       return result;
     }
@@ -179,6 +209,12 @@ class UserEntity extends Entity {
     if (this.groupsUsers && contain.groups_users) {
       result.groups_users = this.groupsUsers.toDto();
     }
+    if (this.accountRecoveryUserSetting && contain.account_recovery_user_setting) {
+      result.account_recovery_user_setting = this.accountRecoveryUserSetting.toDto();
+    }
+    if (this.pendingAccountRecoveryUserRequest && contain.pending_account_recovery_request) {
+      result.pending_account_recovery_request = this.pendingAccountRecoveryUserRequest.toDto();
+    }
     return result;
   }
 
@@ -190,9 +226,11 @@ class UserEntity extends Entity {
     return this.toDto(UserEntity.ALL_CONTAIN_OPTIONS);
   }
 
-  // ==================================================
-  // Dynamic properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Dynamic properties getters
+   * ==================================================
+   */
   /**
    * Get user id
    * @returns {(string|null)} uuid
@@ -274,17 +312,35 @@ class UserEntity extends Entity {
     return this._props.is_mfa_enabled;
   }
 
+  /**
+   * Get the user locale.
+   * @returns {(string|null)}
+   */
+  get locale() {
+    return this._props.locale || null;
+  }
+
+  /**
+   * Set the user locale
+   * @params {string} locale The locale to set
+   */
+  set locale(locale) {
+    this._props.locale = locale;
+  }
+
   /**
    * UserEntity.ALL_CONTAIN_OPTIONS
    * @returns {object} all contain options that can be used in toDto()
    */
   static get ALL_CONTAIN_OPTIONS() {
-    return {profile: ProfileEntity.ALL_CONTAIN_OPTIONS, role: true, gpgkey: true, groups_users: true};
+    return {profile: ProfileEntity.ALL_CONTAIN_OPTIONS, role: true, gpgkey: true, groups_users: true, account_recovery_user_setting: true, pending_account_recovery_request: true};
   }
 
-  // ==================================================
-  // Static properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Static properties getters
+   * ==================================================
+   */
   /**
    * ProfileEntity.ENTITY_NAME
    * @returns {string}
@@ -293,9 +349,11 @@ class UserEntity extends Entity {
     return ENTITY_NAME;
   }
 
-  // ==================================================
-  // Associated properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Associated properties getters
+   * ==================================================
+   */
   /**
    * Get user profile
    * @returns {(ProfileEntity|null)} profile
@@ -328,6 +386,21 @@ class UserEntity extends Entity {
     return this._groups_users || null;
   }
 
+  /**
+   * Get user account recover setting
+   * @returns {(accountRecoverUserSetting|null)} account recover setting
+   */
+  get accountRecoveryUserSetting() {
+    return this._account_recovery_user_setting || null;
+  }
+
+  /**
+   * Get the pending account recovery request
+   * @returns {AccountRecoveryRequestEntity|null} pending account recovery request
+   */
+  get pendingAccountRecoveryUserRequest() {
+    return this._pending_account_recovery_request || null;
+  }
 }
 
-exports.UserEntity = UserEntity;
+export default UserEntity;

package/src/all/background_page/model/entity/user/userEntity.test.fixtures.js

@@ -1,10 +1,27 @@
-exports.UserEntityTestFixtures = {
-  "default": {
+/**
+ * Passbolt ~ Open source password manager for teams
+ * Copyright (c) 2021 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) 2021 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.0.0
+ */
+
+import {pgpKeys} from "../../../../../../test/fixtures/pgpKeys/keys";
+
+export const defaultUserEntityTestFixtures = (data = {}) => {
+  const defaultData = {
     "id": "d57c10f5-639d-5160-9c81-8a0c6c4ec856",
     "role_id": "0d51c3a8-5e67-5e3d-882f-e1868966d817",
     "username": "admin@passbolt.com",
     "active": true,
     "deleted": false,
+    "disabled": null,
     "created": "2020-04-20T11:32:16+00:00",
     "modified": "2020-04-20T11:32:16+00:00",
     "last_logged_in": "2012-07-04T13:39:25+00:00",
@@ -49,7 +66,7 @@ exports.UserEntityTestFixtures = {
     "gpgkey": {
       "id": "91d8a7fd-3ab3-5e98-a4a5-0d8694ff23b9",
       "user_id": "d57c10f5-639d-5160-9c81-8a0c6c4ec856",
-      "armored_key": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBFY06pcBEADjYRuq05Zatu4qYtXmexbrwtUdakNJJHPlWxcusohdTLUmSXrt\n7LegXBE3OjvV9HbdBQfbpjitFp8eJw5krYQmh1+w\/UYjb5Jy\/A7ma3oawzbVwNpL\nwuAafYma5LLLloZD\/OpYKprhWfW9FHKyq6t+AcH5CFs\/HvixdrdbAO7K1\/z6mgWc\nT6HBP5\/dGTseAlrvUDTsW1kzo6qsrOWoUunrqm31umsvcfNROtDKM16zgZl+GlYY\n1BxNcRKr1\/AcZUrp4zdSSc6IXrYjJ+1kgHz\/ZoSrKn5QiqEn7wQEveJu+jNGSv8j\nMvQgjq+AmzveJ\/4f+RQirbe9JOeDgzX7NqloRil3I0FPFoivbRU0PHi4N2q7sN8e\nYpXxXzuL+OEq1GQe5fTsSotQTRZUJxbdUS8DfPckQaK79HoybTQAgA6mgQf\/C+U0\nX2TiBUzgBuhayiW12kHmKyK02htDeRNOYs4bBMdeZhAFm+5C74LJ3FGQOHe+\/o2o\nBktk0rAZScjizijzNzJviRB\/3nAJSBW6NSNYcbnosk0ET2osg2tLvzegRI6+NQJE\nb0EpByTMypUDhCNKgg5aEDUVWcq4iucps\/1e6\/2vg2XVB7xdphT4\/K44ZeBHdFuf\nhGQvs8rkAPzpkpsEWKgpTR+hdhbMmNiL984Ywk98nNuzgfkgpcP57xawNwARAQAB\ntCtQYXNzYm9sdCBEZWZhdWx0IEFkbWluIDxhZG1pbkBwYXNzYm9sdC5jb20+iQJO\nBBMBCgA4AhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAFiEEDB0XYRENHjPJAG0a\nWxszLtBkJtMFAl0bmoYACgkQWxszLtBkJtPnxg\/\/Q9WOWUGf7VOnfbaIix3NGAON\nI7rgXuLFc1E0vG20XWT2+C6xGskFwjoJbiyDrbMYnILGn7vDIn3MSoITemLjtt97\n\/lEXK7AgbJEWQWF1lxpXm0nCvjJ6h+qatGK96ncjcua6ecUut10A\/CACpuqxfKOh\nD6CaM5l\/ksEDtwvrv2MIaVajuCvwg+yUx0I0rfAQv0YTXbJ5MRn1pvOo3c6n5Q0z\n5eu\/iiG0UNNIE3Tk5KpT02MTMv5ullpt3mtNjMHH0\/TdPxCtUKVh4q34x3syiYLe\npaddf5Ctv9CL52VWfsG3qFPHp7euOFY8lfzuemoqD9jcE7QIJnkCmwtLXLQrE0O2\nRW\/y\/oXqrETXu2sFyHMr1Xw\/\/QeJgIv63LBGmcPOj93VyHIlcUDarM2oq2+DXKxr\nDs2xfnFKVCZwpSvecIfKXUKsnX3AGrpetoZdfw0jAUVI3nt6YCu8KvczXxetfjOV\n3HHXa40gtOZk5OoKbfuTjzQlpc1oaDyLH8PT1GYsN3wWoDs4zulh6uKDpSt+4z58\nH1BfPFlrO2uhZSfk3E83uBQXZcABeXNxCdrTCJm8P90sbjLu1TlaeOnrWwVT7Yq8\ni8LE7lbAXnT1HjQlDi8GB2+2EnZZmOX+Z84a16jDElZazUNsE8zT7OmyjuB7GGDb\nQEFYzkb9dr1j1sukzty5Ag0EVjTqlwEQAJ37C9s4pq4jvcEF3bJgL+q3SBolgBIp\nN1g1\/woi9vEiOh+7e08Kr8mEhF04cpRDbhY6dcZ8OIXIQ99fgdNXfehlAWnI56NE\n\/FOIyif8TvGBfO6yE35fKSskwGNdUZWIZ0U0pxSXQvB+KEGWlq2c3Uf\/jhTZDnLN\nvfDjnYmn5ycp5sVWhtAmKFha9NJ6LGA0D1MC+jcCJCKtQRGgVvlqOESFDmQ7Pu8\/\nayr2BO0URHJ0Ob30lHluCnoKIv50qGpL9BYuGAdCfLBHXzRQhHIbfc\/cTPkK1kTX\nX5x\/MkiEl88TeGN+yjNVS7qqdxYgs+QYnDDZqevhWEvVyXVQjcCWSIHfjL1x5Ndq\nYL6+ci\/OxyIFoPs4K2umN3JPmpFi+fIPh2CexKy6BnyE8oAgNvgdDb6ZOfAtvShZ\nPM7QG4LZal2+nYp4n7gJRh6kepTQT\/4Bua0xOtRQhgcI4nGtcCxEDRMMzjqbGYlc\nnciMjsiMg9LPpWPDA+xKrRZKYwVFy8vLx\/alOz\/h1BZjx2u7YmuaGENxE62Lfyh0\nxeoCBDTdnWEOQTH6LVsomVtUO1FVap1t5jkYSdpxBuHf8\/2Ye7N3FTMRKe9n4e75\nsAJ00utnMl6P2Zca9mM4T29PK+LPFx2G2h35DQ7MbEid1cAZ8QVR3UyoiR8+u9jM\nek+9uFCm+nAxABEBAAGJAjYEGAEKACACGwwWIQQMHRdhEQ0eM8kAbRpbGzMu0GQm\n0wUCXRuamQAKCRBbGzMu0GQm004PD\/9sFmFkdoSqwU\/En77+h0gt4knlgZbgj0iR\nromnknIwLKBbJJXksHmMPXJB9b3WZ\/gGV3pPVtDWDKg3NZW4HLK13w3s3wQ2ViVV\nA6FzABDSkI3YBqkkasLRZU7oN9XajdFfph5wLhDSgTCjSncGfcjVzPugWKLqPPih\nZO6mpqxSFYEhx+p\/O80Tlj90UsOFRdot7cqn5wOhXZtKsQ0RwaA\/uq\/sFe6UNKHG\n2RBgQfoj5JbazJbvlgMiWxhBalwZKQWs8IBh\/4ag8AFwwoJN+gOtNM9C4UCHu+yt\n0Tv2\/Tu+Apcj0oyFaKJD4uQUmChQ2fDRysqJEIhee+yL29mrdcB4jG7Q2rt8HbhY\nwlsHKgas0YIHdR6dUOCiyw72i0khwrd2PDgxKRu5+cob6wMSqXbIIxFLLLACHy2s\nKd6fQcg8FxoivEiF0lRfMi32A\/YWGJ\/k1OoFCzW55KFXqqBMptYZWh2Jezhttmid\nYHPc7jas7HEPnw3SvVM0gYAcmEVWWvjKfUpOhSYYkk\/B71w9RuIpPyyI7G2XI8Db\nG2ttngDIOL8njS6ybU9Og6yTNUoHL1wWEZN1b3fznKHcC9lyr8MIg00QNeDItt9i\nILCOkjoEdUdauqlRIa+EmUu+AL+JobrlQTzyrCIm7aaT3Hp9EyaEx5xvJDWtmjgf\nFYNCFtV1fw==\n=amwR\n-----END PGP PUBLIC KEY BLOCK-----",
+      "armored_key": pgpKeys.ada.public,
       "bits": 4096,
       "uid": "Passbolt Default Admin \u003Cadmin@passbolt.com\u003E",
       "key_id": "D06426D3",
@@ -60,6 +77,24 @@ exports.UserEntityTestFixtures = {
       "deleted": false,
       "created": "2020-04-20T11:32:18+00:00",
       "modified": "2020-04-20T11:32:18+00:00"
+    },
+    "account_recovery_user_setting": {
+      "id": "d4c0e643-3967-443b-93b3-102d902c4510",
+      "user_id": "d57c10f5-639d-5160-9c81-8a0c6c4ec856",
+      "status": "approved",
+      "created": "2020-05-04T20:31:45+00:00",
+      "modified": "2020-05-04T20:31:45+00:00",
+      "created_by": "d57c10f5-639d-5160-9c81-8a0c6c4ec856",
+      "modified_by": "d57c10f5-639d-5160-9c81-8a0c6c4ec856"
+    },
+    "pending_account_recovery_request": {
+      "id": "d4c0e643-3967-443b-93b3-102d902c4510",
+      "status": "pending",
+      "created": "2020-05-04T20:31:45+00:00",
+      "modified": "2020-05-04T20:31:45+00:00",
+      "created_by": "d57c10f5-639d-5160-9c81-8a0c6c4ec856",
+      "modified_by": "d57c10f5-639d-5160-9c81-8a0c6c4ec856"
     }
-  }
-}
+  };
+  return Object.assign(defaultData, data);
+};

package/src/all/background_page/model/entity/user/userEntity.test.js

@@ -11,17 +11,16 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.13.0
  */
-import {UserEntity} from "./userEntity";
-import {UserEntityTestFixtures} from "./userEntity.test.fixtures";
-import {EntitySchema} from "../abstract/entitySchema";
-import {EntityValidationError} from '../abstract/entityValidationError';
-import Validator from 'validator';
-
-// Reset the modules before each test.
-beforeEach(() => {
-  window.Validator = Validator;
-  jest.resetModules();
-});
+import UserEntity from "./userEntity";
+import {defaultUserEntityTestFixtures} from "./userEntity.test.fixtures";
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
+import EntityValidationError from "passbolt-styleguide/src/shared/models/entity/abstract/entityValidationError";
+import {
+  customEmailValidationProOrganizationSettings
+} from "../organizationSettings/organizationSettingsEntity.test.data";
+import OrganizationSettingsModel from "../../organizationSettings/organizationSettingsModel";
+import OrganizationSettingsEntity from "../organizationSettings/organizationSettingsEntity";
+import {defaultUserDto} from "passbolt-styleguide/src/shared/models/entity/user/userEntity.test.data";
 
 describe("User entity", () => {
   it("schema must validate", () => {
@@ -43,13 +42,16 @@ describe("User entity", () => {
   });
 
   it("constructor works if valid DTO with associated entity data is provided", () => {
-    const dto = UserEntityTestFixtures.default;
+    const dto = defaultUserEntityTestFixtures({
+      "disabled": "2025-04-20T11:32:16+00:00",
+    });
     const filtered = {
       "id": "d57c10f5-639d-5160-9c81-8a0c6c4ec856",
       "role_id": "0d51c3a8-5e67-5e3d-882f-e1868966d817",
       "username": "admin@passbolt.com",
       "active": true,
       "deleted": false,
+      "disabled": "2025-04-20T11:32:16+00:00",
       "created": "2020-04-20T11:32:16+00:00",
       "modified": "2020-04-20T11:32:16+00:00",
       "last_logged_in": "2012-07-04T13:39:25+00:00",
@@ -63,22 +65,27 @@ describe("User entity", () => {
     expect(entity.role).not.toBe(null);
     expect(entity.profile).not.toBe(null);
     expect(entity.gpgkey).not.toBe(null);
+    expect(entity.accountRecoveryUserSetting).not.toBe(null);
     expect(entity.role.name).toEqual('admin');
     expect(entity.isMfaEnabled).toBe(false);
     expect(entity.gpgkey.armoredKey.startsWith('-----BEGIN PGP PUBLIC KEY BLOCK-----')).toBe(true);
+    expect(entity.accountRecoveryUserSetting.status).toEqual('approved');
+    expect(entity.pendingAccountRecoveryUserRequest).not.toBe(null);
+    expect(entity.pendingAccountRecoveryUserRequest.status).toEqual('pending');
 
-    const dtoWithContain = entity.toDto({role: true, profile: true, gpgkey: true});
+    const dtoWithContain = entity.toDto({role: true, profile: true, gpgkey: true, account_recovery_user_setting: true, pending_account_recovery_request: true});
     expect(dtoWithContain.role.name).toEqual('admin');
     expect(dtoWithContain.profile.first_name).toEqual('Admin');
     expect(dtoWithContain.gpgkey.armored_key.startsWith('-----BEGIN PGP PUBLIC KEY BLOCK-----')).toBe(true);
     expect(dtoWithContain.is_mfa_enabled).toBe(false);
+    expect(dtoWithContain.pending_account_recovery_request.status).toBe('pending');
   });
 
   it("constructor throws an exception if DTO is missing required field", () => {
     try {
       new UserEntity({"created": "2020-04-20T11:32:17+00:00"});
       expect(false).toBe(true);
-    } catch(error) {
+    } catch (error) {
       expect((error instanceof EntityValidationError)).toBe(true);
       expect(error.hasError('username', 'required')).toBe(true);
       // expect(error.hasError('role_id', 'required')).toBe(true);
@@ -86,23 +93,46 @@ describe("User entity", () => {
   });
 
   it("constructor throws an exception if DTO contains invalid field", () => {
+    expect.assertions(5);
+
     try {
       new UserEntity({
         "id": "🤷",
         "role_id": -0,
         "username": "(ノಠ益ಠ)ノ",
+        "disabled": "it's not a date for sure",
       });
-      expect(false).toBe(true);
-    } catch(error) {
-      expect((error instanceof EntityValidationError)).toBe(true);
+    } catch (error) {
+      expect(error).toBeInstanceOf(EntityValidationError);
       expect(error.hasError('id', 'format')).toBe(true);
       expect(error.hasError('role_id', 'type')).toBe(true);
-      expect(error.hasError('username', 'format')).toBe(true);
+      expect(error.hasError('username', 'custom')).toBe(true);
+      expect(error.hasError('disabled', 'type')).toBe(true);
     }
   });
 
+  it("constructor returns validation error if the username is not standard.", () => {
+    expect.assertions(2);
+    try {
+      const dto = defaultUserDto({username: "ada@passbolt.c"});
+      new UserEntity(dto);
+    } catch (error) {
+      expect(error instanceof EntityValidationError).toBe(true);
+      expect(error.hasError('username', 'custom')).toBe(true);
+    }
+  });
+
+  it("constructor works if the username is not standard and the application settings defined a custom validation.", () => {
+    expect.assertions(1);
+    const organizationSettings = customEmailValidationProOrganizationSettings();
+    OrganizationSettingsModel.set(new OrganizationSettingsEntity(organizationSettings));
+    const dto = defaultUserDto({username: "ada@passbolt.c"});
+    const entity = new UserEntity(dto);
+    expect(entity.username).toEqual("ada@passbolt.c");
+  });
+
   it("serialization works with full object inside collection", () => {
-    const dto = UserEntityTestFixtures.default;
+    const dto = defaultUserEntityTestFixtures();
     const entity = new UserEntity(dto);
     expect(entity.groupsUsers).not.toBeNull();
     expect(entity.groupsUsers.items[0].id).toEqual('03e26ff8-81d2-5b7f-87e4-99bbc40e1f95');
@@ -118,7 +148,6 @@ describe("User entity", () => {
     const entity = new UserEntity(dto);
     expect(entity.isMfaEnabled).toBe(null);
 
-
     const dto2 = {
       "role_id": "a58de6d3-f52c-5080-b79b-a601a647ac85",
       "username": "dame@passbolt.com",

package/src/all/background_page/model/entity/user/usersCollection.js

@@ -11,11 +11,10 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.13.0
  */
-const {EntityCollection} = require('../abstract/entityCollection');
-const {EntitySchema} = require('../abstract/entitySchema');
-const {EntityCollectionError} = require('../abstract/entityCollectionError');
-const {UserEntity} = require('./userEntity');
-const {GroupsUsersCollection} = require("../groupUser/groupsUsersCollection");
+import EntityCollection from "passbolt-styleguide/src/shared/models/entity/abstract/entityCollection";
+import UserEntity from "./userEntity";
+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 = 'Users';
 
@@ -24,21 +23,21 @@ const RULE_UNIQUE_USERNAME = 'unique_username';
 
 class UsersCollection extends EntityCollection {
   /**
-   * Users Entity constructor
-   *
-   * @param {Object} usersCollectionDto user 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.
+   * @throws {EntityCollectionError} Build Rule: Ensure all items in the collection are unique by username.
    */
-  constructor(usersCollectionDto) {
+  constructor(usersCollectionDto, options = {}) {
     super(EntitySchema.validate(
       UsersCollection.ENTITY_NAME,
       usersCollectionDto,
       UsersCollection.getSchema()
-    ));
-
+    ), options);
 
-    // Check if user usernames and ids are unique
-    // Why not this.push? It is faster than adding items one by one
+    /*
+     * Check if user usernames and ids are unique
+     * Why not this.push? It is faster than adding items one by one
+     */
     const ids = this._props.map(user => user.id);
     ids.sort().sort((a, b) => {
       if (a === b) {
@@ -54,7 +53,7 @@ class UsersCollection extends EntityCollection {
 
     // Directly push into the private property _items[]
     this._props.forEach(user => {
-      this._items.push(new UserEntity(user));
+      this._items.push(new UserEntity(user, {clone: false}));
     });
 
     // We do not keep original props
@@ -70,7 +69,7 @@ class UsersCollection extends EntityCollection {
     return {
       "type": "array",
       "items": UserEntity.getSchema(),
-    }
+    };
   }
 
   /**
@@ -98,9 +97,11 @@ class UsersCollection extends EntityCollection {
     return this._items.find(r => (r.id === userId));
   }
 
-  // ==================================================
-  // Sanitization
-  // ==================================================
+  /*
+   * ==================================================
+   * Sanitization
+   * ==================================================
+   */
   /**
    * Sanitize user dto:
    * - Remove group users which don't validate if any.
@@ -118,9 +119,11 @@ class UsersCollection extends EntityCollection {
     return sanitizedDto;
   }
 
-  // ==================================================
-  // Assertions
-  // ==================================================
+  /*
+   * ==================================================
+   * Assertions
+   * ==================================================
+   */
   /**
    * Assert there is no other user with the same id in the collection
    *
@@ -133,8 +136,8 @@ class UsersCollection extends EntityCollection {
     }
     const length = this.users.length;
     let i = 0;
-    for(; i < length; i++) {
-      let existingUser = this.users[i];
+    for (; i < length; i++) {
+      const existingUser = this.users[i];
       if (existingUser.id && existingUser.id === user.id) {
         throw new EntityCollectionError(i, UsersCollection.RULE_UNIQUE_ID, `User id ${user.id} already exists.`);
       }
@@ -150,17 +153,19 @@ class UsersCollection extends EntityCollection {
   assertUniqueUsername(user) {
     const length = this.users.length;
     let i = 0;
-    for(; i < length; i++) {
-      let existingUser = this.users[i];
+    for (; i < length; i++) {
+      const existingUser = this.users[i];
       if (existingUser.username === user.username) {
         throw new EntityCollectionError(i, UsersCollection.RULE_UNIQUE_USERNAME, `The username ${user.username} already exists.`);
       }
     }
   }
 
-  // ==================================================
-  // Setters
-  // ==================================================
+  /*
+   * ==================================================
+   * Setters
+   * ==================================================
+   */
   /**
    * Push a copy of the user to the list
    * @param {object} user DTO or UserEntity
@@ -195,14 +200,16 @@ class UsersCollection extends EntityCollection {
    * @param {Array} userIds
    */
   removeMany(userIds) {
-    for(let i in userIds) {
+    for (const i in userIds) {
       this.remove(userIds[i]);
     }
   }
 
-  // ==================================================
-  // Static getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Static getters
+   * ==================================================
+   */
   /**
    * UsersCollection.ENTITY_NAME
    * @returns {string}
@@ -228,4 +235,4 @@ class UsersCollection extends EntityCollection {
   }
 }
 
-exports.UsersCollection = UsersCollection;
+export default UsersCollection;