Fix AuthName

technyon · May 20, 2024 · 859c594 · 859c594
1 parent 8d03cd6
commit 859c594
Show file tree

Hide file tree

Showing 9 changed files with 145 additions and 91 deletions.
diff --git a/README.md b/README.md
@@ -390,7 +390,7 @@ Example usage for changing multiple settings at once:<br>
 The result of the last configuration change action will be published to the `configuration/commandResult` MQTT topic as JSON data.<br>
 <br>
 The JSON data will include a node called "general" and a node for every setting that Nuki Hub detected in the action.<br>
-Possible values for the "general" node are "noPinSet", "invalidJson", "invalidConfig", "success" and "noChange".<br>
+Possible values for the "general" node are "noValidPinSet", "invalidJson", "invalidConfig", "success" and "noChange".<br>
 Possible values for the node per setting are "unchanged", "noValueSet", "invalidValue", "valueTooLong", "accessDenied", "success", "failed", "timeOut", "working", "notPaired", "error" and "undefined"<br>
 <br>
 Example:
@@ -465,7 +465,7 @@ Examples:
 ### Result of attempted keypad code changes
 
 The result of the last configuration change action will be published to the `configuration/commandResultJson` MQTT topic.<br>
-Possible values are "noPinSet", "keypadControlDisabled", "keypadNotAvailable", "keypadDisabled", "invalidConfig", "invalidJson", "noActionSet", "invalidAction", "noExistingCodeIdSet", "noNameSet", "noValidCodeSet", "noCodeSet", "invalidAllowedFrom", "invalidAllowedUntil", "invalidAllowedFromTime", "invalidAllowedUntilTime", "success", "failed", "timeOut", "working", "notPaired", "error" and "undefined".<br>
+Possible values are "noValidPinSet", "keypadControlDisabled", "keypadNotAvailable", "keypadDisabled", "invalidConfig", "invalidJson", "noActionSet", "invalidAction", "noExistingCodeIdSet", "noNameSet", "noValidCodeSet", "noCodeSet", "invalidAllowedFrom", "invalidAllowedUntil", "invalidAllowedFromTime", "invalidAllowedUntilTime", "success", "failed", "timeOut", "working", "notPaired", "error" and "undefined".<br>
 
 ## Keypad control (alternative, optional)
 

diff --git a/platformio.ini b/platformio.ini
@@ -24,14 +24,6 @@ build_flags =
 	-DESP_PLATFORM
 	-DESP32
 	-DARDUINO_ARCH_ESP32
-	-DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_NONE
-	-DCONFIG_NIMBLE_CPP_LOG_LEVEL=0
-;	-DDEBUG_SENSE_NUKI
-;	-DDEBUG_NUKI_COMMAND
-;	-DDEBUG_NUKI_CONNECT
-;	-DDEBUG_NUKI_COMMUNICATION
-;	-DDEBUG_NUKI_HEX_DATA
-;	-DDEBUG_NUKI_READABLE_DATA
 lib_deps =
 
 monitor_speed = 115200
@@ -41,61 +33,88 @@ monitor_filters =
 
 [env:esp32dev]
 board = esp32dev
+build_flags =
+	${env.build_flags}
+    -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_NONE
+	-DCONFIG_NIMBLE_CPP_LOG_LEVEL=0
 
 [env:esp32-c3]
 board = esp32-c3-devkitc-02
+build_flags =
+	${env.build_flags}
+    -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_NONE
+	-DCONFIG_NIMBLE_CPP_LOG_LEVEL=0
 
 [env:esp32solo1]
 platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.03/platform-espressif32-2023.10.03.zip
 board = esp32-solo1
 build_flags =
 	${env.build_flags}
 	-DFRAMEWORK_ARDUINO_SOLO1
+    -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_NONE
+	-DCONFIG_NIMBLE_CPP_LOG_LEVEL=0
 
 [env:esp32-s3]
 board = esp32-s3-devkitc-1
+build_flags =
+	${env.build_flags}
+    -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_NONE
+	-DCONFIG_NIMBLE_CPP_LOG_LEVEL=0
 
 [env:esp32dev_dbg]
-extends = env:esp32dev
+board = esp32dev
 build_flags =
 	${env.build_flags}
+    -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
+	-DCONFIG_NIMBLE_CPP_LOG_LEVEL=4
+    -DDEBUG_NUKIHUB
 	-DDEBUG_SENSE_NUKI
 	-DDEBUG_NUKI_COMMAND
 	-DDEBUG_NUKI_CONNECT
 	-DDEBUG_NUKI_COMMUNICATION
