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

fix metodo doEnroll x check enroll da licenza

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-01-19 17:47:35 +01:00
parent 58a68e1282
commit 9b5ea0a842
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MConnectSDK/MConnectClient.cs
+26 -8
View File
@@ -290,6 +290,8 @@ namespace MConnectSDK
}
}
// LEGACY to remove after v2 release
#if false
/// <summary>
/// URL pagina per check enroll (parametrico)
/// <summary>
@@ -298,10 +300,6 @@ namespace MConnectSDK
get
{
string answ = "";
#if false
string shortBaseUrl = RemoveFromEnd(BaseUrl, "/api");
answ = $"{shortBaseUrl}/clients/{organizationCode}/machines/{MachineID}";
#endif
if (ApiVersion == "v1")
{
answ = $"{BaseUrl}/{organizationCode}/machines/{MachineID}";
@@ -313,6 +311,7 @@ namespace MConnectSDK
return answ;
}
}
#endif
/// <summary>
/// URL pagina per Download Immagini ( https://firebasestorage.googleapis.com/v0/b/scm-mconnect.appspot.com/o/ )
@@ -839,8 +838,10 @@ namespace MConnectSDK
answ.Source = SourceType.CLOUD;
}
answ.CallResultOk = (answ.CloudStatusOk || answ.LocalStatusOk);
// x capire SE sia enrolled --> faccio chiamata di verifica...
// x capire SE sia enrolled --> faccio chiamata di verifica... (prima activation, ora licenza)
answ.IsHmiEnrolled = checkEnroll();
// rispondo!
return answ;
}
@@ -1117,6 +1118,8 @@ namespace MConnectSDK
// controllo preliminare ping/cloud..
if (pingOk && cloudOk)
{
// LEGACY to remove after v2 release
#if false
// controllo con la chiamata della clientInfo...
var taskCliInfo = Task.Run(() => GetClientStatusAsync());
taskCliInfo.Wait();
@@ -1145,6 +1148,19 @@ namespace MConnectSDK
Log.Instance.Error($"Errore in fase di checkEnroll: {Environment.NewLine}{taskRes.Result}");
}
}
#endif
// verifica licenza da cui so che è enrolled
var currStatus = reqStatus;
var currLicense = GetLicenseMConnect();
// se fosse 404 --> null quindi NO buono
if (currLicense != null)
{
// verifico attiva licenza = enrolled
currStatus.IsHmiEnrolled = currLicense.IsActive;
answ = true;
reqStatus = currStatus;
}
}
return answ;
}
@@ -1242,11 +1258,12 @@ namespace MConnectSDK
/// <returns>{ext}<returns>
public string doEnroll()
{
string answ = "";
// LEGACY to remove after v2 release
#if false
// effettuo call DI ENROLL
Uri callUri = new Uri(pageUrlCheckEnroll);
#endif
string answ = "";
// predispongo le URI di chiamata
Uri callUriAssig = new Uri(pageUrlAssignment);
Uri callUriActiv = new Uri(pageUrlActivation);
@@ -1256,8 +1273,9 @@ namespace MConnectSDK
// controllo preliminare ping/cloud..
if (pingOk && cloudOk)
{
// attivazione/assegnazione legacy
// LEGACY to remove after v2 release
#if false
// attivazione/assegnazione legacy
var taskRes = Task.Run(() => Utils.putAsync(callUri, callCont, verifResp.access_token));
taskRes.Wait();
answ = taskRes.Result;
@@ -1836,7 +1854,7 @@ namespace MConnectSDK
// controllo SE sia stato autorizzato
if (enrollResp != null && enrollResp.statusCode == 200)
{
if (enrollResp.result.OrganizationCode.ToUpper() == organizationCode.ToUpper())
if (enrollResp.result.OrganizationCode.Equals(organizationCode, StringComparison.OrdinalIgnoreCase))
{
sb.AppendLine("--------------------------------------------------");
sb.AppendLine(string.Format("{0:HH.mm.ss.fff} | ENROLL DONE", DateTime.Now));