fix media redirect

config/config.devnet-old.yaml

@@ -82,7 +82,6 @@ urls:
   providers: 'https://devnet-old-delegation-api.multiversx.com/providers'
   delegation: 'https://devnet-old-delegation-api.multiversx.com'
   media: 'https://devnet-old-media.elrond.com'
-  nftThumbnails: 'https://devnet-old-media.elrond.com/nfts/thumbnail'
   tmp: '/tmp'
   ipfs: 'https://ipfs.io/ipfs'
   socket: 'devnet-socket-api.multiversx.com'

config/config.devnet.yaml

@@ -52,10 +52,6 @@ features:
   assetsFetch:
     enabled: true
     assetesUrl: 'https://tools.multiversx.com/assets-cdn'
-  mediaRedirect:
-    enabled: false
-    storageUrls:
-      - 'https://s3.amazonaws.com/devnet-media.elrond.com'
   auth:
     enabled: false
     maxExpirySeconds: 86400
@@ -138,7 +134,6 @@ urls:
   providers: 'https://devnet-delegation-api.multiversx.com/providers'
   delegation: 'https://devnet-delegation-api.multiversx.com'
   media: 'https://devnet-media.elrond.com'
-  nftThumbnails: 'https://devnet-media.elrond.com/nfts/thumbnail'
   tmp: '/tmp'
   ipfs: 'https://ipfs.io/ipfs'
   socket: 'devnet-socket-api.multiversx.com'

config/config.e2e-mocked.mainnet.yaml

@@ -34,7 +34,6 @@ urls:
   providers: 'https://internal-delegation-api.multiversx.com/providers'
   delegation: 'https://delegation-api.multiversx.com'
   media: 'https://media.elrond.com'
-  nftThumbnails: 'https://media.elrond.com/nfts/thumbnail'
   maiarId: 'https://id-api.multiversx.com'
 database:
   enabled: false

config/config.e2e.mainnet.yaml

@@ -138,7 +138,6 @@ urls:
   providers: 'https://delegation-api.multiversx.com/providers'
   delegation: 'https://delegation-api.multiversx.com'
   media: 'https://media.elrond.com'
-  nftThumbnails: 'https://media.elrond.com/nfts/thumbnail'
   tmp: '/tmp'
   ipfs: 'https://ipfs.io/ipfs'
   socket: 'socket-api-fra.multiversx.com'

config/config.mainnet.yaml

@@ -117,10 +117,6 @@ features:
   assetsFetch:
     enabled: true
     assetesUrl: 'https://tools.multiversx.com/assets-cdn'
-  mediaRedirect:
-    enabled: false
-    storageUrls:
-      - 'https://s3.amazonaws.com/media.elrond.com'
 image:
   width: 600
   height: 600
@@ -142,7 +138,6 @@ urls:
   providers: 'https://delegation-api.multiversx.com/providers'
   delegation: 'https://delegation-api.multiversx.com'
   media: 'https://media.elrond.com'
-  nftThumbnails: 'https://media.elrond.com/nfts/thumbnail'
   tmp: '/tmp'
   ipfs: 'https://ipfs.io/ipfs'
   socket: 'socket-api-fra.multiversx.com'

config/config.testnet.yaml

@@ -116,10 +116,6 @@ features:
   assetsFetch:
     enabled: true
     assetesUrl: 'https://tools.multiversx.com/assets-cdn'
-  mediaRedirect:
-    enabled: false
-    storageUrls:
-      - 'https://s3.amazonaws.com/testnet-media.elrond.com'
 image:
   width: 600
   height: 600
@@ -141,7 +137,6 @@ urls:
   providers: 'https://testnet-delegation-api.multiversx.com/providers'
   delegation: 'https://testnet-delegation-api.multiversx.com'
   media: 'https://testnet-media.elrond.com'
-  nftThumbnails: 'https://testnet-media.elrond.com/nfts/thumbnail'
   tmp: '/tmp'
   ipfs: 'https://ipfs.io/ipfs'
   socket: 'testnet-socket-api.multiversx.com'

src/common/api-config/api.config.service.ts

@@ -603,15 +603,6 @@ export class ApiConfigService {
     return mediaUrl;
   }
 
