[Feature/#74] login api

.gitignore

@@ -29,6 +29,8 @@ render.experimental.xml
 # Keystore files
 *.jks
 *.keystore
+app/release.keystore
+app/debug.keystore
 
 # Google Services (e.g. APIs or Firebase)
 google-services.json

app/build.gradle.kts

@@ -6,6 +6,25 @@ plugins {
 
 android {
     namespace = "com.teamsolply.solply"
+
+    signingConfigs {
+        getByName("debug") {
+            keyAlias = "androiddebugkey"
+            keyPassword = "android"
+            storeFile = File("${project.rootDir.absolutePath}/keystore/debug.keystore")
+        }
+    }
+
+    buildTypes {
+        debug {
+            signingConfig = signingConfigs.getByName("debug")
+        }
+        release {
+            signingConfig = signingConfigs.getByName("debug")
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
 }
 
 dependencies {
@@ -32,6 +51,7 @@ dependencies {
     implementation(projects.local.main)
     implementation(projects.local.oauth)
     implementation(projects.local.place)
+    implementation(projects.remote.oauth)
     implementation(projects.remote.onboarding)
     implementation(projects.remote.place)
     implementation(projects.remote.course)

core/designsystem/src/main/java/com/teamsolply/solply/designsystem/component/textfield/SolplyTextField.kt

@@ -114,12 +114,12 @@ private fun BaseTextField(
 @Composable
 fun SolplyNicknameTextField(
     value: String,
+    isNicknameDuplicate: Boolean,
     onValueChange: (String) -> Unit,
     modifier: Modifier = Modifier,
     placeholder: String = "여기에 입력하세요.",
     maxLength: Int = 8,
     minLength: Int = 2,
-    onDuplicateCheck: (String) -> Boolean,
     checkNicknameValidate: (String) -> Boolean
 ) {
     var validationState by remember { mutableStateOf<NickNameValidateState>(NickNameValidateState.Empty) }
@@ -130,16 +130,16 @@ fun SolplyNicknameTextField(
         NickNameValidateState.MaxLength,
         NickNameValidateState.Typing
     ) ||
-            (validationState == NickNameValidateState.Empty && value.isNotEmpty())
+        (validationState == NickNameValidateState.Empty && value.isNotEmpty())
 
     LaunchedEffect(value) {
         if (value.isNotEmpty()) {
             isTyping = true
             delay(300)
 
-            if(value.length<minLength){
-                validationState =NickNameValidateState.TooShort
-                isTyping=false
+            if (value.length < minLength) {
+                validationState = NickNameValidateState.TooShort
+                isTyping = false
                 return@LaunchedEffect
             }
             if (value.length == maxLength) {
@@ -153,9 +153,8 @@ fun SolplyNicknameTextField(
                 validationState = NickNameValidateState.Invalid
                 isTyping = false
             } else {
-                val duplicate = onDuplicateCheck(value)
                 validationState =
-                    if (duplicate) NickNameValidateState.Duplicate else NickNameValidateState.Valid
+                    if (isNicknameDuplicate) NickNameValidateState.Duplicate else NickNameValidateState.Valid
                 isTyping = false
             }
         } else {
@@ -170,7 +169,8 @@ fun SolplyNicknameTextField(
         validationState in listOf(
             NickNameValidateState.Duplicate,
             NickNameValidateState.Invalid,
-            NickNameValidateState.TooShort) ->
+            NickNameValidateState.TooShort
+        ) ->
             Pair(SolplyTheme.colors.white, SolplyTheme.colors.red600)
 
         validationState == NickNameValidateState.Typing ->

core/network/src/main/java/com/teamsolply/solply/network/AccessTokenInterceptor.kt

@@ -32,13 +32,12 @@ class AccessTokenInterceptor @Inject constructor(
             originalRequest
         }
 
-        if (Log.isLoggable(TAG, Log.DEBUG)) {
-            Log.d(TAG, "Request URL: ${newRequest.url}")
-            Log.d(
-                TAG,
-                "Authorization header: ${if (newRequest.header("Authorization") != null) "Bearer [REDACTED]" else "null"}"
-            )
-        }
+        Log.d(TAG, "Request URL: ${newRequest.url}")
+        Log.d(
+            TAG,
+            "Authorization header: ${if (newRequest.header("Authorization") != null) "Bearer [REDACTED]" else "null"}"
+        )
+
         return chain.proceed(newRequest)
     }
 

core/network/src/main/java/com/teamsolply/solply/network/service/TokenRefreshService.kt

@@ -5,8 +5,8 @@ import retrofit2.http.Header
 import retrofit2.http.POST
 
 interface TokenRefreshService {
-    @POST("")
+    @POST("api/auth/refresh")
     suspend fun postRefreshJwtToken(
-        @Header("Authorization") refreshToken: String
+        @Header("Refresh-Token") refreshToken: String
     ): ResponsePostAuthRefreshDto
 }

data/oauth/src/main/java/com/teamsolply/solply/oauth/dto/request/SocialLoginRequestDto.kt

@@ -0,0 +1,10 @@
+package com.teamsolply.solply.oauth.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SocialLoginRequestDto(
+    @SerialName("oauthAccessToken")
+    val oauthAccessToken: String
+)

data/oauth/src/main/java/com/teamsolply/solply/oauth/dto/response/SocialLoginResponseDto.kt

@@ -0,0 +1,14 @@
+package com.teamsolply.solply.oauth.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SocialLoginResponseDto(
+    @SerialName("accessToken")
+    val accessToken: String,
+    @SerialName("refreshToken")
+    val refreshToken: String,
+    @SerialName("isNewUser")
+    val isNewUser: Boolean
+)

data/oauth/src/main/java/com/teamsolply/solply/oauth/repository/OauthRepositoryImpl.kt

@@ -2,15 +2,35 @@ package com.teamsolply.solply.oauth.repository
 
 import com.teamsolply.solply.oauth.model.TokenEntity
 import com.teamsolply.solply.oauth.source.OauthLocalDataSource
+import com.teamsolply.solply.oauth.source.OauthRemoteDataSource
 import javax.inject.Inject
 
 class OauthRepositoryImpl @Inject constructor(
-    private val oauthLocalDataSource: OauthLocalDataSource
+    private val oauthLocalDataSource: OauthLocalDataSource,
+    private val oauthRemoteDataSource: OauthRemoteDataSource
 ) : OauthRepository {
-    override suspend fun saveJwtToken(jwtToken: TokenEntity): Result<Unit> = runCatching {
-        oauthLocalDataSource.setAuthLocalData(
-            accessToken = jwtToken.accessToken,
-            refreshToken = jwtToken.refreshToken
+
+    override suspend fun postSocialLogin(
+        provider: String,
+        oauthAccessToken: String
+    ): Result<TokenEntity> = runCatching {
+        oauthRemoteDataSource.socialLogin(
+            provider = provider,
+            oauthAccessToken = oauthAccessToken
+        )
+    }.mapCatching {
+        TokenEntity(
+            accessToken = it.accessToken,
+            refreshToken = it.refreshToken,
+            isNewUser = it.isNewUser
         )
     }
+
+    override suspend fun saveJwtToken(accessToken: String, refreshToken: String): Result<Unit> =
+        runCatching {
+            oauthLocalDataSource.setAuthLocalData(
+                accessToken = accessToken,
+                refreshToken = refreshToken
+            )
+        }
 }

data/oauth/src/main/java/com/teamsolply/solply/oauth/source/OauthRemoteDataSource.kt

@@ -0,0 +1,7 @@
+package com.teamsolply.solply.oauth.source
+
+import com.teamsolply.solply.oauth.dto.response.SocialLoginResponseDto
+
+interface OauthRemoteDataSource {
+    suspend fun socialLogin(provider: String, oauthAccessToken: String): SocialLoginResponseDto
+}

remote/onboarding/src/main/java/com/teamsolply/solply/onboarding/dto/request/SignUpRequestDto.kt → data/onboarding/src/main/java/com/teamsolply/solply/onboarding/dto/request/PatchUserInfoRequestDto.kt

@@ -4,9 +4,11 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class SignUpRequestDto(
+data class PatchUserInfoRequestDto(
+    @SerialName("favoriteTown")
+    val favoriteTown: Long,
+    @SerialName("persona")
+    val persona: String,
     @SerialName("nickname")
-    val nickname: String,
-    @SerialName("id")
-    val id: Int
+    val nickname: String
 )

data/onboarding/src/main/java/com/teamsolply/solply/onboarding/dto/response/NicknameDuplicateResponseDto.kt

@@ -0,0 +1,10 @@
+package com.teamsolply.solply.onboarding.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NicknameDuplicateResponseDto(
+    @SerialName("isDuplicated")
+    val isDuplicated: Boolean
+)

data/onboarding/src/main/java/com/teamsolply/solply/onboarding/dto/response/PatchUserInfoResponseDto.kt

@@ -0,0 +1,16 @@
+package com.teamsolply.solply.onboarding.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PatchUserInfoResponseDto(
+    @SerialName("favoriteTownId")
+    val favoriteTownId: Long,
+    @SerialName("favoriteTownName")
+    val favoriteTownName: String,
+    @SerialName("persona")
+    val persona: String,
+    @SerialName("nickname")
+    val nickname: String
+)

data/onboarding/src/main/java/com/teamsolply/solply/onboarding/repository/OnBoardingRepositoryImpl.kt

@@ -1,16 +1,35 @@
 package com.teamsolply.solply.onboarding.repository
 
-import com.teamsolply.solply.onboarding.model.SignUpEntity
+import com.teamsolply.solply.onboarding.dto.request.PatchUserInfoRequestDto
+import com.teamsolply.solply.onboarding.model.UserInfoEntity
 import com.teamsolply.solply.onboarding.source.OnBoardingRemoteDataSource
 import javax.inject.Inject
 
 class OnBoardingRepositoryImpl @Inject constructor(
     private val onBoardingRemoteDataSource: OnBoardingRemoteDataSource
 ) : OnBoardingRepository {
-    override suspend fun signUp(signUpInfo: SignUpEntity) = runCatching {
-        onBoardingRemoteDataSource.signUp(
-            nickname = signUpInfo.nickname,
-            id = signUpInfo.userId
+    override suspend fun checkNicknameDuplicate(nickname: String): Result<Boolean> = runCatching {
+        onBoardingRemoteDataSource.checkNicknameDuplicate(nickname = nickname).isDuplicated
+    }
+
+    override suspend fun patchUserInfo(
+        favoriteTown: Long,
+        persona: String,
+        nickname: String
+    ): Result<UserInfoEntity> = runCatching {
+        onBoardingRemoteDataSource.patchUserInfo(
+            PatchUserInfoRequestDto(
+                favoriteTown = favoriteTown,
+                persona = persona,
+                nickname = nickname
+            )
+        )
+    }.mapCatching {
+        UserInfoEntity(
+            favoriteTownId = it.favoriteTownId,
+            favoriteTownName = it.favoriteTownName,
+            persona = it.persona,
+            nickname = it.nickname
         )
     }
 }

data/onboarding/src/main/java/com/teamsolply/solply/onboarding/source/OnBoardingRemoteDataSource.kt

@@ -1,5 +1,10 @@
 package com.teamsolply.solply.onboarding.source
 
+import com.teamsolply.solply.onboarding.dto.request.PatchUserInfoRequestDto
+import com.teamsolply.solply.onboarding.dto.response.NicknameDuplicateResponseDto
+import com.teamsolply.solply.onboarding.dto.response.PatchUserInfoResponseDto
+
 interface OnBoardingRemoteDataSource {
-    suspend fun signUp(nickname: String, id: Int)
+    suspend fun checkNicknameDuplicate(nickname: String): NicknameDuplicateResponseDto
+    suspend fun patchUserInfo(patchUserInfoRequestDto: PatchUserInfoRequestDto): PatchUserInfoResponseDto
 }

domain/oauth/src/main/java/com/teamsolply/solply/oauth/model/TokenEntity.kt

@@ -2,5 +2,6 @@ package com.teamsolply.solply.oauth.model
 
 data class TokenEntity(
     val accessToken: String,
-    val refreshToken: String
+    val refreshToken: String,
+    val isNewUser: Boolean
 )

domain/oauth/src/main/java/com/teamsolply/solply/oauth/repository/OauthRepository.kt

@@ -3,5 +3,6 @@ package com.teamsolply.solply.oauth.repository
 import com.teamsolply.solply.oauth.model.TokenEntity
 
 interface OauthRepository {
-    suspend fun saveJwtToken(jwtToken: TokenEntity): Result<Unit>
+    suspend fun postSocialLogin(provider: String, oauthAccessToken: String): Result<TokenEntity>
+    suspend fun saveJwtToken(accessToken: String, refreshToken: String): Result<Unit>
 }

domain/onboarding/src/main/java/com/teamsolply/solply/onboarding/model/UserInfoEntity.kt

@@ -0,0 +1,8 @@
+package com.teamsolply.solply.onboarding.model
+
+data class UserInfoEntity(
+    val favoriteTownId: Long?,
+    val favoriteTownName: String,
+    val persona: String,
+    val nickname: String
+)

domain/onboarding/src/main/java/com/teamsolply/solply/onboarding/repository/OnBoardingRepository.kt

@@ -1,7 +1,12 @@
 package com.teamsolply.solply.onboarding.repository
 
-import com.teamsolply.solply.onboarding.model.SignUpEntity
+import com.teamsolply.solply.onboarding.model.UserInfoEntity
 
 interface OnBoardingRepository {
-    suspend fun signUp(signUpInfo: SignUpEntity): Result<Unit>
+    suspend fun checkNicknameDuplicate(nickname: String): Result<Boolean>
+    suspend fun patchUserInfo(
+        favoriteTown: Long,
+        persona: String,
+        nickname: String
+    ): Result<UserInfoEntity>
 }

feature/main/src/main/java/com/teamsolply/solply/main/MainNavigator.kt

@@ -16,7 +16,6 @@ import com.teamsolply.solply.mypage.collection.course.navigateCourseCollection
 import com.teamsolply.solply.mypage.collection.place.navigatePlaceCollection
 import com.teamsolply.solply.mypage.navigation.navigateMypage
 import com.teamsolply.solply.oauth.navigation.navigateOauth
-import com.teamsolply.solply.onboarding.navigation.OnBoarding
 import com.teamsolply.solply.onboarding.navigation.navigateOnBoarding
 import com.teamsolply.solply.place.navigation.navigatePlace
 
@@ -27,7 +26,7 @@ internal class MainNavigator(
         @Composable get() = navController
             .currentBackStackEntryAsState().value?.destination
 
-    val startDestination = OnBoarding
+    val startDestination = Splash
 
     val currentTab: MainNavTab?
         @Composable get() = MainNavTab.find { tab ->

feature/main/src/main/java/com/teamsolply/solply/main/MainScreen.kt

@@ -130,6 +130,15 @@ internal fun MainScreen(
                                 launchSingleTop = true
                             }
                             navigator.navigateToOnboarding(navOptions)
+                        },
+                        navigateToPlace = {
+                            val navOptions = navOptions {
+                                popUpTo(0) {
+                                    inclusive = true
+                                }
+                                launchSingleTop = true
+                            }
+                            navigator.navigateToPlace(navOptions = navOptions)
                         }
                     )
                     onBoardingNavGraph(