admin/Mareon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MARX#80511 Secrets en Tokens in de Mareon logging

Browse Source 
svn path=/Mareon/trunk/; revision=62324
This commit is contained in:
Marcel Bourseau
2023-10-24 15:53:13 +00:00
parent bb3ac0a286
commit 48ebac3ff6
3 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ax/SRC/A365_GetToken.js
View File

@@ -39,7 +39,6 @@ function MARX_GetToken (v_url, v_client_id, v_client_secret, v_grant_type, v_res
{
__Log("MARX_GetToken v_url: " + v_url,3);
__Log("MARX_GetToken v_client_id: " + v_client_id,3);
__Log("MARX_GetToken v_client_secret: " + v_client_secret,4);
__Log("MARX_GetToken v_grant_type: " + v_grant_type,3);
__Log("MARX_GetToken v_resource: " + v_resource,3);
__Log("MARX_GetToken v_scope: " + v_scope,3);

22
ax/SRC/AxFacilitor.js
View File

@@ -389,10 +389,9 @@ function Ax2012_2_FACILITOR()
//Bijlages naar AX2012 kan alleen via Token icm Saxton AX-webservice(s). Op soortgelijke (bijna identieke wijze) als AX365.
//---------------
__Log("*** START AX2012 --> FCLT : Get Token ***", 2);
G_Token_saxton = ReadSaxtonTokenFromFile();
__Log("G_Token_saxton ReadSaxtonTokenFromFile:" + G_Token_saxton, 4);
G_Token_saxton = ReadSaxtonTokenFromFile();
if (G_Token_saxton == ""){
__Log("G_Token_saxton ReadSaxtonTokenFromFile is leeg:", 4);
__Log("G_Token_saxton ReadSaxtonTokenFromFile is leeg:", 3);
G_Token_saxton = A2012_saxton_GetToken();
}
__Log("*** END Get Token", 2);
@@ -434,10 +433,9 @@ function AX365_2_FACILITOR()
if (G_ID_saxton_url != "" && G_push_notifyqueue == "1")
{
__Log("*** START AX365 --> FCLT : Get AX Saxton Token ***", 2);
G_Token_saxton = ReadSaxtonTokenFromFile();
__Log("G_Token_saxton ReadSaxtonTokenFromFile:" + G_Token_saxton, 4);
G_Token_saxton = ReadSaxtonTokenFromFile();
if (G_Token_saxton == ""){
__Log("G_Token_saxton ReadSaxtonTokenFromFile is leeg:", 4);
__Log("G_Token_saxton ReadSaxtonTokenFromFile is leeg:", 3);
G_Token_saxton = A365_saxton_GetToken();
}
__Log("*** END Get AX Saxton Token", 2);
@@ -461,10 +459,9 @@ function AX365_2_FACILITOR()
{
__Log("*** START AX365 --> FCLT : Get Supplierservice Token ***", 2);
G_Token_supplierservice = ReadSupplierserviceTokenFromFile();
__Log("G_Token_supplierservice ReadSupplierserviceTokenFromFile:" + G_Token_supplierservice, 4);
G_Token_supplierservice = ReadSupplierserviceTokenFromFile();
if (G_Token_supplierservice == ""){
__Log("G_Token_supplierservice ReadSupplierserviceTokenFromFile is leeg:", 4);
__Log("G_Token_supplierservice ReadSupplierserviceTokenFromFile is leeg:", 3);
G_Token_supplierservice = A365_supplierservice_GetToken();
}
__Log("*** END Get Supplierservice Token", 2);
@@ -655,9 +652,9 @@ function MAREON_2_TWINQ()
{
__Log("*** START MAREON --> TWINQ : Get (Saxton) Token ***", 2);
G_Token_saxton = ReadSaxtonTokenFromFile();
__Log("G_Token_saxton ReadSaxtonTokenFromFile:" + G_Token_saxton, 4);
if (G_Token_saxton == ""){
__Log("G_Token_saxton ReadSaxtonTokenFromFile is leeg:", 4);
__Log("G_Token_saxton ReadSaxtonTokenFromFile is leeg:", 3);
G_Token_saxton = TWINQ_GetToken();
}
__Log("*** END Get (Saxton) Token", 2);
@@ -741,9 +738,10 @@ function FACILITOR_2_Xtractor()
// 1.73 -- MARX#76390: Kan oude logging van de SYNC adapter automatisch opgeruimd worden + MARX#76891: Registratie in AX2012 of inkooporder aanwezig is in Mareon
// 1.74 -- MARX#78797: Premium Ter Steege met woco "Mijande Wonen" (Viewpoint/Itris) - soapaction toegevoegd, contenttype aangepast en timestamp in MsgDateTime verbeterd
// 1.75 -- MARX#74747: Voor T365 de Facturen via de Saxton/JSON koppeling
// 1.76 -- MARX#80511: Weg met de Secrets en Tokens in de Mareon logging
var G_Mareon_Adapter = "1.75";
var G_Mareon_Adapter = "1.76";
//MARX#56643: Test Haagwonen inkoopordernummer ontbreekt in Mareon ION001753
var G_new_date = new Date();
//-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

13
ax/SRC/Common.js
View File

@@ -65,7 +65,6 @@ function apiFCLT_inner(v_URL, v_API, v_APIKEY, v_req, v_type, v_soap_envelope, v
__Log("Version Mareon Adapter: " + G_Mareon_Adapter,3);
__Log("apiFCLT v_URL: " + v_URL,3);
__Log("apiFCLT v_API: " + v_API,3);
__Log("apiFCLT v_APIKEY: " + v_APIKEY,4);
__Log("apiFCLT v_type: " + v_type,3);
__Log("apiFCLT v_soap_envelope: " + v_soap_envelope,3);
__Log("apiFCLT v_discard_active_abort: " + v_discard_active_abort,3);
@@ -544,8 +543,7 @@ function api2_AX2012_inner (v_Url, v_API, v_req, v_type, v_soapAction, v_discard
var v_msg = api2_AX2012_RequestXML(v_Url, v_API, v_req);
}
if (v_soort_api == 2){
xmlhttp.setRequestHeader("Content-Type", "application/json"),
__Log("api2_AX2012_inner G_Token_saxton: " + G_Token_saxton, 4);
xmlhttp.setRequestHeader("Content-Type", "application/json"),
xmlhttp.setRequestHeader("Authorization", "Bearer " + G_Token_saxton);
//xmlhttp.setRequestHeader("SOAPAction", '"http://tempuri.org/'+v_soapAction+'"');
var v_msg = api2_AX2012_RequestJSON(v_Url, v_API, v_req);
@@ -664,8 +662,7 @@ function api2_AX365_inner (v_Url, v_API, v_req, v_type, v_soapAction, v_discard_
xmlhttp.setProxy(SXH_PROXY_SET_PROXY, proxy);
xmlhttp.open("POST", v_Url, false);
__Log("api2_AX365_inner v_token: " + v_token, 4);
xmlhttp.setRequestHeader("Authorization", "Bearer " + v_token);
if (v_soort_api == 1){
@@ -807,8 +804,7 @@ function api2_TWINQ_inner (v_Url, v_API, v_req, v_type, v_soapAction, v_discard_
xmlhttp.setProxy(SXH_PROXY_SET_PROXY, proxy);
xmlhttp.open("POST", v_Url, false);
__Log("api2_TWINQ_inner v_token: " + v_token, 4);
xmlhttp.setRequestHeader("Authorization", "Bearer " + v_token);
xmlhttp.setRequestHeader("Content-Type", "text/plain");
var v_msg = v_req;
@@ -1221,8 +1217,7 @@ function apiIDentity (v_url, v_req, v_type, v_contenttype, v_discard_active_abor
xmlhttp.open("POST", v_url, false);
xmlhttp.setRequestHeader("Content-Type", v_contenttype);
if (v_basic_authentication == 1)
{
__Log("apiIDentity l_secret: " + v_secret, 4);
{
xmlhttp.setRequestHeader("Authorization", "Basic " + v_secret);
}