-  getNftThumbnailsUrl(): string {
-    const nftThumbnailsUrl = this.configService.get<string>('urls.nftThumbnails');
-    if (!nftThumbnailsUrl) {
-      throw new Error('No nft thumbnails url present');
-    }
-
-    return nftThumbnailsUrl;
-  }
-
   getSecurityAdmins(): string[] {
     const admins = this.configService.get<string[]>('features.auth.admins') ?? this.configService.get<string[]>('security.admins');
     if (admins === undefined) {
@@ -938,12 +929,4 @@ export class ApiConfigService {
   getCacheDuration(): number {
     return this.configService.get<number>('caching.cacheDuration') ?? 3;
   }
-
-  isMediaRedirectFeatureEnabled(): boolean {
-    return this.configService.get<boolean>('features.mediaRedirect.enabled') ?? false;
-  }
-
-  getMediaRedirectFileStorageUrls(): string[] {
-    return this.configService.get<string[]>('features.mediaRedirect.storageUrls') ?? [];
-  }
 }

src/endpoints/endpoints.controllers.module.ts

@@ -39,7 +39,6 @@ import { PoolController } from "./pool/pool.controller";
 import { TpsController } from "./tps/tps.controller";
 import { ApplicationController } from "./applications/application.controller";
 import { EventsController } from "./events/events.controller";
-import { MediaController } from "./media/media.controller";
 
 @Module({})
 export class EndpointsControllersModule {
@@ -51,7 +50,6 @@ export class EndpointsControllersModule {
       TokenController, TransactionController, UsernameController, VmQueryController, WaitingListController,
       HealthCheckController, DappConfigController, WebsocketController, TransferController,
       ProcessNftsPublicController, TransactionsBatchController, ApplicationController, EventsController,
-      MediaController,
     ];
 
     const isMarketplaceFeatureEnabled = configuration().features?.marketplace?.enabled ?? false;

src/endpoints/endpoints.services.module.ts

@@ -36,7 +36,6 @@ import { PoolModule } from "./pool/pool.module";
 import { TpsModule } from "./tps/tps.module";
 import { ApplicationModule } from "./applications/application.module";
 import { EventsModule } from "./events/events.module";
-import { MediaModule } from "./media/media.module";
 
 @Module({
   imports: [
@@ -78,14 +77,13 @@ import { MediaModule } from "./media/media.module";
     TpsModule,
     ApplicationModule,
     EventsModule,
-    MediaModule,
   ],
   exports: [
     AccountModule, CollectionModule, BlockModule, DelegationModule, DelegationLegacyModule, IdentitiesModule, KeysModule,
     MiniBlockModule, NetworkModule, NftModule, NftMediaModule, TagModule, NodeModule, ProviderModule,
     RoundModule, SmartContractResultModule, ShardModule, StakeModule, TokenModule, RoundModule, TransactionModule, UsernameModule, VmQueryModule,
     WaitingListModule, EsdtModule, BlsModule, DappConfigModule, TransferModule, PoolModule, TransactionActionModule, WebsocketModule, MexModule,
-    ProcessNftsModule, NftMarketplaceModule, TransactionsBatchModule, TpsModule, ApplicationModule, EventsModule, MediaModule,
+    ProcessNftsModule, NftMarketplaceModule, TransactionsBatchModule, TpsModule, ApplicationModule, EventsModule,
   ],
 })
 export class EndpointsServicesModule { }

src/endpoints/nfts/nft.service.ts

@@ -652,31 +652,28 @@ export class NftService {
   }
 
   private applyRedirectMedia(nft: Nft) {
-    // FIXME: This is a temporary fix to avoid breaking the API
-    const isMediaRedirectFeatureEnabled = this.apiConfigService.isMediaRedirectFeatureEnabled();
-    if (!isMediaRedirectFeatureEnabled) {
-      // return;
-    }
-
-    if (!nft.media || nft.media.length === 0) {
+    if (!nft.media || !Array.isArray(nft.media) || nft.media.length === 0) {
       return;
     }
 
     try {
       const network = this.apiConfigService.getNetwork();
-      // const defaultMediaUrl = `https://${network === 'mainnet' ? '' : `${network}-`}media.elrond.com`;
-      const defaultMediaUrl = `https://${network === 'mainnet' ? '' : `${network}-`}api.multiversx.com/media`;
+      const defaultMediaUrl = `https://${network === 'mainnet' ? '' : `${network}-`}media.elrond.com`;
+      const defaultApiMediaUrl = `https://${network === 'mainnet' ? '' : `${network}-`}api.multiversx.com/media`;
 
       for (const media of nft.media) {
         if (media.url) {
-          media.url = media.url.replace(defaultMediaUrl, this.apiConfigService.getMediaUrl());
+          media.url = ApiUtils.replaceUri(media.url, defaultMediaUrl, this.apiConfigService.getMediaUrl());
+          media.url = ApiUtils.replaceUri(media.url, defaultApiMediaUrl, this.apiConfigService.getMediaUrl());
         }
         if (media.thumbnailUrl) {
-          media.thumbnailUrl = media.thumbnailUrl.replace(defaultMediaUrl, this.apiConfigService.getMediaUrl());
+          media.thumbnailUrl = ApiUtils.replaceUri(media.thumbnailUrl, defaultMediaUrl, this.apiConfigService.getMediaUrl());
+          media.thumbnailUrl = ApiUtils.replaceUri(media.thumbnailUrl, defaultApiMediaUrl, this.apiConfigService.getMediaUrl());
         }
       }
-    } catch {
-      // TODO: there are some cases where the nft.media is an empty object, we should investigate why
+    } catch (error) {
+      this.logger.error(`Error when applying redirect media for NFT with identifier '${nft.identifier}'`);
+      this.logger.error(error);
     }
   }
 }