diff --git a/server/controllers/arpaConnectionController.js b/server/controllers/arpaConnectionController.js index 956ea3a..6c1f5c4 100644 --- a/server/controllers/arpaConnectionController.js +++ b/server/controllers/arpaConnectionController.js @@ -1,6 +1,6 @@ /* eslint-disable node/handle-callback-err */ const axios = require('axios') -const { verityAxiosConfig, panatechAxiosConfig } = require('../ArpaWebservice') +const { verityAxiosConfig, panatechAxiosConfig, getVerityToken, getPanatechToken } = require('../ArpaWebservice') function axiosConfig(db) { if (db === 'verity') return verityAxiosConfig() else if (db === 'panatech') return panatechAxiosConfig() @@ -9,7 +9,9 @@ function axiosConfig(db) { /// //// cross server requests module.exports.getRouteManager = [ - (req, res) => { + async (req, res) => { + await getVerityToken() + await getPanatechToken() const { url, db } = req.body axios .get(url, axiosConfig(db)) @@ -26,7 +28,9 @@ module.exports.getRouteManager = [ } ] module.exports.postRouteManager = [ - (req, res) => { + async (req, res) => { + await getVerityToken() + await getPanatechToken() const { url, db, data } = req.body axios .post(url, data, axiosConfig(db)) @@ -41,7 +45,9 @@ module.exports.postRouteManager = [ } ] module.exports.putRouteManager = [ - (req, res) => { + async (req, res) => { + await getVerityToken() + await getPanatechToken() const { url, db, data } = req.body axios .put(url, data, axiosConfig(db)) @@ -56,7 +62,9 @@ module.exports.putRouteManager = [ } ] module.exports.deleteRouteManager = [ - (req, res) => { + async (req, res) => { + await getVerityToken() + await getPanatechToken() const { url, db, data } = req.body axios .delete(url, data, axiosConfig(db)) diff --git a/server/database.js b/server/database.js index d6351c0..2bff9b7 100644 --- a/server/database.js +++ b/server/database.js @@ -1,10 +1,12 @@ /* eslint-disable no-unused-vars */ const mongoose = require('mongoose') // mongodb database connection string. change it as per your needs. here "mydb" is the name of the database. You don't need to create DB from mongodb terminal. mongoose create the database automatically. -const outHostUrl = 'mongodb://root:9a82d91402ee06cb@danak-db-public.danakcorp.com:52694/asanserv_database?authSource=admin' +const outHostUrl = + 'mongodb://root:9a82d91402ee06cb@danak-db-public.danakcorp.com:52694/asanserv_database?authSource=admin' // const outHostUrl = 'mongodb://root:KPTt76tImNBBMm4Kor8QA9gB@hotaka.liara.cloud:33794/asanserv_database?authSource=admin' -const inHostUrl = 'mongodb://root:9a82d91402ee06cb@srv-captain--asan-service-db:27017/asanserv_database?authSource=admin' -const init = ()=>{ +const inHostUrl = + 'mongodb://root:9a82d91402ee06cb@srv-captain--asan-service-db:27017/asanserv_database?authSource=admin' +const init = () => { try { mongoose.connect(outHostUrl, { useNewUrlParser: true, @@ -12,7 +14,7 @@ const init = ()=>{ useFindAndModify: false, useCreateIndex: true, connectTimeoutMS: 30000, - socketTimeoutMS: 45000, + socketTimeoutMS: 45000 }) } catch (error) { init() diff --git a/server/index.js b/server/index.js index cf88ae1..7c58483 100644 --- a/server/index.js +++ b/server/index.js @@ -14,7 +14,7 @@ function init() { const authentication = require('./authentication') const { checkThirdPartyAccess } = require('./plugins/checkThirdPartyAccess') const { rs } = require('./plugins/resHeader') - const { getVerityToken, getPanatechToken } = require('./ArpaWebservice') + // const { getVerityToken, getPanatechToken } = require('./ArpaWebservice') const cronJobs = require('./plugins/cronJobs') const router = express.Router() const cors = require('cors') @@ -29,8 +29,8 @@ function init() { app.use(cors()) console.log('🟢 ~ Node Server is running ') // load plugins - getVerityToken() - getPanatechToken() + // getVerityToken() + // getPanatechToken() cronJobs() // API routes