Remove unnecessary request utility (#706)

- Use default request utility from legacy source code
- Improve calling structure
- Implement posibility of create endpoint for request
- Allows define a generic calling for backend service
- Remove unnecessary functions

config/default.json

@@ -5,14 +5,10 @@
   },
   "adempiere": {
     "api": {
-      "url": "https://api.erpya.com",
+      "url": "https://api.erpya.com/adempiere-api"
-      "service": "/adempiere-api",
-      "fullPath": "https://api.erpya.com/adempiere-api"
     },
     "images": {
-      "url": "https://api.erpya.com",
+      "url": "https://api.erpya.com/adempiere-api/img"
-      "service": "/adempiere-api/img",
-      "fullPath": "https://api.erpya.com/adempiere-api/img"
     }
   }
 }

src/api/ADempiere/browser.js

@@ -1,8 +1,6 @@
 // Get Instance for connection
-import {
+import request from '@/utils/request'
-  ApiRest as requestRest,
+import { config } from '@/utils/ADempiere/config'
-  evaluateResponse
-} from '@/api/ADempiere/instances.js'
 
 /**
  * Request a browser search
@@ -40,7 +38,8 @@ export function requestBrowserSearch({
     }
   })
 
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/list-browser-items',
     data: {
       // Running Parameters
@@ -60,7 +59,6 @@ export function requestBrowserSearch({
       page_size: pageSize
     }
   })
-    .then(evaluateResponse)
     .then(responseBrowserSearch => {
       const { convertEntityList } = require('@/utils/ADempiere/apiConverts/persistence.js')
 

src/api/ADempiere/dashboard/dashboard.js

@@ -2,10 +2,8 @@
 // please if you want to implement a custom dashboard create a new fielwith api definition
 
 // Get Instance for connection
-import {
+import request from '@/utils/request'
-  ApiRest as requestRest,
+import { config } from '@/utils/ADempiere/config'
-  evaluateResponse
-} from '@/api/ADempiere/instances.js'
 
 // Get Recent Items based on selection option
 export function requestListRecentItems({
@@ -14,8 +12,10 @@ export function requestListRecentItems({
   pageToken,
   pageSize
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/logs/list-recent-items',
+    method: 'post',
     data: {
       user_uuid: userUuid,
       role_uuid: roleUuid,
@@ -27,7 +27,6 @@ export function requestListRecentItems({
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(recentItmesReponse => {
       const { convertRecentItemsList } = require('@/utils/ADempiere/apiConverts/dashboard.js')
 
@@ -45,8 +44,10 @@ export function getFavoritesFromServer({
   pageToken,
   pageSize
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/dashboard/list-favorites',
+    method: 'post',
     data: {
       user_id: userId,
       user_uuid: userUuid
@@ -57,7 +58,6 @@ export function getFavoritesFromServer({
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(favoritesListReponse => {
       const { convertFavorite } = require('@/utils/ADempiere/apiConverts/dashboard.js')
 
@@ -80,8 +80,10 @@ export function getPendingDocumentsFromServer({
   pageToken,
   pageSize
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/dashboard/list-pending-documents',
+    method: 'post',
     data: {
       user_id: userId,
       user_uuid: userUuid,
@@ -94,7 +96,6 @@ export function getPendingDocumentsFromServer({
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(pendingDocumentsListResponse => {
       const { convertPendingDocument } = require('@/utils/ADempiere/apiConverts/dashboard.js')
 
@@ -115,8 +116,10 @@ export function requestLisDashboards({
   pageToken,
   pageSize
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/dashboard/list-dashboards',
+    method: 'post',
     data: {
       role_id: roleId,
       role_uuid: roleUuid
@@ -127,7 +130,6 @@ export function requestLisDashboards({
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(dashboardsListResponse => {
       const { convertDashboard } = require('@/utils/ADempiere/apiConverts/dashboard.js')
 

src/api/ADempiere/dictionary.js

@@ -1,8 +1,6 @@
 // Get Instance for connection
-import {
+import request from '@/utils/request'
-  ApiRest as requestRest,
+import { config } from '@/utils/ADempiere/config'
-  evaluateResponse
-} from '@/api/ADempiere/instances.js'
 
 /**
  * Request dictionary Window metadata
@@ -13,7 +11,8 @@ export function requestWindowMetadata({
   uuid,
   id
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/dictionary/window',
     method: 'get',
     params: {
@@ -21,7 +20,6 @@ export function requestWindowMetadata({
       id
     }
   })
-    .then(evaluateResponse)
     .then(windowResponse => {
       const { convertWindow } = require('@/utils/ADempiere/apiConverts/dictionary.js')
 
@@ -38,7 +36,8 @@ export function requestProcessMetadata({
   uuid,
   id
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/dictionary/process',
     method: 'get',
     params: {
@@ -46,7 +45,6 @@ export function requestProcessMetadata({
       id
     }
   })
-    .then(evaluateResponse)
     .then(processResponse => {
       const { convertProcess } = require('@/utils/ADempiere/apiConverts/dictionary.js')
 
@@ -63,7 +61,8 @@ export function requestBrowserMetadata({
   uuid,
   id
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/dictionary/browser',
     method: 'get',
     params: {
@@ -71,7 +70,6 @@ export function requestBrowserMetadata({
       id
     }
   })
-    .then(evaluateResponse)
     .then(browserResponse => {
       const { convertBrowser } = require('@/utils/ADempiere/apiConverts/dictionary.js')
 
@@ -88,7 +86,8 @@ export function requestForm({
   uuid,
   id
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/dictionary/form',
     method: 'get',
     params: {
@@ -96,7 +95,6 @@ export function requestForm({
       id
     }
   })
-    .then(evaluateResponse)
     .then(formResponse => {
       const { convertForm } = require('@/utils/ADempiere/apiConverts/dictionary.js')
 
@@ -114,7 +112,8 @@ export function requestFieldMetadata({
   columnName,
   elementColumnName
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/dictionary/field',
     method: 'get',
     params: {
@@ -128,7 +127,6 @@ export function requestFieldMetadata({
       element_column_name: elementColumnName
     }
   })
-    .then(evaluateResponse)
     .then(fieldResponse => {
       const { convertField } = require('@/utils/ADempiere/apiConverts/field.js')
 
@@ -140,7 +138,7 @@ export function requestReference({
   uuid,
   columnName
 }) {
-  return requestRest({
+  return request({
     url: '/dictionary/reference',
     method: 'get',
     params: {
@@ -148,7 +146,6 @@ export function requestReference({
       column_name: columnName
     }
   })
-    .then(evaluateResponse)
     .then(validationResponse => {
       const { convertReference } = require('@/utils/ADempiere/apiConverts/field.js')
 
@@ -160,7 +157,8 @@ export function requestValidationRule({
   uuid,
   id
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/dictionary/validation',
     method: 'get',
     params: {
@@ -168,7 +166,6 @@ export function requestValidationRule({
       id
     }
   })
-    .then(evaluateResponse)
     .then(validationResponse => {
       const { convertValidationRule } = require('@/utils/ADempiere/apiConverts/dictionary.js')
 

src/api/ADempiere/enrollment.js

@@ -1,8 +1,6 @@
 // Get Instance for connection
-import {
+import request from '@/utils/request'
-  ApiRest as requestRest,
+import { config } from '@/utils/ADempiere/config'
-  evaluateResponse
-} from '@/api/ADempiere/instances.js'
 
 const clientVersion = '1.0.0'
 const applicationType = 'ADempiere-Vue'
@@ -19,7 +17,8 @@ export function requestEnrollUser({
   password,
   eMail
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/enrollment/enroll',
     data: {
       user_name: userName,
@@ -30,7 +29,6 @@ export function requestEnrollUser({
       application_type: applicationType
     }
   })
-    .then(evaluateResponse)
     .then(enrollResponse => {
       return {
         userName: enrollResponse.user_name,
@@ -52,7 +50,8 @@ export function requestForgotPassword(eMailOrUserName) {
     userName = eMailOrUserName
   }
 
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/enrollment/reset-password',
     data: {
       user_name: userName,
@@ -61,7 +60,6 @@ export function requestForgotPassword(eMailOrUserName) {
       application_type: applicationType
     }
   })
-    .then(evaluateResponse)
     .then(forgotResponse => {
       return {
         responseType: forgotResponse.response_type,
@@ -79,7 +77,8 @@ export function requestChangePassword({
   token,
   password
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/enrollment/change-password',
     data: {
       token,
@@ -88,7 +87,6 @@ export function requestChangePassword({
       application_type: applicationType
     }
   })
-    .then(evaluateResponse)
     .then(changePasswordResponse => {
       return {
         responseType: changePasswordResponse.response_type,
@@ -105,7 +103,8 @@ export function requestChangePassword({
 export function requestActivateUser({
   token
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/enrollment/activate-user',
     data: {
       token,
@@ -113,7 +112,6 @@ export function requestActivateUser({
       application_type: applicationType
     }
   })
-    .then(evaluateResponse)
     .then(activateUserResponse => {
       return {
         responseType: activateUserResponse.response_type,

src/api/ADempiere/field/preference.js

@@ -1,8 +1,7 @@
 // Service for backend based on API
 // use this service for consume all related to preference of field
-import {
+import request from '@/utils/request'
-  ApiRest as serviceApi
+import { config } from '@/utils/ADempiere/config'
-} from '@/api/ADempiere/instances.js'
 
 // Update preference from API using criteria
 export function setPreference({
@@ -15,8 +14,10 @@ export function setPreference({
   isForCurrentOrganization,
   isForCurrentContainer
 }) {
-  return serviceApi({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/set-preference',
+    method: 'post',
     data: {
       container_uuid: parentUuid,
       column_name: attribute,
@@ -39,8 +40,10 @@ export function deletePreference({
   isForCurrentOrganization,
   isForCurrentContainer
 }) {
-  return serviceApi({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/delete-preference',
+    method: 'post',
     data: {
       container_uuid: parentUuid,
       column_name: attribute,

src/api/ADempiere/form/point-of-sales.js

@@ -1,8 +1,7 @@
 // Get Instance for connection
-import {
+import request from '@/utils/request'
-  ApiRest as requestRest,
+import { config } from '@/utils/ADempiere/config'
-  evaluateResponse
+
-} from '@/api/ADempiere/instances.js'
 import { isEmptyValue } from '@/utils/ADempiere'
 
 /**
@@ -16,13 +15,14 @@ export { requestGetConversionRate } from '@/api/ADempiere/system-core.js'
 export function requestGetPointOfSales({
   posUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/get-point-of-sales',
+    method: 'post',
     data: {
       point_of_sales_uuid: posUuid
     }
   })
-    .then(evaluateResponse)
     .then(posResponse => {
       const { convertPointOfSales } = require('@/utils/ADempiere/apiConverts/pos.js')
 
@@ -36,8 +36,10 @@ export function requestListPointOfSales({
   pageSize,
   pageToken
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/list-point-of-sales',
+    method: 'post',
     data: {
       user_uuid: userUuid
     },
@@ -46,7 +48,6 @@ export function requestListPointOfSales({
       page_token: pageToken
     }
   })
-    .then(evaluateResponse)
     .then(posListResponse => {
       const { convertPointOfSales } = require('@/utils/ADempiere/apiConverts/pos.js')
 
@@ -67,8 +68,10 @@ export function requestCreateOrder({
   documentTypeUuid,
   salesRepresentativeUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/create-order',
+    method: 'post',
     data: {
       pos_uuid: posUuid,
       customer_uuid: customerUuid,
@@ -76,7 +79,6 @@ export function requestCreateOrder({
       sales_representative_uuid: salesRepresentativeUuid
     }
   })
-    .then(evaluateResponse)
     .then(createOrderResponse => {
       const { convertOrder } = require('@/utils/ADempiere/apiConverts/pos.js')
 
@@ -91,8 +93,10 @@ export function requestUpdateOrder({
   customerUuid,
   description
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/update-order',
+    method: 'post',
     data: {
       order_uuid: orderUuid,
       pos_uuid: posUuid,
@@ -100,7 +104,6 @@ export function requestUpdateOrder({
       description
     }
   })
-    .then(evaluateResponse)
     .then(updateOrderResponse => {
       const { convertOrder } = require('@/utils/ADempiere/apiConverts/pos.js')
 
@@ -110,13 +113,14 @@ export function requestUpdateOrder({
 
 // Get order from uuid
 export function requestGetOrder(orderUuid) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/get-order',
+    method: 'post',
     data: {
       order_uuid: orderUuid
     }
   })
-    .then(evaluateResponse)
     .then(getOrderResponse => {
       const { convertOrder } = require('@/utils/ADempiere/apiConverts/pos.js')
 
@@ -132,8 +136,10 @@ export function requestDeleteOrder({
   // documentTypeUuid,
   // salesRepresentativeUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/delete-order',
+    method: 'post',
     data: {
       order_uuid: orderUuid
       // pos_uuid: posUuid,
@@ -142,7 +148,9 @@ export function requestDeleteOrder({
       // sales_representative_uuid: salesRepresentativeUuid
     }
   })
-    .then(evaluateResponse)
+    .then(response => {
+      return response
+    })
 }
 
 // List orders from pos uuid
@@ -204,8 +212,10 @@ export function requestListOrders({
   })
   */
 
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/list-orders',
+    method: 'post',
     data: {
       pos_uuid: posUuid,
       document_no: documentNo,
@@ -225,7 +235,6 @@ export function requestListOrders({
       page_token: pageToken
     }
   })
