@gofynd/fdk-client-javascript 1.4.0 → 1.4.1

package/README.md

@@ -214,7 +214,7 @@ console.log("Active Theme: ", response.information.name);
 The above code will log the curl command in the console
 
 ```bash
-curl --request GET "https://api.fynd.com/service/application/theme/v1.0/applied-theme" --header 'authorization: Bearer <authorization-token>' --header 'x-fp-sdk-version: 1.4.0' --header 'x-fp-date: 20230222T115108Z' --header 'x-fp-signature: v1.1:1e3ab3b02b5bc626e3c32a37ee844266ade02bbcbaafc28fc7a0e46a76a7a1a8'
+curl --request GET "https://api.fynd.com/service/application/theme/v1.0/applied-theme" --header 'authorization: Bearer <authorization-token>' --header 'x-fp-sdk-version: 1.4.1' --header 'x-fp-date: 20230222T115108Z' --header 'x-fp-signature: v1.1:1e3ab3b02b5bc626e3c32a37ee844266ade02bbcbaafc28fc7a0e46a76a7a1a8'
 Active Theme: Emerge
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gofynd/fdk-client-javascript",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "",
   "main": "index.js",
   "scripts": {

package/sdk/partner/OAuthClient.js

@@ -68,18 +68,37 @@ class OAuthClient extends BaseOAuthClient {
     }
   }
 
-  async renewAccessToken(isOfflineToken = true) {
-    if (isOfflineToken) {
-      await this.getNewAccessToken();
-    } else {
-      res = await this.getAccesstokenObj({
-        grant_type: "refresh_token",
-        refresh_token: this.refreshToken,
-      });
-      res.expires_at =
-        res.expires_at || new Date().getTime() + res.expires_in * 1000;
+  async renewAccessToken(isOfflineToken = false) {
+    try {
+      Logger({ level: "INFO", message: "Renewing partner access token..." });
+      let res;
+      if (isOfflineToken) {
+        let requestCacheKey = `${this.config.apiKey}:${this.config.organizationId}`;
+        if (!refreshTokenRequestCache[requestCacheKey]) {
+          refreshTokenRequestCache[requestCacheKey] = this.getAccesstokenObj({
+            grant_type: "refresh_token",
+            refresh_token: this.refreshToken,
+          });
+        }
+        res = await refreshTokenRequestCache[requestCacheKey].finally(() => {
+          delete refreshTokenRequestCache[requestCacheKey];
+        });
+      } else {
+        res = await this.getAccesstokenObj({
+          grant_type: "refresh_token",
+          refresh_token: this.refreshToken,
+        });
+      }
       this.setToken(res);
+      this.token_expires_at =
+        new Date().getTime() + this.token_expires_in * 1000;
+      Logger({ level: "INFO", message: "Done." });
       return res;
+    } catch (error) {
+      if (error.isAxiosError) {
+        throw new FDKTokenIssueError(error.message);
+      }
+      throw error;
     }
   }
 

package/sdk/partner/PartnerAPIClient.js

@@ -16,7 +16,7 @@ class APIClient {
    * @param {Options} options
    */
   static async execute(conf, method, url, query, body, xHeaders, options) {
-    const token = await conf.oauthClient.getNewAccessToken();
+    const token = await conf.oauthClient.getAccessToken();
 
     const extraHeaders = conf.extraHeaders.reduce((acc, curr) => {
       acc = { ...acc, ...curr };

package/sdk/platform/Webhook/WebhookPlatformModel.d.ts

@@ -57,20 +57,6 @@ export = WebhookPlatformModel;
  * @typedef EventConfigResponse
  * @property {EventConfig[]} [event_configs]
  */
-/**
- * @typedef EventConfigs
- * @property {string} [created_on]
- * @property {string} [description]
- * @property {string} [display_name]
- * @property {string} [event_category]
- * @property {string} [event_name]
- * @property {Object} [event_schema]
- * @property {string} [event_type]
- * @property {number} [id]
- * @property {SubscriberEventMapping} [subscriber_event_mapping]
- * @property {string} [updated_on]
- * @property {string} [version]
- */
 /**
  * @typedef EventProcessReportObject
  * @property {number} [attempt] - The attempt number of the event.
@@ -241,19 +227,6 @@ export = WebhookPlatformModel;
  * @property {string} [updated_on]
  * @property {string} [webhook_url]
  */
-/**
- * @typedef SubscriberEventMapping
- * @property {string} [created_on]
- * @property {number} [event_id]
- * @property {number} [id]
- * @property {number} [subscriber_id]
- */
-/**
- * @typedef SubscriberFailureResponse
- * @property {string} [code]
- * @property {string} [message]
- * @property {string} [stack]
- */
 /**
  * @typedef SubscriberResponse
  * @property {Association} [association]
@@ -261,7 +234,7 @@ export = WebhookPlatformModel;
  * @property {string} [created_on]
  * @property {Object} [custom_headers]
  * @property {string} [email_id]
- * @property {EventConfigs[]} [event_configs]
+ * @property {EventConfig[]} [event_configs]
  * @property {number} [id]
  * @property {string} [modified_by]
  * @property {string} [name]
@@ -283,7 +256,7 @@ export = WebhookPlatformModel;
 declare class WebhookPlatformModel {
 }
 declare namespace WebhookPlatformModel {
-    export { Association, AuthMeta, CancelResponse, CdnObject, DownloadReportResponse, Err, Error, Event, EventConfig, EventConfigResponse, EventConfigs, EventProcessReportObject, EventProcessReports, EventProcessRequest, HistoryAssociation, HistoryFilters, HistoryItems, HistoryPayload, HistoryResponse, Item, Page, PingWebhook, PingWebhookResponse, ReportFilterResponse, ReportFiltersPayload, RetryCountResponse, RetryEventRequest, RetryFailureResponse, RetryStatusResponse, RetrySuccessResponse, SubscriberConfig, SubscriberConfigList, SubscriberConfigResponse, SubscriberEventMapping, SubscriberFailureResponse, SubscriberResponse, UploadServiceObject, Url, SubscriberStatus };
+    export { Association, AuthMeta, CancelResponse, CdnObject, DownloadReportResponse, Err, Error, Event, EventConfig, EventConfigResponse, EventProcessReportObject, EventProcessReports, EventProcessRequest, HistoryAssociation, HistoryFilters, HistoryItems, HistoryPayload, HistoryResponse, Item, Page, PingWebhook, PingWebhookResponse, ReportFilterResponse, ReportFiltersPayload, RetryCountResponse, RetryEventRequest, RetryFailureResponse, RetryStatusResponse, RetrySuccessResponse, SubscriberConfig, SubscriberConfigList, SubscriberConfigResponse, SubscriberResponse, UploadServiceObject, Url, SubscriberStatus };
 }
 /** @returns {Association} */
 declare function Association(): Association;
@@ -359,21 +332,6 @@ declare function EventConfigResponse(): EventConfigResponse;
 type EventConfigResponse = {
     event_configs?: EventConfig[];
 };
-/** @returns {EventConfigs} */
-declare function EventConfigs(): EventConfigs;
-type EventConfigs = {
-    created_on?: string;
-    description?: string;
-    display_name?: string;
-    event_category?: string;
-    event_name?: string;
-    event_schema?: any;
-    event_type?: string;
-    id?: number;
-    subscriber_event_mapping?: SubscriberEventMapping;
-    updated_on?: string;
-    version?: string;
-};
 /** @returns {EventProcessReportObject} */
 declare function EventProcessReportObject(): EventProcessReportObject;
 type EventProcessReportObject = {
@@ -671,21 +629,6 @@ type SubscriberConfigResponse = {
     updated_on?: string;
     webhook_url?: string;
 };
-/** @returns {SubscriberEventMapping} */
-declare function SubscriberEventMapping(): SubscriberEventMapping;
-type SubscriberEventMapping = {
-    created_on?: string;
-    event_id?: number;
-    id?: number;
-    subscriber_id?: number;
-};
-/** @returns {SubscriberFailureResponse} */
-declare function SubscriberFailureResponse(): SubscriberFailureResponse;
-type SubscriberFailureResponse = {
-    code?: string;
-    message?: string;
-    stack?: string;
-};
 /** @returns {SubscriberResponse} */
 declare function SubscriberResponse(): SubscriberResponse;
 type SubscriberResponse = {
@@ -694,7 +637,7 @@ type SubscriberResponse = {
     created_on?: string;
     custom_headers?: any;
     email_id?: string;
-    event_configs?: EventConfigs[];
+    event_configs?: EventConfig[];
     id?: number;
     modified_by?: string;
     name?: string;

package/sdk/platform/Webhook/WebhookPlatformModel.js

@@ -68,21 +68,6 @@ const Joi = require("joi");
  * @property {EventConfig[]} [event_configs]
  */
 
-/**
- * @typedef EventConfigs
- * @property {string} [created_on]
- * @property {string} [description]
- * @property {string} [display_name]
- * @property {string} [event_category]
- * @property {string} [event_name]
- * @property {Object} [event_schema]
- * @property {string} [event_type]
- * @property {number} [id]
- * @property {SubscriberEventMapping} [subscriber_event_mapping]
- * @property {string} [updated_on]
- * @property {string} [version]
- */
-
 /**
  * @typedef EventProcessReportObject
  * @property {number} [attempt] - The attempt number of the event.
@@ -275,21 +260,6 @@ const Joi = require("joi");
  * @property {string} [webhook_url]
  */
 
-/**
- * @typedef SubscriberEventMapping
- * @property {string} [created_on]
- * @property {number} [event_id]
- * @property {number} [id]
- * @property {number} [subscriber_id]
- */
-
-/**
- * @typedef SubscriberFailureResponse
- * @property {string} [code]
- * @property {string} [message]
- * @property {string} [stack]
- */
-
 /**
  * @typedef SubscriberResponse
  * @property {Association} [association]
@@ -297,7 +267,7 @@ const Joi = require("joi");
  * @property {string} [created_on]
  * @property {Object} [custom_headers]
  * @property {string} [email_id]
- * @property {EventConfigs[]} [event_configs]
+ * @property {EventConfig[]} [event_configs]
  * @property {number} [id]
  * @property {string} [modified_by]
  * @property {string} [name]
@@ -409,23 +379,6 @@ class WebhookPlatformModel {
     });
   }
 
-  /** @returns {EventConfigs} */
-  static EventConfigs() {
-    return Joi.object({
-      created_on: Joi.string().allow(""),
-      description: Joi.string().allow(""),
-      display_name: Joi.string().allow(""),
-      event_category: Joi.string().allow(""),
-      event_name: Joi.string().allow(""),
-      event_schema: Joi.object().pattern(/\S/, Joi.any()),
-      event_type: Joi.string().allow(""),
-      id: Joi.number(),
-      subscriber_event_mapping: WebhookPlatformModel.SubscriberEventMapping(),
-      updated_on: Joi.string().allow(""),
-      version: Joi.string().allow(""),
-    });
-  }
-
   /** @returns {EventProcessReportObject} */
   static EventProcessReportObject() {
     return Joi.object({
@@ -656,25 +609,6 @@ class WebhookPlatformModel {
     });
   }
 
-  /** @returns {SubscriberEventMapping} */
-  static SubscriberEventMapping() {
-    return Joi.object({
-      created_on: Joi.string().allow(""),
-      event_id: Joi.number(),
-      id: Joi.number(),
-      subscriber_id: Joi.number(),
-    });
-  }
-
-  /** @returns {SubscriberFailureResponse} */
-  static SubscriberFailureResponse() {
-    return Joi.object({
-      code: Joi.string().allow(""),
-      message: Joi.string().allow(""),
-      stack: Joi.string().allow(""),
-    });
-  }
-
   /** @returns {SubscriberResponse} */
   static SubscriberResponse() {
     return Joi.object({
@@ -683,7 +617,7 @@ class WebhookPlatformModel {
       created_on: Joi.string().allow(""),
       custom_headers: Joi.any(),
       email_id: Joi.string().allow(""),
-      event_configs: Joi.array().items(WebhookPlatformModel.EventConfigs()),
+      event_configs: Joi.array().items(WebhookPlatformModel.EventConfig()),
       id: Joi.number(),
       modified_by: Joi.string().allow(""),
       name: Joi.string().allow(""),