Merge branch 'login' of...

Merge branch 'login' of https://gitlab.informatika.org/IF3210-2024-Android-AVK/if3210-2024-android-avk into develop

app/src/main/java/com/example/tubespbd/auth/LoginService.kt

 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

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