-	-DDEBUG_NUKI_HEX_DATA
+	;-DDEBUG_NUKI_HEX_DATA
 	-DDEBUG_NUKI_READABLE_DATA
 
 [env:esp32-s3_dbg]
-extends = env:esp32-s3
+board = esp32-s3-devkitc-1
 build_flags =
 	${env.build_flags}
+    -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
+	-DCONFIG_NIMBLE_CPP_LOG_LEVEL=4
+    -DDEBUG_NUKIHUB
 	-DDEBUG_SENSE_NUKI
 	-DDEBUG_NUKI_COMMAND
 	-DDEBUG_NUKI_CONNECT
 	-DDEBUG_NUKI_COMMUNICATION
-	-DDEBUG_NUKI_HEX_DATA
+	;-DDEBUG_NUKI_HEX_DATA
 	-DDEBUG_NUKI_READABLE_DATA
 
 [env:esp32-c3_dbg]
-extends = env:esp32-c3
+board = esp32-c3-devkitc-02
 build_flags =
 	${env.build_flags}
+    -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
+	-DCONFIG_NIMBLE_CPP_LOG_LEVEL=4
+    -DDEBUG_NUKIHUB
 	-DDEBUG_SENSE_NUKI
 	-DDEBUG_NUKI_COMMAND
 	-DDEBUG_NUKI_CONNECT
 	-DDEBUG_NUKI_COMMUNICATION
-	-DDEBUG_NUKI_HEX_DATA
+	;-DDEBUG_NUKI_HEX_DATA
 	-DDEBUG_NUKI_READABLE_DATA
 
 [env:esp32solo1_dbg]
-extends = env:esp32solo1
+platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.03/platform-espressif32-2023.10.03.zip
+board = esp32-solo1
 build_flags =
 	${env.build_flags}
     -DFRAMEWORK_ARDUINO_SOLO1
+    -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
+	-DCONFIG_NIMBLE_CPP_LOG_LEVEL=4
+    -DDEBUG_NUKIHUB
 	-DDEBUG_SENSE_NUKI
 	-DDEBUG_NUKI_COMMAND
 	-DDEBUG_NUKI_CONNECT
 	-DDEBUG_NUKI_COMMUNICATION
-	-DDEBUG_NUKI_HEX_DATA
+	;-DDEBUG_NUKI_HEX_DATA
 	-DDEBUG_NUKI_READABLE_DATA
