Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-30 19:38:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

make it fit in allocated space

Browse Source
This commit is contained in:
philippe44
2023-03-27 17:09:27 -07:00
parent 7dfdd7b9e5
commit fc78b36c1f
24 changed files with 421 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
components/spotify/cspot/src/LoginBlob.cpp
View File

@@ -1,6 +1,9 @@
#include "LoginBlob.h"
#include "ConstantParameters.h"
#include "Logger.h"
#ifdef BELL_ONLY_CJSON
#include "cJSON.h"
#endif
using namespace cspot;
@@ -125,21 +128,46 @@ void LoginBlob::loadUserPass(const std::string& username,
}
void LoginBlob::loadJson(const std::string& json) {
#ifdef BELL_ONLY_CJSON
cJSON* root = cJSON_Parse(json.c_str());
cJSON* item = cJSON_GetObjectItem(root, "authType");
this->authType = item->valueint;
item = cJSON_GetObjectItem(root, "username");
this->username = item->valuestring;
item = cJSON_GetObjectItem(root, "authData");
std::string authDataObject = item->valuestring;
cJSON_Delete(root);
#else
auto root = nlohmann::json::parse(json);
this->authType = root["authType"];
this->username = root["username"];
std::string authDataObject = root["authData"];
this->authData = crypto->base64Decode(authDataObject);
#endif
}
std::string LoginBlob::toJson() {
#ifdef BELL_ONLY_CJSON
cJSON* json_obj = cJSON_CreateObject();
cJSON_AddStringToObject(json_obj, "authData", crypto->base64Encode(authData).c_str());
cJSON_AddNumberToObject(json_obj, "authType", this->authType);
cJSON_AddStringToObject(json_obj, "username", this->username.c_str());
char *str = cJSON_PrintUnformatted(json_obj);
cJSON_Delete(json_obj);
std::string json_objStr(str);
free(str);
return json_objStr;
#else
nlohmann::json obj;
obj["authData"] = crypto->base64Encode(authData);
obj["authType"] = this->authType;
obj["username"] = this->username;
return obj.dump();
#endif
}
void LoginBlob::loadZeroconfQuery(
@@ -164,7 +192,35 @@ std::string LoginBlob::buildZeroconfInfo() {
// Encode publicKey into base64
auto encodedKey = crypto->base64Encode(crypto->publicKey);
#ifdef BELL_ONLY_CJSON
cJSON* json_obj = cJSON_CreateObject();
cJSON_AddNumberToObject(json_obj, "status", 101);
cJSON_AddStringToObject(json_obj, "statusString", "OK");
cJSON_AddStringToObject(json_obj, "version", cspot::protocolVersion);
cJSON_AddStringToObject(json_obj, "libraryVersion", cspot::swVersion);
cJSON_AddStringToObject(json_obj, "accountReq", "PREMIUM");
cJSON_AddStringToObject(json_obj, "brandDisplayName", cspot::brandName);
cJSON_AddStringToObject(json_obj, "modelDisplayName", name.c_str());
cJSON_AddStringToObject(json_obj, "voiceSupport", "NO");
cJSON_AddStringToObject(json_obj, "availability", this->username.c_str());
cJSON_AddNumberToObject(json_obj, "productID", 0);
cJSON_AddStringToObject(json_obj, "tokenType", "default");
cJSON_AddStringToObject(json_obj, "groupStatus", "NONE");
cJSON_AddStringToObject(json_obj, "resolverVersion", "0");
cJSON_AddStringToObject(json_obj, "scope", "streaming,client-authorization-universal");
cJSON_AddStringToObject(json_obj, "activeUser", "");
cJSON_AddStringToObject(json_obj, "deviceID", deviceId.c_str());
cJSON_AddStringToObject(json_obj, "remoteName", name.c_str());
cJSON_AddStringToObject(json_obj, "publicKey", encodedKey.c_str());
cJSON_AddStringToObject(json_obj, "deviceType", "deviceType");
char *str = cJSON_PrintUnformatted(json_obj);
cJSON_Delete(json_obj);
std::string json_objStr(str);
free(str);
return json_objStr;
#else
nlohmann::json obj;
obj["status"] = 101;
obj["statusString"] = "OK";
@@ -188,6 +244,7 @@ std::string LoginBlob::buildZeroconfInfo() {
obj["deviceType"] = "SPEAKER";
return obj.dump();
#endif
}
std::string LoginBlob::getDeviceId() {