From caf70e358e2a48ebebecf25243dc407a58fe4b70 Mon Sep 17 00:00:00 2001
From: Kenneth Ezekiel <88850771+KenEzekiel@users.noreply.github.com>
Date: Thu, 14 Mar 2024 15:40:29 +0700
Subject: [PATCH] add logout and inject dependency
---
.../java/com/example/tubespbd/auth/LoginService.kt | 9 +++++++++
.../example/tubespbd/auth/TokenExpirationService.kt | 13 +++----------
2 files changed, 12 insertions(+), 10 deletions(-)
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 b615974..9c4b3ce 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 4a171b2..016aff3 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
--
GitLab