passbolt-browser-extension 5.3.2 → 5.4.1

package/src/all/background_page/model/export/resources/csvRowComposer/csvNordpassRowComposer.js

@@ -43,7 +43,11 @@ class CsvNordpassRowComposer extends AbstractRowComposer {
     const row = {};
     const externalResourceDto = externalResourceEntity.toDto();
     for (const propertyName in this.mapping) {
-      row[this.mapping[propertyName]] = externalResourceDto[propertyName] || "";
+      if (propertyName === "uris") {
+        row[this.mapping[propertyName]] = externalResourceDto.uris?.length > 0 ? externalResourceDto.uris[0] : "";
+      } else {
+        row[this.mapping[propertyName]] = externalResourceDto[propertyName] || "";
+      }
     }
     return row;
   }

package/src/all/background_page/model/export/resources/csvRowComposer/csvNordpassRowComposer.test.js

@@ -18,7 +18,7 @@ describe("CsvNorpassRowComposer", () => {
     const dto = {
       "name": "Password 1",
       "username": "Username 1",
-      "uri": "https://url1.com",
+      "uris": ["https://url1.com"],
       "secret_clear": "Secret 1",
       "description": "Description 1",
       "folder_parent_path": "Folder 1"
@@ -28,7 +28,7 @@ describe("CsvNorpassRowComposer", () => {
     expect(csvRow).toBeInstanceOf(Object);
     expect(csvRow.name).toEqual(externalResourceEntity.name);
     expect(csvRow.username).toEqual(externalResourceEntity.username);
-    expect(csvRow.url).toEqual(externalResourceEntity.uri);
+    expect(csvRow.url).toEqual(externalResourceEntity.uris[0]);
     expect(csvRow.password).toEqual(externalResourceEntity.secretClear);
     expect(csvRow.note).toEqual(externalResourceEntity.description);
     expect(csvRow.folder).toEqual(externalResourceEntity.folderParentPath);

package/src/all/background_page/model/export/resources/csvRowComposer/csvSafariRowComposer.js

@@ -43,7 +43,11 @@ class CsvSafariRowComposer extends AbstractRowComposer {
     const row = {};
     const externalResourceDto = externalResourceEntity.toDto();
     for (const propertyName in this.mapping) {
-      row[this.mapping[propertyName]] = externalResourceDto[propertyName] || "";
+      if (propertyName === "uris") {
+        row[this.mapping[propertyName]] = externalResourceDto.uris?.length > 0 ? externalResourceDto.uris[0] : "";
+      } else {
+        row[this.mapping[propertyName]] = externalResourceDto[propertyName] || "";
+      }
     }
     return row;
   }

package/src/all/background_page/model/export/resources/csvRowComposer/csvSafariRowComposer.test.js

@@ -18,7 +18,7 @@ describe("CsvSafariRowComposer", () => {
     const dto = {
       "name": "Password 1",
       "username": "Username 1",
-      "uri": "https://url1.com",
+      "uris": ["https://url1.com"],
       "secret_clear": "Secret 1",
       "description": "Description 1",
       "folder_parent_path": "Folder 1"
@@ -28,7 +28,7 @@ describe("CsvSafariRowComposer", () => {
     expect(csvRow).toBeInstanceOf(Object);
     expect(csvRow.Title).toEqual(externalResourceEntity.name);
     expect(csvRow.Username).toEqual(externalResourceEntity.username);
-    expect(csvRow.URL).toEqual(externalResourceEntity.uri);
+    expect(csvRow.URL).toEqual(externalResourceEntity.uris[0]);
     expect(csvRow.Password).toEqual(externalResourceEntity.secretClear);
     expect(csvRow.Notes).toEqual(externalResourceEntity.description);
   });

package/src/all/background_page/model/export/resources/resourcesKdbxExporter.js

@@ -94,7 +94,8 @@ class ResourcesKdbxExporter {
     if (externalResourceEntity.totp) {
       this.setTotpField(kdbxEntry, externalResourceEntity);
     }
-    kdbxEntry.fields.set('URL', externalResourceEntity.uri);
+    this.setUrisFields(kdbxEntry, externalResourceEntity);
+    this.setCustomFields(kdbxEntry, externalResourceEntity);
     kdbxEntry.fields.set('Notes', externalResourceEntity.description);
 
     if (externalResourceEntity.expired) {
@@ -106,6 +107,48 @@ class ResourcesKdbxExporter {
       kdbxEntry.times.expires = false;
     }
 
+    this.setIconField(kdbxEntry, externalResourceEntity);
+  }
+
+  /**
+   * Set the custom fields according to the kdbx format
+   * @param {kdbxweb.KdbxEntry} kdbxEntry
+   * @param {ExternalResourceEntity} externalResourceEntity
+   * @returns {void}
+   */
+  setCustomFields(kdbxEntry, externalResourceEntity) {
+    if (externalResourceEntity.customFields) {
+      externalResourceEntity.customFields.items.forEach(customField => {
+        kdbxEntry.fields.set(customField.key, kdbxweb.ProtectedValue.fromString(customField.value));
+      });
+    }
+  }
+
+  /**
+   * Set the URL fields according to the kdbx format
+   * @param {kdbxweb.KdbxEntry} kdbxEntry
+   * @param {ExternalResourceEntity} externalResourceEntity
+   * @returns {void}
+   */
+  setUrisFields(kdbxEntry, externalResourceEntity) {
+    if (externalResourceEntity.uris && externalResourceEntity.uris.length > 0) {
+      kdbxEntry.fields.set('URL', externalResourceEntity.uris[0]);
+      if (externalResourceEntity.uris.length > 1) {
+        kdbxEntry.fields.set('KP2A_URL', externalResourceEntity.uris[1]);
+        for (let i = 2; i < externalResourceEntity.uris.length; i++) {
+          kdbxEntry.fields.set(`KP2A_URL_${i}`, externalResourceEntity.uris[i]);
+        }
+      }
+    }
+  }
+
+  /**
+   * Set the icon fields according to the kdbx format
+   * @param {kdbxweb.KdbxEntry} kdbxEntry
+   * @param {ExternalResourceEntity} externalResourceEntity
+   * @returns {void}
+   */
+  setIconField(kdbxEntry, externalResourceEntity) {
     if (!externalResourceEntity.icon) {
       return;
     }
@@ -131,7 +174,6 @@ class ResourcesKdbxExporter {
     switch (this.exportEntity.format) {
       case ExportResourcesFileEntity.FORMAT_KDBX: {
         kdbxEntry.fields.set('TimeOtp-Secret-Base32', kdbxweb.ProtectedValue.fromString(totp.secretKey));
-        // Adapt algorithm to match keepass windows
         const algorithm = `HMAC-${totp.algorithm.substring(0, 3)}-${totp.algorithm.substring(3)}`;
         kdbxEntry.fields.set('TimeOtp-Algorithm', algorithm);
         kdbxEntry.fields.set('TimeOtp-Length', totp.digits.toString());

package/src/all/background_page/model/export/resources/resourcesKdbxExporter.test.js

@@ -20,6 +20,7 @@ import ExportResourcesFileEntity from "../../entity/export/exportResourcesFileEn
 import fs from "fs";
 import {defaultTotpDto} from "../../entity/totp/totpDto.test.data";
 import {defaultIconDto} from "passbolt-styleguide/src/shared/models/entity/resource/metadata/iconEntity.test.data";
+import {defaultCustomFieldsCollection} from "passbolt-styleguide/src/shared/models/entity/customField/customFieldsCollection.test.data";
 
 global.kdbxweb = kdbxweb;
 kdbxweb.CryptoEngine.argon2 = argon2;
@@ -30,11 +31,12 @@ describe("ResourcesKdbxExporter", () => {
       id: `7f077753-0835-4054-92ee-556660ea04a${num}`,
       name: `Password ${num}`,
       username: `username${num}`,
-      uri: `https://url${num}.com`,
+      uris: [`https://url${num}.com`, `https://alturl${num}.com`, `https://extraurl${num}.com`],
       description: `Description ${num}`,
       secret_clear: `Secret ${num}`,
       folder_parent_path: '',
       totp: defaultTotpDto(),
+      custom_fields: defaultCustomFieldsCollection(),
       expired: null,
     }, data);
   }
@@ -65,7 +67,7 @@ describe("ResourcesKdbxExporter", () => {
   });
 
   it("should export resources and folders for keepass windows", async() => {
-    expect.assertions(20);
+    expect.assertions(25);
 
     const now = new Date();
     now.setMilliseconds(0);
@@ -121,6 +123,16 @@ describe("ResourcesKdbxExporter", () => {
     expect(digits).toEqual("6");
     expect(period).toEqual("30");
 
+    expect(password1.fields.get('URL')).toEqual("https://url1.com");
+    expect(password1.fields.get('KP2A_URL')).toEqual("https://alturl1.com");
+    expect(password1.fields.get('KP2A_URL_2')).toEqual("https://extraurl1.com");
+
+    const customFields1 = password3.fields.get('Key 0').getText();
+    const customFields2 = password3.fields.get('Key 1').getText();
+
+    expect(customFields1).toEqual("Value 0");
+    expect(customFields2).toEqual("Value 1");
+
     expect(password4.fields.get('Title')).toEqual("Password 4");
     expect(password4.times.expires).toStrictEqual(true);
     expect(password4.times.expiryTime).toStrictEqual(new Date(now));
@@ -167,7 +179,7 @@ describe("ResourcesKdbxExporter", () => {
   });
 
   it("should export resources and folders for other keepass", async() => {
-    expect.assertions(17);
+    expect.assertions(22);
 
     const now = new Date();
     now.setMilliseconds(0);
@@ -217,6 +229,15 @@ describe("ResourcesKdbxExporter", () => {
     const totp = password1.fields.get('otp').getText();
     expect(totp).toEqual("otpauth://totp/Password%201%3Ausername1?secret=DAV3DS4ERAAF5QGH&issuer=https%253A%252F%252Furl1.com&algorithm=SHA1&digits=6&period=30");
 
+    expect(password1.fields.get('URL')).toEqual("https://url1.com");
+    expect(password1.fields.get('KP2A_URL')).toEqual("https://alturl1.com");
+    expect(password1.fields.get('KP2A_URL_2')).toEqual("https://extraurl1.com");
+    const customFields1 = password3.fields.get('Key 0').getText();
+    const customFields2 = password3.fields.get('Key 1').getText();
+
+    expect(customFields1).toEqual("Value 0");
+    expect(customFields2).toEqual("Value 1");
+
     expect(password4.fields.get('Title')).toEqual("Password 4");
     expect(password4.times.expires).toStrictEqual(true);
     expect(password4.times.expiryTime).toStrictEqual(new Date(now));

package/src/all/background_page/model/import/resources/csvRowParser/abstractCsvRowParser.js

@@ -50,7 +50,7 @@ class AbstractCsvRowParser {
     }
 
     // Check how many optional properties the row parser match
-    const optionalFields = ["username", "uri", "description", "folder_parent_path"];
+    const optionalFields = ["username", "uris", "description", "folder_parent_path"];
     const countOptionalFieldsReducer = (count, fieldName) => (csvHasField(fieldName) ? ++count : count);
     const countOptionalFields = optionalFields.reduce(countOptionalFieldsReducer, 0);
 

package/src/all/background_page/model/import/resources/csvRowParser/csv1PasswordRowParser.js

@@ -24,7 +24,7 @@ class Csv1PasswordRowParser extends AbstractCsvRowParser {
     return {
       "name": "Title",
       "username": "Username",
-      "uri": "Url",
+      "uris": "Url",
       "secret_clear": "Password",
       "description": "Notes",
       "folder_parent_path": "Type"
@@ -43,7 +43,9 @@ class Csv1PasswordRowParser extends AbstractCsvRowParser {
     const externalResourceDto = {};
 
     for (const propertyName in this.mapping) {
-      if (data[this.mapping[propertyName]]) {
+      if (propertyName === "uris") {
+        externalResourceDto[propertyName] = [data[this.mapping[propertyName]]];
+      } else if (data[this.mapping[propertyName]]) {
         externalResourceDto[propertyName] = data[this.mapping[propertyName]];
       }
     }
@@ -59,7 +61,7 @@ class Csv1PasswordRowParser extends AbstractCsvRowParser {
       }
       if (!resourceType) {
         //Fallback default content type not supported
-        resourceType = ResourcesTypeImportParser.fallbackDefaulResourceType(resourceTypesCollection, scores);
+        resourceType = ResourcesTypeImportParser.fallbackDefaulResourceType(resourceTypesCollection, metadataTypesSettings);
         importEntity.importResourcesErrors.push(new ImportError("Imported with default content type", externalResourceDto, new Error("No resource type associated to this row.")));
       }
     }

package/src/all/background_page/model/import/resources/csvRowParser/csv1PasswordRowParser.test.js

@@ -65,7 +65,7 @@ describe("Csv1PasswordRowParser", () => {
     const expectedEntity = new ExternalResourceEntity({
       name: data.Title,
       username: data.Username,
-      uri: data.Url,
+      uris: [data.Url],
       resource_type_id: expectedResourceType.id,
       secret_clear: data.Password,
       description: data.Notes,
@@ -77,6 +77,7 @@ describe("Csv1PasswordRowParser", () => {
     expect(externalResourceEntity).toBeInstanceOf(ExternalResourceEntity);
     expect(externalResourceEntity.toDto()).toEqual(expectedEntity.toDto());
   });
+
   it("parses resource of type default-v5 with all properties from csv row", () => {
     expect.assertions(2);
 
@@ -101,7 +102,7 @@ describe("Csv1PasswordRowParser", () => {
     const expectedEntity = new ExternalResourceEntity({
       name: data.Title,
       username: data.Username,
-      uri: data.Url,
+      uris: [data.Url],
       resource_type_id: expectedResourceType.id,
       secret_clear: data.Password,
       description: data.Notes,

package/src/all/background_page/model/import/resources/csvRowParser/csvBitWardenRowParser.js

@@ -14,6 +14,7 @@ import ExternalResourceEntity from "../../../entity/resource/external/externalRe
 import ResourcesTypeImportParser from "../resourcesTypeImportParser";
 import AbstractCsvRowParser from "./abstractCsvRowParser";
 import ImportError from "../../../../error/importError";
+import ExternalTotpEntity from "../../../entity/totp/externalTotpEntity";
 
 class CsvBitWardenRowParser extends AbstractCsvRowParser {
   /**
@@ -24,10 +25,11 @@ class CsvBitWardenRowParser extends AbstractCsvRowParser {
     return {
       "name": "name",
       "username": "login_username",
-      "uri": "login_uri",
+      "uris": "login_uri",
       "secret_clear": "login_password",
       "description": "notes",
-      "folder_parent_path": "folder"
+      "folder_parent_path": "folder",
+      "totp": "login_totp"
     };
   }
 
@@ -43,7 +45,13 @@ class CsvBitWardenRowParser extends AbstractCsvRowParser {
     const externalResourceDto = {};
     for (const propertyName in this.mapping) {
       if (data[this.mapping[propertyName]]) {
-        externalResourceDto[propertyName] = data[this.mapping[propertyName]];
+        if (propertyName === "uris") {
+          externalResourceDto[propertyName] = data[this.mapping[propertyName]] ? data[this.mapping[propertyName]].split(",") : [];
+        } else if (propertyName.toLowerCase() === "totp") {
+          externalResourceDto.totp = this.parseTotp(data[this.mapping[propertyName]]);
+        } else {
+          externalResourceDto[propertyName] = data[this.mapping[propertyName]];
+        }
       }
     }
     resourceTypesCollection.filterByResourceTypeVersion(metadataTypesSettings.defaultResourceTypes);
@@ -66,6 +74,17 @@ class CsvBitWardenRowParser extends AbstractCsvRowParser {
 
     return new ExternalResourceEntity(externalResourceDto);
   }
+
+  /**
+   * Parse the TOTP
+   * @param {string} totpUrl
+   * @return {{secret_key: *, period: *, digits: *, algorithm: *}}
+   */
+  static parseTotp(totpUrl) {
+    const totpUrlDecoded = new URL(decodeURIComponent(totpUrl));
+    const totp = ExternalTotpEntity.createTotpFromUrl(totpUrlDecoded);
+    return totp.toDto();
+  }
 }
 
 export default CsvBitWardenRowParser;

package/src/all/background_page/model/import/resources/csvRowParser/csvBitWardenRowParser.test.js

@@ -18,7 +18,7 @@ import {
 import ResourceTypesCollection from "passbolt-styleguide/src/shared/models/entity/resourceType/resourceTypesCollection";
 import {defaultMetadataTypesSettingsV4Dto, defaultMetadataTypesSettingsV50FreshDto} from "passbolt-styleguide/src/shared/models/entity/metadata/metadataTypesSettingsEntity.test.data";
 import MetadataTypesSettingsEntity from "passbolt-styleguide/src/shared/models/entity/metadata/metadataTypesSettingsEntity";
-import {RESOURCE_TYPE_PASSWORD_AND_DESCRIPTION_SLUG, RESOURCE_TYPE_V5_DEFAULT_SLUG} from "passbolt-styleguide/src/shared/models/entity/resourceType/resourceTypeSchemasDefinition";
+import {RESOURCE_TYPE_PASSWORD_AND_DESCRIPTION_SLUG, RESOURCE_TYPE_PASSWORD_DESCRIPTION_TOTP_SLUG, RESOURCE_TYPE_V5_DEFAULT_SLUG, RESOURCE_TYPE_V5_DEFAULT_TOTP_SLUG} from "passbolt-styleguide/src/shared/models/entity/resourceType/resourceTypeSchemasDefinition";
 import BinaryConvert from "../../../../utils/format/binaryConvert";
 import ImportResourcesFileEntity from "../../../entity/import/importResourcesFileEntity";
 
@@ -49,7 +49,7 @@ describe("CsvBitWardenRowParser", () => {
     const data = {
       "name": "Password 1",
       "login_username": "Username 1",
-      "login_uri": "https://url1.com",
+      "login_uri": "https://url1.com,https://url2.com,https://url3.com",
       "login_password": "Secret 1",
       "notes": "Description 1",
       "folder": "Folder 1"
@@ -67,7 +67,7 @@ describe("CsvBitWardenRowParser", () => {
     const expectedEntity = new ExternalResourceEntity({
       name: data.name,
       username: data.login_username,
-      uri: data.login_uri,
+      uris: data.login_uri.split(","),
       resource_type_id: expectedResourceType.id,
       secret_clear: data.login_password,
       description: data.notes,
@@ -103,11 +103,99 @@ describe("CsvBitWardenRowParser", () => {
     const expectedEntity = new ExternalResourceEntity({
       name: data.name,
       username: data.login_username,
-      uri: data.login_uri,
+      uris: [data.login_uri],
+      resource_type_id: expectedResourceType.id,
+      secret_clear: data.login_password,
+      description: data.notes,
+      folder_parent_path: data.folder,
+    });
+
+    const externalResourceEntity = CsvBitWardenRowParser.parse(data, importEntity, resourceTypesCollection, metadataTypesSettings);
+
+    expect(externalResourceEntity).toBeInstanceOf(ExternalResourceEntity);
+    expect(externalResourceEntity.toDto()).toEqual(expectedEntity.toDto());
+  });
+
+  it("parses resource of type v5-default-with-totp with all properties from csv row", () => {
+    expect.assertions(2);
+
+    const data = {
+      "name": "Password 1",
+      "login_username": "Username 1",
+      "login_uri": "https://url1.com",
+      "login_password": "Secret 1",
+      "notes": "Description 1",
+      "folder": "Folder 1",
+      "login_totp": "otpauth://totp/test.com%20%3A%20admin%40passbolt.com:admin%40passbolt.com?secret=TJSNMLGTCYOEMXZG&period=30&digits=6&issuer=test.com%20%3A%20admin%40passbolt.com"
+    };
+
+    const importDto = {
+      "ref": "import-ref",
+      "file_type": "csv",
+      "file": btoa(BinaryConvert.toBinary(data))
+    };
+    const importEntity = new ImportResourcesFileEntity(importDto);
+    const resourceTypesCollection = new ResourceTypesCollection(resourceTypesCollectionDto());
+    const metadataTypesSettings = new MetadataTypesSettingsEntity(defaultMetadataTypesSettingsV50FreshDto());
+    const expectedResourceType = resourceTypesCollection.items.find(resourceType => resourceType.slug === RESOURCE_TYPE_V5_DEFAULT_TOTP_SLUG);
+    const expectedEntity = new ExternalResourceEntity({
+      name: data.name,
+      username: data.login_username,
+      uris: [data.login_uri],
+      resource_type_id: expectedResourceType.id,
+      secret_clear: data.login_password,
+      description: data.notes,
+      folder_parent_path: data.folder,
+      totp: {
+        period: 30,
+        digits: 6,
+        algorithm: "SHA1",
+        secret_key: "TJSNMLGTCYOEMXZG"
+      }
+    });
+
+    const externalResourceEntity = CsvBitWardenRowParser.parse(data, importEntity, resourceTypesCollection, metadataTypesSettings);
+
+    expect(externalResourceEntity).toBeInstanceOf(ExternalResourceEntity);
+    expect(externalResourceEntity.toDto()).toEqual(expectedEntity.toDto());
+  });
+
+  it("parses resource of type password-description-totp with all properties from csv row", () => {
+    expect.assertions(2);
+
+    const data = {
+      "name": "Password 1",
+      "login_username": "Username 1",
+      "login_uri": "https://url1.com",
+      "login_password": "Secret 1",
+      "notes": "Description 1",
+      "folder": "Folder 1",
+      "login_totp": "otpauth://totp/test.com%20%3A%20admin%40passbolt.com:admin%40passbolt.com?secret=TJSNMLGTCYOEMXZG&period=30&digits=6&issuer=test.com%20%3A%20admin%40passbolt.com"
+    };
+
+    const importDto = {
+      "ref": "import-ref",
+      "file_type": "csv",
+      "file": btoa(BinaryConvert.toBinary(data))
+    };
+    const importEntity = new ImportResourcesFileEntity(importDto);
+    const resourceTypesCollection = new ResourceTypesCollection(resourceTypesCollectionDto());
+    const metadataTypesSettings = new MetadataTypesSettingsEntity(defaultMetadataTypesSettingsV4Dto());
+    const expectedResourceType = resourceTypesCollection.items.find(resourceType => resourceType.slug === RESOURCE_TYPE_PASSWORD_DESCRIPTION_TOTP_SLUG);
+    const expectedEntity = new ExternalResourceEntity({
+      name: data.name,
+      username: data.login_username,
+      uris: [data.login_uri],
       resource_type_id: expectedResourceType.id,
       secret_clear: data.login_password,
       description: data.notes,
       folder_parent_path: data.folder,
+      totp: {
+        period: 30,
+        digits: 6,
+        algorithm: "SHA1",
+        secret_key: "TJSNMLGTCYOEMXZG"
+      }
     });
 
     const externalResourceEntity = CsvBitWardenRowParser.parse(data, importEntity, resourceTypesCollection, metadataTypesSettings);

package/src/all/background_page/model/import/resources/csvRowParser/csvChromiumRowParser.js

@@ -23,7 +23,7 @@ class CsvChromiumRowParser extends AbstractCsvRowParser {
   static get mapping() {
     return {
       "name": "name",
-      "uri": "url",
+      "uris": "url",
       "username": "username",
       "secret_clear": "password",
     };
@@ -40,7 +40,9 @@ class CsvChromiumRowParser extends AbstractCsvRowParser {
   static parse(data, importEntity, resourceTypesCollection, metadataTypesSettings) {
     const externalResourceDto = {};
     for (const propertyName in this.mapping) {
-      if (data[this.mapping[propertyName]]) {
+      if (propertyName === "uris") {
+        externalResourceDto[propertyName] = [data[this.mapping[propertyName]]];
+      } else if (data[this.mapping[propertyName]]) {
         externalResourceDto[propertyName] = data[this.mapping[propertyName]];
       }
     }

package/src/all/background_page/model/import/resources/csvRowParser/csvChromiumRowParser.test.js

@@ -65,7 +65,7 @@ describe("CsvChromiumRowParser", () => {
     const expectedEntity = new ExternalResourceEntity({
       name: data.name,
       username: data.username,
-      uri: data.url,
+      uris: [data.url],
       resource_type_id: expectedResourceType.id,
       secret_clear: data.password,
     });
@@ -98,7 +98,7 @@ describe("CsvChromiumRowParser", () => {
     const expectedEntity = new ExternalResourceEntity({
       name: data.name,
       username: data.username,
-      uri: data.url,
+      uris: [data.url],
       resource_type_id: expectedResourceType.id,
       secret_clear: data.password,
     });

package/src/all/background_page/model/import/resources/csvRowParser/csvDashlaneRowParser.js

@@ -28,7 +28,7 @@ class CsvDashlaneRowParser extends AbstractCsvRowParser {
       "name": "title",
       "secret_clear": "password",
       "description": "note",
-      "uri": "url",
+      "uris": "url",
       "category": "category",
       "otpSecret": "otpSecret"
     };
@@ -46,7 +46,9 @@ class CsvDashlaneRowParser extends AbstractCsvRowParser {
     const externalResourceDto = {};
 
     for (const propertyName in this.mapping) {
-      if (data[this.mapping[propertyName]]) {
+      if (propertyName === "uris") {
+        externalResourceDto[propertyName] = [data[this.mapping[propertyName]]];
+      } else if (data[this.mapping[propertyName]]) {
         externalResourceDto[propertyName] = data[this.mapping[propertyName]];
       }
     }

package/src/all/background_page/model/import/resources/csvRowParser/csvDashlaneRowParser.test.js

@@ -66,7 +66,7 @@ describe("CsvDashlaneRowParser", () => {
     const expectedEntity = new ExternalResourceEntity({
       name: data.title,
       username: data.username,
-      uri: data.url,
+      uris: [data.url],
       resource_type_id: expectedResourceType.id,
       secret_clear: data.password,
       description: data.note,
@@ -101,7 +101,7 @@ describe("CsvDashlaneRowParser", () => {
     const expectedEntity = new ExternalResourceEntity({
       name: data.title,
       username: data.username,
-      uri: data.url,
+      uris: [data.url],
       resource_type_id: expectedResourceType.id,
       secret_clear: data.password,
       description: data.note,
@@ -113,3 +113,4 @@ describe("CsvDashlaneRowParser", () => {
     expect(externalResourceEntity.toDto()).toEqual(expectedEntity.toDto());
   });
 });
+

package/src/all/background_page/model/import/resources/csvRowParser/csvKdbxRowParser.js

@@ -25,7 +25,7 @@ class CsvKdbxRowParser extends AbstractCsvRowParser {
     return {
       "name": "Title",
       "username": "Username",
-      "uri": "URL",
+      "uris": "URL",
       "secret_clear": "Password",
       "description": "Notes",
       "folder_parent_path": "Group",
@@ -46,13 +46,16 @@ class CsvKdbxRowParser extends AbstractCsvRowParser {
 
     for (const propertyName in this.mapping) {
       if (data[this.mapping[propertyName]]) {
-        if (propertyName.toLowerCase() === "totp") {
+        if (propertyName === "uris") {
+          externalResourceDto[propertyName] = [data[this.mapping[propertyName]]];
+        } else if (propertyName.toLowerCase() === "totp") {
           externalResourceDto.totp = this.parseTotp(data[this.mapping[propertyName]]);
         } else {
           externalResourceDto[propertyName] = data[this.mapping[propertyName]];
         }
       }
     }
+
     resourceTypesCollection.filterByResourceTypeVersion(metadataTypesSettings.defaultResourceTypes);
     const scores = ResourcesTypeImportParser.getScores(externalResourceDto, resourceTypesCollection);
     let resourceType = ResourcesTypeImportParser.findMatchingResourceType(resourceTypesCollection, scores);
@@ -63,7 +66,6 @@ class CsvKdbxRowParser extends AbstractCsvRowParser {
         importEntity.importResourcesErrors.push(new ImportError("Resource partially imported", externalResourceDto, new Error("We used the closest resource type supported.")));
       }
       if (!resourceType) {
-        //Fallback default content type not supported
         resourceType = ResourcesTypeImportParser.fallbackDefaulResourceType(resourceTypesCollection, metadataTypesSettings);
         importEntity.importResourcesErrors.push(new ImportError("Imported with default content type", externalResourceDto, new Error("No resource type associated to this row.")));
       }

package/src/all/background_page/model/import/resources/csvRowParser/csvKdbxRowParser.test.js

@@ -64,7 +64,7 @@ describe("CsvKdbxRowParser", () => {
     const expectedEntity = new ExternalResourceEntity({
       name: data.Title,
       username: data.Username,
-      uri: data.URL,
+      uris: [data.URL],
       resource_type_id: expectedResourceType.id,
       secret_clear: data.Password,
       description: data.Notes,
@@ -101,7 +101,7 @@ describe("CsvKdbxRowParser", () => {
     const expectedEntity = new ExternalResourceEntity({
       name: data.Title,
       username: data.Username,
-      uri: data.URL,
+      uris: [data.URL],
       resource_type_id: expectedResourceType.id,
       secret_clear: data.Password,
       description: data.Notes,
@@ -138,7 +138,7 @@ describe("CsvKdbxRowParser", () => {
     const expectedEntity = new ExternalResourceEntity({
       name: data.Title,
       username: data.Username,
-      uri: data.URL,
+      uris: [data.URL],
       resource_type_id: expectedResourceType.id,
       secret_clear: data.Password,
       description: data.Notes,
@@ -181,7 +181,7 @@ describe("CsvKdbxRowParser", () => {
     const expectedEntity = new ExternalResourceEntity({
       name: data.Title,
       username: data.Username,
-      uri: data.URL,
+      uris: [data.URL],
       resource_type_id: expectedResourceType.id,
       secret_clear: data.Password,
       description: data.Notes,

package/src/all/background_page/model/import/resources/csvRowParser/csvLastPassRowParser.js

@@ -22,7 +22,7 @@ class CsvLastPassRowParser extends AbstractCsvRowParser {
    */
   static get mapping() {
     return {
-      "uri": "url",
+      "uris": "url",
       "username": "username",
       "secret_clear": "password",
       "totp": "totp",
@@ -45,7 +45,9 @@ class CsvLastPassRowParser extends AbstractCsvRowParser {
     const externalResourceDto = {};
 
     for (const propertyName in this.mapping) {
-      if (data[this.mapping[propertyName]]) {
+      if (propertyName === "uris") {
+        externalResourceDto[propertyName] = [data[this.mapping[propertyName]]];
+      } else if (data[this.mapping[propertyName]]) {
         externalResourceDto[propertyName] = data[this.mapping[propertyName]];
       }
     }

package/src/all/background_page/model/import/resources/csvRowParser/csvLastPassRowParser.test.js

@@ -65,7 +65,7 @@ describe("CsvLastPassRowParser", () => {
     const expectedEntity = new ExternalResourceEntity({
       name: data.name,
       username: data.username,
-      uri: data.url,
+      uris: [data.url],
       resource_type_id: expectedResourceType.id,
       secret_clear: data.password,
       description: data.extra,
@@ -102,7 +102,7 @@ describe("CsvLastPassRowParser", () => {
     const expectedEntity = new ExternalResourceEntity({
       name: data.name,
       username: data.username,
-      uri: data.url,
+      uris: [data.url],
       resource_type_id: expectedResourceType.id,
       secret_clear: data.password,
       description: data.extra,