Browse Source

Remove pointless check.

Adam Ierymenko 4 years ago
parent
commit
0cf62d334d
1 changed files with 12 additions and 14 deletions
  1. 12 14
      controller/EmbeddedNetworkController.cpp

+ 12 - 14
controller/EmbeddedNetworkController.cpp

@@ -1367,21 +1367,19 @@ void EmbeddedNetworkController::_request(
 		std::string memberId = member["id"];
 		std::string memberId = member["id"];
 		fprintf(stderr, "ssoEnabled && !ssoExempt %s-%s\n", nwids, memberId.c_str());
 		fprintf(stderr, "ssoEnabled && !ssoExempt %s-%s\n", nwids, memberId.c_str());
 		uint64_t authenticationExpiryTime = (int64_t)OSUtils::jsonInt(member["authenticationExpiryTime"], 0);
 		uint64_t authenticationExpiryTime = (int64_t)OSUtils::jsonInt(member["authenticationExpiryTime"], 0);
-		if (authenticationExpiryTime > 0) {
-			fprintf(stderr, "authExpiryTime: %lld\n", authenticationExpiryTime);
-			if (authenticationExpiryTime < now) {
-				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 if (authorized) {
-				_db.memberExpiring(authenticationExpiryTime, nwid, identity.address().toInt());
+		fprintf(stderr, "authExpiryTime: %lld\n", authenticationExpiryTime);
+		if (authenticationExpiryTime < now) {
+			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 if (authorized) {
+			_db.memberExpiring(authenticationExpiryTime, nwid, identity.address().toInt());
 		}
 		}
 	}
 	}