diff --git a/src/NetworkLock.cpp b/src/NetworkLock.cpp
@@ -199,7 +199,7 @@ void NetworkLock::onMqttDataReceived(const char* topic, byte* payload, const uns
     if(comparePrefixedPath(topic, mqtt_topic_config_action))
     {
         if(strcmp(value, "") == 0 || strcmp(value, "--") == 0) return;
-        
+
         if(_configUpdateReceivedCallback != NULL)
         {
             _configUpdateReceivedCallback(value);
@@ -265,7 +265,7 @@ void NetworkLock::publishKeyTurnerState(const NukiLock::KeyTurnerState& keyTurne
     }
 
     json["trigger"] = str;
-    
+
     char curTime[20];
     sprintf(curTime, "%04d-%02d-%02d %02d:%02d:%02d", keyTurnerState.currentTimeYear, keyTurnerState.currentTimeMonth, keyTurnerState.currentTimeDay, keyTurnerState.currentTimeHour, keyTurnerState.currentTimeMinute, keyTurnerState.currentTimeSecond);
     json["currentTime"] = curTime;
@@ -375,11 +375,8 @@ void NetworkLock::publishState(NukiLock::LockState lockState)
 void NetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntry>& logEntries)
 {
     char str[50];
-
-    _authId = 0;
-    memset(_authName, 0, sizeof(_authName));
-    _authName[0] = '\0';
-    _authFound = false;
+    char authName[33];
+    bool authFound = false;
 
     JsonDocument json;
 
@@ -391,20 +388,31 @@ void NetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntry>&
             break;
         }
         --i;
-        if((log.loggingType == NukiLock::LoggingType::LockAction || log.loggingType == NukiLock::LoggingType::KeypadAction) && ! _authFound)
+
+        memset(authName, 0, sizeof(authName));
+        authName[0] = '\0';
+
+        if((log.loggingType == NukiLock::LoggingType::LockAction || log.loggingType == NukiLock::LoggingType::KeypadAction))
         {
-            _authFound = true;
-            _authId = log.authId;
             int sizeName = sizeof(log.name);
-            memcpy(_authName, log.name, sizeName);
-            if(_authName[sizeName - 1] != '\0') _authName[sizeName] = '\0';
+            memcpy(authName, log.name, sizeName);
+            if(authName[sizeName - 1] != '\0') authName[sizeName] = '\0';
+
+            if(!authFound)
+            {
+                authFound = true;
+                _authFound = true;
+                _authId = log.authId;
+                memset(_authName, 0, sizeof(_authName));
+                memcpy(_authName, authName, sizeof(authName));
+            }
         }
 
         auto entry = json.add<JsonVariant>();
 
         entry["index"] = log.index;
         entry["authorizationId"] = log.authId;
-        entry["authorizationName"] = _authName;
+        entry["authorizationName"] = authName;
         entry["timeYear"] = log.timeStampYear;
         entry["timeMonth"] = log.timeStampMonth;
         entry["timeDay"] = log.timeStampDay;
@@ -470,7 +478,7 @@ void NetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntry>&
     serializeJson(json, _buffer, _bufferSize);
     publishString(mqtt_topic_lock_log, _buffer);
 
-    if(_authFound)
+    if(authFound)
     {
         publishUInt(mqtt_topic_lock_auth_id, _authId);
         publishString(mqtt_topic_lock_auth_name, _authName);

diff --git a/src/NetworkOpener.cpp b/src/NetworkOpener.cpp
@@ -266,7 +266,7 @@ void NetworkOpener::publishKeyTurnerState(const NukiOpener::OpenerState& keyTurn
     }
 
     json["trigger"] = str;
-    
+
     json["ringToOpenTimer"] = keyTurnerState.ringToOpenTimer;
     char curTime[20];
     sprintf(curTime, "%04d-%02d-%02d %02d:%02d:%02d", keyTurnerState.currentTimeYear, keyTurnerState.currentTimeMonth, keyTurnerState.currentTimeDay, keyTurnerState.currentTimeHour, keyTurnerState.currentTimeMinute, keyTurnerState.currentTimeSecond);
@@ -373,11 +373,8 @@ void NetworkOpener::publishState(NukiOpener::OpenerState lockState)
 void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntry>& logEntries)
 {
     char str[50];
-
-    _authId = 0;
-    memset(_authName, 0, sizeof(_authName));
-    _authName[0] = '\0';
-    _authFound = false;
+    char authName[33];
+    bool authFound = false;
 
     JsonDocument json;
 
@@ -390,13 +387,23 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
         }
         --i;
 
-        if((log.loggingType == NukiOpener::LoggingType::LockAction || log.loggingType == NukiOpener::LoggingType::KeypadAction) && ! _authFound)
+        memset(authName, 0, sizeof(authName));
+        authName[0] = '\0';
+
+        if((log.loggingType == NukiOpener::LoggingType::LockAction || log.loggingType == NukiOpener::LoggingType::KeypadAction))
         {
-            _authFound = true;
-            _authId = log.authId;
             int sizeName = sizeof(log.name);
-            memcpy(_authName, log.name, sizeName);
-            if(_authName[sizeName - 1] != '\0') _authName[sizeName] = '\0';
+            memcpy(authName, log.name, sizeName);
+            if(authName[sizeName - 1] != '\0') authName[sizeName] = '\0';
+
+            if(!authFound)
+            {
+                authFound = true;
+                _authFound = true;
+                _authId = log.authId;
+                memset(_authName, 0, sizeof(_authName));
+                memcpy(_authName, authName, sizeof(authName));
+            }
         }
 
         auto entry = json.add<JsonVariant>();
@@ -494,7 +501,7 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
     serializeJson(json, _buffer, _bufferSize);
     publishString(mqtt_topic_lock_log, _buffer);
 
-    if(_authFound)
+    if(authFound)
     {
         publishUInt(mqtt_topic_lock_auth_id, _authId);
         publishString(mqtt_topic_lock_auth_name, _authName);
@@ -891,7 +898,7 @@ void NetworkOpener::publishStatusUpdated(const bool statusUpdated)
 {
     publishBool(mqtt_topic_lock_status_updated, statusUpdated);
 }
-  
+
 void NetworkOpener::setLockActionReceivedCallback(LockActionResult (*lockActionReceivedCallback)(const char *))
 {
     _lockActionReceivedCallback = lockActionReceivedCallback;