Notification of about-to-expire status... almost there.

1 files changed, 15 insertions, 11 deletions

diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp
index 971cc1b7..5709878c 100644
--- a/controller/EmbeddedNetworkController.cpp
+++ b/controller/EmbeddedNetworkController.cpp
@@ -1366,17 +1366,21 @@ void EmbeddedNetworkController::_request(
 		std::string memberId = member["id"];
 		fprintf(stderr, "ssoEnabled && !ssoExempt %s-%s\n", nwids, memberId.c_str());
 		uint64_t authenticationExpiryTime = (int64_t)OSUtils::jsonInt(member["authenticationExpiryTime"], 0);
-		fprintf(stderr, "authExpiryTime: %lld\n", authenticationExpiryTime);
-		if (authenticationExpiryTime < now) {
-			std::string authenticationURL = _db.getSSOAuthURL(member, _ssoRedirectURL);
-			if (!authenticationURL.empty()) {
-				Dictionary<3072> authInfo;
-				authInfo.add("aU", authenticationURL.c_str());
-				fprintf(stderr, "sending auth URL: %s\n", authenticationURL.c_str());
-				DB::cleanMember(member);
-				_db.save(member,true);
-				_sender->ncSendError(nwid,requestPacketId,identity.address(),NetworkController::NC_ERROR_AUTHENTICATION_REQUIRED, authInfo.data(), authInfo.sizeBytes());
-				return;
+		if (authenticationExpiryTime > 0) {
+			fprintf(stderr, "authExpiryTime: %lld\n", authenticationExpiryTime);
+			if (authenticationExpiryTime < now) {
+				std::string authenticationURL = _db.getSSOAuthURL(member, _ssoRedirectURL);
+				if (!authenticationURL.empty()) {
+					Dictionary<3072> authInfo;
+					authInfo.add("aU", authenticationURL.c_str());
+					fprintf(stderr, "sending auth URL: %s\n", authenticationURL.c_str());
+					DB::cleanMember(member);
+					_db.save(member,true);
+					_sender->ncSendError(nwid,requestPacketId,identity.address(),NetworkController::NC_ERROR_AUTHENTICATION_REQUIRED, authInfo.data(), authInfo.sizeBytes());
+					return;
+				}
+			} else {
+				_db.memberExpiring(authenticationExpiryTime, nwid, identity.address().toInt());
 			}
 		}
 	}