[Feature/#179] authenticator 구현 #180
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package com.teamwable.common.restarter | ||
|
|
||
| interface AppReStarter { | ||
| fun restartApp() | ||
|
|
||
| fun makeToast(message: String) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package com.teamwable.common.restarter | ||
|
|
||
| import dagger.Binds | ||
| import dagger.Module | ||
| import dagger.hilt.InstallIn | ||
| import dagger.hilt.components.SingletonComponent | ||
| import javax.inject.Singleton | ||
|
|
||
| @Module | ||
| @InstallIn(SingletonComponent::class) | ||
| abstract class AppReStarterModule { | ||
| @Binds | ||
| @Singleton | ||
| abstract fun bindsAppRestarter( | ||
| appRestarter: DefaultAppReStarter, | ||
| ): AppReStarter | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package com.teamwable.common.restarter | ||
|
|
||
| import android.content.Context | ||
| import android.content.Intent | ||
| import android.widget.Toast | ||
| import dagger.hilt.android.qualifiers.ApplicationContext | ||
| import kotlinx.coroutines.CoroutineScope | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.launch | ||
| import javax.inject.Inject | ||
|
|
||
| class DefaultAppReStarter @Inject constructor( | ||
| @ApplicationContext private val context: Context, | ||
| ) : AppReStarter { | ||
| private var currentToast: Toast? = null | ||
| private val scope = CoroutineScope(Dispatchers.Main) | ||
|
|
||
| override fun restartApp() { | ||
| scope.launch { | ||
| val restartIntent = context.packageManager | ||
| .getLaunchIntentForPackage(context.packageName) | ||
| ?.component | ||
| ?.let(Intent::makeRestartActivityTask) | ||
|
|
||
| context.startActivity(restartIntent) | ||
| } | ||
| } | ||
|
|
||
| override fun makeToast(message: String) { | ||
| scope.launch { | ||
| currentToast?.cancel() | ||
| currentToast = Toast.makeText(context, message, Toast.LENGTH_SHORT) | ||
| currentToast?.show() | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| package com.teamwable.network | ||
|
|
||
| import com.teamwable.common.restarter.AppReStarter | ||
| import com.teamwable.datastore.datasource.WablePreferencesDataSource | ||
| import com.teamwable.network.datasource.AuthService | ||
| import com.teamwable.network.util.runSuspendCatching | ||
| import kotlinx.coroutines.flow.first | ||
| import kotlinx.coroutines.runBlocking | ||
| import kotlinx.coroutines.sync.Mutex | ||
| import kotlinx.coroutines.sync.withLock | ||
| import okhttp3.Authenticator | ||
| import okhttp3.Request | ||
| import okhttp3.Response | ||
| import okhttp3.Route | ||
| import timber.log.Timber | ||
| import javax.inject.Inject | ||
|
|
||
| class TokenAuthenticator @Inject constructor( | ||
| private val dataStore: WablePreferencesDataSource, | ||
| private val authService: AuthService, | ||
| private val appRestarter: AppReStarter, | ||
| ) : Authenticator { | ||
| private val mutex = Mutex() | ||
|
|
||
| override fun authenticate(route: Route?, response: Response): Request? { | ||
| if (response.code != 401) return null | ||
|
Collaborator
There was a problem hiding this comment. 토큰 만료만 401로 오나요?! 따로 토큰 만료인지 확인하는 분기가 없어도 되는지 궁금합니다! |
||
|
|
||
| if (response.request.header("Authorization-Retry") != null) return null | ||
|
|
||
| return runBlocking { | ||
| val newAccessToken = refreshToken() ?: return@runBlocking null | ||
| response.request | ||
| .newBuilder() | ||
| .header("Authorization", newAccessToken) | ||
| .header("Authorization-Retry", "true") | ||
| .build() | ||
| } | ||
| } | ||
|
|
||
| private suspend fun refreshToken(): String? { | ||
| return mutex.withLock { | ||
|
|
||
| val accessToken = dataStore.accessToken.first() | ||
| val refreshToken = dataStore.refreshToken.first() | ||
|
|
||
| runSuspendCatching { | ||
| authService.getReissueToken(accessToken, refreshToken) | ||
| }.onSuccess { | ||
| val newAccess = "Bearer ${it.data.accessToken}" | ||
| dataStore.updateAccessToken(newAccess) | ||
| dataStore.updateRefreshToken(it.data.refreshToken) | ||
| return newAccess | ||
| }.onFailure { | ||
| Timber.e(it) | ||
| dataStore.clear() | ||
| notifyReLoginRequired() | ||
| } | ||
| null | ||
| } | ||
| } | ||
|
|
||
| private fun notifyReLoginRequired() { | ||
| appRestarter.makeToast("재 로그인이 필요해요") | ||
| appRestarter.restartApp() | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,112 +1,22 @@ | ||
| package com.teamwable.network | ||
|
|
||
| import com.teamwable.datastore.datasource.WablePreferencesDataSource | ||
| import kotlinx.coroutines.flow.first | ||
| import kotlinx.coroutines.runBlocking | ||
| import okhttp3.Interceptor | ||
| import okhttp3.Request | ||
| import okhttp3.Response | ||
| import javax.inject.Inject | ||
|
|
||
| class TokenInterceptor @Inject constructor( | ||
| private val dataStore: WablePreferencesDataSource, | ||
| ) : Interceptor { | ||
| override fun intercept(chain: Interceptor.Chain): Response { | ||
| val accessToken = runBlocking { dataStore.accessToken.first() } | ||
| val authRequest: Request = chain.request().newBuilder() | ||
| .addHeader("Authorization", accessToken) | ||
| .build() | ||
|
|
||
| return chain.proceed(authRequest) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
앱 재시작 시 null 안전성 개선 필요
getLaunchIntentForPackage()가 null을 반환할 경우startActivity(null)로 인한 예외가 발생할 수 있습니다.다음과 같이 null 체크를 추가하세요:
override fun restartApp() { scope.launch { val restartIntent = context.packageManager .getLaunchIntentForPackage(context.packageName) ?.component ?.let(Intent::makeRestartActivityTask) - - context.startActivity(restartIntent) + + restartIntent?.let { + context.startActivity(it) + } ?: run { + // 로그 출력 또는 다른 처리 + } } }🤖 Prompt for AI Agents