From 7937ec8c65c881aa0c17222210b4812a10b6f0c8 Mon Sep 17 00:00:00 2001
From: iranl <iranl@users.noreply.github.com>
Date: Sat, 17 Feb 2024 11:42:03 +0100
Subject: [PATCH] Add auth info

---
 NetworkLock.cpp   |  4 ++--
 NetworkLock.h     |  6 ++++--
 NetworkOpener.cpp |  4 ++--
 NetworkOpener.h   |  3 +++
 NukiWrapper.cpp   | 11 ++++++-----
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/NetworkLock.cpp b/NetworkLock.cpp
index f1026b4..c87ed30 100644
--- a/NetworkLock.cpp
+++ b/NetworkLock.cpp
@@ -299,6 +299,8 @@ void NetworkLock::publishKeyTurnerState(const NukiLock::KeyTurnerState& keyTurne
     }
 
     json["keypad_battery_critical"] = keypadBatteryCritical;
+    json["auth_id"] = authId;
+    json["auth_name"] = authName;
 
     _firstTunerStatePublish = false;
 }
@@ -328,8 +330,6 @@ void NetworkLock::publishAuthorizationInfo(const std::list<NukiLock::LogEntry>&
     char str[50];
 
     bool authFound = false;
-    uint32_t authId = 0;
-    char authName[33];
     memset(authName, 0, sizeof(authName));
 
     DynamicJsonDocument json(_bufferSize);
diff --git a/NetworkLock.h b/NetworkLock.h
index 95f0e88..866a18a 100644
--- a/NetworkLock.h
+++ b/NetworkLock.h
@@ -73,14 +73,16 @@ private:
 
     bool _firstTunerStatePublish = true;
     unsigned long _lastMaintenanceTs = 0;
-    bool _haEnabled= false;
+    bool _haEnabled = false;
     bool _reconnected = false;
 
     String _keypadCommandName = "";
     String _keypadCommandCode = "";
     uint _keypadCommandId = 0;
     int _keypadCommandEnabled = 1;
-    uint8_t _queryCommands = 0;
+    uint8_t _queryCommands = 0;    
+    uint32_t authId = 0;
+    char authName[33];
 
     char* _buffer;
     size_t _bufferSize;
diff --git a/NetworkOpener.cpp b/NetworkOpener.cpp
index 71c6788..f5e1e60 100644
--- a/NetworkOpener.cpp
+++ b/NetworkOpener.cpp
@@ -272,6 +272,8 @@ void NetworkOpener::publishKeyTurnerState(const NukiOpener::OpenerState& keyTurn
     }
 
     json["battery_critical"] = critical;
+    json["auth_id"] = authId;
+    json["auth_name"] = authName;    
 
     serializeJson(json, _buffer, _bufferSize);
     publishString(mqtt_topic_lock_json, _buffer);
@@ -314,8 +316,6 @@ void NetworkOpener::publishAuthorizationInfo(const std::list<NukiOpener::LogEntr
     char str[50];
 
     bool authFound = false;
-    uint32_t authId = 0;
-    char authName[33];
     memset(authName, 0, sizeof(authName));
 
     DynamicJsonDocument json(_bufferSize);
diff --git a/NetworkOpener.h b/NetworkOpener.h
index 5a2853e..166ed73 100644
--- a/NetworkOpener.h
+++ b/NetworkOpener.h
@@ -82,6 +82,9 @@ private:
     int _keypadCommandEnabled = 1;
     unsigned long _resetLockStateTs = 0;
     uint8_t _queryCommands = 0;
+    uint32_t authId = 0;
+    char authName[33];    
+    
     NukiOpener::LockState _currentLockState = NukiOpener::LockState::Undefined;
 
     char* _buffer;
diff --git a/NukiWrapper.cpp b/NukiWrapper.cpp
index 50519eb..56764ce 100644
--- a/NukiWrapper.cpp
+++ b/NukiWrapper.cpp
@@ -324,8 +324,14 @@ void NukiWrapper::updateKeyTurnerState()
         }
         return;
     }
+    
     _retryLockstateCount = 0;
 
+    if(_publishAuthData)
+    {
+        updateAuthData();
+    }
+
     _network->publishKeyTurnerState(_keyTurnerState, _lastKeyTurnerState);
     updateGpioOutputs();
 
@@ -333,11 +339,6 @@ void NukiWrapper::updateKeyTurnerState()
     lockstateToString(_keyTurnerState.lockState, lockStateStr);
     Log->println(lockStateStr);
 
-    if(_publishAuthData)
-    {
-        updateAuthData();
-    }
-
     postponeBleWatchdog();
 }