-    .then(evaluateResponse)
     .then(ordersListResponse => {
       const { convertOrder } = require('@/utils/ADempiere/apiConverts/pos.js')
 
@@ -250,8 +259,10 @@ export function requestCreateOrderLine({
   price,
   discountRate
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/create-order-line',
+    method: 'post',
     data: {
       order_uuid: orderUuid,
       product_uuid: productUuid,
@@ -263,7 +274,6 @@ export function requestCreateOrderLine({
       warehouse_uuid: warehouseUuid
     }
   })
-    .then(evaluateResponse)
     .then(createOrderLineResponse => {
       const { convertOrderLine } = require('@/utils/ADempiere/apiConverts/pos.js')
 
@@ -279,8 +289,10 @@ export function requestUpdateOrderLine({
   price,
   discountRate
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/update-order-line',
+    method: 'post',
     data: {
       // is_add_quantity: true,
       order_line_uuid: orderLineUuid,
@@ -290,7 +302,6 @@ export function requestUpdateOrderLine({
       discount_rate: discountRate
     }
   })
-    .then(evaluateResponse)
     .then(createOrderLineResponse => {
       const { convertOrderLine } = require('@/utils/ADempiere/apiConverts/pos.js')
 
@@ -302,13 +313,17 @@ export function requestUpdateOrderLine({
 export function requestDeleteOrderLine({
   orderLineUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/delete-order-line',
+    method: 'post',
     data: {
       order_line_uuid: orderLineUuid
     }
   })
-    .then(evaluateResponse)
+    .then(response => {
+      return response
+    })
 }
 
 export function requestListOrderLines({
@@ -316,8 +331,10 @@ export function requestListOrderLines({
   pageSize,
   pageToken
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/list-order-lines',
+    method: 'post',
     data: {
       order_uuid: orderUuid
     },
@@ -326,7 +343,6 @@ export function requestListOrderLines({
       page_token: pageToken
     }
   })
-    .then(evaluateResponse)
     .then(ordersLineListResponse => {
       const { convertOrderLine } = require('@/utils/ADempiere/apiConverts/pos.js')
 
@@ -341,13 +357,14 @@ export function requestListOrderLines({
 }
 
 export function getKeyLayout({ keyLayoutUuid }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/get-key-layout',
+    method: 'post',
     data: {
       key_layout_uuid: keyLayoutUuid
     }
   })
-    .then(evaluateResponse)
     .then(keyLayoutResponse => {
       const { convertKeyLayout } = require('@/utils/ADempiere/apiConverts/pos.js')
 
@@ -367,8 +384,10 @@ export function getProductPriceList({
   pageSize,
   pageToken
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/list-product-prices',
+    method: 'post',
     data: {
       price_list_uuid: priceListUuid,
       search_value: searchValue,
@@ -381,7 +400,6 @@ export function getProductPriceList({
       page_token: pageToken
     }
   })
-    .then(evaluateResponse)
     .then(productPriceListResponse => {
       const { convertProductPrice } = require('@/utils/ADempiere/apiConverts/core.js')
 
@@ -454,8 +472,10 @@ export function createPayment({
   tenderTypeCode,
   currencyUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/create-payment',
+    method: 'post',
     data: {
       pos_uuid: posUuid,
       order_uuid: orderUuid,
@@ -469,7 +489,6 @@ export function createPayment({
       currency_uuid: currencyUuid
     }
   })
-    .then(evaluateResponse)
     .then(createPaymentResponse => {
       return createPaymentResponse
     })
@@ -486,8 +505,10 @@ export function updatePayment({
   paymentDate,
   tenderTypeCode
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/update-payment',
+    method: 'post',
     data: {
       payment_uuid: paymentUuid,
       bank_uuid: bankUuid,
@@ -498,7 +519,6 @@ export function updatePayment({
       tender_type_code: tenderTypeCode
     }
   })
-    .then(evaluateResponse)
     .then(updatePaymentResponse => {
       return updatePaymentResponse
     })
@@ -509,13 +529,14 @@ export function updatePayment({
 export function deletePayment({
   paymentUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/delete-payment',
+    method: 'post',
     data: {
       payment_uuid: paymentUuid
     }
   })
-    .then(evaluateResponse)
     .then(deletePaymentResponse => {
       return deletePaymentResponse
     })
@@ -527,14 +548,15 @@ export function getPaymentsList({
   posUuid,
   orderUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/list-payments',
+    method: 'post',
     data: {
       pos_uuid: posUuid,
       order_uuid: orderUuid
     }
   })
-    .then(evaluateResponse)
     .then(listPaymentsResponse => {
       const { paymentsMethod } = require('@/utils/ADempiere/apiConverts/pos.js')
       return {
@@ -588,8 +610,10 @@ export function processOrder({
       }
     })
   }
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/process-order',
+    method: 'post',
     data: {
       pos_uuid: posUuid,
       order_uuid: orderUuid,
@@ -597,7 +621,6 @@ export function processOrder({
       payments: payments
     }
   })
-    .then(evaluateResponse)
     .then(processOrderResponse => {
       return processOrderResponse
     })

src/api/ADempiere/form/price-checking.js

@@ -1,8 +1,6 @@
 // Get Instance for connectionimport {
-import {
+import request from '@/utils/request'
-  ApiRest as requestRest,
+import { config } from '@/utils/ADempiere/config'
-  evaluateResponse
-} from '@/api/ADempiere/instances.js'
 
 // List Point of sales
 export function requestGetProductPrice({
@@ -15,8 +13,10 @@ export function requestGetProductPrice({
   warehouseUuid,
   validFrom
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/pos/get-product-price',
+    method: 'post',
     data: {
       search_value: searchValue,
       upc,
@@ -28,7 +28,6 @@ export function requestGetProductPrice({
       valid_from: validFrom
     }
   })
-    .then(evaluateResponse)
     .then(productPriceResponse => {
       const { convertProductPrice } = require('@/utils/ADempiere/apiConverts/core.js')
 

src/api/ADempiere/instances.js

@@ -1,75 +0,0 @@
-import { config } from '@/utils/ADempiere/config'
-/**
- * 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
- * @param {object} params to send get uri
- * @param {string} responseType default is 'json'
- * @returns {function}
- */
-export function ApiRest({
-  url,
-  method = 'post',
-  data = {},
-  params = {},
-  responseType = 'json'
-}) {
-  const setInterceptor = (request) => {
-    request.interceptors.response.use(response => {
-      return response.data
-    }, error => {
-      return Promise.reject(error)
-    })
-    return request.interceptors
-  }
-
-  const apiRestAddress = config.adempiere.api.fullPath
-  const axios = require('axios')
-  const request = axios.create({
-    baseURL: apiRestAddress,
-    // timeout: 10000, // 10s
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8'
-    },
-    responseType
-  })
-  request.interceptors = setInterceptor(request)
-
-  const { getToken } = require('@/utils/auth')
-  const { getLanguage } = require('@/lang/index')
-  const language = getLanguage() || 'en_US'
-  params = {
-    token: getToken(),
-    language,
-    ...params
-  }
-
-  return request({
-    url,
-    method,
-    data,
-    params
-  })
-}
-
-/**
- * Evaluate the response if is a success or error
- * @author EdwinBetanc0urt <EdwinBetanc0urt@oulook.com>
- * @author elsiosanchez <elsiosanches@gmail.com>
- * @param {object} response
- * @returns {mixed}
- */
-export const evaluateResponse = (response) => {
-  if (response.code >= 400) {
-    const error = {
-      code: response.code,
-      message: response.result
-    }
-    throw error
-  }
-
-  return response.result
-}

src/api/ADempiere/persistence.js

@@ -1,8 +1,6 @@
 // Get Instance for connection
-import {
+import request from '@/utils/request'
-  ApiRest as requestRest,
+import { config } from '@/utils/ADempiere/config'
-  evaluateResponse
-} from '@/api/ADempiere/instances.js'
 
 /**
  * Create entity
@@ -20,14 +18,15 @@ export function requestCreateEntity({
     }
   })
 
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/data/create',
+    method: 'post',
     data: {
       table_name: tableName,
       attributes: attributesList
     }
   })
-    .then(evaluateResponse)
     .then(entityCreateResponse => {
       const { convertEntity } = require('@/utils/ADempiere/apiConverts/persistence.js')
 
@@ -55,8 +54,10 @@ export function requestUpdateEntity({
     }
   })
 
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/data/update',
+    method: 'post',
     data: {
       table_name: tableName,
       id: recordId,
@@ -64,7 +65,6 @@ export function requestUpdateEntity({
       attributes: attributesList
     }
   })
-    .then(evaluateResponse)
     .then(entityUpdateResponse => {
       const { convertEntity } = require('@/utils/ADempiere/apiConverts/persistence.js')
 
@@ -83,14 +83,18 @@ export function requestDeleteEntity({
   recordId,
   recordUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/data/delete',
+    method: 'post',
     data: {
       table_name: tableName,
       id: recordId,
       uuid: recordUuid
     }
-  }).then(evaluateResponse)
+  }).then(response => {
+    return response
+  })
 }
 
 /**
@@ -105,8 +109,10 @@ export function rollbackEntity({
   recordUuid,
   eventType
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/data/rollback-entity',
+    method: 'post',
     data: {
       table_name: tableName,
       id: recordId,
@@ -114,7 +120,6 @@ export function rollbackEntity({
       event_type: eventType
     }
   })
-    .then(evaluateResponse)
     .then(entityResponse => {
       const { convertEntity } = require('@/utils/ADempiere/apiConverts/persistence.js')
 
@@ -128,7 +133,8 @@ export function requestGetEntity({
   recordId,
   recordUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/data/entity',
     method: 'get',
     params: {
@@ -137,7 +143,6 @@ export function requestGetEntity({
       id: recordId
     }
   })
-    .then(evaluateResponse)
     .then(entityResponse => {
       const { convertEntity } = require('@/utils/ADempiere/apiConverts/persistence.js')
 
@@ -177,8 +182,10 @@ export function requestListEntities({
     }
   })
 
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/data/list',
+    method: 'post',
     data: {
       table_name: tableName,
       // DSL Query
@@ -196,7 +203,6 @@ export function requestListEntities({
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(entitiesListResponse => {
       const { convertEntityList } = require('@/utils/ADempiere/apiConverts/persistence.js')
 
@@ -219,8 +225,10 @@ export function requestTranslations({
   pageToken,
   pageSize
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/list-translations',
+    method: 'post',
     data: {
       table_name: tableName,
       id: recordId,
@@ -233,7 +241,6 @@ export function requestTranslations({
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(languageListResponse => {
       const { convertTranslation } = require('@/utils/ADempiere/apiConverts/persistence.js')
 
@@ -253,7 +260,8 @@ export function requestResource({ resourceUuid }, callBack = {
   onStatus: () => {},
   onEnd: () => {}
 }) {
-  const stream = requestRest({
+  const stream = request({
+    baseURL: config.adempiere.api.url,
     url: '/resource',
     method: 'get',
     params: {
@@ -293,7 +301,8 @@ export function requestImage({
     operation
   })
 
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: urn,
     method: 'get',
     responseType: 'arraybuffer'

src/api/ADempiere/private-access.js

@@ -1,8 +1,7 @@
 // Get Instance for connection
-import {
+import request from '@/utils/request'
-  ApiRest as requestRest,
+import { config } from '@/utils/ADempiere/config'
-  evaluateResponse
+
-} from '@/api/ADempiere/instances.js'
 import { convertPrivateAccess } from '@/utils/ADempiere/apiConverts/privateAccess.js'
 
 // Get private access for a record
@@ -11,15 +10,16 @@ export function requestGetPrivateAccess({
   recordId,
   recordUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/get-private-access',
+    method: 'post',
     data: {
       table_name: tableName,
       id: recordId,
       uuid: recordUuid
     }
   })
-    .then(evaluateResponse)
     .then(responsePrivateAccess => {
       return convertPrivateAccess(responsePrivateAccess)
     })
@@ -31,15 +31,16 @@ export function requestLockPrivateAccess({
   recordId,
   recordUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/lock-private-access',
+    method: 'post',
     data: {
       table_name: tableName,
       id: recordId,
       uuid: recordUuid
     }
   })
-    .then(evaluateResponse)
     .then(responsePrivateAccess => {
       return convertPrivateAccess(responsePrivateAccess)
     })
@@ -51,15 +52,16 @@ export function requestUnlockPrivateAccess({
   recordId,
   recordUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/unlock-private-access',
+    method: 'post',
     data: {
       table_name: tableName,
       id: recordId,
       uuid: recordUuid
     }
   })
-    .then(evaluateResponse)
     .then(responsePrivateAccess => {
       return convertPrivateAccess(responsePrivateAccess)
     })
@@ -78,8 +80,10 @@ export function getAccessList({
   recordUuid,
   sessionUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/update-access-record',
+    method: 'post',
     params: {
       table_name: tableName,
       id: recordId,
@@ -87,7 +91,9 @@ export function getAccessList({
       token: sessionUuid
     }
   })
-    .then(evaluateResponse)
+    .then(respose => {
+      return respose
+    })
 }
 
 /**
@@ -103,8 +109,10 @@ export function updateAccessRecord({
   recordUuid,
   listRecord
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/update-access-record',
+    method: 'post',
     params: {
       table_name: tableName,
       id: recordId,
@@ -112,5 +120,7 @@ export function updateAccessRecord({
       list_rol: listRecord
     }
   })
-    .then(evaluateResponse)
+    .then(response => {
+      return response
+    })
 }

src/api/ADempiere/process.js

@@ -1,8 +1,6 @@
 // Get Instance for connection
-import {
+import request from '@/utils/request'
-  ApiRest as requestRest,
+import { config } from '@/utils/ADempiere/config'
-  evaluateResponse
-} from '@/api/ADempiere/instances.js'
 
 /**
  * Request a process
@@ -43,8 +41,10 @@ export function requestRunProcess({
     }
   })
 
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/data/process',
+    method: 'post',
     data: {
       process_uuid: uuid,
       table_name: tableName,
@@ -59,7 +59,6 @@ export function requestRunProcess({
       print_format_uuid: printFormatUuid
     }
   })
-    .then(evaluateResponse)
     .then(processRunResponse => {
       const { convertProcessLog } = require('@/utils/ADempiere/apiConverts/process.js')
 
@@ -78,8 +77,10 @@ export function requestListProcessesLogs({
   pageSize
 }) {
   //  Get Process Activity
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/logs/list-process-logs',
+    method: 'post',
     data: {
       instance_uuid: instanceUuid,
       user_uuid: userUuid,
@@ -92,7 +93,6 @@ export function requestListProcessesLogs({
       page_token: pageToken
     }
   })
-    .then(evaluateResponse)
     .then(processLogResponse => {
       const { convertProcessLog } = require('@/utils/ADempiere/apiConverts/process.js')
 

src/api/ADempiere/report.js

@@ -1,8 +1,6 @@
 // Get Instance for connection
-import {
+import request from '@/utils/request'
-  ApiRest as requestRest,
+import { config } from '@/utils/ADempiere/config'
-  evaluateResponse
-} from '@/api/ADempiere/instances.js'
 
 /**
  * Request Pending Documents List
@@ -15,8 +13,10 @@ export function requestListReportsViews({
   pageToken,
   pageSize
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/list-report-views',
+    method: 'post',
     data: {
       table_name: tableName,
       process_uuid: processUuid
@@ -26,7 +26,6 @@ export function requestListReportsViews({
       page_size: pageSize
     }
   })
-    .then(evaluateResponse)
     .then(reportViewResponse => {
       const { convertReportView } = require('@/utils/ADempiere/apiConverts/report.js')
 
@@ -48,8 +47,10 @@ export function requestListPrintFormats({
   pageToken,
   pageSize
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/list-print-formats',
+    method: 'post',
     data: {
       table_name: tableName,
       report_view_uuid: reportViewUuid,
@@ -60,7 +61,6 @@ export function requestListPrintFormats({
       page_size: pageSize
     }
   })
-    .then(evaluateResponse)
     .then(responseListPrintFormats => {
       const { convertListPrintFormats } = require('@/utils/ADempiere/apiConverts/report.js')
 
@@ -74,8 +74,10 @@ export function requestListDrillTables({
   pageToken,
   pageSize
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/list-drill-tables',
+    method: 'post',
     data: {
       table_name: tableName
     },
@@ -84,7 +86,6 @@ export function requestListDrillTables({
       page_size: pageSize
     }
   })
-    .then(evaluateResponse)
     .then(drillTablesResponse => {
       const { convertDrillTables } = require('@/utils/ADempiere/apiConverts/report.js')
 
@@ -112,8 +113,10 @@ export function requestGetReportOutput({
   whereClause,
   orderByClause
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/get-report-output',
+    method: 'post',
     data: {
       table_name: tableName,
       // reference
@@ -130,7 +133,6 @@ export function requestGetReportOutput({
       order_by_clause: orderByClause
     }
   })
-    .then(evaluateResponse)
     .then(reportOutpuResponse => {
       const { convertReportOutput } = require('@/utils/ADempiere/apiConverts/report.js')
 

src/api/ADempiere/rule.js

@@ -1,8 +1,6 @@
 // Get Instance for connection
-import {
+import request from '@/utils/request'
-  ApiRest as requestRest,
+import { config } from '@/utils/ADempiere/config'
-  evaluateResponse
-} from '@/api/ADempiere/instances.js'
 
 /**
  * Run callout request
@@ -28,8 +26,10 @@ export function runCallOutRequest({
   callout,
   attributesList = []
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/run-callout',
+    method: 'post',
     data: {
       table_name: tableName,
       window_uuid: windowUuid,
@@ -42,5 +42,7 @@ export function runCallOutRequest({
       attributes: attributesList
     }
   })
-    .then(evaluateResponse)
+    .then(response => {
+      return response
+    })
 }

src/api/ADempiere/system-core.js

@@ -1,8 +1,6 @@
 // Get Instance for connection
-import {
+import request from '@/utils/request'
-  ApiRest as requestRest,
+import { config } from '@/utils/ADempiere/config'
-  evaluateResponse
-} from '@/api/ADempiere/instances.js'
 
 // Get Organization list from role
 export function requestOrganizationsList({
@@ -11,8 +9,10 @@ export function requestOrganizationsList({
   pageToken,
   pageSize
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/core/list-organizations',
+    method: 'post',
     data: {
       role_id: roleId,
       role_uuid: roleUuid
@@ -23,7 +23,6 @@ export function requestOrganizationsList({
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(organizationsListResponse => {
       const { convertOrganization } = require('@/utils/ADempiere/apiConverts/core.js')
 
@@ -44,8 +43,10 @@ export function requestWarehousesList({
   pageToken,
   pageSize
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/core/list-warehouses',
+    method: 'post',
     data: {
       organization_id: organizationId,
       organization_uuid: organizationUuid
@@ -56,7 +57,6 @@ export function requestWarehousesList({
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(warehousesListResponse => {
       return {
         nextPageToken: warehousesListResponse.next_page_token,
@@ -75,7 +75,8 @@ export function requestGetCountryDefinition({
   id,
   uuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/core/country',
     method: 'get',
     params: {
@@ -83,7 +84,6 @@ export function requestGetCountryDefinition({
       uuid
     }
   })
-    .then(evaluateResponse)
     .then(countryResponse => {
       const { convertCountry } = require('@/utils/ADempiere/apiConverts/core.js')
 
@@ -96,15 +96,16 @@ export function requestLanguagesList({
   pageToken,
   pageSize
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/core/list-languages',
+    method: 'post',
     params: {
       // Page Data
       pageToken,
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(languagesListResponse => {
       const { convertLanguage } = require('@/utils/ADempiere/apiConverts/core.js')
 
@@ -143,8 +144,10 @@ export function requestCreateBusinessPartner({
   countryUuid,
   posUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/core/create-business-partner',
+    method: 'post',
     data: {
       value,
       tax_id: taxId,
@@ -171,7 +174,6 @@ export function requestCreateBusinessPartner({
       pos_uuid: posUuid
     }
   })
-    .then(evaluateResponse)
     .then(businessPartnerResponse => {
       const { convertBusinessPartner } = require('@/utils/ADempiere/apiConverts/core.js')
 
@@ -182,14 +184,14 @@ export function requestCreateBusinessPartner({
 export function requestGetBusinessPartner({
   searchValue
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/core/get-business-partner',
     method: 'get',
     params: {
       search_value: searchValue
     }
   })
-    .then(evaluateResponse)
     .then(businessPartnerResponse => {
       const { convertBusinessPartner } = require('@/utils/ADempiere/apiConverts/core.js')
 
@@ -210,8 +212,10 @@ export function requestListBusinessPartner({
   pageSize,
   pageToken
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/core/list-business-partner',
+    method: 'post',
     data: {
       search_value: searchValue,
       value,
@@ -227,7 +231,6 @@ export function requestListBusinessPartner({
       page_token: pageToken
     }
   })
-    .then(evaluateResponse)
     .then(businessPartnerResponse => {
       const { convertBusinessPartner } = require('@/utils/ADempiere/apiConverts/core.js')
 
@@ -255,8 +258,10 @@ export function requestGetConversionRate({
   currencyToUuid,
   conversionDate
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/core/get-conversion-rate',
+    method: 'post',
     data: {
       conversion_type_uuid: conversionTypeUuid,
       currency_from_uuid: currencyFromUuid,
@@ -264,7 +269,6 @@ export function requestGetConversionRate({
       conversion_date: conversionDate
     }
   })
-    .then(evaluateResponse)
     .then(conversionRateResponse => {
       const { convertConversionRate } = require('@/utils/ADempiere/apiConverts/core.js')
 

src/api/ADempiere/user-interface.js

@@ -1,8 +1,6 @@
 // Get Instance for connection
-import {
+import request from '@/utils/request'
-  ApiRest as requestRest,
+import { config } from '@/utils/ADempiere/config'
-  evaluateResponse
-} from '@/api/ADempiere/instances.js'
 
 /**
  * Get Attachment
@@ -13,7 +11,8 @@ export function requestResourceReference({
   recordId,
   recordUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/resource-reference',
     method: 'get',
     params: {
@@ -21,7 +20,9 @@ export function requestResourceReference({
       image_uuid: recordUuid
     }
   })
-    .then(evaluateResponse)
+    .then(response => {
+      return response
+    })
 }
 
 /**
@@ -35,7 +36,8 @@ export function requestAttachment({
   recordId,
   recordUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/attachment',
     method: 'get',
     params: {
@@ -44,5 +46,7 @@ export function requestAttachment({
       uuid: recordUuid
     }
   })
-    .then(evaluateResponse)
+    .then(respose => {
+      return respose
+    })
 }

src/api/ADempiere/values.js

@@ -1,8 +1,7 @@
 // Get Instance for connection
-import {
+import request from '@/utils/request'
-  ApiRest as requestRest,
+import { config } from '@/utils/ADempiere/config'
-  evaluateResponse
+
-} from '@/api/ADempiere/instances.js'
 import { isEmptyValue } from '@/utils/ADempiere/valueUtils.js'
 
 /**
@@ -23,15 +22,19 @@ export function requestLookup({
       value
     }]
   }
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/get-lookup-item',
+    method: 'post',
     data: {
       table_name: tableName,
       query: directQuery,
       filters
     }
   })
-    .then(evaluateResponse)
+    .then(respose => {
+      return respose
+    })
 }
 
 /**
@@ -61,8 +64,10 @@ export function requestLookupList({
     }]
   }
 
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/list-lookup-items',
+    method: 'post',
     data: {
       table_name: tableName,
       query,
@@ -75,7 +80,6 @@ export function requestLookupList({
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(lookupListResponse => {
       return {
         nextPageToken: lookupListResponse.next_page_token,
@@ -100,8 +104,10 @@ export function requestReferencesList({
   pageToken,
   pageSize
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/list-references',
+    method: 'post',
     data: {
       id: recordId,
       uuid: recordUuid,
@@ -114,7 +120,6 @@ export function requestReferencesList({
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(referencesListResposnse => {
       const { convertReferencesList } = require('@/utils/ADempiere/apiConverts/values.js')
 
@@ -124,13 +129,17 @@ export function requestReferencesList({
 
 // Get default value for a field
 export function requestDefaultValue(query) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/get-default-value',
+    method: 'post',
     data: {
       query
     }
   })
-    .then(evaluateResponse)
+    .then(respose => {
+      return respose
+    })
 }
 
 /**
@@ -144,15 +153,16 @@ export function requestGetContextInfoValue({
   id,
   query
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/get-context-info-value',
+    method: 'post',
     data: {
       query,
       uuid,
       id
     }
   })
-    .then(evaluateResponse)
     .then(contextInfoValueResponse => {
       return {
         messageText: contextInfoValueResponse.message_text,

src/api/ADempiere/window.js

@@ -1,8 +1,6 @@
 // Get Instance for connection
-import {
+import request from '@/utils/request'
-  ApiRest as requestRest,
+import { config } from '@/utils/ADempiere/config'
-  evaluateResponse
-} from '@/api/ADempiere/instances.js'
 
 // Get list of log for a records
 export function requestListEntityLogs({
@@ -12,8 +10,10 @@ export function requestListEntityLogs({
   pageToken,
   pageSize
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/logs/list-entity-logs',
+    method: 'post',
     data: {
       table_name: tableName,
       id: recordId,
@@ -25,7 +25,6 @@ export function requestListEntityLogs({
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(entityLogsListResponse => {
       const { convertEntityLog } = require('@/utils/ADempiere/apiConverts/window.js')
 
@@ -47,8 +46,10 @@ export function requestListWorkflowsLogs({
   pageToken,
   pageSize
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/logs/list-workflow-logs',
+    method: 'post',
     data: {
       table_name: tableName,
       id: recordId,
@@ -60,7 +61,6 @@ export function requestListWorkflowsLogs({
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(workflowLogsListResponse => {
       const { convertWorkflowProcess } = require('@/utils/ADempiere/apiConverts/window.js')
 
@@ -80,8 +80,10 @@ export function requestListWorkflows({
   pageToken,
   pageSize
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/workflow/list-workflow',
+    method: 'post',
     data: {
       table_name: tableName
     },
@@ -91,7 +93,6 @@ export function requestListWorkflows({
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(workflowListResponse => {
       const { convertWorkflowDefinition } = require('@/utils/ADempiere/apiConverts/window.js')
 
@@ -118,8 +119,10 @@ export function requestListEntityChats({
   pageToken,
   pageSize
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/logs/list-entity-chats',
+    method: 'post',
     data: {
       table_name: tableName,
       id: recordId,
@@ -131,7 +134,6 @@ export function requestListEntityChats({
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(entityChatListResponse => {
       const { convertEntityChat } = require('@/utils/ADempiere/apiConverts/window.js')
 
@@ -156,8 +158,10 @@ export function requestListChatsEntries({
   pageToken,
   pageSize
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/logs/list-chat-entries',
+    method: 'post',
     data: {
       id,
       uuid
@@ -168,7 +172,6 @@ export function requestListChatsEntries({
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(chatEntriesListResponse => {
       const { convertChatEntry } = require('@/utils/ADempiere/apiConverts/window.js')
 
@@ -194,8 +197,10 @@ export function requestCreateChatEntry({
   recordUuid,
   comment
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/ui/create-chat-entry',
+    method: 'post',
     data: {
       table_name: tableName,
       id: recordId,
@@ -203,7 +208,6 @@ export function requestCreateChatEntry({
       comment: comment
     }
   })
-    .then(evaluateResponse)
     .then(chatEntryResponse => {
       const { convertChatEntry } = require('@/utils/ADempiere/apiConverts/window.js')
 
@@ -229,8 +233,10 @@ export function requestListDocumentStatuses({
   pageSize,
   pageToken
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/workflow/list-document-statuses',
+    method: 'post',
     data: {
       id: recordId,
       uuid: recordUuid,
@@ -243,7 +249,6 @@ export function requestListDocumentStatuses({
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(listDocumentsActionsResponse => {
       return {
         nextPageToken: listDocumentsActionsResponse.next_page_token,
@@ -263,8 +268,10 @@ export function requestListDocumentActions({
   pageSize,
   pageToken
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/workflow/list-document-actions',
+    method: 'post',
     data: {
       id: recordId,
       uuid: recordUuid,
@@ -278,7 +285,6 @@ export function requestListDocumentActions({
       pageSize
     }
   })
-    .then(evaluateResponse)
     .then(listDocumentsActionsResponse => {
       return {
         nextPageToken: listDocumentsActionsResponse.next_page_token,

src/api/role.js

@@ -1,11 +1,9 @@
 import request from '@/utils/request'
-import {
+import { config } from '@/utils/ADempiere/config'
-  ApiRest as requestRest,
-  evaluateResponse
-} from '@/api/ADempiere/instances.js'
 
 export function getRoutes() {
   return request({
+    baseURL: config.adempiere.api.url,
     url: '/vue-element-admin/routes',
     method: 'get'
   })
@@ -13,20 +11,21 @@ export function getRoutes() {
 
 export function getRoles() {
   return request({
+    baseURL: config.adempiere.api.url,
     url: '/vue-element-admin/roles',
     method: 'get'
   })
 }
 
 export function requestRolesList(token) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: 'user/roles',
     method: 'get',
     params: {
       token
     }
   })
-    .then(evaluateResponse)
     .then(responseRoles => {
       const { convertRole } = require('@/utils/ADempiere/apiConverts/user.js')
       const rolesList = responseRoles.map(itemRol => {
@@ -39,6 +38,7 @@ export function requestRolesList(token) {
 
 export function addRole(data) {
   return request({
+    baseURL: config.adempiere.api.url,
     url: '/vue-element-admin/role',
     method: 'post',
     data
@@ -47,6 +47,7 @@ export function addRole(data) {
 
 export function updateRole(id, data) {
   return request({
+    baseURL: config.adempiere.api.url,
     url: `/vue-element-admin/role/${id}`,
     method: 'put',
     data
@@ -55,6 +56,7 @@ export function updateRole(id, data) {
 
 export function deleteRole(id) {
   return request({
+    baseURL: config.adempiere.api.url,
     url: `/vue-element-admin/role/${id}`,
     method: 'delete'
   })
@@ -71,7 +73,8 @@ export function requestChangeRole({
   organizationUuid,
   warehouseUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: 'user/change-role',
     method: 'post',
     data: {
@@ -80,7 +83,6 @@ export function requestChangeRole({
       warehouse: warehouseUuid
     }
   })
-    .then(evaluateResponse)
     .then(responseChangeRole => {
       const { convertSession } = require('@/utils/ADempiere/apiConverts/user.js')
 

src/api/user.js

@@ -1,8 +1,6 @@
 // Instance for connection
-import {
+import request from '@/utils/request'
-  ApiRest as requestRest,
+import { config } from '@/utils/ADempiere/config'
-  evaluateResponse
-} from '@/api/ADempiere/instances.js'
 
 /**
  * Make login by UserName and password, this function can return user data for show
@@ -16,7 +14,8 @@ export function login({
   organizationUuid,
   token
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/user/login',
     method: 'post',
     data: {
@@ -34,14 +33,17 @@ export function login({
  * @param {string} token or session UUID
  */
 export function requestUserInfoFromSession(token) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/user/info',
     method: 'get',
     params: {
       token
     }
   })
-    .then(evaluateResponse)
+    .then(response => {
+      return response
+    })
 }
 
 /**
@@ -49,14 +51,14 @@ export function requestUserInfoFromSession(token) {
  * @param {string} token or session UUID
  */
 export function requestSessionInfo(token) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/user/session',
     method: 'get',
     params: {
       token
     }
   })
-    .then(evaluateResponse)
     .then(responseSession => {
       const { convertSession } = require('@/utils/ADempiere/apiConverts/user.js')
 
@@ -71,14 +73,17 @@ export function requestSessionInfo(token) {
 export function requestMenu({
   sessionUuid
 }) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
     url: '/user/menu',
     method: 'get',
     params: {
       token: sessionUuid
     }
   })
-    .then(evaluateResponse)
+    .then(response => {
+      return response
+    })
 }
 
 /**
@@ -86,7 +91,9 @@ export function requestMenu({
  * @param {string} token or session UUID
  */
 export function logout(token) {
-  return requestRest({
+  return request({
+    baseURL: config.adempiere.api.url,
+    method: 'post',
     url: '/user/logout',
     data: {
       token

src/store/modules/user.js

@@ -118,15 +118,9 @@ const actions = {
         organizationUuid,
         token
       })
-        .then(logInResponse => {
+        .then(token => {
-          if ([13, 500].includes(logInResponse.code)) {
-            reject(logInResponse)
-            return
-          }
-          const { result: token } = logInResponse
           commit('SET_TOKEN', token)
           setToken(token)
-
           resolve()
         })
         .catch(error => {

src/utils/request.js

@@ -2,6 +2,7 @@ import axios from 'axios'
 import { MessageBox, Message } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
+import { getLanguage } from '@/lang/index'
 
 // create an axios instance
 const service = axios.create({
@@ -14,7 +15,13 @@ const service = axios.create({
 service.interceptors.request.use(
   config => {
     // do something before request is sent
-
+    //  Add custom token and language
+    if (!config.params) {
+      config.params = {}
+    }
+    config.params.token = getToken()
+    config.params.language = getLanguage() || 'en_US'
+    //  Set header
     if (store.getters.token) {
       // let each request carry token
       // ['X-Token'] is a custom headers key
@@ -44,14 +51,13 @@ service.interceptors.response.use(
    */
   response => {
     const res = response.data
-
     // if the custom code is not 20000, it is judged as an error.
-    if (res.code !== 20000) {
+    if (res.code >= 400) {
-      Message({
+      // Message({
-        message: res.message || 'Error',
+      //   message: res.result || 'Error',
-        type: 'error',
+      //   type: 'error',
-        duration: 5 * 1000
+      //   duration: 5 * 1000
-      })
+      // })
 
       // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
       if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
@@ -66,9 +72,9 @@ service.interceptors.response.use(
           })
         })
       }
-      return Promise.reject(new Error(res.message || 'Error'))
+      return Promise.reject(new Error(res.message || res.result || 'Error'))
     } else {
-      return res
+      return res.result
     }
   },
   error => {