[로그인] #9 - 로그인 기능 구현

app/build.gradle.kts

@@ -25,13 +25,19 @@ android {
 }
 
 dependencies {
-    implementation(projects.core.designsystem)
     implementation(projects.feature.mypage)
     implementation(projects.feature.home)
     implementation(projects.feature.viewmore)
     implementation(projects.feature.map)
     implementation(projects.feature.signin)
     implementation(projects.feature.splash)
+
+    implementation(projects.core.repo.signin.impl)
+
+    implementation(projects.core.http)
+
+    implementation(projects.core.designsystem)
+
     implementation(libs.androidx.appcompat)
     implementation(libs.kotlinx.immutable)
 }

app/src/main/AndroidManifest.xml

@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application

app/src/main/kotlin/org/cazait/cazaitandroid/MainNavigator.kt

@@ -11,6 +11,8 @@ import androidx.navigation.navOptions
 import org.cazait.cazaitandroid.feature.home.navigateHome
 import org.cazait.cazaitandroid.feature.map.navigateMap
 import org.cazait.cazaitandroid.feature.mypage.navigateMyPage
+import org.cazait.cazaitandroid.feature.signin.navigateSignIn
+import org.cazait.cazaitandroid.feature.splash.SplashNav
 import org.cazait.cazaitandroid.feature.viewmore.navigateViewMore
 
 internal class MainNavigator(
@@ -20,7 +22,7 @@ internal class MainNavigator(
         @Composable get() = navController
             .currentBackStackEntryAsState().value?.destination
 
-    val startDestination = org.cazait.cazaitandroid.feature.splash.SplashNav.route
+    val startDestination = SplashNav.route
 
     val currentTab: MainTab?
         @Composable get() = currentDestination
@@ -44,6 +46,10 @@ internal class MainNavigator(
         }
     }
 
+    fun navigateSignIn() {
+        navController.navigateSignIn()
+    }
+
     @Composable
     fun shouldShowBottomBar(): Boolean {
         val currentRoute = currentDestination?.route ?: return false

app/src/main/kotlin/org/cazait/cazaitandroid/ui/MainScreen.kt

@@ -46,6 +46,7 @@ import org.cazait.cazaitandroid.core.designsystem.theme.surfaceDim
 import org.cazait.cazaitandroid.feature.home.homeNavGraph
 import org.cazait.cazaitandroid.feature.map.mapNavGraph
 import org.cazait.cazaitandroid.feature.mypage.myPageNavGraph
+import org.cazait.cazaitandroid.feature.signin.signInNavGraph
 import org.cazait.cazaitandroid.feature.splash.splashNavGraph
 import org.cazait.cazaitandroid.feature.viewmore.viewMoreNavGraph
 import org.cazait.cazaitandroid.rememberMainNavigator
@@ -82,27 +83,29 @@ internal fun MainScreen(
                     startDestination = navigator.startDestination,
                 ) {
                     homeNavGraph(
-                        padding = padding,
-                        onCafeClick = {},
-                        onShowErrorSnackbar = onShowErrorSnackbar,
+//                        padding = padding,
+//                        onCafeClick = {},
+//                        onShowErrorSnackbar = onShowErrorSnackbar,
                     )
                     mapNavGraph(
-                        padding = padding,
-                        onCafeClick = {},
-                        onShowErrorSnackbar = onShowErrorSnackbar,
+//                        padding = padding,
+//                        onCafeClick = {},
+//                        onShowErrorSnackbar = onShowErrorSnackbar,
                     )
                     myPageNavGraph(
-                        padding = padding,
-                        onCafeClick = {},
-                        onShowErrorSnackbar = onShowErrorSnackbar,
+//                        padding = padding,
+//                        onCafeClick = {},
+//                        onShowErrorSnackbar = onShowErrorSnackbar,
                     )
                     viewMoreNavGraph(
-                        padding = padding,
-                        onShowErrorSnackbar = onShowErrorSnackbar,
+//                        padding = padding,
+//                        onShowErrorSnackbar = onShowErrorSnackbar,
                     )
                     splashNavGraph(
-                        padding = padding,
-                        onClickStart = { navigator.navigate(tab = MainTab.HOME) },
+                        onClickStart = { navigator.navigateSignIn() },
+                    )
+                    signInNavGraph(
+                        onShowErrorSnackbar = onShowErrorSnackbar,
                     )
                 }
             }

build-logic/src/main/kotlin/cazait.coroutine.library.gradle.kts

@@ -0,0 +1,7 @@
+import org.cazait.cazaitandroid.configureCoroutineAndroid
+
+plugins {
+    id("cazait.kotlin.library")
+}
+
+configureCoroutineAndroid()

core/designsystem/src/main/kotlin/org/cazait/cazaitandroid/core/designsystem/theme/Theme.kt

@@ -32,13 +32,14 @@ private val DarkColorScheme = darkColorScheme(
     onError = Red05,
     errorContainer = Red04,
     onErrorContainer = Red01,
-    surface = Graphite,
+    surface = DarkGray,
     onSurface = White,
     inverseSurface = Neon05,
     inverseOnSurface = Black,
     outline = DarkGray,
     outlineVariant = Cosmos,
     scrim = Black,
+    background = Graphite,
 )
 
 private val LightColorScheme = lightColorScheme(
@@ -65,7 +66,8 @@ private val LightColorScheme = lightColorScheme(
     inverseOnSurface = White,
     outline = LightGray,
     outlineVariant = DarkGray,
-    scrim = Black,
+    scrim = White,
+    background = Beige,
 )
 
 val LocalDarkTheme = compositionLocalOf { true }

core/http/build.gradle.kts

@@ -0,0 +1,18 @@
+plugins {
+    id("cazait.android.library")
+    id("cazait.android.hilt")
+}
+
+android {
+    namespace = "org.cazait.cazaitandroid.core.http"
+}
+
+dependencies {
+    implementation(libs.retrofit.core)
+    implementation(libs.retrofit.kotlin.serialization)
+    implementation(libs.okhttp.logging)
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.kotlinx.datetime)
+
+    implementation(libs.inject)
+}

core/http/src/main/kotlin/org/cazait/cazaitandroid/core/http/OkHttpModule.kt

@@ -0,0 +1,38 @@
+package org.cazait.cazaitandroid.core.http
+
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.serialization.json.Json
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Converter
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object OkHttpModule {
+
+    @Provides
+    @Singleton
+    fun provideOkHttpClient(): OkHttpClient = OkHttpClient.Builder()
+        .addInterceptor(HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY))
+        .build()
+
+    @Provides
+    @Singleton
+    fun provideConverterFactory(
+        json: Json,
+    ): Converter.Factory {
+        return json.asConverterFactory("application/json".toMediaType())
+    }
+
+    @Provides
+    @Singleton
+    fun provideJson(): Json = Json {
+        ignoreUnknownKeys = true
+    }
+}

