Epitech/T-DEV-811
4
0
Fork 0
Code Issues 7 Pull Requests 1 Packages Projects 1 Releases Wiki Activity

feat(IOT): LibAPI #21

Merged
Clement merged 12 commits from feat/LibAPI into master 2023-04-03 14:55:14 +00:00
Conversation 2 Commits 12 Files Changed 7 +8 -6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 789cab74a9 - Show all commits

14
IOT/lib/API/src/API.cpp
View File

@ -27,10 +27,9 @@ bool API::wifiBegin(String wifiId, String wifiPass, Stream* espSerial){
} }
return true; return true;
} }
bool API::connect(){
JSONVar* API::connect(){
this->client->stop(); this->client->stop();
JSONVar* sortie =nullptr; bool sortie = false;
JSONVar data; JSONVar data;
@ -69,14 +68,16 @@ JSONVar* API::connect(){
String str = responce.substring(responce.indexOf("{"),responce.lastIndexOf("}")+1); String str = responce.substring(responce.indexOf("{"),responce.lastIndexOf("}")+1);
sortie = new JSONVar(JSONVar::parse(str)); JSONVar jsonRes = new JSONVar(JSONVar::parse(str));
this->token = JSONVar::stringify((*sortie)["token"]); this->token = JSONVar::stringify(jsonRes["token"]);
this->token = this->token.substring(1,this->token.length()-1); this->token = this->token.substring(1,this->token.length()-1);
this->client->stop(); this->client->stop();
sortie = true;
return sortie; return sortie;
} }
@ -90,7 +91,8 @@ bool API::sendValute(String val, String poubelleID, String valUnit, bool full){
String strData = JSONVar::stringify(data); String strData = JSONVar::stringify(data);
if(this->token == ""){ if(this->token == ""){
this->connect(); bool connected = this->connect();
if(!connected)return false;
} }
if(this->https){ if(this->https){
if (!this->client->connectSSL(("https://" + this->serveurHost).c_str(), 443)) { if (!this->client->connectSSL(("https://" + this->serveurHost).c_str(), 443)) {