[Feat/#41] sharedpreferences + SignIn + SignUp 분기 처리 및 연결

app/build.gradle.kts

@@ -33,7 +33,7 @@ android {
             gradleLocalProperties(rootDir).getProperty("native.app.key"),
         )
         manifestPlaceholders["NATIVE_APP_KEY"] =
-            gradleLocalProperties(rootDir).getProperty("native.app.key")
+            gradleLocalProperties(rootDir).getProperty("nativeAppKey")
     }
 
     buildTypes {

app/src/main/AndroidManifest.xml

@@ -21,12 +21,11 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data
-                    android:host="oauth"
+                <!-- Redirect URI: "kakao${NATIVE_APP_KEY}://oauth" -->
+                <data android:host="oauth"
                     android:scheme="kakao${NATIVE_APP_KEY}" />
             </intent-filter>
         </activity>
@@ -37,7 +36,7 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.going.presentation.splash.SplashActivity"
+            android:name="com.going.presentation.onboarding.splash.SplashActivity"
             android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter>
@@ -48,7 +47,7 @@
         </activity>
 
         <activity
-            android:name="com.going.presentation.auth.SignInActivity"
+            android:name="com.going.presentation.onboarding.signin.SignInActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
 
@@ -58,7 +57,7 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.going.presentation.onboarding.OnboardingProfileSettingActivity"
+            android:name="com.going.presentation.onboarding.signup.OnboardingProfileSettingActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
 

app/src/main/java/com/going/going/di/DataSourceModule.kt

@@ -1,8 +1,8 @@
 package com.going.going.di
 
-import com.going.data.datasource.LoginDataSource
+import com.going.data.datasource.AuthDataSource
 import com.going.data.datasource.MockDataSource
-import com.going.data.datasourceImpl.LoginDataSourceImpl
+import com.going.data.datasourceImpl.AuthDataSourceImpl
 import com.going.data.datasourceImpl.MockDataSourceImpl
 import dagger.Module
 import dagger.Provides
@@ -21,8 +21,6 @@ object DataSourceModule {
 
     @Provides
     @Singleton
-    fun provideLoginDataSource(loginDataSourceImpl: LoginDataSourceImpl): LoginDataSource =
-        loginDataSourceImpl
-
-
+    fun provideAuthDataSource(authDataSourceImpl: AuthDataSourceImpl): AuthDataSource =
+        authDataSourceImpl
 }

app/src/main/java/com/going/going/di/DataStoreModule.kt

@@ -0,0 +1,27 @@
+package com.going.going.di
+
+import android.content.Context
+import android.content.SharedPreferences
+import com.going.data.local.GoingDataStoreImpl
+import com.going.data.local.GoingDataStore
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DataStoreModule {
+
+    @Provides
+    @Singleton
+    fun provideSharedPreferences(@ApplicationContext context: Context): SharedPreferences =
+        context.getSharedPreferences(context.packageName, Context.MODE_PRIVATE)
+
+    @Provides
+    @Singleton
+    fun provideGoingDataStore(dataStoreImpl: GoingDataStoreImpl): GoingDataStore =
+        dataStoreImpl
+}

app/src/main/java/com/going/going/di/RepositoryModule.kt

@@ -1,8 +1,10 @@
 package com.going.going.di
 
-import com.going.data.repositoryImpl.LoginRepositoryImpl
+import com.going.data.repositoryImpl.TokenRepositoryImpl
+import com.going.data.repositoryImpl.AuthRepositoryImpl
 import com.going.data.repositoryImpl.MockRepositoryImpl
-import com.going.domain.repository.LoginRepository
+import com.going.domain.repository.TokenRepository
+import com.going.domain.repository.AuthRepository
 import com.going.domain.repository.MockRepository
 import dagger.Module
 import dagger.Provides
@@ -21,6 +23,11 @@ object RepositoryModule {
 
     @Provides
     @Singleton
-    fun provideLoginRepository(loginRepositoryImpl: LoginRepositoryImpl): LoginRepository =
-        loginRepositoryImpl
+    fun provideAuthRepository(authRepositoryImpl: AuthRepositoryImpl): AuthRepository =
+        authRepositoryImpl
+
+    @Provides
+    @Singleton
+    fun provideTokenRepository(tokenRepositoryImpl: TokenRepositoryImpl): TokenRepository =
+        tokenRepositoryImpl
 }

app/src/main/java/com/going/going/di/ServiceModule.kt

@@ -1,6 +1,6 @@
 package com.going.going.di
 
-import com.going.data.service.LoginService
+import com.going.data.service.AuthService
 import com.going.data.service.MockService
 import dagger.Module
 import dagger.Provides
@@ -20,7 +20,6 @@ object ServiceModule {
 
     @Provides
     @Singleton
-    fun provideLoginService(retrofit: Retrofit): LoginService =
-        retrofit.create(LoginService::class.java)
-
+    fun provideLoginService(retrofit: Retrofit): AuthService =
+        retrofit.create(AuthService::class.java)
 }

core-ui/build.gradle.kts

@@ -47,4 +47,4 @@ dependencies {
     testImplementation(TestDependencies.jUnit)
     androidTestImplementation(TestDependencies.androidTest)
     androidTestImplementation(TestDependencies.espresso)
-}
+}

data/src/main/java/com/going/data/datasource/AuthDataSource.kt