core/repo/signin/api/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    id("cazait.coroutine.library")
+    id("kotlinx-serialization")
+}
+
+dependencies {
+    api(libs.kotlinx.datetime)
+    implementation(libs.kotlinx.serialization.json)
+}

core/repo/signin/api/src/main/kotlin/org/cazait/cazaitandroid/core/repo/signin/api/SignInRepository.kt

@@ -0,0 +1,9 @@
+package org.cazait.cazaitandroid.core.repo.signin.api
+
+import org.cazait.cazaitandroid.core.repo.signin.api.model.AccountName
+import org.cazait.cazaitandroid.core.repo.signin.api.model.Password
+import org.cazait.cazaitandroid.core.repo.signin.api.model.UserInformation
+
+interface SignInRepository {
+    suspend fun postSignIn(accountName: AccountName, password: Password): UserInformation
+}

core/repo/signin/api/src/main/kotlin/org/cazait/cazaitandroid/core/repo/signin/api/model/AccessToken.kt

@@ -0,0 +1,4 @@
+package org.cazait.cazaitandroid.core.repo.signin.api.model
+
+@JvmInline
+value class AccessToken(val token: String)

core/repo/signin/api/src/main/kotlin/org/cazait/cazaitandroid/core/repo/signin/api/model/AccountName.kt

@@ -0,0 +1,4 @@
+package org.cazait.cazaitandroid.core.repo.signin.api.model
+
+@JvmInline
+value class AccountName(val name: String)

core/repo/signin/api/src/main/kotlin/org/cazait/cazaitandroid/core/repo/signin/api/model/Password.kt

@@ -0,0 +1,4 @@
+package org.cazait.cazaitandroid.core.repo.signin.api.model
+
+@JvmInline
+value class Password(val word: String)

core/repo/signin/api/src/main/kotlin/org/cazait/cazaitandroid/core/repo/signin/api/model/RefreshToken.kt

@@ -0,0 +1,4 @@
+package org.cazait.cazaitandroid.core.repo.signin.api.model
+
+@JvmInline
+value class RefreshToken(val token: String)

core/repo/signin/api/src/main/kotlin/org/cazait/cazaitandroid/core/repo/signin/api/model/UserId.kt

@@ -0,0 +1,6 @@
+package org.cazait.cazaitandroid.core.repo.signin.api.model
+
+import java.util.UUID
+
+@JvmInline
+value class UserId(val uuid: UUID)

core/repo/signin/api/src/main/kotlin/org/cazait/cazaitandroid/core/repo/signin/api/model/UserInformation.kt

@@ -0,0 +1,8 @@
+package org.cazait.cazaitandroid.core.repo.signin.api.model
+
+data class UserInformation(
+    val userId: UserId,
+    val accountName: AccountName,
+    val accessToken: AccessToken,
+    val refreshToken: RefreshToken,
+)

core/repo/signin/impl/build.gradle.kts

@@ -0,0 +1,22 @@
+plugins {
+    id("cazait.android.library")
+    id("cazait.android.hilt")
+    id("kotlinx-serialization")
+}
+
+android {
+    namespace = "org.cazait.cazaitandroid.core.repo.signin"
+}
+
+dependencies {
+    implementation(projects.core.repo.signin.api)
+
+    implementation(libs.androidx.datastore)
+
+    implementation(libs.retrofit.core)
+    implementation(libs.retrofit.kotlin.serialization)
+    implementation(libs.kotlinx.datetime)
+
+    testImplementation(libs.junit4)
+    testImplementation(libs.kotlin.test)
+}

