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

Merge remote-tracking branch 'gitlab.scm/develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-02-08 15:57:36 +01:00
parent 2d0852866a 7f6281457b
commit 88b2ab5e58
5 changed files with 1530 additions and 1359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=221']) {
withEnv(['NEXT_BUILD_NUMBER=222']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
MConnectSDK/MConnectClient.cs
+13 -7
View File
@@ -34,7 +34,7 @@ namespace MConnectSDK
/// <summary>
/// URL BASE per le chiamate
/// <summary>
protected string BaseUrl = @"https://stg.api.maestroconnect.scmgroup.com/";
protected string BaseUrl = @"https://stg.api.maestroconnect.scmgroup.com/clients";
/// <summary>
/// ID applicativo/client per piattaforma MaestroConnect (differente per UTE)
@@ -61,6 +61,11 @@ namespace MConnectSDK
/// <summary>
protected memLayer ML;
/// <summary>
/// URL BASE per le chiamate OAuth
/// <summary>
protected string OAuthUrl = @"https://stg.api.maestroconnect.scmgroup.com/api";
/// <summary>
/// Semaforo ping PRELIMINARE
/// </summary>
@@ -640,7 +645,7 @@ namespace MConnectSDK
private void doTokenStep()
{
// parametri chiamata
Uri callUri = new Uri(BaseUrl + "/oauth2/token");
Uri callUri = new Uri(OAuthUrl + "/oauth2/token");
// encapsulo clientID
var payload = "{\"client_id\": \"" + ClientID + "\"}";
HttpContent callCont = new StringContent(payload, Encoding.UTF8, "application/json");
@@ -674,7 +679,7 @@ namespace MConnectSDK
if (pingOk && cloudOk)
{
// parametri chiamata
Uri callUri = new Uri(BaseUrl + "/oauth2/verification");
Uri callUri = new Uri(OAuthUrl + "/oauth2/verification");
// !!! FARE fix hard coded !!!
var payload = "{\"client_id\": \"" + ClientID + "\", \"device_code\": \"" + tokResp.device_code + "\"}";
HttpContent callCont = new StringContent(payload, Encoding.UTF8, "application/json");
@@ -776,6 +781,7 @@ namespace MConnectSDK
MachineID = config["MachineID"].ToString();
ClientID = config["Client_ID"].ToString();
// URL base x le chiamate REALI
OAuthUrl = config["OAuthUrl"].ToString();
BaseUrl = config["BaseUrl"].ToString();
WebAppUrl = config["WebAppUrl"].ToString();
UploadUrl = config["UploadUrl"].ToString();
@@ -852,7 +858,7 @@ namespace MConnectSDK
private void refreshAuthToken()
{
// parametri chiamata
Uri callUri = new Uri(BaseUrl + "/oauth2/refresh");
Uri callUri = new Uri(OAuthUrl + "/oauth2/refresh");
var payload = "{\"refresh_token\": \"" + verifResp.refresh_token + "\"}";
HttpContent callCont = new StringContent(payload, Encoding.UTF8, "application/json");
@@ -1289,7 +1295,7 @@ namespace MConnectSDK
if (answ == "201")
{
// step 2: ATTIVAZIONE
var taskResActiv = Task.Run(() => Utils.postUriAsync(callUriAssig, callCont, verifResp.access_token));
var taskResActiv = Task.Run(() => Utils.postUriAsync(callUriActiv, callCont, verifResp.access_token));
taskResActiv.Wait();
answ = taskResActiv.Result;
}
@@ -1406,7 +1412,7 @@ namespace MConnectSDK
if (pingOk && cloudOk)
{
// provo a chiamare clientInfo...
string pageUrl = $"{BaseUrl}/oauth2/clientinfo?access_token={verifResp.access_token}";
string pageUrl = $"{OAuthUrl}/oauth2/clientinfo?access_token={verifResp.access_token}";
var taskRes = Task.Run(() => Utils.getPageAsync(pageUrl));
taskRes.Wait();
@@ -1464,7 +1470,7 @@ namespace MConnectSDK
if (pingOk && cloudOk)
{
// provo a chiamare clientInfo...
string pageUrl = $"{BaseUrl}/oauth2/clientinfo?access_token={verifResp.access_token}";
string pageUrl = $"{OAuthUrl}/oauth2/clientinfo?access_token={verifResp.access_token}";
var taskRes = Task.Run(() => Utils.getPageAsync(pageUrl));
taskRes.Wait();
TestClient/MainForm.Designer.cs
Generated
+539 -484
View File
File diff suppressed because it is too large Load Diff
TestClient/MainForm.cs
+975 -866
View File
File diff suppressed because it is too large Load Diff
TestClient/mconnect.conf.yaml
+2 -1
View File
@@ -1,10 +1,11 @@
#File di conf per MConnectClientSDK
conf:
Client_ID: "test"
MachineID: "ckhkljalb16nt0g4cysrk7bec"
MachineID: "ckk2ornjz224s0g4amp935fm2"
PingTarget: "tst.api.maestroconnect.scmgroup.com"
AliveTarget: "https://tst.api.maestroconnect.scmgroup.com/health"
ApiVersion: "v2"
OAuthUrl: "https://tst.api.maestroconnect.scmgroup.com/api"
BaseUrl: "https://tst.api.maestroconnect.scmgroup.com/clients"
UploadUrl: "https://tst.api.maestroconnect.scmgroup.com/storage-api/backups"
WebAppUrl: "https://tst.maestroconnect.scmgroup.com/settings/machine-activation?user_code={0}&machine_id={1}"