Merge pull request #89 from Begin-Vegan/feature/BVVER24-138-user_info

유저 추가 정보 입력 및 JWT 토큰의 발급 및 검증 방식 변경

app/src/main/AndroidManifest.xml

@@ -2,10 +2,28 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <!--    갤러리 권한-->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28" /> <!-- Android 10 이하에서만 유효 -->
+
+    <!-- Android 12 및 이후 버전용 퍼미션 설정 -->
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"
+        android:minSdkVersion="31" />
+
+    <!--    카메라 권한-->
+    <uses-permission android:name="android.permission.CAMERA" />
+
     <application
         android:name=".config.ApplicationClass"
         android:allowBackup="true"
@@ -17,7 +35,6 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Beginvegan"
         android:usesCleartextTraffic="true"
-        tools:targetApi="31">
-    </application>
+        tools:targetApi="31"></application>
 
 </manifest>

data/build.gradle.kts

@@ -86,4 +86,7 @@ dependencies {
 
     // KaKao Login
     implementation(Dependencies.KAKAO_LOGIN)
+
+    // DataStore
+    implementation("androidx.datastore:datastore-preferences:1.1.1")
 }

data/src/main/java/com/example/data/di/AlarmModule.kt

@@ -1,6 +1,7 @@
 package com.example.data.di
 
 import com.example.data.mapper.alarms.AlarmMapper
+import com.example.data.repository.local.auth.AuthTokenDataSource
 import com.example.data.repository.remote.alarms.AlarmRemoteDataSource
 import com.example.data.repository.remote.alarms.AlarmRemoteDataSourceImpl
 import com.example.data.repository.remote.alarms.AlarmRepositoryImpl
@@ -13,7 +14,7 @@ import dagger.hilt.components.SingletonComponent
 import retrofit2.Retrofit
 import javax.inject.Singleton
 
