Egalware/MConnectSDK
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Imbastito enroll (NON SO se vada...)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-03-29 15:04:31 +01:00
parent 0da7def741
commit a632a3d8f3
2 changed files with 23 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MConnectSDK/MConnectClient.cs
+12 -35
View File
@@ -887,7 +887,7 @@ namespace MConnectSDK
{
// attesa come richiesto da call precedente...
Thread.Sleep(tokResp.interval);
enrollResponse resp = null;
// verifico il token della risposta...
if (verifResp != null)
@@ -899,13 +899,13 @@ namespace MConnectSDK
// parametri chiamata...SENZA /api...
string shortBaseUrl = BaseUrl.Replace("/api", "");
string pageUrl = $"{shortBaseUrl}/clients/{organizationCode}/machines/{_MConnectID}";
// effettuo call DI ENROLL
// effettuo call DI ENROLL
Uri callUri = new Uri(pageUrl);
var payload = "";
HttpContent callCont = new StringContent(payload, Encoding.UTF8, "application/json");
var taskRes = Task.Run(() => Utils.putAsync(pageUrl, verifResp.access_token, callCont));
var taskRes = Task.Run(() => Utils.putAsync(callUri, callCont, verifResp.access_token));
taskRes.Wait();
var rawResult = taskRes.Result;
@@ -916,17 +916,18 @@ namespace MConnectSDK
rawResult = taskRes.Result;
// leggo la risposta...
var resp = JsonConvert.DeserializeObject<enrolledMachineData>(taskRes.Result);
resp = JsonConvert.DeserializeObject<enrollResponse>(taskRes.Result);
}
}
// controllo SE sia stato autorizzato
if (tokenRetVal == 200)
if (resp != null && resp.statusCode == 200)
{
if (resp.result.OrganizationCode == organizationCode)
{ }
sb.AppendLine("--------------------------------------------------");
sb.AppendLine(string.Format("{0:HH.mm.ss.fff} | OAuth process DONE", DateTime.Now));
sb.AppendLine(string.Format("{0:HH.mm.ss.fff} | ENROLL DONE", DateTime.Now));
sb.AppendLine("--------------------------------------------------");
answ.Message = sb.ToString();
// riporto in risposta i dati VUOTI...
@@ -936,32 +937,8 @@ namespace MConnectSDK
// registro che è OK x AUTH
answ.HasAuth = true;
reqStatus.IsAuth = true;
answ.IsEnrolled = false;
reqStatus.IsHmiEnrolled = false;
// controllo se sia stato arruolato, altrimenti lo arruolo...
if (_currParam.testMode)
{
// fingo di chiamare associazione...per simularlo imposto una enroll date a + 5 secondi, se non ci fosse... altrimenti aspetto...
if (enrollDate < DateTime.Now.AddSeconds(10))
{
answ.IsEnrolled = true;
reqStatus.IsHmiEnrolled = true;
}
else
{
enrollDate = DateTime.Now.AddSeconds(5);
}
}
else
{
/*-----------------------------------------
* Processo VERA chiamata:
* - chiamo metodo x associazione
* - salvo dati orgCode
*-----------------------------------------*/
// chiamo la enroll machine
}
answ.IsEnrolled = true;
reqStatus.IsHmiEnrolled = true;
}
// non autorizzato...
else
MConnectSDK/Utils.cs
+11 -5
View File
@@ -115,16 +115,22 @@ namespace MConnectSDK
}
/// <summary>
/// Effettua PUT async della REST API indicata
/// </summary>
/// <param name="pageURL"></param>
public static async Task<string> putAsync(string pageURL, string oauthToken, HttpContent callCont)
/// </summary>
/// <param name="reqUri">URI della chiamata</param>
/// <param name="callCont">contenuto della chiamata</param>
/// <param name="oauthToken">token da passare come bearer</param>
public static async Task<string> putAsync(Uri reqUri, HttpContent callCont, string oauthToken)
{
string answ = "";
// ... Use HttpClient.
using (HttpClient client = new HttpClient())
{
client.DefaultRequestHeaders.Add("Authorization", "Bearer " + oauthToken);
using (HttpResponseMessage response = await client.PutAsync(pageURL, callCont))
if (oauthToken != "")
{
client.DefaultRequestHeaders.Add("Authorization", "Bearer " + oauthToken);
}
using (HttpResponseMessage response = await client.PutAsync(reqUri, callCont))
using (HttpContent content = response.Content)
{
// ... lettura contenuto...