Merge pull request DDD-Community#10 from Minsu-Lee/feature/auth-api

feat(login) : 회원가입 화면 구현 및 로그인/로그아웃/회원가입 기능 연동

Author: Minsu-Lee

app/build.gradle.kts

@@ -60,6 +60,7 @@ dependencies {
     implementation(project(":feature:splash"))
     implementation(project(":feature:login"))
     implementation(project(":feature:main"))
+    implementation(project(":feature:signup"))
 
     implementation(project(":data"))
 

app/src/main/kotlin/com/anddd/nevera/MainActivity.kt

@@ -14,6 +14,8 @@ import com.anddd.nevera.feature.main.home.navigation.homeScreen
 import com.anddd.nevera.feature.login.main.navigation.LOGIN_ROUTE
 import com.anddd.nevera.feature.login.main.navigation.loginScreen
 import com.anddd.nevera.feature.main.home.navigation.HOME_ROUTE
+import com.anddd.nevera.feature.signup.main.navigation.SIGNUP_ROUTE
+import com.anddd.nevera.feature.signup.main.navigation.signupScreen
 import com.anddd.nevera.feature.splash.main.navigation.SPLASH_ROUTE
 import com.anddd.nevera.feature.splash.main.navigation.splashScreen
 import dagger.hilt.android.AndroidEntryPoint
@@ -45,19 +47,30 @@ class MainActivity : ComponentActivity() {
                             }
                         )
                         loginScreen(
-                            onLoginSuccess = {
+                            onNavigateToHome = {
                                 navController.navigate(HOME_ROUTE) {
                                     popUpTo(LOGIN_ROUTE) { inclusive = true }
                                 }
                             },
+                            onNavigateToSignup = {
+                                navController.navigate(SIGNUP_ROUTE)
+                            },
                             onGoogleLoginClick = {
                                 // TODO: Google SDK 연동 후 LoginViewModel.snsLogin 호출
-                            },
-                            onKakaoLoginClick = {
-                                // TODO: Kakao SDK 연동 후 LoginViewModel.snsLogin 호출
                             }
                         )
-                        homeScreen()
+                        signupScreen(
+                            onNavigateToLogin = {
+                                navController.popBackStack()
+                            }
+                        )
+                        homeScreen(
+                            onNavigateToLogin = {
+                                navController.navigate(LOGIN_ROUTE) {
+                                    popUpTo(HOME_ROUTE) { inclusive = true }
+                                }
+                            }
+                        )
                     }
                 }
             }

core/network/src/main/kotlin/com/anddd/nevera/core/network/auth/TokenProvider.kt