-@Module(includes = [NetworkModule::class])
+@Module(includes = [NetworkModule::class, DataStoreModule::class])
 @InstallIn(SingletonComponent::class)
 class AlarmModule {
     @Singleton
@@ -24,8 +25,11 @@ class AlarmModule {
 
     @Provides
     @Singleton
-    fun provideAlarmRemoteDataSource(alarmService: AlarmService): AlarmRemoteDataSource {
-        return AlarmRemoteDataSourceImpl(alarmService)
+    fun provideAlarmRemoteDataSource(
+        alarmService: AlarmService,
+        authTokenDataSource: AuthTokenDataSource
+    ): AlarmRemoteDataSource {
+        return AlarmRemoteDataSourceImpl(alarmService, authTokenDataSource)
     }
 
     @Provides

data/src/main/java/com/example/data/di/AuthModule.kt

@@ -1,6 +1,7 @@
 package com.example.data.di
 
 import com.example.data.mapper.auth.AuthMapper
+import com.example.data.repository.local.auth.AuthTokenDataSource
 import com.example.data.repository.remote.auth.AuthRepositoryImpl
 import com.example.data.repository.remote.auth.AuthRemoteDataSource
 import com.example.data.repository.remote.auth.AuthRemoteDataSourceImpl
@@ -14,9 +15,9 @@ import retrofit2.Retrofit
 import javax.inject.Singleton
 
 
-@Module(includes = [NetworkModule::class])
+@Module(includes = [NetworkModule::class,DataStoreModule::class])
 @InstallIn(SingletonComponent::class)
-class AuthModule {
+object AuthModule {
     @Singleton
     @Provides
     fun provideUserService(retrofit: Retrofit): UserService {
@@ -32,9 +33,10 @@ class AuthModule {
     @Provides
     fun provideAuthRepository(
         authRemoteDataSource: AuthRemoteDataSource,
+        authTokenDataSource: AuthTokenDataSource,
         authMapper: AuthMapper
     ): AuthRepository {
-        return AuthRepositoryImpl(authRemoteDataSource, authMapper)
+        return AuthRepositoryImpl(authRemoteDataSource, authTokenDataSource,authMapper)
     }
 
     @Provides

data/src/main/java/com/example/data/di/BookmarkModule.kt

@@ -1,5 +1,6 @@
 package com.example.data.di
 
+import com.example.data.repository.local.auth.AuthTokenDataSource
 import com.example.data.repository.remote.bookmarks.BookmarkRemoteDataSource
 import com.example.data.repository.remote.bookmarks.BookmarkRemoteDataSourceImpl
 import com.example.data.repository.remote.bookmarks.BookmarkRepositoryImpl
@@ -12,7 +13,7 @@ import dagger.hilt.components.SingletonComponent
 import retrofit2.Retrofit
 import javax.inject.Singleton
 
-@Module(includes = [NetworkModule::class])
+@Module(includes = [NetworkModule::class,DataStoreModule::class])
 @InstallIn(SingletonComponent::class)
 class BookmarkModule {
     @Singleton
@@ -23,8 +24,8 @@ class BookmarkModule {
 
     @Provides
     @Singleton
-    fun provideBookmarkRemoteDataSource(bookmarkService: BookmarkService): BookmarkRemoteDataSource {
-        return BookmarkRemoteDataSourceImpl(bookmarkService)
+    fun provideBookmarkRemoteDataSource(bookmarkService: BookmarkService,authTokenDataSource: AuthTokenDataSource): BookmarkRemoteDataSource {
+        return BookmarkRemoteDataSourceImpl(bookmarkService,authTokenDataSource)
     }
 
     @Provides

data/src/main/java/com/example/data/di/DataStoreModule.kt

@@ -0,0 +1,34 @@
+package com.example.data.di
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.PreferenceDataStoreFactory
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.preferencesDataStoreFile
+import com.example.data.repository.local.auth.AuthTokenDataSource
+import com.example.data.repository.local.auth.AuthTokenDataSourceImpl
+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 provideDataStore(@ApplicationContext context: Context): DataStore<Preferences> {
+        return PreferenceDataStoreFactory.create {
+            context.preferencesDataStoreFile("auth_prefs")
+        }
+    }
+
+    @Provides
+    @Singleton
+    fun provideAuthTokenDataSource(authTokenDataSourceImpl: AuthTokenDataSourceImpl): AuthTokenDataSource {
+        return authTokenDataSourceImpl
+    }
+}

data/src/main/java/com/example/data/di/TipsMagazineModule.kt

@@ -2,6 +2,7 @@ package com.example.data.di
 
 import com.example.data.mapper.tips.TipsMagazineDetailMapper
 import com.example.data.mapper.tips.TipsMagazineMapper
+import com.example.data.repository.local.auth.AuthTokenDataSource
 import com.example.data.repository.remote.tips.TipsMagazineRemoteDataSource
 import com.example.data.repository.remote.tips.TipsMagazineRemoteDataSourceImpl
 import com.example.data.repository.remote.tips.TipsMagazineRepositoryImpl
@@ -14,7 +15,7 @@ import dagger.hilt.components.SingletonComponent
 import retrofit2.Retrofit
 import javax.inject.Singleton
 
-@Module(includes = [NetworkModule::class])
+@Module(includes = [NetworkModule::class, DataStoreModule::class])
 @InstallIn(SingletonComponent::class)
 class TipsMagazineModule {
     @Singleton
@@ -25,18 +26,27 @@ class TipsMagazineModule {
 
     @Provides
     @Singleton
-    fun provideTipsMagazineDataSource(tipsMagazineService: TipsMagazineService): TipsMagazineRemoteDataSource {
-        return TipsMagazineRemoteDataSourceImpl(tipsMagazineService)
+    fun provideTipsMagazineDataSource(
+        tipsMagazineService: TipsMagazineService,
+        authTokenDataSource: AuthTokenDataSource
+    ): TipsMagazineRemoteDataSource {
+        return TipsMagazineRemoteDataSourceImpl(tipsMagazineService, authTokenDataSource)
     }
 
     @Provides
     @Singleton
     fun provideTipsMagazineRepository(
         tipsMagazineRemoteDataSource: TipsMagazineRemoteDataSource,
+        authTokenDataSource: AuthTokenDataSource,
         tipsMagazineMapper: TipsMagazineMapper,
         tipsMagazineDetailMapper: TipsMagazineDetailMapper
     ): TipsMagazineRepository {
-        return TipsMagazineRepositoryImpl(tipsMagazineRemoteDataSource, tipsMagazineMapper, tipsMagazineDetailMapper)
+        return TipsMagazineRepositoryImpl(
+            tipsMagazineRemoteDataSource,
+            authTokenDataSource,
+            tipsMagazineMapper,
+            tipsMagazineDetailMapper
+        )
     }
 
     @Provides

data/src/main/java/com/example/data/di/TipsRecipeModule.kt

@@ -2,6 +2,7 @@ package com.example.data.di
 
 import com.example.data.mapper.tips.TipsRecipeDetailMapper
 import com.example.data.mapper.tips.TipsRecipeMapper
+import com.example.data.repository.local.auth.AuthTokenDataSource
 import com.example.data.repository.remote.tips.TipsRecipeRemoteDataSource
 import com.example.data.repository.remote.tips.TipsRecipeRemoteDataSourceImpl
 import com.example.data.repository.remote.tips.TipsRecipeRepositoryImpl
@@ -14,7 +15,7 @@ import dagger.hilt.components.SingletonComponent
 import retrofit2.Retrofit
 import javax.inject.Singleton
 
-@Module(includes = [NetworkModule::class])
+@Module(includes = [NetworkModule::class, DataStoreModule::class])
 @InstallIn(SingletonComponent::class)
 class TipsRecipeModule {
     @Singleton
@@ -25,8 +26,11 @@ class TipsRecipeModule {
 
     @Provides
     @Singleton
-    fun provideTipsRecipeRemoteDataSource(tipsRecipeService: TipsRecipeService): TipsRecipeRemoteDataSource {
-        return TipsRecipeRemoteDataSourceImpl(tipsRecipeService)
+    fun provideTipsRecipeRemoteDataSource(
+        tipsRecipeService: TipsRecipeService,
+        authTokenDataSource: AuthTokenDataSource,
+    ): TipsRecipeRemoteDataSource {
+        return TipsRecipeRemoteDataSourceImpl(tipsRecipeService, authTokenDataSource)
     }
 
     @Provides
@@ -36,7 +40,11 @@ class TipsRecipeModule {
         tipsRecipeMapper: TipsRecipeMapper,
         tipsRecipeDetailMapper: TipsRecipeDetailMapper
     ): TipsRecipeRepository {
-        return TipsRecipeRepositoryImpl(tipsRecipeRemoteDataSource, tipsRecipeMapper, tipsRecipeDetailMapper)
+        return TipsRecipeRepositoryImpl(
+            tipsRecipeRemoteDataSource,
+            tipsRecipeMapper,
+            tipsRecipeDetailMapper
+        )
     }
 
     @Provides
@@ -47,7 +55,7 @@ class TipsRecipeModule {
 
     @Provides
     @Singleton
-    fun provideTipsRecipeDetailMapper(): TipsRecipeDetailMapper{
+    fun provideTipsRecipeDetailMapper(): TipsRecipeDetailMapper {
         return TipsRecipeDetailMapper()
     }
 }

data/src/main/java/com/example/data/di/UserInfoModule.kt

@@ -0,0 +1,54 @@
+package com.example.data.di
+
+import com.example.data.mapper.auth.AuthMapper
+import com.example.data.mapper.core.BaseMapper
+import com.example.data.repository.local.auth.AuthTokenDataSource
+import com.example.data.repository.remote.auth.AuthRemoteDataSource
+import com.example.data.repository.remote.auth.AuthRemoteDataSourceImpl
+import com.example.data.repository.remote.auth.AuthRepositoryImpl
+import com.example.data.repository.remote.userInfo.SaveUserInfoDataSource
+import com.example.data.repository.remote.userInfo.SaveUserInfoDataSourceImpl
+import com.example.data.repository.remote.userInfo.SaveUserInfoRepositoryImpl
+import com.example.data.retrofit.UserInfoService
+import com.example.data.retrofit.UserService
+import com.example.domain.repository.auth.AuthRepository
+import com.example.domain.repository.userInfo.SaveUserInfoRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+
+@Module(includes = [NetworkModule::class,DataStoreModule::class])
+@InstallIn(SingletonComponent::class)
+object UserInfoModule {
+    @Singleton
+    @Provides
+    fun providerUserInfoService(retrofit: Retrofit): UserInfoService {
+        return retrofit.create(UserInfoService::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideUserInfoRemoteDataSource(
+        userServiceInfo: UserInfoService,
+        authTokenDataSource: AuthTokenDataSource
+    ): SaveUserInfoDataSource {
+        return SaveUserInfoDataSourceImpl(userServiceInfo, authTokenDataSource)
+    }
+
+    @Provides
+    fun provideAuthRepository(
+        saveUserInfoDataSource: SaveUserInfoDataSource,
+        baseMapper: BaseMapper
+    ): SaveUserInfoRepository {
+        return SaveUserInfoRepositoryImpl(saveUserInfoDataSource, baseMapper)
+    }
+
+    @Provides
+    fun providerBaseMapper(): BaseMapper {
+        return BaseMapper()
+    }
+}