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

MARX#62284: Identityserver gegevens (tbv AX2012) niet in mareon sync.xml

Browse Source 
svn path=/Mareon/trunk/; revision=46670
This commit is contained in:
Marcel Bourseau
2020-04-29 09:07:42 +00:00
parent 32f3d274cc
commit 44cf58b2a5
3 changed files with 91 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ax/SRC/AxFacilitor.js
View File

@@ -575,7 +575,7 @@ var G_mar_timeout = 0; //initieel 1e keer.
G_log_level = v_loglevel;
__Log("***XML- common/logging G_log_level is overruled by Mareon :" + v_loglevel, 1);
}
v_date_sendlogfile = l_array[10]; // format "yyyy-mm-dd"
v_date_sendlogfile = l_array[10]; // format "yyyy-mm-dd"
if (v_date_sendlogfile != "")
{
FCLT_SendLogFile(v_date_sendlogfile);
@@ -614,6 +614,44 @@ var G_mar_timeout = 0; //initieel 1e keer.
var G_mar_sync_bijlages_opdrgvr = l_array[16]; // Bijlages vanuit opdrachtgever worden gedeeld met leverancier indien niet leeg/0. Voor Facilitor vullen met de flexprop-key
var G_mar_sync_bijlages_naar_opdrgvr = l_array[17]; // Bijlages vanuit opdrachtnemer worden gedeeld met opdrachtgever indien niet leeg/0. Voor Facilitor vullen met de flexprop-key
//MARX62284: Identityserver gegevens (tbv AX2012) niet in mareon sync.xml
var v_ax2012_bcproxy = l_array[19];
if (v_ax2012_bcproxy != ""){
G_ax2012_bcProxy = v_ax2012_bcproxy;
__Log("***XML- G_ax2012_bcProxy is overruled by Mareon", 3);
}
var v_ID_url = l_array[20];
if (v_ID_url != ""){
G_ID_url = v_ID_url;
__Log("***XML- G_ID_url is overruled by Mareon", 3);
}
var v_ID_client_id = l_array[21];
if (v_ID_client_id != ""){
G_ID_client_id = v_ID_client_id;
__Log("***XML- G_ID_client_id is overruled by Mareon", 3);
}
var v_ID_client_secret = l_array[22];
if (v_ID_client_secret != ""){
G_ID_client_secret = v_ID_client_secret;
__Log("***XML- G_ID_client_secret is overruled by Mareon", 3);
}
var v_ID_grant_type = l_array[23];
if (v_ID_grant_type != ""){
G_ID_grant_type = v_ID_grant_type;
__Log("***XML- G_ID_grant_type is overruled by Mareon", 3);
}
var v_ID_resource = l_array[24];
if (v_ID_resource != ""){
G_ID_resource = v_ID_resource;
__Log("***XML- G_ID_resource is overruled by Mareon", 3);
}
var v_ID_scope = l_array[25];
if (v_ID_scope != ""){
G_ID_scope = v_ID_scope;
__Log("***XML- G_ID_scope is overruled by Mareon", 3);
}
if (AX_or_Tobias() == "A")
{
__Log("AX2009", 2);

27
ax/SRC/Common.js
View File

@@ -110,17 +110,22 @@ function apiFCLT_inner(v_URL, v_API, v_APIKEY, v_req, v_type, v_soap_envelope, v
xmlhttp.send(msg);
if (v_type == 1){
var result_data = xmlhttp.responseXML;
__Log("apiFCLT - XML :" + result_data.xml, 3);
if (G_log_level == 4){
var l_xml = xmlhttp.responseBody;
WriteXML2File("Log/", v_API, "xml" , l_xml);
}
if (v_API != "MAREONINFO"){
//Mareon info bevat secrets, die gaan we nooit loggen...
__Log("apiFCLT - XML :" + result_data.xml, 3);
if (G_log_level == 4){
var l_xml = xmlhttp.responseBody;
WriteXML2File("Log/", v_API, "xml" , l_xml);
}
}
}
else
{
var txt = xmlhttp.responseText || "{}";
var result_data = eval("(" + txt + ")");
__Log("apiFCLT - XML :" + result_data,3);
{ if (v_API != "MAREONINFO"){
//Mareon info bevat secrets, die gaan we nooit loggen...
var txt = xmlhttp.responseText || "{}";
var result_data = eval("(" + txt + ")");
__Log("apiFCLT - XML :" + result_data,3);
}
}
}
catch (e)
@@ -582,8 +587,8 @@ function api2_AX2012_inner (v_Url, v_API, v_req, v_type, v_soapAction, v_discard
__Log("api2_AX2012_inner ResponseText:" + l_resp,1);
if (xmlhttp.status == 401){
// Token expired? Kan heel goed mogelijk zijn, token heeft geldigheid van uur
if (v_soort_api== 2 && xmlhttp.status == 401){
// In geval van soort-api=2, is Token expired? Kan heel goed mogelijk zijn, token heeft geldigheid van uur
// In dit geval wordt een HTTP 401 (Unautorized) geretourneerd, (itt AX365, die doet HTTP-500)
// Forbidden gevonden, we doen een retry, door een nieuwe token op te halen / op te vragen, max. 3 x in een sync (G_AX365_Allowed_Get_Token > 0)

37
ax/SRC/F_GetMareonInfo.js
View File

@@ -22,7 +22,6 @@ function F_GetMareonInfo()
var v_resp = apiFCLT(G_marx_url, v_API, v_APIKEY, v_req, v_type, v_soap_envelop, 0);
__Log("F_GetMareonInfo: " + v_resp.text, 3);
// SPlitsen van XML's...
@@ -141,5 +140,41 @@ function F_GetMareonInfo()
__Log("l_prs_bedrijf_key: " + l_prs_bedrijf_key.text,2);
l_result.push(l_prs_bedrijf_key.text);
// Begin MARX#62284: Identityserver gegevens (tbv AX2012) niet in mareon sync.xml
var l_node = strQuery + "/ax2012_bcproxy";
var l_ax2012_bcproxy = v_resp.selectSingleNode(l_node);
l_result.push(l_ax2012_bcproxy.text); // (array 19)
var l_node = strQuery + "/identityserver_url";
var l_identityserver_url = v_resp.selectSingleNode(l_node);
__Log("l_identityserver_url: " + l_identityserver_url.text,2);
l_result.push(l_identityserver_url.text); // (array 20)
var l_node = strQuery + "/identityserver_clientid";
var l_identityserver_clientid = v_resp.selectSingleNode(l_node);
__Log("l_identityserver_clientid: " + l_identityserver_clientid.text,2);
l_result.push(l_identityserver_clientid.text); // (array 21)
var l_node = strQuery + "/identityserver_clientsecret";
var l_identityserver_clientsecret = v_resp.selectSingleNode(l_node);
l_result.push(l_identityserver_clientsecret.text); // (array 22)
var l_node = strQuery + "/identityserver_granttype";
var l_identityserver_granttype = v_resp.selectSingleNode(l_node);
__Log("l_identityserver_granttype: " + l_identityserver_granttype.text,2);
l_result.push(l_identityserver_granttype.text); // (array 23)
var l_node = strQuery + "/identityserver_resource";
var l_identityserver_resource = v_resp.selectSingleNode(l_node);
__Log("l_identityserver_resource: " + l_identityserver_resource.text,2);
l_result.push(l_identityserver_resource.text); // (array 24)
var l_node = strQuery + "/identityserver_scope";
var l_identityserver_scope = v_resp.selectSingleNode(l_node);
__Log("l_identityserver_scope: " + l_identityserver_scope.text,2);
l_result.push(l_identityserver_scope.text); // (array 25)
// Einde MARX#62284: Identityserver gegevens (tbv AX2012) niet in mareon sync.xml
return l_result;
}