Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PC-000] 토큰 health Check 로직 추가 #57

Merged
merged 1 commit into from
Feb 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ class AuthRepositoryImpl @Inject constructor(
}
}

override suspend fun checkTokenHealth(): Result<Unit> = authDataSource.checkTokenHealth()

override suspend fun requestAuthCode(phoneNumber: String): Result<Unit> =
authDataSource.requestAuthCode(phoneNumber)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,8 @@ class FakeAuthDataSource : AuthDataSource {
): Result<VerifyAuthCodeResponse> {
return Result.success(verifyResponse)
}

override suspend fun checkTokenHealth(): Result<Unit> {
return Result.success(Unit)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ interface AuthRepository {
): Result<Unit>

suspend fun logout(): Result<Unit>

suspend fun checkTokenHealth(): Result<Unit>
}
3 changes: 3 additions & 0 deletions core/network/src/main/java/com/puzzle/network/api/PieceApi.kt
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ interface PieceApi {
@GET("/api/valueTalks")
suspend fun loadValueTalks(): Result<ApiResponse<LoadValueTalksResponse>>

@GET("/api/login/token/health-check")
suspend fun checkTokenHealth(): Result<ApiResponse<Unit>>

@POST("/api/auth/refresh")
suspend fun refreshToken(@Body refreshTokenRequest: RefreshTokenRequest): Result<ApiResponse<RefreshTokenResponse>>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ class PieceInterceptor @Inject constructor(
private fun isAccessTokenUsed(request: Request): Boolean {
return when (request.url.encodedPath) {
"/api/common/health" -> false
"/api/login/token/refresh" -> false
"/api/login/token/health-check" -> false
"/api/login/oauth" -> false
"/api/terms" -> false
"/api/valueTalks" -> false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ interface AuthDataSource {
suspend fun loginOauth(provider: OAuthProvider, token: String): Result<LoginOauthResponse>
suspend fun requestAuthCode(phoneNumber: String): Result<Unit>
suspend fun verifyAuthCode(phoneNumber: String, code: String): Result<VerifyAuthCodeResponse>
suspend fun checkTokenHealth(): Result<Unit>
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,6 @@ class AuthDataSourceImpl @Inject constructor(
code = code,
)
).unwrapData()

override suspend fun checkTokenHealth(): Result<Unit> = pieceApi.checkTokenHealth().unwrapData()
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,19 @@ import androidx.lifecycle.viewModelScope
import com.puzzle.common.event.EventHelper
import com.puzzle.domain.model.error.ErrorHelper
import com.puzzle.domain.model.error.HttpResponseException
import com.puzzle.domain.model.user.UserRole.NONE
import com.puzzle.domain.model.user.UserRole.PENDING
import com.puzzle.domain.model.user.UserRole.REGISTER
import com.puzzle.domain.model.user.UserRole.USER
import com.puzzle.domain.repository.AuthRepository
import com.puzzle.domain.repository.ProfileRepository
import com.puzzle.domain.repository.TermsRepository
import com.puzzle.domain.repository.UserRepository
import com.puzzle.navigation.AuthGraphDest
import com.puzzle.navigation.MatchingGraphDest
import com.puzzle.navigation.NavigationEvent
import com.puzzle.navigation.NavigationHelper
import com.puzzle.navigation.OnboardingRoute
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.async
import kotlinx.coroutines.flow.MutableStateFlow
Expand All @@ -26,6 +29,7 @@ import javax.inject.Inject

@HiltViewModel
class MainViewModel @Inject constructor(
private val authRepository: AuthRepository,
private val termsRepository: TermsRepository,
private val userRepository: UserRepository,
private val profileRepository: ProfileRepository,
Expand Down Expand Up @@ -83,6 +87,10 @@ class MainViewModel @Inject constructor(
}

private fun checkRedirection() = viewModelScope.launch {
// 토큰이 만료 되었을경우 종료
authRepository.checkTokenHealth().onFailure { return@launch }

// 토큰이 만료되지 않을경우 UserRole에 따라 화면 분기
val userRole = async { userRepository.getUserRole() }
.await()
.getOrElse { return@launch }
Expand All @@ -106,7 +114,12 @@ class MainViewModel @Inject constructor(
)
}

else -> Unit
NONE -> navigationHelper.navigate(
NavigationEvent.NavigateTo(
route = OnboardingRoute,
popUpTo = AuthGraphDest.LoginRoute,
)
)
}
}.also { _isInitialized.value = true }
}