validuntil should work now #151

CHANGELOG.md

@@ -1,7 +1,15 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [0.8.1]
+## [Unreleased 0.8.2]
+#### Added
+- [firmware] log for firmware update #152
+- [webui] Expired access attempts logged as "Expired"
+
+#### Fixed
+- [firmware] validuntil is being ignored #151
+
+## [0.8.1] 2018-09-01
 #### Added
 - [firmware] Global websocket message to inform ws clients to toggle relay (upcoming client version will use it)
 - [webui] incremental id for event log

src/rfid.esp

@@ -100,13 +100,28 @@ void ICACHE_FLASH_ATTR rfidloop() {
 				Serial.print(username);
 #endif
 			if (AccType == 1) {
-				activateRelay = true;
-				ws.textAll("{\"command\":\"giveAccess\"}");
+				unsigned long validL = json["validuntil"];
+				unsigned long nowL = now();
+
+				if (validL > nowL ) {
+					activateRelay = true;
+					ws.textAll("{\"command\":\"giveAccess\"}");
 #ifdef DEBUG
-				Serial.println(" have access");
+					Serial.println(" have access");
 #endif
-				if (mqttenabled == 1) {
-					mqtt_publish_access(now(), "true", "Always", username, uid);
+					if (mqttenabled == 1) {
+						mqtt_publish_access(now(), "true", "Always", username, uid);
+					}
+				}
+
+				else {
+#ifdef DEBUG
+					Serial.println(" expired");
+#endif
+					if (mqttenabled == 1) {
+						mqtt_publish_access(now(), "true", "Expired", username, uid);
+					}
+					AccType = 2;
 				}
 			} else if (AccType == 99) {
 				doEnableWifi = true;