Merge branch 'fix-OAUTH-bug' into 'master'

Fix oauth bug

See merge request saburly/psihologija!53

helpers/api.js

@@ -2,7 +2,6 @@ const axios = require('axios');
 
 const { getToken } = require('../services/officeRnD/oauth');
 
-console.log('API file');
 const API = axios.create({
     baseURL: 'https://app.officernd.com/api/v1/organizations/sima-space-test-environment',
     headers: {'Authorization': `Bearer TOKEN`}

helpers/oauthApi.js

@@ -0,0 +1,15 @@
+'use strict';
+
+require('dotenv').config();
+const axios = require('axios');
+
+const OAUTHUrl = process.env.ORD_OAUTH_URL;
+
+const OAuthAPI = axios.create({
+    baseURL: OAUTHUrl,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+});
+
+module.exports = {
+    OAuthAPI,
+};

services/officeRnD/oauth.js

@@ -3,7 +3,7 @@ require('dotenv').config();
 const moment = require('moment');
 const queryString = require('query-string');
 
-const { API } = require('../../helpers/api');
+const { OAuthAPI } = require('../../helpers/oauthApi');
 const db = require('../../models/index');
 const { officeRnDAPIErrors } = require('../../constants/constants');
 
@@ -71,7 +71,6 @@ const refreshOauthToken = () => {
     return new Promise((resolve, reject) => {
         const clientID = process.env.ORD_OAUTH_CLIENT_ID;
         const clientSecret = process.env.ORD_OAUTH_CLIENT_SECRET;
-        const OAUTHUrl = process.env.ORD_OAUTH_URL;
 
         const OAUTHRequestBody = {
             client_id: clientID,
@@ -79,13 +78,8 @@ const refreshOauthToken = () => {
             grant_type: 'client_credentials',
             scope: 'officernd.api.read officernd.api.write',
         };
-        const config = {
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded'
-            }
-        };
 
-        API.post(OAUTHUrl, queryString.stringify(OAUTHRequestBody), config)
+        OAuthAPI.post('/', queryString.stringify(OAUTHRequestBody))
             .then((oauthResponse) => {
                 const responseData = oauthResponse && oauthResponse.data ? oauthResponse.data : null;
                 if (responseData){