From 6d55b7cb52f5cae28e1c65c015363fdc117a8875 Mon Sep 17 00:00:00 2001
From: Elsio Sanchez <45974454+elsiosanchez@users.noreply.github.com>
Date: Wed, 4 Nov 2020 16:15:17 -0400
Subject: [PATCH] Change environment variables (#534)

* Change environment variables

* change baseUrl

Co-authored-by: elsiosanchez <elsiosanches@gmial.com>
---
 src/api/ADempiere/config.json   | 17 +++++++++++++++++
 src/api/ADempiere/constants.js  |  5 -----
 src/api/ADempiere/instances.js  |  8 ++++----
 src/utils/ADempiere/resource.js |  7 ++++---
 4 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 src/api/ADempiere/config.json
 delete mode 100644 src/api/ADempiere/constants.js

diff --git a/src/api/ADempiere/config.json b/src/api/ADempiere/config.json
new file mode 100644
index 00000000..d38cbaa0
--- /dev/null
+++ b/src/api/ADempiere/config.json
@@ -0,0 +1,17 @@
+{
+  "adempiereApi": {
+    "images": {
+      "protocol": "http:",
+      "baseUrl": "//localhost",
+      "port": 9527
+    }
+  },
+  "adempiereStore": {
+    "images": {
+      "protocol": "http:",
+      "baseUrl": "//0.0.0.0:",
+      "port": 8085
+    }
+  },
+  "service": "/adempiere-api"
+}
diff --git a/src/api/ADempiere/constants.js b/src/api/ADempiere/constants.js
deleted file mode 100644
index a986930d..00000000
--- a/src/api/ADempiere/constants.js
+++ /dev/null
@@ -1,5 +0,0 @@
-
-const apiRestAddress = process.env.VUE_APP_API_REST_ADDRESS || 'http://localhost'
-const apiRestPort = process.env.VUE_APP_API_REST_PORT || '8085'
-
-export const API_REST_ADDRESS = `${apiRestAddress}:${apiRestPort}/adempiere-api`
diff --git a/src/api/ADempiere/instances.js b/src/api/ADempiere/instances.js
index eadb5d0f..e253ecca 100644
--- a/src/api/ADempiere/instances.js
+++ b/src/api/ADempiere/instances.js
@@ -1,6 +1,6 @@
 /**
  * Instance for connection to API RESTful with axios
- * @author EdwinBetanc0urt <EdwinBetanc0urt@oulook.com>
+ * @author elsiosanchez <elsiosanches@gmail.com>
  * @param {string} url to resource request
  * @param {string} method rest, 'get' and 'post' (as default)
  * @param {object} data body to send post request
@@ -23,11 +23,11 @@ export function ApiRest({
     })
     return request.interceptors
   }
-  const { API_REST_ADDRESS } = require('@/api/ADempiere/constants.js')
+  const config = require('@/api/ADempiere/config.json')
+  const apiRestAddress = config.adempiereStore.images.protocol + config.adempiereStore.images.baseUrl + config.adempiereStore.images.port + config.service
   const axios = require('axios')
-
   const request = axios.create({
-    baseURL: API_REST_ADDRESS,
+    baseURL: apiRestAddress,
     // timeout: 10000, // 10s
     headers: {
       'Content-Type': 'application/json;charset=UTF-8'
diff --git a/src/utils/ADempiere/resource.js b/src/utils/ADempiere/resource.js
index 780b5eb9..9e108619 100644
--- a/src/utils/ADempiere/resource.js
+++ b/src/utils/ADempiere/resource.js
@@ -25,7 +25,7 @@ export function buildImageFromArray({
 
 /**
  * Build a base 64 image from arrayBuffer
- * @author EdwinBetanc0urt <EdwinBetanc0urt@oulook.com>
+ * @author elsiosanchez <Elsiosanches@gmail.com>
  * @param {array} arrayBuffer
  * @param {string} contentType
  * @returns {string} image as base64 encoded
@@ -43,7 +43,7 @@ export function buildImageFromArrayBuffer({
 
 /**
  * Get path to get file
- * @author EdwinBetanc0urt <EdwinBetanc0urt@oulook.com>
+ * @author elsiosanchez <Elsiosanches@gmail.com>
  * @param {string} file
  * @param {number} width
  * @param {number} height
@@ -57,7 +57,8 @@ export function getImagePath({
   operation = 'fit'
 }) {
   // TODO: Evaluate path url 'http://domain:port/adempiere-api', 'adempiere-api' is part of urn
-  const { API_REST_ADDRESS: url } = require('@/api/ADempiere/constants.js')
+  const config = require('@/api/ADempiere/config.json')
+  const url = config.adempiereStore.images.protocol + config.adempiereStore.images.baseUrl + config.adempiereStore.images.port + config.service
   const urn = `/img?action=${operation}&width=${width}&height=${height}&url=${file}`
   const uri = `${url}${urn}`