@@ -0,0 +1,18 @@
+package com.going.data.datasource
+
+import com.going.data.dto.BaseResponse
+import com.going.data.dto.request.SignInRequestDto
+import com.going.data.dto.request.SignUpRequestDto
+import com.going.data.dto.response.AuthResponseDto
+
+interface AuthDataSource {
+    suspend fun postSignIn(
+        Authorization: String,
+        platform: SignInRequestDto,
+    ): BaseResponse<AuthResponseDto>
+
+    suspend fun postSignUp(
+        Authorization: String,
+        data: SignUpRequestDto,
+    ): BaseResponse<AuthResponseDto>
+}

data/src/main/java/com/going/data/datasourceImpl/AuthDataSourceImpl.kt

@@ -0,0 +1,24 @@
+package com.going.data.datasourceImpl
+
+import com.going.data.datasource.AuthDataSource
+import com.going.data.dto.BaseResponse
+import com.going.data.dto.request.SignInRequestDto
+import com.going.data.dto.request.SignUpRequestDto
+import com.going.data.dto.response.AuthResponseDto
+import com.going.data.service.AuthService
+import javax.inject.Inject
+
+class AuthDataSourceImpl @Inject constructor(
+    private val authService: AuthService,
+) : AuthDataSource {
+    override suspend fun postSignIn(
+        Authorization: String,
+        platform: SignInRequestDto,
+    ): BaseResponse<AuthResponseDto> =
+        authService.postSignin(Authorization, platform)
+
+    override suspend fun postSignUp(
+        Authorization: String,
+        data: SignUpRequestDto,
+    ): BaseResponse<AuthResponseDto> = authService.postSignUp(Authorization, data)
+}

data/src/main/java/com/going/data/dto/request/SignInRequestDto.kt

@@ -0,0 +1,15 @@
+package com.going.data.dto.request
+
+import com.going.domain.entity.request.RequestSignInModel
+import com.going.domain.entity.request.RequestSignUpModel
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SignInRequestDto(
+    @SerialName("platform")
+    val platform: String
+)
+
+fun RequestSignInModel.toSignInRequestDto(): SignInRequestDto =
+    SignInRequestDto(platform)

data/src/main/java/com/going/data/dto/request/SignUpRequestDto.kt

@@ -0,0 +1,18 @@
+package com.going.data.dto.request
+
+import com.going.domain.entity.request.RequestSignUpModel
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SignUpRequestDto(
+    @SerialName("name")
+    val name: String,
+    @SerialName("intro")
+    val intro: String,
+    @SerialName("platform")
+    val platform: String,
+)
+
+fun RequestSignUpModel.toSignUpRequestDto(): SignUpRequestDto =
+    SignUpRequestDto(name, intro, platform)

data/src/main/java/com/going/data/dto/response/AuthResponseDto.kt

@@ -0,0 +1,16 @@
+package com.going.data.dto.response
+
+import com.going.domain.entity.response.AuthTokenModel
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class AuthResponseDto(
+    @SerialName("accessToken")
+    val accessToken: String,
+    @SerialName("refreshToken")
+    val refreshToken: String,
+) {
+    fun toAuthTokenModel() =
+        AuthTokenModel(accessToken = accessToken, refreshToken = refreshToken)
+}

data/src/main/java/com/going/data/local/GoingDataStore.kt

@@ -0,0 +1,6 @@
+package com.going.data.local
+
+interface GoingDataStore {
+    var accessToken: String
+    var refreshToken: String
+}

data/src/main/java/com/going/data/local/GoingDataStoreImpl.kt

@@ -0,0 +1,22 @@
+package com.going.data.local
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import javax.inject.Inject
+
+class GoingDataStoreImpl @Inject constructor(
+    private val dataStore: SharedPreferences,
+) : GoingDataStore {
+    override var accessToken: String
+        get() = dataStore.getString(ACCESS_TOKEN, "") ?: ""
+        set(value) = dataStore.edit { putString(ACCESS_TOKEN, value) }
+
+    override var refreshToken: String
+        get() = dataStore.getString(REFRESH_TOKEN, "") ?: ""
+        set(value) = dataStore.edit { putString(REFRESH_TOKEN, value) }
+
+    companion object {
+        private const val ACCESS_TOKEN = "ACCESS_TOKEN"
+        private const val REFRESH_TOKEN = "REFRESH_TOKEN"
+    }
+}

data/src/main/java/com/going/data/repositoryImpl/AuthRepositoryImpl.kt

@@ -0,0 +1,36 @@
+package com.going.data.repositoryImpl
+
+import com.going.data.datasource.AuthDataSource
+import com.going.data.dto.request.toSignInRequestDto
+import com.going.data.dto.request.toSignUpRequestDto
+import com.going.domain.entity.request.RequestSignInModel
+import com.going.domain.entity.request.RequestSignUpModel
+import com.going.domain.entity.response.AuthTokenModel
+import com.going.domain.repository.AuthRepository
+import javax.inject.Inject
+
+class AuthRepositoryImpl @Inject constructor(
+    private val authDataSource: AuthDataSource,
+) : AuthRepository {
+    override suspend fun postSignIn(
+        Authorization: String,
+        requestSignIpModel: RequestSignInModel,
+    ): Result<AuthTokenModel> =
+        runCatching {
+            authDataSource.postSignIn(
+                Authorization,
+                requestSignIpModel.toSignInRequestDto(),
+            ).data.toAuthTokenModel()
+        }
+
+    override suspend fun postSignUp(
+        Authorization: String,
+        requestSignUpModel: RequestSignUpModel,
+    ): Result<AuthTokenModel> =
+        runCatching {
+            authDataSource.postSignUp(
+                Authorization,
+                requestSignUpModel.toSignUpRequestDto(),
+            ).data.toAuthTokenModel()
+        }
+}