updating from main

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.4.3](https://github.com/nevermined-io/node/compare/v0.4.2...v0.4.3)
+
+> 25 November 2022
+
+- Fix filename when downloading [`#56`](https://github.com/nevermined-io/node/pull/56)
+- get filename from ddo by default if defined [`f1f9356`](https://github.com/nevermined-io/node/commit/f1f9356819d53a9a5c61414eeffaa25536f3747f)
+- Automated CHANGELOG.md update [`a785b3a`](https://github.com/nevermined-io/node/commit/a785b3a46ab260348ff7b2aa60a82d7aa4b7a557)
+
 #### [v0.4.2](https://github.com/nevermined-io/node/compare/v0.4.1...v0.4.2)
 
 > 22 November 2022

src/shared/nevermined/nvm.service.ts

@@ -47,7 +47,10 @@ export class NeverminedService {
     return this.config.nvm().web3ProviderUri;
   }
 
-  async getAssetUrl(did: string, index: number): Promise<{ url: string; content_type: string; dtp: boolean }> {
+  async getAssetUrl(
+    did: string,
+    index: number
+  ): Promise<{ url: string; content_type: string; dtp: boolean; name?: string }> {
     // get url for DID
     let asset: DDO;
     try {
@@ -59,14 +62,15 @@ export class NeverminedService {
     const service = asset.findServiceByType('metadata');
     const file_attributes = service.attributes.main.files[index];
     const content_type = file_attributes.contentType;
+    const name = file_attributes.name;
     const auth_method = asset.findServiceByType('authorization').service || 'RSAES-OAEP';
     if (auth_method === 'RSAES-OAEP') {
       const filelist = JSON.parse(
         await decrypt(this.config.cryptoConfig(), service.attributes.encryptedFiles, 'PSK-RSA')
       );
       // download url or what?
       const url: string = filelist[index].url;
-      return { url, content_type, dtp: this.isDTP(service.attributes.main) };
+      return { url, content_type, dtp: this.isDTP(service.attributes.main), name };
     }
     Logger.error(`Auth METHOD wasn't RSAES-OAEP`);
     throw new BadRequestException();
@@ -76,7 +80,7 @@ export class NeverminedService {
     Logger.debug(`Downloading asset from ${did} index ${index}`);
     try {
       // eslint-disable-next-line prefer-const
-      let { url, content_type, dtp } = await this.getAssetUrl(did, index);
+      let { url, content_type, dtp, name } = await this.getAssetUrl(did, index);
       if (!url) {
         Logger.error(`URL for did ${did} not found`);
         throw new NotFoundException(`URL for did ${did} not found`);
@@ -86,8 +90,14 @@ export class NeverminedService {
       }
       Logger.debug(`Serving URL ${url}`);
 
-      const param = url.split('/').slice(-1)[0];
-      const filename = param.split('?')[0];
+      // If filename is on the ddo we will use that by default
+      let filename: string;
+      if (name) {
+        filename = name;
+      } else {
+        const param = url.split('/').slice(-1)[0];
+        filename = param.split('?')[0];
+      }
 
       let response;