Darkages/SpotMicroESP32-Leika
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrades ArduinoJson from version 6 to 7

Browse Source
This commit is contained in:
Rune Harlyk
2024-05-07 10:36:16 +02:00
committed by Rune Harlyk
parent 2b4d196e7c
commit a150caad9d
39 changed files with 241 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esp32/lib/ESP32-sveltekit/SecuritySettingsService.cpp
+4 -4
View File
@@ -69,7 +69,7 @@ void SecuritySettingsService::configureJWTHandler()
Authentication SecuritySettingsService::authenticateJWT(String &jwt)
{
DynamicJsonDocument payloadDocument(MAX_JWT_SIZE);
JsonDocument payloadDocument;
_jwtHandler.parseJWT(jwt, payloadDocument);
if (payloadDocument.is<JsonObject>())
{
@@ -106,7 +106,7 @@ inline void populateJWTPayload(JsonObject &payload, User *user)
boolean SecuritySettingsService::validatePayload(JsonObject &parsedPayload, User *user)
{
DynamicJsonDocument jsonDocument(MAX_JWT_SIZE);
JsonDocument jsonDocument;
JsonObject payload = jsonDocument.to<JsonObject>();
populateJWTPayload(payload, user);
return payload == parsedPayload;
@@ -114,7 +114,7 @@ boolean SecuritySettingsService::validatePayload(JsonObject &parsedPayload, User
String SecuritySettingsService::generateJWT(User *user)
{
DynamicJsonDocument jsonDocument(MAX_JWT_SIZE);
JsonDocument jsonDocument;
JsonObject payload = jsonDocument.to<JsonObject>();
populateJWTPayload(payload, user);
return _jwtHandler.buildJWT(payload);
@@ -179,7 +179,7 @@ esp_err_t SecuritySettingsService::generateToken(PsychicRequest *request)
{
if (_user.username == usernameParam)
{
PsychicJsonResponse response = PsychicJsonResponse(request, false, GENERATE_TOKEN_SIZE);
PsychicJsonResponse response = PsychicJsonResponse(request, false);
JsonObject root = response.getRoot();
root["token"] = generateJWT(&_user);
return response.send();