diff --git a/app/src/main/java/com/example/tubespbd/auth/LoginService.kt b/app/src/main/java/com/example/tubespbd/auth/LoginService.kt
index b615974eef00ca9ab7513950b3a1aa831d39e9ef..9c4b3ce1ebf3d781736697d5ef66f36126044eb1 100644
--- a/app/src/main/java/com/example/tubespbd/auth/LoginService.kt
+++ b/app/src/main/java/com/example/tubespbd/auth/LoginService.kt
@@ -1,6 +1,8 @@
 package com.example.tubespbd.auth
 
+import android.content.Intent
 import android.util.Log
+import com.example.tubespbd.LoginActivity
 import com.example.tubespbd.interfaces.AuthService
 import com.example.tubespbd.responses.LoginRequest
 import com.example.tubespbd.responses.LoginResponse
@@ -42,4 +44,11 @@ class LoginService {
             }
         }
     }
+
+    fun logout() {
+        // Update the expiration, assumed the server time and client time is the same
+        TokenManager.getToken()
+    }
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/tubespbd/auth/TokenExpirationService.kt b/app/src/main/java/com/example/tubespbd/auth/TokenExpirationService.kt
index 4a171b2c10ed831cb7a59bc6978a40588edf9c6b..016aff34fa38493eb6496559e70e1b64a1e0091f 100644
--- a/app/src/main/java/com/example/tubespbd/auth/TokenExpirationService.kt
+++ b/app/src/main/java/com/example/tubespbd/auth/TokenExpirationService.kt
@@ -109,11 +109,11 @@ class TokenExpirationService: Service() {
                     } else {
                         // Not keep logged in, initiate logout
                         Log.d("Redirect", "Token expired, logging out")
-                        logout()
+                        loginService.logout()
+                        // Navigate to login page again
+                        navigateToLogin()
                     }
 
-
-
                 } else {
                     // Handle unsuccessful response
                     Log.e("TokenExpirationService", "Token check failed: ${response.code()}")
@@ -129,13 +129,6 @@ class TokenExpirationService: Service() {
         return isExpired
     }
 
-    private fun logout() {
-        // Update the expiration, assumed the server time and client time is the same
-        TokenManager.getToken()
-        // Navigate to login page again
-        navigateToLogin()
-    }
-
     private fun navigateToLogin() {
         val intent = Intent(this, LoginActivity::class.java)
         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK