Merge branch 'v3' into add-profile-endpoints

Author: borkopetrovicc

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
+# [3.13.7] - 10-03-2023
+
+### Changes
+
+- Fixed undefined values for `getSignedMediaToken` method
+
+# [3.13.6] - 10-03-2023
+
+### Added
+
+- Axios version upgraded to newest
+- New `Assets` method `getSignedMediaToken`
+
 # [3.13.5] - 02-02-2023
 
 ### Added

index.d.ts

@@ -494,6 +494,9 @@ export interface RequestDataCaptureAccessData {
   company: string;
   merchant_uuid: string;
 }
+export interface SignedMediaResponse {
+  token: string;
+}
 
 export declare class Asset {
   constructor(config: Record<string, unknown>, Account: Account);
@@ -537,6 +540,10 @@ export declare class Asset {
   requestDataCaptureNoAuthAccess(
     accessData: RequestDataCaptureAccessData
   ): Promise<AxiosResponse<CommonResponse>>;
+  getSignedMediaToken(
+    appConfigId: string,
+    mediaId: string
+  ): Promise<AxiosResponse<SignedMediaResponse>>;
 }
 
 export interface BrandingDetails {
@@ -1102,6 +1109,7 @@ export interface ApiEndpoints {
   getFreemiumAsset: string;
   getCloudfrontURL: (assetId: number, videoUrl: string) => string;
   requestCodeAccess: string;
+  getSignedMediaToken: (appConfigId: string, mediaId: string) => string;
   releaseAccessCode: (code: number) => string;
   requestDataCaptureNoAuthAccess: string;
   // Payment

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inplayer-org/inplayer.js",
-  "version": "3.13.5",
+  "version": "3.13.7",
   "author": "InPlayer",
   "license": "MIT",
   "description": "A Javascript SDK for Inplayer's RESTful API",
@@ -44,7 +44,7 @@
   ],
   "dependencies": {
     "aws-iot-device-sdk": "^2.2.6",
-    "axios": "^0.19.2",
+    "axios": "^0.21.2",
     "core-js": "^3.8.2",
     "fingerprintjs2": "^2.1.2",
     "lodash": "^4.17.20",

src/constants/index.ts

@@ -68,6 +68,9 @@ export const API = {
     `items/access/codes/${codeId}/${fingerprint}`,
   // donation
   getDonations: (id: number): string => `v2/items/${id}/donations`,
+  // media signer
+  getSignedMediaToken: (appConfigId: string, mediaId: string): string =>
+    `v2/items/jw-media/token?app_config_id=${appConfigId}&media_id=${mediaId}`,
 
   // Payments
   getPaymentMethods: '/payments/methods',

src/endpoints/asset.ts

@@ -17,6 +17,7 @@ import {
   GetMerchantPackage,
   ItemDetailsV1,
   RequestDataCaptureAccessData,
+  SignedMediaResponse,
 } from '../models/IAsset&Access';
 import BaseExtend from '../extends/base';
 import { API } from '../constants';
@@ -59,7 +60,9 @@ class Asset extends BaseExtend {
    * }
    * ```
    */
-  async checkAccessForAsset(id: number): Promise<AxiosResponse<GetItemAccessV1>> {
+  async checkAccessForAsset(
+    id: number,
+  ): Promise<AxiosResponse<GetItemAccessV1>> {
     const tokenObject = await this.request.getToken();
 
     return this.request.authenticatedGet(API.checkAccessForAsset(id), {
@@ -128,7 +131,10 @@ class Asset extends BaseExtend {
    * }
    * ```
    */
-  async getAsset(assetId: number, merchantUuid: string): Promise<AxiosResponse<ItemDetailsV1>> {
+  async getAsset(
+    assetId: number,
+    merchantUuid: string,
+  ): Promise<AxiosResponse<ItemDetailsV1>> {
     return this.request.get(API.getAsset(assetId, merchantUuid));
   }
 
@@ -332,7 +338,9 @@ class Asset extends BaseExtend {
    * }
    * ```
    */
-  async getAssetsInPackage(id: number): Promise<AxiosResponse<GetAssetsInPackage>> {
+  async getAssetsInPackage(
+    id: number,
+  ): Promise<AxiosResponse<GetAssetsInPackage>> {
     return this.request.get(API.getAssetsInPackage(id));
   }
 
@@ -622,7 +630,9 @@ class Asset extends BaseExtend {
    * }
    * ```
    */
-  getAccessCode(assetId: number): CodeAccessData | null | Promise<CodeAccessData | null> {
+  getAccessCode(
+    assetId: number,
+  ): CodeAccessData | null | Promise<CodeAccessData | null> {
     const accessCode = tokenStorage.getItem(
       this.config.INPLAYER_ACCESS_CODE_NAME(assetId),
     );
@@ -632,7 +642,9 @@ class Asset extends BaseExtend {
         (resolvedString ? (JSON.parse(resolvedString) as CodeAccessData) : null)) as Promise<CodeAccessData | null>;
     }
 
-    return accessCode ? (JSON.parse(accessCode as string) as CodeAccessData) : null;
+    return accessCode
+      ? (JSON.parse(accessCode as string) as CodeAccessData)
+      : null;
   }
 
   /**
@@ -655,7 +667,9 @@ class Asset extends BaseExtend {
    * }]
    * ```
    */
-  async getAccesCodeSessions(codeId: number): Promise<AxiosResponse<Array<CodeAccessSessionsData>>> {
+  async getAccesCodeSessions(
+    codeId: number,
+  ): Promise<AxiosResponse<Array<CodeAccessSessionsData>>> {
     return this.request.get(API.requestAccessCodeSessions(codeId));
   }
 
@@ -676,7 +690,9 @@ class Asset extends BaseExtend {
    * }
    * ```
    */
-  async terminateSession(assetId: number): Promise<AxiosResponse<CommonResponse> | null> {
+  async terminateSession(
+    assetId: number,
+  ): Promise<AxiosResponse<CommonResponse> | null> {
     const accessCode: CodeAccessData | null = await this.getAccessCode(assetId);
 
     if (!accessCode) {
@@ -756,7 +772,10 @@ class Asset extends BaseExtend {
    * }
    * ```
    */
-  async getCloudfrontURL(assetId: number, videoUrl: string): Promise<AxiosResponse<CloudfrontUrl>> {
+  async getCloudfrontURL(
+    assetId: number,
+    videoUrl: string,
+  ): Promise<AxiosResponse<CloudfrontUrl>> {
     const tokenObject = await this.request.getToken();
 
     return this.request.get(API.getCloudfrontURL(assetId, videoUrl), {
@@ -793,7 +812,9 @@ class Asset extends BaseExtend {
    * }
    * ```
    */
-  async getDonationOptions(assetId: number): Promise<AxiosResponse<DonationDetails>> {
+  async getDonationOptions(
+    assetId: number,
+  ): Promise<AxiosResponse<DonationDetails>> {
     const tokenObject = await this.request.getToken();
 
     return this.request.get(API.getDonations(assetId), {
@@ -802,6 +823,35 @@ class Asset extends BaseExtend {
       },
     });
   }
+
+  /**
+   * Retrieves a signed token for media protection
+   * @method getSignedMediaToken
+   * @async
+   * @param {number} appConfigId The id of the config used on the OTT Web App
+   * @param {number} mediaId The id of the requested media to watch on the OTT Web App
+   * @example
+   *     InPlayer.Asset
+   *     .getSignedMediaToken('slgaIsfX', 'kAscZclP)
+   *     .then(data => console.log(data));
+   * @returns {AxiosResponse<SignedMediaResponse>} Contains the data:
+   * ```typescript
+   * {
+   *    token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpX...
+   * }
+   */
+  async getSignedMediaToken(
+    appConfigId: string,
+    mediaId: string,
+  ): Promise<AxiosResponse<SignedMediaResponse>> {
+    const tokenObject = await this.request.getToken();
+
+    return this.request.get(API.getSignedMediaToken(appConfigId, mediaId), {
+      headers: {
+        Authorization: `Bearer ${tokenObject.token}`,
+      },
+    });
+  }
 }
 
 export default Asset;

src/models/Config.ts

@@ -43,6 +43,7 @@ export interface ApiEndpoints {
   getAssetAccessFees: (id: number) => string;
   getCloudfrontURL: (assetId: number, videoUrl: string) => string;
   getPurchaseHistory: (status: string, page?: number, size?: number) => string;
+  getSignedMediaToken: (appConfigId: string, mediaId: string) => string;
   // code only
   requestCodeAccess: string;
   requestAccessCodeSessions: (codeId: number) => string;
@@ -60,21 +61,24 @@ export interface ApiEndpoints {
   createDirectDebitMandate: string;
   payForAssetDonation: string;
   confirmForAssetDonation: string;
-  validateReceipt: (platform: string) => string,
+  validateReceipt: (platform: string) => string;
   getAssetsHistory: (
     size: number,
     page: number,
     startDate?: string,
     endDate?: string,
-    type?: string,
+    type?: string
   ) => string;
   // Subscriptions
   getSubscriptions: (limit: number, page: number) => string;
   getSubscription: (id: string) => string;
   cancelSubscription: (url: string) => string;
   subscribe: string;
   subscribeV2: string;
-  changeSubscriptionPlan: (access_fee_id: number, inplayer_token: string) => string;
+  changeSubscriptionPlan: (
+    access_fee_id: number,
+    inplayer_token: string
+  ) => string;
   // Voucher
   getDiscount: string;
   // Restrictions
@@ -89,7 +93,7 @@ export interface Request {
   setToken(
     token: string,
     refreshToken: string,
-    expiresAt: number,
+    expiresAt: number
   ): void | Promise<void>;
   removeToken(): void | Promise<void>;
   get(

src/models/IAsset&Access.ts

@@ -315,7 +315,7 @@ export interface Gift {
 export interface TransactionsDetails {
   access_fee_description: string;
   action_type: string;
-  charged_amount: number
+  charged_amount: number;
   client_id: string;
   consumer_email: string;
   consumer_id: number;
@@ -357,6 +357,10 @@ export interface AssetsTransactions {
   unique_paying_customers: number;
 }
 
+export interface SignedMediaResponse {
+  token: string;
+}
+
 export interface Asset extends BaseExtend {
   checkAccessForAsset(id: number): Promise<AxiosResponse<GetItemAccessV1>>;
   isFreeTrialUsed(id: number): Promise<AxiosResponse<boolean>>;
@@ -377,15 +381,27 @@ export interface Asset extends BaseExtend {
     page?: number,
     startDate?: string,
     endDate?: string,
-    type?: string,
+    type?: string
   ): Promise<AxiosResponse<AssetsTransactions>>;
-  getAccessCode(assetId: number): CodeAccessData | null | Promise<CodeAccessData | null>;
-  requestCodeAccess(data: RequestCodeAccessData): Promise<AxiosResponse<CodeAccessData>>;
-  getAccesCodeSessions(codeId: number): Promise<AxiosResponse<Array<CodeAccessSessionsData>>>;
-  terminateSession(assetId: number): Promise<AxiosResponse<CommonResponse> | null>;
+  getAccessCode(
+    assetId: number
+  ): CodeAccessData | null | Promise<CodeAccessData | null>;
+  requestCodeAccess(
+    data: RequestCodeAccessData
+  ): Promise<AxiosResponse<CodeAccessData>>;
+  getAccesCodeSessions(
+    codeId: number
+  ): Promise<AxiosResponse<Array<CodeAccessSessionsData>>>;
+  terminateSession(
+    assetId: number
+  ): Promise<AxiosResponse<CommonResponse> | null>;
   getCloudfrontURL(
     assetId: number,
     videoUrl: string
   ): Promise<AxiosResponse<CloudfrontUrl>>;
   getDonationOptions(assetId: number): Promise<AxiosResponse<DonationDetails>>;
+  getSignedMediaToken(
+    appConfigId: string,
+    mediaId: string
+  ): Promise<AxiosResponse<SignedMediaResponse>>;
 }

yarn.lock

@@ -1515,12 +1515,12 @@ aws-iot-device-sdk@^2.2.6:
     mqtt "2.18.8"
     websocket-stream "^5.0.1"
 
-axios@^0.19.2:
-  version "0.19.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
-  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
+axios@^0.21.2:
+  version "0.21.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.2.tgz#21297d5084b2aeeb422f5d38e7be4fbb82239017"
+  integrity sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg==
   dependencies:
-    follow-redirects "1.5.10"
+    follow-redirects "^1.14.0"
 
 babel-code-frame@^6.26.0:
   version "6.26.0"
@@ -2370,13 +2370,6 @@ d@1, d@^1.0.1:
     es5-ext "^0.10.50"
     type "^1.0.1"
 
-debug@=3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
 debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -3165,12 +3158,10 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-[email protected]:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
-  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
-  dependencies:
-    debug "=3.1.0"
+follow-redirects@^1.14.0:
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
+  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
 for-in@^1.0.2:
   version "1.0.2"