core/repo/signin/impl/src/main/kotlin/org/cazait/cazaitandroid/core/repo/signin/DefaultSignInRepository.kt

@@ -0,0 +1,21 @@
+package org.cazait.cazaitandroid.core.repo.signin
+
+import org.cazait.cazaitandroid.core.repo.signin.api.SignInRepository
+import org.cazait.cazaitandroid.core.repo.signin.api.model.AccountName
+import org.cazait.cazaitandroid.core.repo.signin.api.model.Password
+import org.cazait.cazaitandroid.core.repo.signin.api.model.UserInformation
+import org.cazait.cazaitandroid.core.repo.signin.mapper.toData
+import org.cazait.cazaitandroid.core.repo.signin.network.SignInApi
+import org.cazait.cazaitandroid.core.repo.signin.network.model.SignInRequest
+import javax.inject.Inject
+
+internal class DefaultSignInRepository @Inject constructor(
+    private val signInApi: SignInApi,
+) : SignInRepository {
+    override suspend fun postSignIn(
+        accountName: AccountName,
+        password: Password,
+    ): UserInformation = signInApi.postSignIn(
+        SignInRequest(accountName.name, password.word),
+    ).data.toData()
+}

core/repo/signin/impl/src/main/kotlin/org/cazait/cazaitandroid/core/repo/signin/di/SignInRepoModule.kt

@@ -0,0 +1,40 @@
+package org.cazait.cazaitandroid.core.repo.signin.di
+
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import okhttp3.OkHttpClient
+import org.cazait.cazaitandroid.core.repo.signin.DefaultSignInRepository
+import org.cazait.cazaitandroid.core.repo.signin.api.SignInRepository
+import org.cazait.cazaitandroid.core.repo.signin.network.SignInApi
+import retrofit2.Converter
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object SignInRepoModule {
+    @Provides
+    @Singleton
+    fun provideSignInApi(
+        okHttpClient: OkHttpClient,
+        converterFactory: Converter.Factory,
+    ): SignInApi {
+        return Retrofit.Builder()
+            .baseUrl("https://cazait.shop")
+            .addConverterFactory(converterFactory)
+            .client(okHttpClient).build()
+            .create(SignInApi::class.java)
+    }
+}
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal abstract class SignInRepoBindModule {
+    @Binds
+    abstract fun bindSignInRepository(
+        dataSource: DefaultSignInRepository,
+    ): SignInRepository
+}

core/repo/signin/impl/src/main/kotlin/org/cazait/cazaitandroid/core/repo/signin/mapper/SignInMapper.kt

@@ -0,0 +1,16 @@
+package org.cazait.cazaitandroid.core.repo.signin.mapper
+
+import org.cazait.cazaitandroid.core.repo.signin.api.model.AccessToken
+import org.cazait.cazaitandroid.core.repo.signin.api.model.AccountName
+import org.cazait.cazaitandroid.core.repo.signin.api.model.RefreshToken
+import org.cazait.cazaitandroid.core.repo.signin.api.model.UserId
+import org.cazait.cazaitandroid.core.repo.signin.api.model.UserInformation
+import org.cazait.cazaitandroid.core.repo.signin.network.model.UserInformationResponse
+import java.util.UUID
+
+internal fun UserInformationResponse.toData(): UserInformation = UserInformation(
+    userId = UserId(UUID.fromString(id)),
+    accountName = AccountName(accountName),
+    accessToken = AccessToken(accessToken),
+    refreshToken = RefreshToken(refreshToken),
+)

core/repo/signin/impl/src/main/kotlin/org/cazait/cazaitandroid/core/repo/signin/network/SignInApi.kt

@@ -0,0 +1,17 @@
+package org.cazait.cazaitandroid.core.repo.signin.network
+
+import org.cazait.cazaitandroid.core.repo.signin.network.model.SignInRequest
+import org.cazait.cazaitandroid.core.repo.signin.network.model.SignInResponse
+import retrofit2.http.Body
+import retrofit2.http.POST
+import retrofit2.http.Query
+
+internal interface SignInApi {
+    @POST("/api/auths/log-in")
+    suspend fun postSignIn(
+        @Body
+        signInRequest: SignInRequest,
+        @Query("role")
+        role: String = "user",
+    ): SignInResponse
+}

core/repo/signin/impl/src/main/kotlin/org/cazait/cazaitandroid/core/repo/signin/network/model/SignInRequest.kt

@@ -0,0 +1,6 @@
+package org.cazait.cazaitandroid.core.repo.signin.network.model
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SignInRequest(val accountName: String, val password: String)

core/repo/signin/impl/src/main/kotlin/org/cazait/cazaitandroid/core/repo/signin/network/model/SignInResponse.kt

@@ -0,0 +1,11 @@
+package org.cazait.cazaitandroid.core.repo.signin.network.model
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+internal data class SignInResponse(
+    val code: Int,
+    val result: String,
+    val message: String,
+    val data: UserInformationResponse,
+)