Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #345 from iranl/fix-authName

Browse Source 
Fix authName
This commit is contained in:
Jan-Ole Schümann
2024-05-04 15:12:13 +07:00
committed by GitHub
parent 9b1097159d 5f69865491
commit 0f929bd5e2
4 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
NetworkLock.cpp
View File

@@ -20,8 +20,9 @@ NetworkLock::NetworkLock(Network* network, Preferences* preferences, char* buffe
_configTopics.push_back(mqtt_topic_config_auto_unlock); _configTopics.push_back(mqtt_topic_config_auto_unlock);
_configTopics.push_back(mqtt_topic_config_auto_lock); _configTopics.push_back(mqtt_topic_config_auto_lock);
_configTopics.push_back(mqtt_topic_config_single_lock); _configTopics.push_back(mqtt_topic_config_single_lock);
memset(authName, 0, sizeof(authName)); memset(_authName, 0, sizeof(_authName));
_authName[0] = '\0';
_network->registerMqttReceiver(this); _network->registerMqttReceiver(this);
} }
@@ -226,7 +227,7 @@ void NetworkLock::onMqttDataReceived(const char* topic, byte* payload, const uns
publishString(mqtt_topic_keypad_json_action, "--"); publishString(mqtt_topic_keypad_json_action, "--");
} }
if(comparePrefixedPath(topic, mqtt_topic_timecontrol_action)) if(comparePrefixedPath(topic, mqtt_topic_timecontrol_action))
{ {
if(strcmp(value, "") == 0 || strcmp(value, "--") == 0) return; if(strcmp(value, "") == 0 || strcmp(value, "--") == 0) return;
@@ -325,8 +326,8 @@ void NetworkLock::publishKeyTurnerState(const NukiLock::KeyTurnerState& keyTurne
} }
} }
json["auth_id"] = authId; json["auth_id"] = _authId;
json["auth_name"] = authName; json["auth_name"] = _authName;
serializeJson(json, _buffer, _bufferSize); serializeJson(json, _buffer, _bufferSize);
publishString(mqtt_topic_lock_json, _buffer); publishString(mqtt_topic_lock_json, _buffer);
@@ -372,8 +373,10 @@ void NetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntry>&
{ {
char str[50]; char str[50];
bool authFound = false; _authId = 0;
memset(authName, 0, sizeof(authName)); memset(_authName, 0, sizeof(_authName));
_authName[0] = '\0';
_authFound = false;
JsonDocument json; JsonDocument json;
@@ -385,18 +388,20 @@ void NetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntry>&
break; break;
} }
--i; --i;
if((log.loggingType == NukiLock::LoggingType::LockAction || log.loggingType == NukiLock::LoggingType::KeypadAction) && ! authFound) if((log.loggingType == NukiLock::LoggingType::LockAction || log.loggingType == NukiLock::LoggingType::KeypadAction) && ! _authFound)
{ {
authFound = true; _authFound = true;
authId = log.authId; _authId = log.authId;
memcpy(authName, log.name, sizeof(log.name)); int sizeName = sizeof(log.name);
memcpy(_authName, log.name, sizeName);
if(_authName[sizeName - 1] != '\0') _authName[sizeName] = '\0';
} }
auto entry = json.add(); auto entry = json.add();
entry["index"] = log.index; entry["index"] = log.index;
entry["authorizationId"] = log.authId; entry["authorizationId"] = log.authId;
entry["authorizationName"] = log.name; entry["authorizationName"] = _authName;
entry["timeYear"] = log.timeStampYear; entry["timeYear"] = log.timeStampYear;
entry["timeMonth"] = log.timeStampMonth; entry["timeMonth"] = log.timeStampMonth;
entry["timeDay"] = log.timeStampDay; entry["timeDay"] = log.timeStampDay;
@@ -462,10 +467,10 @@ void NetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntry>&
serializeJson(json, _buffer, _bufferSize); serializeJson(json, _buffer, _bufferSize);
publishString(mqtt_topic_lock_log, _buffer); publishString(mqtt_topic_lock_log, _buffer);
if(authFound) if(_authFound)
{ {
publishUInt(mqtt_topic_lock_auth_id, authId); publishUInt(mqtt_topic_lock_auth_id, _authId);
publishString(mqtt_topic_lock_auth_name, authName); publishString(mqtt_topic_lock_auth_name, _authName);
} }
} }

7
NetworkLock.h
View File

@@ -84,9 +84,10 @@ private:
String _keypadCommandCode = ""; String _keypadCommandCode = "";
uint _keypadCommandId = 0; uint _keypadCommandId = 0;
int _keypadCommandEnabled = 1; int _keypadCommandEnabled = 1;
uint8_t _queryCommands = 0; uint8_t _queryCommands = 0;
uint32_t authId = 0; uint32_t _authId = 0;
char authName[33]; char _authName[33];
bool _authFound = false;
char* _buffer; char* _buffer;
size_t _bufferSize; size_t _bufferSize;

33
NetworkOpener.cpp
View File

