From 98d8512e656fa2b67e5e125ca7b9eb7c3861560a Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sun, 5 Jul 2026 09:43:00 -0700
Subject: [PATCH] Handle expired login token

---
 .../java/org/traccar/api/resource/SessionResource.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/traccar/api/resource/SessionResource.java b/src/main/java/org/traccar/api/resource/SessionResource.java
index 327e2b0f0..bbabba39d 100644
--- a/src/main/java/org/traccar/api/resource/SessionResource.java
+++ b/src/main/java/org/traccar/api/resource/SessionResource.java
@@ -79,7 +79,12 @@ public class SessionResource extends BaseResource {
     public User get(@QueryParam("token") String token) throws StorageException, IOException, GeneralSecurityException {
 
         if (token != null) {
-            LoginResult loginResult = loginService.login(token);
+            LoginResult loginResult;
+            try {
+                loginResult = loginService.login(token);
+            } catch (SecurityException | GeneralSecurityException e) {
+                throw new WebApplicationException(Response.status(Response.Status.UNAUTHORIZED).build());
+            }
             if (loginResult != null) {
                 User user = loginResult.getUser();
                 SessionHelper.userLogin(actionLogger, request, user, loginResult.getExpiration());