@@ -33,8 +33,8 @@ internal object AuthNetworkModule {
 
     @Provides
     @Singleton
-    @AuthOkHttpClient
-    fun provideAuthOkHttpClient(): OkHttpClient =
+    @RefreshOkHttpClient
+    fun provideRefreshOkHttpClient(): OkHttpClient =
         OkHttpClient.Builder()
             .addInterceptor(loggingInterceptor)
             .connectTimeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
@@ -44,14 +44,14 @@ internal object AuthNetworkModule {
 
     @Provides
     @Singleton
-    @AuthOkHttpClient
-    fun provideAuthRetrofit(
-        @AuthOkHttpClient okHttpClient: OkHttpClient,
+    @RefreshRetrofit
+    fun provideRefreshRetrofit(
+        @RefreshOkHttpClient okHttpClient: OkHttpClient,
         gson: Gson,
     ): Retrofit =
         Retrofit.Builder()
             .baseUrl(BuildConfig.BASE_URL)
             .client(okHttpClient)
             .addConverterFactory(GsonConverterFactory.create(gson))
             .build()
-}
+}

core/network/src/main/kotlin/com/anddd/nevera/core/network/di/AuthNetworkModule.kt

@@ -48,7 +48,10 @@ object NetworkModule {
 
     @Provides
     @Singleton
-    fun provideRetrofit(okHttpClient: OkHttpClient, gson: Gson): Retrofit =
+    fun provideRetrofit(
+        okHttpClient: OkHttpClient,
+        gson: Gson
+    ): Retrofit =
         Retrofit.Builder()
             .baseUrl(BuildConfig.BASE_URL)
             .client(okHttpClient)

core/network/src/main/kotlin/com/anddd/nevera/core/network/di/NetworkModule.kt

@@ -8,4 +8,12 @@ annotation class AuthInterceptorQualifier
 
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
-annotation class AuthOkHttpClient
+annotation class RefreshOkHttpClient
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class RefreshRetrofit
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class RefreshApi

core/network/src/main/kotlin/com/anddd/nevera/core/network/di/NetworkQualifiers.kt

@@ -1,17 +1,40 @@
 package com.anddd.nevera.data.api
 
 import com.anddd.nevera.core.network.model.ApiResponse
-import com.anddd.nevera.data.model.LoginRequest
-import com.anddd.nevera.data.model.LoginResponse
-import com.anddd.nevera.data.model.SnsLoginRequest
+import com.anddd.nevera.data.model.auth.TokenResponse
+import com.anddd.nevera.data.model.auth.EmailRequest
+import com.anddd.nevera.data.model.auth.EmailVerifyRequest
+import com.anddd.nevera.data.model.auth.LoginRequest
+import com.anddd.nevera.data.model.auth.RefreshRequest
+import com.anddd.nevera.data.model.auth.SignupRequest
+import com.anddd.nevera.data.model.auth.SnsLoginRequest
 import retrofit2.http.Body
+import retrofit2.http.DELETE
 import retrofit2.http.POST
 
 internal interface UserApi {
 
-    @POST("auth/login")
-    suspend fun login(@Body request: LoginRequest): ApiResponse<LoginResponse>
+    @POST("api/v1/auth/login")
+    suspend fun login(@Body request: LoginRequest): ApiResponse<TokenResponse>
 
-    @POST("auth/sns-login")
-    suspend fun snsLogin(@Body request: SnsLoginRequest): ApiResponse<LoginResponse>
+    @POST("api/v1/auth/signup")
+    suspend fun signup(@Body request: SignupRequest): ApiResponse<String>
+
+    @POST("api/v1/auth/google")
+    suspend fun googleLogin(@Body request: SnsLoginRequest): ApiResponse<TokenResponse>
+
+    @POST("api/v1/auth/email-request")
+    suspend fun emailRequest(@Body request: EmailRequest): ApiResponse<String>
+
+    @POST("api/v1/auth/email-verify")
+    suspend fun emailVerify(@Body request: EmailVerifyRequest): ApiResponse<String>
+
+    @POST("api/v1/auth/refresh")
+    suspend fun refresh(@Body request: RefreshRequest): ApiResponse<TokenResponse>
+
+    @POST("api/v1/auth/logout")
+    suspend fun logout(): ApiResponse<String>
+
+    @DELETE("api/v1/auth/withdraw")
+    suspend fun withdraw(): ApiResponse<String>
 }

data/src/main/kotlin/com/anddd/nevera/data/api/AuthApi.kt

@@ -1,9 +1,8 @@
 package com.anddd.nevera.data.auth
 
 import com.anddd.nevera.core.network.auth.SessionEventBus
-import com.anddd.nevera.core.network.auth.TokenProvider
-import com.anddd.nevera.data.api.AuthApi
-import com.anddd.nevera.data.api.RefreshRequest
+import com.anddd.nevera.data.datasource.RefreshDataSource
+import com.anddd.nevera.data.datasource.TokenDataSource
 import dagger.Lazy
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
@@ -23,17 +22,17 @@ import javax.inject.Inject
  * 4. refresh API가 401을 반환하면 세션 만료로 간주하고 토큰을 삭제한 뒤 세션 만료 이벤트를 발행
  * 5. 그 외 갱신 실패는 예외를 그대로 전파 (apiCall이 변환)
  *
- * [AuthApi]는 [AuthInterceptor]가 없는 전용 [okhttp3.OkHttpClient]를 사용한다.
+ * [RefreshDataSource]는 [AuthInterceptor]가 없는 전용 [okhttp3.OkHttpClient]를 사용한다.
  * refresh 요청이 동일한 인터셉터를 통과하면 [refreshMutex]를 보유한 채 다시 mutex 획득을 시도하는
  * 데드락이 발생할 수 있기 때문이다.
  *
- * [TokenProvider]와 [AuthApi]는 Dagger [Lazy]로 주입한다.
+ * [TokenDataSource]와 [RefreshDataSource]는 Dagger [Lazy]로 주입한다.
  * OkHttpClient 생성 시점에 이 인터셉터가 먼저 만들어지면서 아직 완성되지 않은
  * 다른 싱글톤을 참조하는 순환 의존성 문제를 방지하기 위함이다.
  */
 internal class AuthInterceptor @Inject constructor(
-    private val tokenProvider: Lazy<TokenProvider>,
-    private val authApi: Lazy<AuthApi>,
+    private val tokenDataSource: Lazy<TokenDataSource>,
+    private val refreshDataSource: Lazy<RefreshDataSource>,
     private val sessionEventBus: SessionEventBus
 ) : Interceptor {
 
@@ -42,7 +41,7 @@ internal class AuthInterceptor @Inject constructor(
 
     // OkHttp Interceptor는 동기 API이므로, suspend 함수 호출을 위해 runBlocking을 사용한다.
     override fun intercept(chain: Interceptor.Chain): Response {
-        val tokenBefore = runBlocking { tokenProvider.get().getAccessToken() }
+        val tokenBefore = runBlocking { tokenDataSource.get().getAccessToken() }
         val request = chain.request()
         val authedRequest = request.newBuilder()
             .apply { tokenBefore?.let { header("Authorization", "Bearer $it") } }
@@ -54,7 +53,7 @@ internal class AuthInterceptor @Inject constructor(
         // 401 Unauthorized : 인증 필요 (토큰 없음·만료)
         return runBlocking {
             refreshMutex.withLock {
-                val tokenAfterLock = tokenProvider.get().getAccessToken()
+                val tokenAfterLock = tokenDataSource.get().getAccessToken()
 
                 if (tokenAfterLock != null && tokenAfterLock != tokenBefore) {
                     // response 불필요
@@ -68,22 +67,25 @@ internal class AuthInterceptor @Inject constructor(
                     )
                 }
 
-                val refreshToken = tokenProvider.get().getRefreshToken()
+                val refreshToken = tokenDataSource.get().getRefreshToken()
                 if (refreshToken != null) {
                     // response 불필요
                     response.close()
 
                     try {
-                        val newTokens = authApi.get().refresh(RefreshRequest(refreshToken))
-                        tokenProvider.get().setTokens(newTokens.accessToken, newTokens.refreshToken)
+                        val response = refreshDataSource.get().refresh(refreshToken)
+                        val newTokenResult = response.result
+                            ?: throw IllegalStateException("Refresh response has no result")
+                        tokenDataSource.get().setTokens(newTokenResult.accessToken, newTokenResult.refreshToken)
+
                         return@withLock chain.proceed(
                             request.newBuilder()
-                                .header("Authorization", "Bearer ${newTokens.accessToken}")
+                                .header("Authorization", "Bearer ${newTokenResult.accessToken}")
                                 .build()
                         )
                     } catch (e: HttpException) {
                         if (e.code() == UNAUTHORIZED_STATUS_CODE) {
-                            tokenProvider.get().clearTokens()
+                            tokenDataSource.get().clearLoginInfo()
                             sessionEventBus.emitSessionExpired()
                         }
                         throw e