-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #158 from EAT-SSU/refactor/token_reissue
- Loading branch information
Showing
16 changed files
with
300 additions
and
226 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains 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
14 changes: 14 additions & 0 deletions
14
app/src/main/java/com/eatssu/android/data/usecase/GetMyReviewsUseCase.kt
This file contains 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,14 @@ | ||
| package com.eatssu.android.data.usecase | ||
|
|
||
| import com.eatssu.android.base.BaseResponse | ||
| import com.eatssu.android.data.dto.response.MyReviewResponse | ||
| import com.eatssu.android.data.repository.UserRepository | ||
| import kotlinx.coroutines.flow.Flow | ||
| import javax.inject.Inject | ||
|
|
||
| class GetMyReviewsUseCase @Inject constructor( | ||
| private val userRepository: UserRepository, | ||
| ) { | ||
| suspend operator fun invoke(): Flow<BaseResponse<MyReviewResponse>> = | ||
| userRepository.getUserReviews() | ||
| } |
11 changes: 3 additions & 8 deletions
11
app/src/main/java/com/eatssu/android/data/usecase/SignOutUseCase.kt
This file contains 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,18 +1,13 @@ | ||
| package com.eatssu.android.data.usecase | ||
|
|
||
| import com.eatssu.android.App | ||
| import com.eatssu.android.base.BaseResponse | ||
| import com.eatssu.android.data.repository.UserRepository | ||
| import com.eatssu.android.util.MySharedPreferences | ||
| import kotlinx.coroutines.flow.Flow | ||
| import javax.inject.Inject | ||
|
|
||
| class SignOutUseCase @Inject constructor( | ||
| private val userRepository: UserRepository, | ||
| ) { | ||
| suspend operator fun invoke(): Flow<BaseResponse<Boolean>> { | ||
| MySharedPreferences.clearUser(App.appContext) | ||
|
|
||
| return userRepository.signOut() | ||
| } | ||
| } | ||
| suspend operator fun invoke(): Flow<BaseResponse<Boolean>> = | ||
| userRepository.signOut() | ||
| } |
This file contains 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
130 changes: 90 additions & 40 deletions
130
app/src/main/java/com/eatssu/android/di/network/TokenInterceptor.kt
This file contains 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,96 +1,146 @@ | ||
| package com.eatssu.android.di.network | ||
|
|
||
|
|
||
| import android.content.Intent | ||
| import android.os.Handler | ||
| import android.os.Looper | ||
| import android.util.Log | ||
| import android.widget.Toast | ||
| import com.eatssu.android.App | ||
| import com.eatssu.android.BuildConfig.BASE_URL | ||
| import com.eatssu.android.base.BaseResponse | ||
| import com.eatssu.android.data.dto.response.TokenResponse | ||
| import com.eatssu.android.data.usecase.GetAccessTokenUseCase | ||
| import com.eatssu.android.data.usecase.GetRefreshTokenUseCase | ||
| import com.eatssu.android.data.usecase.LogoutUseCase | ||
| import com.eatssu.android.data.usecase.ReissueTokenUseCase | ||
| import com.eatssu.android.data.usecase.SetAccessTokenUseCase | ||
| import com.eatssu.android.data.usecase.SetRefreshTokenUseCase | ||
| import com.eatssu.android.ui.login.LoginActivity | ||
| import com.google.gson.Gson | ||
| import com.google.gson.reflect.TypeToken | ||
| import kotlinx.coroutines.runBlocking | ||
| import okhttp3.Interceptor | ||
| import okhttp3.Request | ||
| import okhttp3.RequestBody.Companion.toRequestBody | ||
| import okhttp3.Response | ||
| import java.lang.reflect.Type | ||
| import javax.inject.Inject | ||
|
|
||
| class TokenInterceptor @Inject constructor( | ||
| private val getAccessTokenUseCase: GetAccessTokenUseCase, | ||
| private val getRefreshTokenUseCase: GetRefreshTokenUseCase, | ||
| private val setAccessTokenUseCase: SetAccessTokenUseCase, | ||
| private val setRefreshTokenUseCase: SetRefreshTokenUseCase, | ||
| private val logoutUseCase: LogoutUseCase, | ||
| private val reissueTokenUseCase: ReissueTokenUseCase, | ||
| ) : Interceptor { | ||
|
|
||
| companion object { | ||
| val EXCEPT_LIST = listOf( | ||
| "/login/google", "/reissue", "/users", | ||
| "/", | ||
|
|
||
| "/oauths/reissue/token", | ||
| "/oauths/kakao", | ||
|
|
||
| "/oauths/**", "/users/**", | ||
| "/menus/**", "/meals/**", "/restaurants/**", "/reviews/**", | ||
|
|
||
| "/inquiries/{userInquiriesId}", | ||
| "/inquiries/list", | ||
|
|
||
| "/admin/login" | ||
| ) | ||
|
|
||
| const val TAG = "TokenInterceptor" | ||
|
|
||
| private const val CODE_TOKEN_EXPIRED = 401 | ||
| private const val HEADER_AUTHORIZATION = "Authorization" | ||
| private const val HEADER_ACCESS_TOKEN = "X-ACCESS-AUTH" | ||
| private const val HEADER_REFRESH_TOKEN = "X-REFRESH-AUTH" | ||
| } | ||
|
|
||
| private lateinit var newAccessToken: String | ||
| private lateinit var newRefreshToken: String | ||
|
|
||
| override fun intercept(chain: Interceptor.Chain): Response { | ||
| val token = runBlocking { getAccessTokenUseCase() } | ||
| val accessToken = runBlocking { getAccessTokenUseCase() } | ||
| val refreshToken = runBlocking { getRefreshTokenUseCase() } | ||
|
|
||
| val originalRequest = chain.request() | ||
| val request = chain.request().newBuilder().apply { | ||
| if (EXCEPT_LIST.none { originalRequest.url.encodedPath.endsWith(it) }) { | ||
| addHeader("accept", "application/hal+json") | ||
| addHeader("Content-Type", "application/json") | ||
| addHeader("Authorization", "Bearer $token") | ||
| addHeader(HEADER_AUTHORIZATION, "Bearer $accessToken") | ||
| } | ||
| }.build() | ||
|
|
||
| val response = chain.proceed(request) | ||
|
|
||
| if (response.code == 401) { | ||
| // if (response.code == 401 && !response.request.url.toString().contains("reissue")) { | ||
| // refresh token | ||
| Log.d(TAG, "ํ ํฐ ํคํค") | ||
| response.close() | ||
|
|
||
| Log.d(TAG, "ํ ํฐ ์ฌ๋ฐ๊ธ ์๋") | ||
| try { | ||
| val refreshToken = runBlocking { getRefreshTokenUseCase() } | ||
| val newAccessToken = runBlocking { reissueTokenUseCase(refreshToken) } | ||
|
|
||
| // ์ฌ๋ฐ๊ธ ๋ฐ์ ํ ํฐ์ผ๋ก ์๋ก์ด ์์ฒญ ์์ฑ | ||
| val newRequest = request.newBuilder() | ||
| .removeHeader("Authorization") | ||
| .addHeader("Authorization", "Bearer $newAccessToken") | ||
| val refreshTokenRequest = originalRequest.newBuilder() | ||
| .post("".toRequestBody()) | ||
| .url("$BASE_URL/oauths/reissue/token") | ||
| .addHeader(HEADER_AUTHORIZATION, "Bearer $refreshToken") | ||
| .build() | ||
|
|
||
| chain.proceed(newRequest) | ||
| Log.d(TAG, "์ฌ๋ฐ๊ธ ์ค") | ||
|
|
||
| val refreshTokenResponse = chain.proceed(refreshTokenRequest) | ||
| Log.d(TAG, "refreshTokenResponse : $refreshTokenResponse") | ||
|
|
||
| if (refreshTokenResponse.isSuccessful) { | ||
| Log.d(TAG, "์ฌ๋ฐ๊ธ ์ฑ๊ณต") | ||
|
|
||
| val responseToken = parseRefreshTokenResponse(refreshTokenResponse) | ||
|
|
||
| responseToken?.result?.let { | ||
| runBlocking { | ||
| setAccessTokenUseCase(it.accessToken) | ||
| setRefreshTokenUseCase(it.refreshToken) | ||
|
|
||
| newAccessToken = it.accessToken | ||
| } | ||
| } | ||
|
|
||
| refreshTokenResponse.close() | ||
| val newRequest = originalRequest.newAuthBuilder().build() | ||
| return chain.proceed(newRequest) | ||
| } | ||
|
|
||
| } catch (e: Exception) { | ||
| Log.d(TAG, "ํ ํฐ ์ฌ๋ฐ๊ธ ์คํจ" + response) | ||
| // e.printStackTrace() //์ด๊ฑฐ ๋นผ๋๊น ๊ฐ์ ์ข ๋ฃ ์๋๋ค | ||
|
|
||
| // ๋ฆฌํ๋ ์ ํ ํฐ์ด ๋ง๋ฃ๋์ด ์ฌ๋ฐ๊ธ์ ์คํจํ์ ๋ ๋ก๊ทธ์์ ์ฒ๋ฆฌ | ||
| // if (response.code == 403) { | ||
| runBlocking { logoutUseCase() } | ||
|
|
||
| Handler(Looper.getMainLooper()).post { | ||
| val context = App.appContext | ||
| Toast.makeText(context, "ํ ํฐ์ด ๋ง๋ฃ๋์ด ๋ก๊ทธ์์ ๋ฉ๋๋ค.", Toast.LENGTH_SHORT).show() | ||
| val intent = Intent(context, LoginActivity::class.java) // ๋ก๊ทธ์ธ ํ๋ฉด์ผ๋ก ์ด๋ | ||
| intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) | ||
| context.startActivity(intent) | ||
| // } | ||
| runBlocking { logoutUseCase() } | ||
| Log.d(TAG, "์ฌ๋ฐ๊ธ ์คํจ $e") | ||
|
|
||
| Handler(Looper.getMainLooper()).post { | ||
| val context = App.appContext | ||
| Toast.makeText(context, "ํ ํฐ์ด ๋ง๋ฃ๋์ด ๋ก๊ทธ์์ ๋ฉ๋๋ค.", Toast.LENGTH_SHORT).show() | ||
| val intent = Intent(context, LoginActivity::class.java) // ๋ก๊ทธ์ธ ํ๋ฉด์ผ๋ก ์ด๋ | ||
| intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) | ||
| context.startActivity(intent) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (response.code == 404) { | ||
| runBlocking { logoutUseCase() } | ||
| Log.e(TAG, "๋ค๋ฅธ ์ ์ !") | ||
|
|
||
| Handler(Looper.getMainLooper()).post { | ||
| val context = App.appContext | ||
| Toast.makeText(context, "ํ ํฐ์ด ๋ง๋ฃ๋์ด ๋ก๊ทธ์์ ๋ฉ๋๋ค.", Toast.LENGTH_SHORT).show() | ||
| val intent = Intent(context, LoginActivity::class.java) // ๋ก๊ทธ์ธ ํ๋ฉด์ผ๋ก ์ด๋ | ||
| intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) | ||
| context.startActivity(intent) | ||
| } | ||
| } | ||
|
|
||
| return response | ||
| } | ||
|
|
||
| private fun Request.newAuthBuilder() = | ||
| this.newBuilder().addHeader(HEADER_AUTHORIZATION, "Bearer $newAccessToken") | ||
|
|
||
| private fun parseRefreshTokenResponse(response: Response): BaseResponse<TokenResponse>? { | ||
| return try { | ||
| val gson = Gson() | ||
| val responseType: Type = object : TypeToken<BaseResponse<TokenResponse>>() {}.type | ||
| gson.fromJson(response.body?.string(), responseType) | ||
| } catch (e: Exception) { | ||
| null | ||
| } | ||
| } | ||
| } |
This file contains 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.