diff --git a/app/build.gradle.kts b/app/build.gradle.kts index fb66e28f..d0e68246 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -20,10 +20,10 @@ android { applicationId = "com.sopetit.softie" minSdk = 28 targetSdk = 34 - versionCode = 1 + versionCode = 6 versionName = "1.0.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - buildConfigField("String", "BASE_URL", getApiKey("BASE_URL")) + buildConfigField("String", "BASE_URL", getApiKey("DEV_BASE_URL")) buildConfigField("String", "KAKAO_NATIVE_APP_KEY", getApiKey("KAKAO_NATIVE_APP_KEY")) manifestPlaceholders["KAKAO_REDIRECT_SCHEME"] = getApiKey("KAKAO_REDIRECT_SCHEME") } diff --git a/app/src/main/java/com/sopetit/softie/di/RetrofitModule.kt b/app/src/main/java/com/sopetit/softie/di/RetrofitModule.kt index bddd6ade..69577af3 100644 --- a/app/src/main/java/com/sopetit/softie/di/RetrofitModule.kt +++ b/app/src/main/java/com/sopetit/softie/di/RetrofitModule.kt @@ -15,6 +15,7 @@ import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor import retrofit2.Retrofit +import timber.log.Timber import java.util.concurrent.TimeUnit import javax.inject.Qualifier import javax.inject.Singleton @@ -49,26 +50,29 @@ object RetrofitModule { .build() ) when (response.code) { - EXPIRED_TOKEN -> { - response.close() + + EXPIRED_TOKEN -> try { runBlocking { refreshTokenRepository.postRefreshToken().onSuccess { accessToken -> refreshTokenRepository.setAccessToken(accessToken.accessToken) - response = chain.proceed( - request - .newBuilder() - .addHeader(CONTENT_TYPE, APPLICATION_JSON) - .addHeader( - AUTHORIZATION, - BEARER + localDataSource.accessToken - ) - .build() - ) } } + response.close() + + val newRequest = chain.request() + var newResponse = chain.proceed( + newRequest + .newBuilder() + .addHeader(CONTENT_TYPE, APPLICATION_JSON) + .addHeader(AUTHORIZATION, BEARER + localDataSource.accessToken) + .build() + ) + return@Interceptor newResponse + } catch (t: Throwable) { + Timber.e(t.message) } } - response + return@Interceptor response } @Provides diff --git a/app/src/main/java/com/sopetit/softie/ui/login/LoginViewModel.kt b/app/src/main/java/com/sopetit/softie/ui/login/LoginViewModel.kt index c35bbce4..d25ff265 100644 --- a/app/src/main/java/com/sopetit/softie/ui/login/LoginViewModel.kt +++ b/app/src/main/java/com/sopetit/softie/ui/login/LoginViewModel.kt @@ -28,7 +28,6 @@ class LoginViewModel @Inject constructor( val kakaoLoginCallback: (OAuthToken?, Throwable?) -> Unit = { token, error -> KakaoLoginCallback { accessToken -> - _isKakaoLogin.value = true initTokenUseCase( accessToken = accessToken, refreshToken = "", @@ -36,6 +35,7 @@ class LoginViewModel @Inject constructor( isSignedUp = false ) }.handleResult(token, error) + _isKakaoLogin.value = true } fun postLogin() {