passbolt-browser-extension 3.0.6 → 4.6.2

package/src/all/background_page/model/entity/resourceType/resourceTypeEntity.test.js

@@ -11,16 +11,9 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         3.0.0
  */
-import {EntityValidationError} from "../abstract/entityValidationError";
-import {EntitySchema} from "../abstract/entitySchema";
-import {ResourceTypeEntity} from "./resourceTypeEntity";
-import Validator from 'validator';
-
-// Reset the modules before each test.
-beforeEach(() => {
-  window.Validator = Validator;
-  jest.resetModules();
-});
+import EntityValidationError from "passbolt-styleguide/src/shared/models/entity/abstract/entityValidationError";
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
+import ResourceTypeEntity from "./resourceTypeEntity";
 
 describe("Resource Type entity", () => {
   it("schema must validate", () => {
@@ -60,20 +53,20 @@ describe("Resource Type entity", () => {
   });
 
   it("constructor returns validation error if dto required fields are missing", () => {
-    let t = () => {new ResourceTypeEntity({'id':'7f077753-0835-4054-92ee-556660ea04f1', 'slug':'test'});};
+    let t = () => { new ResourceTypeEntity({'id': '7f077753-0835-4054-92ee-556660ea04f1', 'slug': 'test'}); };
     expect(t).toThrow(EntityValidationError);
-    t = () => {new ResourceTypeEntity({'id':'7f077753-0835-4054-92ee-556660ea04f1', 'name':'test'});};
+    t = () => { new ResourceTypeEntity({'id': '7f077753-0835-4054-92ee-556660ea04f1', 'name': 'test'}); };
     expect(t).toThrow(EntityValidationError);
-    t = () => {new ResourceTypeEntity({'name':'test', 'slug':'test'});};
+    t = () => { new ResourceTypeEntity({'name': 'test', 'slug': 'test'}); };
     expect(t).toThrow(EntityValidationError);
   });
 
   it("constructor returns validation error if dto fields are invalid", () => {
-    let t = () => {new ResourceTypeEntity({'id':'nope', 'name': 'test', 'slug': 'test'});};
+    let t = () => { new ResourceTypeEntity({'id': 'nope', 'name': 'test', 'slug': 'test'}); };
     expect(t).toThrow(EntityValidationError);
-    t = () => {new ResourceTypeEntity({'id':'nope', 'name':  Array(255).join("a"), 'slug': 'test'});};
+    t = () => { new ResourceTypeEntity({'id': 'nope', 'name': Array(255).join("a"), 'slug': 'test'}); };
     expect(t).toThrow(EntityValidationError);
-    t = () => {new ResourceTypeEntity({'id':'7f077753-0835-4054-92ee-556660ea04f1', 'name': 'test', 'slug': 'test', 'description': Array(257).join("a") });};
+    t = () => { new ResourceTypeEntity({'id': '7f077753-0835-4054-92ee-556660ea04f1', 'name': 'test', 'slug': 'test', 'description': Array(257).join("a")}); };
     expect(t).toThrow(EntityValidationError);
   });
 });

package/src/all/background_page/model/entity/resourceType/resourceTypesCollection.js

@@ -11,32 +11,48 @@
  * @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 {ResourceTypeEntity} = require('./resourceTypeEntity');
+import EntityCollection from "passbolt-styleguide/src/shared/models/entity/abstract/entityCollection";
+import ResourceTypeEntity, {
+  RESOURCE_TYPE_PASSWORD_AND_DESCRIPTION_SLUG, RESOURCE_TYPE_PASSWORD_DESCRIPTION_TOTP_SLUG,
+  RESOURCE_TYPE_PASSWORD_STRING_SLUG, RESOURCE_TYPE_TOTP_SLUG
+} from "./resourceTypeEntity";
+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 = 'ResourceTypes';
 const RULE_UNIQUE_ID = 'unique_id';
 
+const SUPPORTED_RESOURCE_TYPES = [
+  RESOURCE_TYPE_PASSWORD_STRING_SLUG,
+  RESOURCE_TYPE_PASSWORD_AND_DESCRIPTION_SLUG,
+  RESOURCE_TYPE_PASSWORD_DESCRIPTION_TOTP_SLUG,
+  RESOURCE_TYPE_TOTP_SLUG
+];
+
+const PASSWORD_RESOURCE_TYPES = [
+  RESOURCE_TYPE_PASSWORD_STRING_SLUG,
+  RESOURCE_TYPE_PASSWORD_AND_DESCRIPTION_SLUG,
+  RESOURCE_TYPE_PASSWORD_DESCRIPTION_TOTP_SLUG,
+];
+
 class ResourceTypesCollection extends EntityCollection {
   /**
-   * Resource Types Entity constructor
-   *
-   * @param {Object} resourceTypesCollectionDto resourceType 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(resourceTypesCollectionDto) {
+  constructor(resourceTypesCollectionDto, options = {}) {
     super(EntitySchema.validate(
       ResourceTypesCollection.ENTITY_NAME,
       resourceTypesCollectionDto,
       ResourceTypesCollection.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(resourceType => {
-      this.push(new ResourceTypeEntity(resourceType));
+      this.push(new ResourceTypeEntity(resourceType, {clone: false}));
     });
 
     // We do not keep original props
@@ -52,7 +68,7 @@ class ResourceTypesCollection extends EntityCollection {
     return {
       "type": "array",
       "items": ResourceTypeEntity.getSchema(),
-    }
+    };
   }
 
   /**
@@ -72,9 +88,19 @@ class ResourceTypesCollection extends EntityCollection {
     return this._items.map(r => r.id);
   }
 
-  // ==================================================
-  // Assertions
-  // ==================================================
+  /**
+   * Get supported resource types
+   * @return {string[]}
+   */
+  get supportedResourceTypes() {
+    return SUPPORTED_RESOURCE_TYPES;
+  }
+
+  /*
+   * ==================================================
+   * Assertions
+   * ==================================================
+   */
   /**
    * Assert there is no other resourceType with the same id in the collection
    *
@@ -87,17 +113,52 @@ class ResourceTypesCollection extends EntityCollection {
     }
     const length = this.resourceTypes.length;
     let i = 0;
-    for(; i < length; i++) {
-      let existingResourceType = this.resourceTypes[i];
+    for (; i < length; i++) {
+      const existingResourceType = this.resourceTypes[i];
       if (existingResourceType.id && existingResourceType.id === resourceType.id) {
         throw new EntityCollectionError(i, ResourceTypesCollection.RULE_UNIQUE_ID, `Resource type id ${resourceType.id} already exists.`);
       }
     }
   }
 
-  // ==================================================
-  // Setters
-  // ==================================================
+  /**
+   * Is resource type id present (supported)
+   * @param id The id
+   * @return {boolean}
+   */
+  isResourceTypeIdPresent(id) {
+    return this.resourceTypes.some(resourceType => resourceType.id === id);
+  }
+
+  /**
+   * Is resource type password present
+   * @param id The id
+   * @return {boolean}
+   */
+  isPasswordResourceType(id) {
+    const passwordResourceTypesSlug = PASSWORD_RESOURCE_TYPES;
+    return this.resourceTypes.some(resourceType => resourceType.id === id && passwordResourceTypesSlug.includes(resourceType.slug));
+  }
+
+  /*
+   * ==================================================
+   * Filter
+   * ==================================================
+   */
+
+  /**
+   * Filter by password resource types.
+   * @return {void} The function alters the collection itself.
+   */
+  filterByPasswordResourceTypes() {
+    this.filterByPropertyValueIn("slug", PASSWORD_RESOURCE_TYPES);
+  }
+
+  /*
+   * ==================================================
+   * Setters
+   * ==================================================
+   */
   /**
    * Push a copy of the resourceType to the list
    * @param {object} resourceType DTO or ResourceTypeEntity
@@ -109,17 +170,21 @@ class ResourceTypesCollection extends EntityCollection {
     if (resourceType instanceof ResourceTypeEntity) {
       resourceType = resourceType.toDto(); // deep clone
     }
-    const resourceTypeEntity = new ResourceTypeEntity(resourceType); // validate
+    if (this.supportedResourceTypes.includes(resourceType.slug)) {
+      const resourceTypeEntity = new ResourceTypeEntity(resourceType); // validate
 
-    // Build rules
-    this.assertUniqueId(resourceTypeEntity);
+      // Build rules
+      this.assertUniqueId(resourceTypeEntity);
 
-    super.push(resourceTypeEntity);
+      super.push(resourceTypeEntity);
+    }
   }
 
-  // ==================================================
-  // Static getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Static getters
+   * ==================================================
+   */
   /**
    * ResourceTypesCollection.ENTITY_NAME
    * @returns {string}
@@ -137,4 +202,4 @@ class ResourceTypesCollection extends EntityCollection {
   }
 }
 
-exports.ResourceTypesCollection = ResourceTypesCollection;
+export default ResourceTypesCollection;

package/src/all/background_page/model/entity/resourceType/resourceTypesCollection.test.js

@@ -0,0 +1,158 @@
+/**
+ * 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         4.1.0
+ */
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
+import ResourceTypeEntity from "./resourceTypeEntity";
+import ResourceTypesCollection from "./resourceTypesCollection";
+import EntityCollectionError from "passbolt-styleguide/src/shared/models/entity/abstract/entityCollectionError";
+import {
+  resourceTypesCollectionDto
+} from "passbolt-styleguide/src/shared/models/entity/resourceType/resourceTypesCollection.test.data";
+import {
+  TEST_RESOURCE_TYPE_PASSWORD_AND_DESCRIPTION, TEST_RESOURCE_TYPE_PASSWORD_DESCRIPTION_TOTP,
+  TEST_RESOURCE_TYPE_PASSWORD_STRING, TEST_RESOURCE_TYPE_TOTP
+} from "passbolt-styleguide/src/shared/models/entity/resourceType/resourceTypeEntity.test.data";
+
+describe("ResourceTypesCollection", () => {
+  it("schema must validate", () => {
+    EntitySchema.validateSchema(ResourceTypesCollection.ENTITY_NAME, ResourceTypesCollection.getSchema());
+  });
+
+  it("constructor works if valid minimal DTO is provided", () => {
+    const dto = {
+      "id": "a58de6d3-f52c-5080-b79b-a601a647ac85",
+      "name": "test resource type",
+      "slug": "password-string"
+    };
+    const dto2 = {
+      "id": "b58de6d3-f52c-5080-b79b-a601a647ac85",
+      "name": "test resource type",
+      "slug": "password-and-description"
+    };
+    const entity = new ResourceTypeEntity(dto);
+    const entity2 = new ResourceTypeEntity(dto2);
+    const resourceTypesCollection = new ResourceTypesCollection([entity, entity2]);
+    expect(resourceTypesCollection.toDto()).toEqual([dto, dto2]);
+  });
+
+  it("constructor works if valid DTO is provided with optional and non supported fields", () => {
+    const dto = {
+      "id": "a58de6d3-f52c-5080-b79b-a601a647ac85",
+      "name": "test resource type",
+      "slug": "password-string",
+      "description": "A test resource type",
+      "created": "2012-07-04T13:39:25+00:00",
+      "modified": "2012-07-04T13:39:25+00:00",
+      "_nope": 'nope'
+    };
+    const dto2 = {
+      "id": "b58de6d3-f52c-5080-b79b-a601a647ac85",
+      "name": "test resource type 2",
+      "slug": "password-and-description",
+      "description": "A test resource type 2",
+      "created": "2012-07-04T13:39:25+00:00",
+      "modified": "2012-07-04T13:39:25+00:00",
+      "_nope": 'nope'
+    };
+    const filtered = {
+      "id": "a58de6d3-f52c-5080-b79b-a601a647ac85",
+      "name": "test resource type",
+      "slug": "password-string",
+      "description": "A test resource type",
+      "created": "2012-07-04T13:39:25+00:00",
+      "modified": "2012-07-04T13:39:25+00:00",
+    };
+    const filtered2 = {
+      "id": "b58de6d3-f52c-5080-b79b-a601a647ac85",
+      "name": "test resource type 2",
+      "slug": "password-and-description",
+      "description": "A test resource type 2",
+      "created": "2012-07-04T13:39:25+00:00",
+      "modified": "2012-07-04T13:39:25+00:00",
+    };
+    const entity = new ResourceTypeEntity(dto);
+    const entity2 = new ResourceTypeEntity(dto2);
+    const resourceTypesCollection = new ResourceTypesCollection([entity, entity2]);
+    expect(resourceTypesCollection.toDto()).toEqual([filtered, filtered2]);
+  });
+
+  it("constructor fails if reusing same resource", () => {
+    const entity = new ResourceTypeEntity({'id': '7f077753-0835-4054-92ee-556660ea04f1', 'slug': 'password-and-description', 'name': 'test'});
+    const t = () => new ResourceTypesCollection([entity, entity]);
+    expect(t).toThrow(EntityCollectionError);
+  });
+
+  it("constructor should be empty if no resource types are supported", () => {
+    const entity = new ResourceTypeEntity({'id': '7f077753-0835-4054-92ee-556660ea04f1', 'slug': 'test-resource-type', 'name': 'test'});
+    const entity2 = new ResourceTypeEntity({'id': 'af077753-0835-4054-92ee-556660ea04f1', 'slug': 'test-resource-type 2', 'name': 'test2'});
+    const resourceTypesCollection = new ResourceTypesCollection([entity, entity2]);
+    expect(resourceTypesCollection.length).toStrictEqual(0);
+  });
+
+  it("Check if resource type id is present or not in the collection", () => {
+    const dto = {
+      "id": "a58de6d3-f52c-5080-b79b-a601a647ac85",
+      "name": "password string",
+      "slug": "password-string"
+    };
+    const dto2 = {
+      "id": "b58de6d3-f52c-5080-b79b-a601a647ac85",
+      "name": "password and description",
+      "slug": "password-and-description"
+    };
+    const dto3 = {
+      "id": '7f077753-0835-4054-92ee-556660ea04f1',
+      "name": "test resource type",
+      "slug": 'test-resource-type'
+    };
+    const entity = new ResourceTypeEntity(dto);
+    const entity2 = new ResourceTypeEntity(dto2);
+    const entity3 = new ResourceTypeEntity(dto3);
+    const resourceTypesCollection = new ResourceTypesCollection([entity, entity2, entity3]);
+    expect(resourceTypesCollection.isResourceTypeIdPresent("7f077753-0835-4054-92ee-556660ea04f1")).toBeFalsy();
+    expect(resourceTypesCollection.isResourceTypeIdPresent("af077753-0835-4054-92ee-556660ea04f1")).toBeFalsy();
+    expect(resourceTypesCollection.isResourceTypeIdPresent("a58de6d3-f52c-5080-b79b-a601a647ac85")).toBeTruthy();
+    expect(resourceTypesCollection.isResourceTypeIdPresent("b58de6d3-f52c-5080-b79b-a601a647ac85")).toBeTruthy();
+  });
+
+  it("Resource type id present in the collection", () => {
+    const dto = {
+      "id": "a58de6d3-f52c-5080-b79b-a601a647ac85",
+      "name": "test resource type",
+      "slug": "password-string"
+    };
+    const dto2 = {
+      "id": "b58de6d3-f52c-5080-b79b-a601a647ac85",
+      "name": "test resource type",
+      "slug": "password-and-description"
+    };
+    const entity = new ResourceTypeEntity(dto);
+    const entity2 = new ResourceTypeEntity(dto2);
+    const resourceTypesCollection = new ResourceTypesCollection([entity, entity2]);
+    expect(resourceTypesCollection.isResourceTypeIdPresent("a58de6d3-f52c-5080-b79b-a601a647ac85")).toBeTruthy();
+    expect(resourceTypesCollection.isResourceTypeIdPresent("b58de6d3-f52c-5080-b79b-a601a647ac85")).toBeTruthy();
+  });
+
+  describe("ResourceTypesCollection::filterByPasswordResourceTypes", () => {
+    it("should filter the collection by resources types behaving like password.", () => {
+      const resourceTypes = new ResourceTypesCollection(resourceTypesCollectionDto());
+      resourceTypes.filterByPasswordResourceTypes();
+      expect.assertions(5);
+      expect(resourceTypes).toHaveLength(3);
+      expect(resourceTypes.getFirst("id", TEST_RESOURCE_TYPE_PASSWORD_STRING)).toBeTruthy();
+      expect(resourceTypes.getFirst("id", TEST_RESOURCE_TYPE_PASSWORD_AND_DESCRIPTION)).toBeTruthy();
+      expect(resourceTypes.getFirst("id", TEST_RESOURCE_TYPE_PASSWORD_DESCRIPTION_TOTP)).toBeTruthy();
+      expect(resourceTypes.getFirst("id", TEST_RESOURCE_TYPE_TOTP)).toBeFalsy();
+    });
+  });
+});

package/src/all/background_page/model/entity/secret/needed/neededSecretEntity.js

@@ -11,26 +11,24 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         2.13.0
  */
-const {Entity} = require('../../abstract/entity');
-const {EntitySchema} = require('../../abstract/entitySchema');
-const {EntityValidationError} = require('../../abstract/entityValidationError');
+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 = 'NeededSecret';
 
+/**
+ * Needed secret entity is used to request secret that need to be encrypted.
+ */
 class NeededSecretEntity extends Entity {
   /**
-   * NeededSecret entity constructor
-   * Used to request secret to encrypt
-   *
-   * @param {Object} neededSecretDto secret DTO
-   * @throws EntityValidationError if the dto cannot be converted into an entity
+   * @inheritDoc
    */
-  constructor(neededSecretDto) {
+  constructor(neededSecretDto, options = {}) {
     super(EntitySchema.validate(
       NeededSecretEntity.ENTITY_NAME,
       neededSecretDto,
       NeededSecretEntity.getSchema()
-    ));
+    ), options);
   }
 
   /**
@@ -54,12 +52,14 @@ class NeededSecretEntity extends Entity {
           "format": "uuid"
         }
       }
-    }
+    };
   }
 
-  // ==================================================
-  // Dynamic properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Dynamic properties getters
+   * ==================================================
+   */
 
   /**
    * Get needed secret user id
@@ -77,9 +77,11 @@ class NeededSecretEntity extends Entity {
     return this._props.resource_id;
   }
 
-  // ==================================================
-  // Static properties getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Static properties getters
+   * ==================================================
+   */
 
   /**
    * NeededSecretEntity.ENTITY_NAME
@@ -90,4 +92,4 @@ class NeededSecretEntity extends Entity {
   }
 }
 
-exports.NeededSecretEntity = NeededSecretEntity;
+export default NeededSecretEntity;

package/src/all/background_page/model/entity/secret/needed/neededSecretsCollection.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 {NeededSecretEntity} = require("./neededSecretEntity");
+import EntityCollection from "passbolt-styleguide/src/shared/models/entity/abstract/entityCollection";
+import NeededSecretEntity from "./neededSecretEntity";
+import EntitySchema from "passbolt-styleguide/src/shared/models/entity/abstract/entitySchema";
 
 const ENTITY_NAME = 'NeededSecrets';
 
 class NeededSecretsCollection extends EntityCollection {
   /**
-   * Secrets Entity constructor
-   *
-   * @param {Object} NeededSecretsCollectionDto secret DTO
-   * @throws EntityValidationError if the dto cannot be converted into an entity
+   * @inheritDoc
    */
-  constructor(NeededSecretsCollectionDto) {
+  constructor(NeededSecretsCollectionDto, options = {}) {
     super(EntitySchema.validate(
       NeededSecretsCollection.ENTITY_NAME,
       NeededSecretsCollectionDto,
       NeededSecretsCollection.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(neededSecret => {
-      this.push(new NeededSecretEntity(neededSecret));
+      this.push(new NeededSecretEntity(neededSecret, {clone: false}));
     });
 
     // We do not keep original props
@@ -50,7 +49,7 @@ class NeededSecretsCollection extends EntityCollection {
     return {
       "type": "array",
       "items": NeededSecretEntity.getSchema(),
-    }
+    };
   }
 
   /**
@@ -61,9 +60,11 @@ class NeededSecretsCollection extends EntityCollection {
     return this._items;
   }
 
-  // ==================================================
-  // Setters
-  // ==================================================
+  /*
+   * ==================================================
+   * Setters
+   * ==================================================
+   */
 
   /**
    * Push a copy of the needed secret to the list
@@ -81,9 +82,11 @@ class NeededSecretsCollection extends EntityCollection {
     super.push(neededSecretEntity);
   }
 
-  // ==================================================
-  // Static getters
-  // ==================================================
+  /*
+   * ==================================================
+   * Static getters
+   * ==================================================
+   */
 
   /**
    * NeededSecretsCollection.ENTITY_NAME
@@ -94,4 +97,4 @@ class NeededSecretsCollection extends EntityCollection {
   }
 }
 
-exports.NeededSecretsCollection = NeededSecretsCollection;
+export default NeededSecretsCollection;