@gofynd/fdk-client-javascript 1.0.3 → 1.1.0

package/sdk/application/Share/ShareApplicationClient.js

@@ -1,10 +1,11 @@
-const APIClient = require("../ApplicationAPIClient");
+const ApplicationAPIClient = require("../ApplicationAPIClient");
+const { FDKClientValidationError } = require("../../common/FDKError");
 const constructUrl = require("../constructUrl");
 const Paginator = require("../../common/Paginator");
-const { FDKClientValidationError } = require("../../common/FDKError");
 const ShareValidator = require("./ShareApplicationValidator");
 const ShareModel = require("./ShareApplicationModel");
 const { Logger } = require("./../../common/Logger");
+const Joi = require("joi");
 
 class Share {
   constructor(_conf) {
@@ -71,7 +72,7 @@ class Share {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -131,7 +132,7 @@ class Share {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -195,7 +196,7 @@ class Share {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -260,7 +261,7 @@ class Share {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "get",
       constructUrl({
@@ -324,7 +325,7 @@ class Share {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -386,7 +387,7 @@ class Share {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "get",
       constructUrl({
@@ -448,7 +449,7 @@ class Share {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({

package/sdk/application/Theme/ThemeApplicationClient.js

@@ -1,10 +1,11 @@
-const APIClient = require("../ApplicationAPIClient");
+const ApplicationAPIClient = require("../ApplicationAPIClient");
+const { FDKClientValidationError } = require("../../common/FDKError");
 const constructUrl = require("../constructUrl");
 const Paginator = require("../../common/Paginator");
-const { FDKClientValidationError } = require("../../common/FDKError");
 const ThemeValidator = require("./ThemeApplicationValidator");
 const ThemeModel = require("./ThemeApplicationModel");
 const { Logger } = require("./../../common/Logger");
+const Joi = require("joi");
 
 class Theme {
   constructor(_conf) {
@@ -64,7 +65,7 @@ class Theme {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "get",
       constructUrl({
@@ -126,7 +127,7 @@ class Theme {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "get",
       constructUrl({
@@ -188,7 +189,7 @@ class Theme {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "get",
       constructUrl({
@@ -251,7 +252,7 @@ class Theme {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "get",
       constructUrl({

package/sdk/application/User/UserApplicationClient.js

@@ -1,10 +1,11 @@
-const APIClient = require("../ApplicationAPIClient");
+const ApplicationAPIClient = require("../ApplicationAPIClient");
+const { FDKClientValidationError } = require("../../common/FDKError");
 const constructUrl = require("../constructUrl");
 const Paginator = require("../../common/Paginator");
-const { FDKClientValidationError } = require("../../common/FDKError");
 const UserValidator = require("./UserApplicationValidator");
 const UserModel = require("./UserApplicationModel");
 const { Logger } = require("./../../common/Logger");
+const Joi = require("joi");
 
 class User {
   constructor(_conf) {
@@ -118,7 +119,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "put",
       constructUrl({
@@ -183,7 +184,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "put",
       constructUrl({
@@ -260,7 +261,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "delete",
       constructUrl({
@@ -344,7 +345,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "delete",
       constructUrl({
@@ -405,7 +406,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -468,7 +469,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -530,7 +531,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "get",
       constructUrl({
@@ -592,7 +593,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "get",
       constructUrl({
@@ -654,7 +655,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "get",
       constructUrl({
@@ -714,7 +715,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "get",
       constructUrl({
@@ -779,7 +780,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -842,7 +843,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -905,7 +906,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -968,7 +969,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -1031,7 +1032,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -1094,7 +1095,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -1157,7 +1158,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -1218,7 +1219,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -1278,7 +1279,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "get",
       constructUrl({
@@ -1341,7 +1342,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -1406,7 +1407,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -1469,7 +1470,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -1532,7 +1533,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -1599,7 +1600,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -1662,7 +1663,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -1730,7 +1731,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -1799,7 +1800,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -1863,7 +1864,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -1926,7 +1927,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -1987,7 +1988,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -2052,7 +2053,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -2115,7 +2116,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -2180,7 +2181,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -2241,7 +2242,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({
@@ -2306,7 +2307,7 @@ class User {
 
     const xHeaders = {};
 
-    const response = await APIClient.execute(
+    const response = await ApplicationAPIClient.execute(
       this._conf,
       "post",
       constructUrl({

package/sdk/common/AxiosHelper.js

@@ -102,7 +102,11 @@ fdkAxios.interceptors.request.use(
     }
   },
   function (error) {
-    Logger({ level: "ERROR", message: error });
+    Logger({
+      level: "ERROR",
+      message: error.data || error.message,
+      stack: error.data.stack || error.stack,
+    });
   }
 );
 
@@ -115,16 +119,19 @@ fdkAxios.interceptors.response.use(
     Logger({
       level: "DEBUG",
       type: "RESPONSE",
-      message: response.config,
+      message: response.data,
       url: response.config.url,
-      response: response.data,
     });
     return response.data; // IF 2XX then return response.data only
   },
   function (error) {
     if (error.response) {
       // Request made and server responded
-      Logger({ level: "ERROR", message: error });
+      Logger({
+        level: "ERROR",
+        message: error.response.data || error.message,
+        stack: error.response.data.stack || error.stack,
+      });
       throw new FDKServerResponseError(
         error.response.data.message || error.message,
         error.response.data.stack || error.stack,
@@ -134,7 +141,11 @@ fdkAxios.interceptors.response.use(
       );
     } else if (error.request) {
       // The request was made but no error.response was received
-      Logger({ level: "ERROR", message: error });
+      Logger({
+        level: "ERROR",
+        message: error.data || error.message,
+        stack: error.data.stack || error.stack,
+      });
       throw new FDKServerResponseError(
         error.message,
         error.stack,
@@ -143,7 +154,7 @@ fdkAxios.interceptors.response.use(
       );
     } else {
       // Something happened in setting up the request that triggered an Error
-      Logger({ level: "ERROR", message: error });
+      Logger({ level: "ERROR", message: error.message });
       throw new FDKServerResponseError(error.message, error.stack);
     }
   }

package/sdk/common/BaseOAuthClient.d.ts

@@ -0,0 +1,17 @@
+export = BaseOAuthClient;
+declare class BaseOAuthClient {
+    constructor(config: any);
+    config: any;
+    token: any;
+    refreshToken: any;
+    retryOAuthTokenTimer: NodeJS.Timeout;
+    raw_token: any;
+    token_expires_in: any;
+    token_expires_at: number;
+    useAutoRenewTimer: any;
+    getAccessToken(): Promise<any>;
+    isTokenExpired(ttl?: number): boolean;
+    setToken(token: any): void;
+    retryOAuthToken(expires_in: any): void;
+    renewAccessToken(): Promise<void>;
+}

package/sdk/common/BaseOAuthClient.js

@@ -0,0 +1,67 @@
+const { Logger } = require("./Logger");
+
+class BaseOAuthClient {
+  constructor(config) {
+    this.config = config;
+    this.token = null;
+    this.refreshToken = null;
+    this.retryOAuthTokenTimer = null;
+    this.raw_token = null;
+    this.token_expires_in = null;
+    this.token_expires_at = 0;
+    this.useAutoRenewTimer =
+      config.useAutoRenewTimer !== undefined ? config.useAutoRenewTimer : true;
+  }
+
+  async getAccessToken() {
+    if (
+      !this.useAutoRenewTimer &&
+      this.refreshToken &&
+      this.isTokenExpired(120)
+    ) {
+      // Check if token is about to expire in less than 2 mins.
+      // Renew if to be expired and auto renew timer is not enabled.
+      await this.renewAccessToken();
+    }
+    return this.token;
+  }
+
+  // default TTL checked 0 seconds
+  isTokenExpired(ttl = 0) {
+    const currentTimestamp = new Date().getTime();
+    // Check if token is about to expire in less than 2 mins
+    if ((this.token_expires_at - currentTimestamp) / 1000 < ttl) {
+      return true;
+    }
+    return false;
+  }
+
+  setToken(token) {
+    this.raw_token = token;
+    this.token_expires_in = token.expires_in;
+    this.token = token.access_token;
+    this.token_expires_at = token.expires_at || this.token_expires_at;
+    this.refreshToken = token.refresh_token ? token.refresh_token : null;
+    if (this.refreshToken && this.useAutoRenewTimer) {
+      this.retryOAuthToken(token.expires_in);
+    }
+  }
+
+  retryOAuthToken(expires_in) {
+    Logger({ type: "INFO", message: "Retrying OAuth Token" });
+    if (this.retryOAuthTokenTimer) {
+      clearTimeout(this.retryOAuthTokenTimer);
+    }
+    if (expires_in > 60) {
+      this.retryOAuthTokenTimer = setTimeout(() => {
+        this.renewAccessToken();
+      }, (expires_in - 60) * 1000);
+    }
+  }
+
+  async renewAccessToken() {
+    // Impementation to renew Access Token
+  }
+}
+
+module.exports = BaseOAuthClient;

package/sdk/common/RequestSigner.js

@@ -1,6 +1,5 @@
 "use strict";
 
-const url = require("url");
 const querystring = require("query-string");
 const sha256 = require("crypto-js/sha256");
 const hmacSHA256 = require("crypto-js/hmac-sha256");
@@ -39,10 +38,6 @@ const HEADERS_TO_INCLUDE = ["x-fp-.*", "host"];
 // request: { path | body, [host], [method], [headers], [service], [region] }
 class RequestSigner {
   constructor(request) {
-    if (typeof request === "string") {
-      request = url.parse(request);
-    }
-
     let headers = (request.headers = request.headers || {});
     this.request = request;
 

package/sdk/partner/OAuthClient.d.ts

@@ -0,0 +1,14 @@
+export = OAuthClient;
+declare class OAuthClient extends BaseOAuthClient {
+    startAuthorization(options: any): string;
+    verifyCallback(query: any): Promise<void>;
+    renewAccessToken(isOfflineToken?: boolean): Promise<any>;
+    getNewAccessToken(): Promise<any>;
+    getAccesstokenObj({ grant_type, client_id, client_secret, scope }: {
+        grant_type: any;
+        client_id: any;
+        client_secret: any;
+        scope: any;
+    }): Promise<any>;
+}
+import BaseOAuthClient = require("../common/BaseOAuthClient");