From 4a10f75f016af996bd15e90101f0d20e4d61e083 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Fri, 22 Jul 2022 17:33:40 -0700
Subject: Add device expiration (fix #3056, fix #3529)

---
 src/main/java/org/traccar/api/security/LoginService.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/main/java/org/traccar/api/security')

diff --git a/src/main/java/org/traccar/api/security/LoginService.java b/src/main/java/org/traccar/api/security/LoginService.java
index 9938cf6dc..104a6fac3 100644
--- a/src/main/java/org/traccar/api/security/LoginService.java
+++ b/src/main/java/org/traccar/api/security/LoginService.java
@@ -83,12 +83,7 @@ public class LoginService {
         if (user == null) {
             throw new SecurityException("Unknown account");
         }
-        if (user.getDisabled()) {
-            throw new SecurityException("Account is disabled");
-        }
-        if (user.getExpirationTime() != null && System.currentTimeMillis() > user.getExpirationTime().getTime()) {
-            throw new SecurityException("Account has expired");
-        }
+        user.checkDisabled();
     }
 
 }
-- 
cgit v1.2.3