vineanova-redux-artifacts 1.83.0 → 1.85.0

package/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## 1.83.0 (2022-10-14)
+## 1.85.0 (2022-10-17)
 
 
 ### Features

package/dist/services/config/serviceConfig.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _get = _interopRequireDefault(require("lodash/get"));
 var _axios = _interopRequireDefault(require("axios"));
 var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
 var _isNil = _interopRequireDefault(require("lodash/isNil"));
@@ -29,21 +30,25 @@ var ServiceConfigClass = /*#__PURE__*/function () {
     value: function initConfig(config) {
       this.config = config;
     }
+  }, {
+    key: "isTestEnv",
+    value: function isTestEnv() {
+      var isTest = (0, _get["default"])(this.config, 'environment.isTest', null);
+      var isLocalHost = (0, _get["default"])(this.config, 'environment.isLocalHost', null);
+      return isTest || isLocalHost;
+    }
   }, {
     key: "getBaseUri",
     value: function getBaseUri(serviceType) {
       _winstonLogger["default"].debug(this.config);
-      var userEmail = get(this.config, 'user.email', null);
+      var userEmail = (0, _get["default"])(this.config, 'user.email', null);
       var isDemoUser = userEmail === 'VineaNovaDemoAdmin.com' && serviceType !== 'login';
-      var isTest = get(this.config, 'environment.isTest', null);
-      var isLocalHost = get(this.config, 'environment.isLocalHost', null);
-      isTest = isTest || isLocalHost;
       if (serviceType === 'mock' || isDemoUser) {
         apiUrl = mockApiUrl;
       } else if (serviceType === 'login') {
-        apiUrl = isTest ? process.env.REACT_APP_COMMON_USER_API : process.env.REACT_APP_PROD_COMMON_USER_API;
+        apiUrl = this.isTestEnv() ? process.env.REACT_APP_COMMON_USER_API : process.env.REACT_APP_PROD_COMMON_USER_API;
       } else {
-        apiUrl = isTest ? process.env.REACT_APP_CORE_API : process.env.REACT_APP_PROD_CORE_API;
+        apiUrl = this.isTestEnv() ? process.env.REACT_APP_CORE_API : process.env.REACT_APP_PROD_CORE_API;
       }
       return apiUrl;
     }
@@ -78,6 +83,7 @@ var ServiceConfigClass = /*#__PURE__*/function () {
       _winstonLogger["default"].debug("serviceType", {
         serviceType: serviceType
       });
+      var isTest = this.isTestEnv();
       var _this$config$user = this.config.user,
         accessToken = _this$config$user.accessToken,
         orgDetails = _this$config$user.orgDetails;
@@ -95,6 +101,8 @@ var ServiceConfigClass = /*#__PURE__*/function () {
       });
       client.interceptors.request.use(function (config) {
         // Do something before request is sent
+        var appCode = isTest ? process.env.REACT_APP_FUNCTION_CODE : process.env.REACT_APP_PROD_FUNCTION_CODE;
+        config.params.code = appCode;
         config.headers.Authorization = "Bearer ".concat(accessToken);
         config.headers["x-orgname"] = displayName;
         config.headers["x-tid"] = id;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vineanova-redux-artifacts",
-  "version": "1.83.0",
+  "version": "1.85.0",
   "description": "",
   "main": "dist/index.js",
   "browser": "lib/index.js",

package/src/services/config/serviceConfig.js

@@ -1,5 +1,6 @@
 /* eslint-disable class-methods-use-this */
 /* eslint-disable no-param-reassign */
+import get from 'lodash/get';
 import axios from "axios";
 import isEmpty from "lodash/isEmpty";
 import isNil from "lodash/isNil";
@@ -19,23 +20,26 @@ class ServiceConfigClass {
     this.config = config;
   }
 
+  isTestEnv() {
+    const isTest = get(this.config, 'environment.isTest', null);
+    const isLocalHost = get(this.config, 'environment.isLocalHost', null);
+    return isTest || isLocalHost;
+  }
+
   getBaseUri(serviceType) {
     logger.debug(this.config);
     const userEmail = get(this.config, 'user.email', null);
     const isDemoUser =
       userEmail === 'VineaNovaDemoAdmin.com' && serviceType !== 'login';
-    let isTest = get(this.config, 'environment.isTest', null);
-    const isLocalHost = get(this.config, 'environment.isLocalHost', null);
-    isTest = isTest || isLocalHost;
 
     if (serviceType === 'mock' || isDemoUser) {
       apiUrl = mockApiUrl;
     } else if (serviceType === 'login') {
-      apiUrl = isTest
+      apiUrl = this.isTestEnv()
         ? process.env.REACT_APP_COMMON_USER_API
         : process.env.REACT_APP_PROD_COMMON_USER_API;
     } else {
-      apiUrl = isTest
+      apiUrl = this.isTestEnv()
         ? process.env.REACT_APP_CORE_API
         : process.env.REACT_APP_PROD_CORE_API;
     }
@@ -65,6 +69,7 @@ class ServiceConfigClass {
   request(options, serviceType) {
     // logger.debug('currentConfig', this.config);
     logger.debug("serviceType", { serviceType });
+    const isTest = this.isTestEnv();
     const { accessToken, orgDetails } = this.config.user;
     if (isEmpty(accessToken) || isNil(accessToken) || isEmpty(orgDetails)) {
       throw new Error("serviceConfig -> No Access token available");
@@ -82,6 +87,10 @@ class ServiceConfigClass {
     client.interceptors.request.use(
       (config) => {
         // Do something before request is sent
+        const appCode = isTest
+          ? process.env.REACT_APP_FUNCTION_CODE
+          : process.env.REACT_APP_PROD_FUNCTION_CODE;
+        config.params.code = appCode;
         config.headers.Authorization = `Bearer ${accessToken}`;
         config.headers["x-orgname"] = displayName;
         config.headers["x-tid"] = id;