[FEAT] 로그인 화면 API 연결

.gitignore

@@ -6,6 +6,7 @@ xcuserdata
 !src/**/build/
 local.properties
 .idea
+**/network_security_config.xml
 .DS_Store
 captures
 .externalNativeBuild

composeApp/src/commonMain/kotlin/org/whosin/client/App.kt

@@ -3,12 +3,15 @@ package org.whosin.client
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.rememberNavController
 import org.jetbrains.compose.ui.tooling.preview.Preview
+import org.whosin.client.core.auth.TokenExpiredManager
+import org.whosin.client.core.navigation.Route
 import org.whosin.client.core.navigation.WhosInNavGraph
-import org.whosin.client.presentation.dummy.DummyScreen
-import org.whosin.client.presentation.dummy.TokenTestScreen
 import ui.theme.WhosInTheme
 
 
@@ -17,6 +20,16 @@ import ui.theme.WhosInTheme
 fun App() {
     WhosInTheme {
         val navController = rememberNavController()
+        val isTokenExpired by TokenExpiredManager.isTokenExpired.collectAsState()
+
+        LaunchedEffect(isTokenExpired) {
+            if (isTokenExpired) {
+                navController.navigate(Route.Login) {
+                    popUpTo(0) { inclusive = true }
+                }
+                TokenExpiredManager.reset()
+            }
+        }
 
         WhosInNavGraph(
             modifier = Modifier

composeApp/src/commonMain/kotlin/org/whosin/client/core/auth/TokenExpiredManager.kt

@@ -0,0 +1,18 @@
+package org.whosin.client.core.auth
+
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+object TokenExpiredManager {
+    private val _isTokenExpired = MutableStateFlow(false)
+    val isTokenExpired: StateFlow<Boolean> = _isTokenExpired.asStateFlow()
+
+    fun setTokenExpired() {
+        _isTokenExpired.value = true
+    }
+
+    fun reset() {
+        _isTokenExpired.value = false
+    }
+}

composeApp/src/commonMain/kotlin/org/whosin/client/core/navigation/Route.kt

@@ -20,13 +20,13 @@ sealed interface Route {
     data object Signup: Route
 
     @Serializable
-    data object EmailVerification: Route
+    data class EmailVerification(val email: String): Route
 
     @Serializable
-    data object PasswordInput: Route
+    data class PasswordInput(val email: String): Route
 
     @Serializable
-    data object NicknameInput: Route
+    data class NicknameInput(val email: String, val password: String): Route
 
     @Serializable
     data class ClubCodeInput(val returnToMyPage: Boolean = false): Route

composeApp/src/commonMain/kotlin/org/whosin/client/core/navigation/WhosInNavGraph.kt

@@ -38,6 +38,11 @@ fun WhosInNavGraph(
                         navController.navigate(Route.Login) {
                             popUpTo(Route.Splash) { inclusive = true }
                         }
+                    },
+                    onNavigateToHome = {
+                        navController.navigate(Route.Home) {
+                            popUpTo(Route.AuthGraph) { inclusive = true }
+                        }
                     }
                 )
             }
@@ -74,35 +79,43 @@ fun WhosInNavGraph(
                     modifier = modifier,
                     onNavigateBack = { navController.navigateUp() },
                     onNavigateToEmailVerification = { email ->
-                        navController.navigate(Route.EmailVerification)
+                        navController.navigate(Route.EmailVerification(email))
                     }
                 )
             }
 
             composable<Route.EmailVerification> { backStackEntry ->
-
+                val emailVerificationRoute = backStackEntry.toRoute<Route.EmailVerification>()
+
                 EmailVerificationScreen(
                     modifier = modifier,
+                    email = emailVerificationRoute.email,
                     onNavigateBack = { navController.navigateUp() },
                     onVerificationComplete = {
-                        navController.navigate(Route.PasswordInput)
+                        navController.navigate(Route.PasswordInput(emailVerificationRoute.email))
                     }
                 )
             }
-
-            composable<Route.PasswordInput> {
+
+            composable<Route.PasswordInput> { backStackEntry ->
+                val passwordInputRoute = backStackEntry.toRoute<Route.PasswordInput>()
+
                 PasswordInputScreen(
                     modifier = modifier,
                     onNavigateBack = { navController.navigateUp() },
                     onPasswordComplete = { password, confirmPassword ->
-                        navController.navigate(Route.NicknameInput)
+                        navController.navigate(Route.NicknameInput(passwordInputRoute.email, password))
                     }
                 )
             }
-
-            composable<Route.NicknameInput> {
+
+            composable<Route.NicknameInput> { backStackEntry ->
+                val nicknameInputRoute = backStackEntry.toRoute<Route.NicknameInput>()
+
                 NicknameInputScreen(
                     modifier = modifier,
+                    email = nicknameInputRoute.email,
+                    password = nicknameInputRoute.password,
                     onNavigateBack = { navController.navigateUp() },
                     onNavigateToClubCode = {
                         navController.navigate(Route.ClubCodeInput(returnToMyPage = false))

composeApp/src/commonMain/kotlin/org/whosin/client/core/network/HttpClientFactory.kt

@@ -21,9 +21,10 @@ import io.ktor.http.encodedPath
 import io.ktor.serialization.kotlinx.json.json
 import kotlinx.serialization.json.Json
 import org.whosin.client.BuildKonfig
+import org.whosin.client.core.auth.TokenExpiredManager
 import org.whosin.client.core.datastore.TokenManager
 import org.whosin.client.data.dto.request.ReissueTokenRequestDto
-import org.whosin.client.data.dto.response.TokenDto
+import org.whosin.client.data.dto.response.ReissueTokenResponseDto
 
 object HttpClientFactory {
     val BASE_URL = BuildKonfig.BASE_URL
@@ -45,10 +46,11 @@ object HttpClientFactory {
                 socketTimeoutMillis = 20_000L
                 requestTimeoutMillis = 20_000L
             }
-            install(Auth){
+            install(Auth) {
                 bearer {
                     loadTokens {
-                        val accessToken = tokenManager.getAccessToken() ?: "eyJhbGciOiJIUzI1NiJ9.eyJ0b2tlblR5cGUiOiJhY2Nlc3MiLCJ1c2VySWQiOjUsInByb3ZpZGVySWQiOiJsb2NhbGhvc3QiLCJuYW1lIjoi7Iug7KKF7JykIiwicm9sZSI6IlJPTEVfTUVNQkVSIiwiaWF0IjoxNzU5MzgyMzg3LCJleHAiOjE3NTk5ODcxODd9.kT9IH60aCA-6ByEITb-_qPAJY0Oik1bbPKqcBWXzHIk"
+                        val accessToken = tokenManager.getAccessToken()
+                            ?: "eyJhbGciOiJIUzI1NiJ9.eyJ0b2tlblR5cGUiOiJhY2Nlc3MiLCJ1c2VySWQiOjUsInByb3ZpZGVySWQiOiJsb2NhbGhvc3QiLCJuYW1lIjoi7Iug7KKF7JykIiwicm9sZSI6IlJPTEVfTUVNQkVSIiwiaWF0IjoxNzU5MzgyMzg3LCJleHAiOjE3NTk5ODcxODd9.kT9IH60aCA-6ByEITb-_qPAJY0Oik1bbPKqcBWXzHIk"
                         val refreshToken = tokenManager.getRefreshToken() ?: "no_token"
                         BearerTokens(accessToken = accessToken, refreshToken = refreshToken)
                     }
@@ -75,7 +77,7 @@ object HttpClientFactory {
                                 "auth/login",
                                 "auth/email",
                                 "auth/email/validation",
-                                "member/reissue" // 토큰 재발급 요청 자체에는 만료된 액세스 토큰을 보내면 안 됨
+                                "auth/reissue" // 토큰 재발급 요청
                             )
 
                             val isNoAuthPath = pathWithNoAuth.any { noAuthPath ->
@@ -88,26 +90,42 @@ object HttpClientFactory {
                         }
                     }
                     refreshTokens {
-                        val rt = tokenManager.getRefreshToken() ?: "no_token"
-                        val response = client.post("member/reissue"){
-                            setBody {
-                                ReissueTokenRequestDto(
-                                    refreshToken = rt
+                        try {
+                            val rt = tokenManager.getRefreshToken()
+                            if (rt.isNullOrEmpty()) {
+                                tokenManager.clearToken()
+                                TokenExpiredManager.setTokenExpired()
+                                return@refreshTokens null
+                            }
+
+                            val response = client.post("auth/reissue") {
+                                setBody(ReissueTokenRequestDto(refreshToken = rt))
+                                markAsRefreshTokenRequest()
+                            }.body<ReissueTokenResponseDto>()
+
+                            if (response.success && response.data != null) {
+                                tokenManager.saveTokens(
+                                    accessToken = response.data.accessToken,
+                                    refreshToken = response.data.refreshToken
+                                )
+                                BearerTokens(
+                                    accessToken = response.data.accessToken,
+                                    refreshToken = response.data.refreshToken
                                 )
+                            } else {
+                                tokenManager.clearToken()
+                                TokenExpiredManager.setTokenExpired()
+                                null
                             }
-                            markAsRefreshTokenRequest()
-                        }.body<TokenDto>()
-                        tokenManager.saveTokens(
-                            accessToken = response.accessToken,
-                            refreshToken = response.refreshToken
-                        )
-                        val accessToken = response.accessToken
-                        val refreshToken = response.refreshToken
-                        BearerTokens(accessToken,refreshToken)
+                        } catch (e: Exception) {
+                            tokenManager.clearToken()
+                            TokenExpiredManager.setTokenExpired()
+                            null
+                        }
                     }
                 }
             }
-            install(Logging){
+            install(Logging) {
                 logger = object : Logger {
                     override fun log(message: String) {
                         println(message)

composeApp/src/commonMain/kotlin/org/whosin/client/data/dto/request/EmailValidationRequestDto.kt

@@ -0,0 +1,12 @@
+package org.whosin.client.data.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EmailValidationRequestDto(
+    @SerialName("email")
+    val email: String,
+    @SerialName("authCode")
+    val authCode: String
+)

composeApp/src/commonMain/kotlin/org/whosin/client/data/dto/request/EmailVerificationRequestDto.kt

@@ -0,0 +1,10 @@
+package org.whosin.client.data.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EmailVerificationRequestDto(
+    @SerialName("email")
+    val email: String
+)

composeApp/src/commonMain/kotlin/org/whosin/client/data/dto/request/FindPasswordRequestDto.kt

@@ -0,0 +1,10 @@
+package org.whosin.client.data.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FindPasswordRequestDto(
+    @SerialName("email")
+    val email: String
+)

composeApp/src/commonMain/kotlin/org/whosin/client/data/dto/request/SignupRequestDto.kt

@@ -0,0 +1,14 @@
+package org.whosin.client.data.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SignupRequestDto(
+    @SerialName("email")
+    val email: String,
+    @SerialName("password")
+    val password: String,
+    @SerialName("nickName")
+    val nickName: String
+)

composeApp/src/commonMain/kotlin/org/whosin/client/data/dto/response/EmailVerificationResponseDto.kt

@@ -0,0 +1,18 @@
+package org.whosin.client.data.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EmailVerificationResponseDto(
+    @SerialName("success")
+    val success: Boolean,
+    @SerialName("status")
+    val status: Int,
+    @SerialName("message")
+    val message: String,
+    @SerialName("data")
+    val data: String? = null,
+    @SerialName("timestamp")
+    val timestamp: String? = null
+)

composeApp/src/commonMain/kotlin/org/whosin/client/data/dto/response/FindPasswordResponseDto.kt

@@ -0,0 +1,18 @@
+package org.whosin.client.data.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FindPasswordResponseDto(
+    @SerialName("success")
+    val success: Boolean,
+    @SerialName("status")
+    val status: Int,
+    @SerialName("message")
+    val message: String,
+    @SerialName("data")
+    val data: String? = null,
+    @SerialName("timestamp")
+    val timestamp: String? = null
+)

composeApp/src/commonMain/kotlin/org/whosin/client/data/dto/response/LoginResponseDto.kt

@@ -7,12 +7,14 @@ import kotlinx.serialization.Serializable
 data class LoginResponseDto(
     @SerialName("success")
     val success: Boolean,
-    @SerialName("code")
-    val code: Int,
+    @SerialName("status")
+    val status: Int,
     @SerialName("message")
     val message: String,
     @SerialName("data")
-    val data: TokenDto
+    val data: TokenDto? = null,
+    @SerialName("timestamp")
+    val timestamp: String? = null
 )
 
 @Serializable

composeApp/src/commonMain/kotlin/org/whosin/client/data/dto/response/ReissueTokenResponseDto.kt

@@ -0,0 +1,18 @@
+package org.whosin.client.data.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ReissueTokenResponseDto(
+    @SerialName("success")
+    val success: Boolean,
+    @SerialName("status")
+    val status: Int,
+    @SerialName("message")
+    val message: String,
+    @SerialName("data")
+    val data: TokenDto? = null,
+    @SerialName("timestamp")
+    val timestamp: String? = null
+)

composeApp/src/commonMain/kotlin/org/whosin/client/data/dto/response/SignupResponseDto.kt

@@ -0,0 +1,18 @@
+package org.whosin.client.data.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SignupResponseDto(
+    @SerialName("success")
+    val success: Boolean,
+    @SerialName("status")
+    val status: Int,
+    @SerialName("message")
+    val message: String,
+    @SerialName("data")
+    val data: String? = null,
+    @SerialName("timestamp")
+    val timestamp: String? = null
+)