Merge pull request #798 from inplayer-org/getAsset-merchant-optional

Make merchantUuid in getAsset optional

Author: naumovski-filip

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+# [3.13.16] - 08-08-2023
+
+- Modified `merchantUuid` parameter in `getAsset` method to be optional
+
 # [3.13.15] - 24-07-2023
 
 - Added `getFeatureFlags` method and `FeatureFlagData` type to `Account` module

index.d.ts

@@ -520,7 +520,7 @@ export declare class Asset {
 
   checkAccessForAsset(id: number): Promise<AxiosResponse<GetItemAccessV1>>;
   isFreeTrialUsed(id: number): Promise<AxiosResponse<boolean>>;
-  getAsset(assetId: number, merchantUuid: string): Promise<AxiosResponse<ItemDetailsV1>>;
+  getAsset(assetId: number, merchantUuid: string): Promise<AxiosResponse<ExternalItemDetails>>;
   getExternalAsset(
     assetType: string,
     externalId: string,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inplayer-org/inplayer.js",
-  "version": "3.13.15",
+  "version": "3.13.16",
   "author": "InPlayer",
   "license": "MIT",
   "description": "A Javascript SDK for Inplayer's RESTful API",

src/constants/index.ts

@@ -31,7 +31,7 @@ export const API = {
   merchantRestrictionSettings: (merchantUuid: string): string => `/restrictions/settings/${merchantUuid}`,
 
   // Items
-  getAsset: (id: number, merchantUuid: string): string => `/items/${merchantUuid}/${id}`,
+  getAsset: (id: number, merchantUuid?: string): string => `/items/${merchantUuid ? `${merchantUuid}/` : ''}${id}`,
   getExternalAsset: (assetType: string, externalId: string, merchantUuid?: string): string => {
     let url = `/items/assets/external/${assetType}/${externalId}`;
     if (merchantUuid) {

src/endpoints/asset.ts

@@ -98,7 +98,7 @@ class Asset extends BaseExtend {
    * @method getAsset
    * @async
    * @param {number} assetId The id of created premium content in InPlayer Dashboard (i.e asset id).
-   * @param {string} merchantUuid The Merchant's unique universal identifier (Merchant UUID).
+   * @param {string?} merchantUuid The Merchant's unique universal identifier (Merchant UUID).
    * You can find it on the InPlayer's dashboard at the Account Details section as Account ID.
    * @example
    *     InPlayer.Asset
@@ -133,8 +133,8 @@ class Asset extends BaseExtend {
    */
   async getAsset(
     assetId: number,
-    merchantUuid: string,
-  ): Promise<AxiosResponse<ItemDetailsV1>> {
+    merchantUuid?: string,
+  ): Promise<AxiosResponse<ExternalItemDetails>> {
     return this.request.get(API.getAsset(assetId, merchantUuid));
   }
 

src/models/IAsset&Access.ts

@@ -170,7 +170,7 @@ export interface ItemDetailsAccess extends ItemDetailsV1 {
 }
 
 export interface ExternalItemDetails extends ItemDetailsV1 {
-  access_fees: GetAccessFee[];
+  access_fees: AccessFee[];
   metahash: Record<string, string>;
 }
 
@@ -368,8 +368,8 @@ export interface Asset extends BaseExtend {
   isFreeTrialUsed(id: number): Promise<AxiosResponse<boolean>>;
   getAsset(
     assetId: number,
-    merchantUuid: string
-  ): Promise<AxiosResponse<ItemDetailsV1>>;
+    merchantUuid?: string
+  ): Promise<AxiosResponse<ExternalItemDetails>>;
   getExternalAsset(
     assetType: string,
     externalId: string,