@@ -16,8 +16,9 @@ NetworkOpener::NetworkOpener(Network* network, Preferences* preferences, char* b
_configTopics.push_back(mqtt_topic_config_button_enabled); _configTopics.push_back(mqtt_topic_config_button_enabled);
_configTopics.push_back(mqtt_topic_config_led_enabled); _configTopics.push_back(mqtt_topic_config_led_enabled);
_configTopics.push_back(mqtt_topic_config_sound_level); _configTopics.push_back(mqtt_topic_config_sound_level);
memset(authName, 0, sizeof(authName)); memset(_authName, 0, sizeof(_authName));
_authName[0] = '\0';
_network->registerMqttReceiver(this); _network->registerMqttReceiver(this);
} }
@@ -297,8 +298,8 @@ void NetworkOpener::publishKeyTurnerState(const NukiOpener::OpenerState& keyTurn
publishBool(mqtt_topic_battery_critical, critical); publishBool(mqtt_topic_battery_critical, critical);
} }
json["auth_id"] = authId; json["auth_id"] = _authId;
json["auth_name"] = authName; json["auth_name"] = _authName;
serializeJson(json, _buffer, _bufferSize); serializeJson(json, _buffer, _bufferSize);
publishString(mqtt_topic_lock_json, _buffer); publishString(mqtt_topic_lock_json, _buffer);
@@ -359,8 +360,10 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
{ {
char str[50]; char str[50];
bool authFound = false; _authId = 0;
memset(authName, 0, sizeof(authName)); memset(_authName, 0, sizeof(_authName));
_authName[0] = '\0';
_authFound = false;
JsonDocument json; JsonDocument json;
@@ -373,18 +376,20 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
} }
--i; --i;
if((log.loggingType == NukiOpener::LoggingType::LockAction || log.loggingType == NukiOpener::LoggingType::KeypadAction) && ! authFound) if((log.loggingType == NukiOpener::LoggingType::LockAction || log.loggingType == NukiOpener::LoggingType::KeypadAction) && ! _authFound)
{ {
authFound = true; _authFound = true;
authId = log.authId; _authId = log.authId;
memcpy(authName, log.name, sizeof(log.name)); int sizeName = sizeof(log.name);
memcpy(_authName, log.name, sizeName);
if(_authName[sizeName - 1] != '\0') _authName[sizeName] = '\0';
} }
auto entry = json.add(); auto entry = json.add();
entry["index"] = log.index; entry["index"] = log.index;
entry["authorizationId"] = log.authId; entry["authorizationId"] = log.authId;
entry["authorizationName"] = log.name; entry["authorizationName"] = _authName;
entry["timeYear"] = log.timeStampYear; entry["timeYear"] = log.timeStampYear;
entry["timeMonth"] = log.timeStampMonth; entry["timeMonth"] = log.timeStampMonth;
entry["timeDay"] = log.timeStampDay; entry["timeDay"] = log.timeStampDay;
@@ -475,10 +480,10 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
serializeJson(json, _buffer, _bufferSize); serializeJson(json, _buffer, _bufferSize);
publishString(mqtt_topic_lock_log, _buffer); publishString(mqtt_topic_lock_log, _buffer);
if(authFound) if(_authFound)
{ {
publishUInt(mqtt_topic_lock_auth_id, authId); publishUInt(mqtt_topic_lock_auth_id, _authId);
publishString(mqtt_topic_lock_auth_name, authName); publishString(mqtt_topic_lock_auth_name, _authName);
} }
} }

7
NetworkOpener.h
View File

@@ -43,7 +43,7 @@ public:
void setConfigUpdateReceivedCallback(void (*configUpdateReceivedCallback)(const char* path, const char* value)); void setConfigUpdateReceivedCallback(void (*configUpdateReceivedCallback)(const char* path, const char* value));
void setKeypadCommandReceivedCallback(void (*keypadCommandReceivedReceivedCallback)(const char* command, const uint& id, const String& name, const String& code, const int& enabled)); void setKeypadCommandReceivedCallback(void (*keypadCommandReceivedReceivedCallback)(const char* command, const uint& id, const String& name, const String& code, const int& enabled));
void setKeypadJsonCommandReceivedCallback(void (*keypadJsonCommandReceivedReceivedCallback)(const char* value)); void setKeypadJsonCommandReceivedCallback(void (*keypadJsonCommandReceivedReceivedCallback)(const char* value));
void setTimeControlCommandReceivedCallback(void (*timeControlCommandReceivedReceivedCallback)(const char* value)); void setTimeControlCommandReceivedCallback(void (*timeControlCommandReceivedReceivedCallback)(const char* value));
void onMqttDataReceived(const char* topic, byte* payload, const unsigned int length) override; void onMqttDataReceived(const char* topic, byte* payload, const unsigned int length) override;
bool reconnected(); bool reconnected();
@@ -86,8 +86,9 @@ private:
int _keypadCommandEnabled = 1; int _keypadCommandEnabled = 1;
unsigned long _resetRingStateTs = 0; unsigned long _resetRingStateTs = 0;
uint8_t _queryCommands = 0; uint8_t _queryCommands = 0;
uint32_t authId = 0; uint32_t _authId = 0;
char authName[33]; char _authName[33];
bool _authFound = false;
NukiOpener::LockState _currentLockState = NukiOpener::LockState::Undefined; NukiOpener::LockState _currentLockState = NukiOpener::LockState::Undefined;