[Feat/#70] 마이페이지 api 연동

app/build.gradle.kts

@@ -142,4 +142,7 @@ dependencies {
     implementation("com.google.android.gms:play-services-oss-licenses:17.1.0")
 
     implementation ("com.jakewharton.timber:timber:5.0.1")
+
+    implementation ("com.auth0.android:jwtdecode:2.0.0")
+
 }

app/src/main/java/umc/everyones/lck/data/datasource/MypageDataSource.kt

@@ -5,6 +5,7 @@ import okhttp3.RequestBody
 import umc.everyones.lck.data.dto.BaseResponse
 import umc.everyones.lck.data.dto.request.mypage.CancelHostViewingPartyMypageRequestDto
 import umc.everyones.lck.data.dto.request.mypage.CancelParticipateViewingPartyMypageRequestDto
+import umc.everyones.lck.data.dto.request.mypage.UpdateProfilesRequestDto
 import umc.everyones.lck.data.dto.request.mypage.UpdateTeamRequestDto
 import umc.everyones.lck.data.dto.response.NonBaseResponse
 import umc.everyones.lck.data.dto.response.mypage.CommentsMypageResponseDto
@@ -33,7 +34,7 @@ interface MypageDataSource {
 
     suspend fun withdraw(): NonBaseResponse
 
-    suspend fun updateProfiles(profileImage: MultipartBody.Part?, updateProfileRequest: RequestBody): BaseResponse<UpdateProfilesResponseDto>
+    suspend fun updateProfiles(profileImage: MultipartBody.Part, request: UpdateProfilesRequestDto): BaseResponse<UpdateProfilesResponseDto>
 
     suspend fun updateTeam(requestDto: UpdateTeamRequestDto ): BaseResponse<Boolean>
 }

app/src/main/java/umc/everyones/lck/data/datasource/login/LoginDataSource.kt

@@ -5,15 +5,15 @@ import okhttp3.RequestBody
 import umc.everyones.lck.data.dto.BaseResponse
 import umc.everyones.lck.data.dto.request.login.CommonLoginRequestDto
 import umc.everyones.lck.data.dto.request.login.NicknameAuthUserRequestDto
-import umc.everyones.lck.data.dto.response.login.CommonLoginResponseDto
+import umc.everyones.lck.data.dto.request.login.RefreshAuthUserRequestDto
 import umc.everyones.lck.data.dto.response.login.LoginResponseDto
 
 interface LoginDataSource {
-    suspend fun signup(signupUserData: RequestBody, profileImage: MultipartBody.Part): BaseResponse<CommonLoginResponseDto>
+    suspend fun signup(signupUserData: RequestBody, profileImage: MultipartBody.Part): BaseResponse<LoginResponseDto>
 
     suspend fun login(requestDto: CommonLoginRequestDto): BaseResponse<LoginResponseDto>
 
-    suspend fun refresh(requestDto: CommonLoginRequestDto): BaseResponse<CommonLoginResponseDto>
+    suspend fun refresh(requestDto: RefreshAuthUserRequestDto): BaseResponse<LoginResponseDto>
 
     suspend fun nickname(request: NicknameAuthUserRequestDto): BaseResponse<Boolean>
 

app/src/main/java/umc/everyones/lck/data/datasourceImpl/LoginDataSourceImpl.kt

@@ -1,13 +1,12 @@
 package umc.everyones.lck.data.datasourceImpl
 
-import android.util.Log
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import umc.everyones.lck.data.datasource.login.LoginDataSource
 import umc.everyones.lck.data.dto.BaseResponse
 import umc.everyones.lck.data.dto.request.login.CommonLoginRequestDto
 import umc.everyones.lck.data.dto.request.login.NicknameAuthUserRequestDto
-import umc.everyones.lck.data.dto.response.login.CommonLoginResponseDto
+import umc.everyones.lck.data.dto.request.login.RefreshAuthUserRequestDto
 import umc.everyones.lck.data.dto.response.login.LoginResponseDto
 import umc.everyones.lck.data.service.LoginService
 import javax.inject.Inject
@@ -18,12 +17,12 @@ class LoginDataSourceImpl @Inject constructor(
     override suspend fun signup(
         signupUserData: RequestBody,
         profileImage: MultipartBody.Part
-    ): BaseResponse<CommonLoginResponseDto> =
+    ): BaseResponse<LoginResponseDto> =
         loginService.signup(signupUserData, profileImage)
 
     override suspend fun login(requestDto: CommonLoginRequestDto):BaseResponse<LoginResponseDto> = loginService.login(requestDto)
 
-    override suspend fun refresh(requestDto: CommonLoginRequestDto):BaseResponse<CommonLoginResponseDto> = loginService.refresh(requestDto)
+    override suspend fun refresh(requestDto: RefreshAuthUserRequestDto):BaseResponse<LoginResponseDto> = loginService.refresh(requestDto)
 
     override suspend fun nickname(requestDto: NicknameAuthUserRequestDto): BaseResponse<Boolean> = loginService.nickname(requestDto.nickName)
 

app/src/main/java/umc/everyones/lck/data/datasourceImpl/MypageDataSourceImpl.kt

@@ -6,6 +6,7 @@ import umc.everyones.lck.data.datasource.MypageDataSource
 import umc.everyones.lck.data.dto.BaseResponse
 import umc.everyones.lck.data.dto.request.mypage.CancelHostViewingPartyMypageRequestDto
 import umc.everyones.lck.data.dto.request.mypage.CancelParticipateViewingPartyMypageRequestDto
+import umc.everyones.lck.data.dto.request.mypage.UpdateProfilesRequestDto
 import umc.everyones.lck.data.dto.request.mypage.UpdateTeamRequestDto
 import umc.everyones.lck.data.dto.response.NonBaseResponse
 import umc.everyones.lck.data.dto.response.mypage.CommentsMypageResponseDto
@@ -47,8 +48,8 @@ class MypageDataSourceImpl @Inject constructor(
     override suspend fun withdraw(): NonBaseResponse =
         mypageService.withdraw()
 
-    override suspend fun updateProfiles(profileImage: MultipartBody.Part?, updateProfileRequest: RequestBody): BaseResponse<UpdateProfilesResponseDto> =
-        mypageService.updateProfiles(profileImage, updateProfileRequest)
+     override suspend fun updateProfiles(profileImage: MultipartBody.Part, updateProfileRequest: UpdateProfilesRequestDto): BaseResponse<UpdateProfilesResponseDto> =
+         mypageService.updateProfiles(profileImage, updateProfileRequest.updateProfileRequest)
 
     override suspend fun updateTeam(requestDto: UpdateTeamRequestDto): BaseResponse<Boolean> =
         mypageService.updateTeam(requestDto)

app/src/main/java/umc/everyones/lck/data/dto/request/login/RefreshAuthUserRequestDto.kt

@@ -0,0 +1,6 @@
+package umc.everyones.lck.data.dto.request.login
+
+data class RefreshAuthUserRequestDto(
+    val kakaoUserId: String,
+    val refreshToken: String
+)

app/src/main/java/umc/everyones/lck/data/dto/request/mypage/UpdateProfilesRequestDto.kt

@@ -1,14 +1,15 @@
 package umc.everyones.lck.data.dto.request.mypage
 
 import okhttp3.MultipartBody
+import okhttp3.RequestBody
 import umc.everyones.lck.data.UpdateProfileRequest
 
 data class UpdateProfilesRequestDto(
     val profileImage: MultipartBody.Part,
-    val updateProfileRequest: UpdateProfileRequestElementDto
+    val updateProfileRequest: RequestBody
 ) {
     data class UpdateProfileRequestElementDto(
-        val nickname: String,
-        val isDefaultImage: Boolean
+        val nickname: String?,
+        val defaultImage: Boolean
     )
 }

app/src/main/java/umc/everyones/lck/data/dto/response/login/LoginResponseDto.kt

@@ -11,5 +11,4 @@ data class LoginResponseDto(
 ){
     fun toLoginResponseDto() =
         LoginResponseModel(accessToken, refreshToken, accessTokenExpirationTime, refreshTokenExpirationTime, nickName)
-}
-
+}

app/src/main/java/umc/everyones/lck/data/dto/response/mypage/UpdateProfilesResponseDto.kt

@@ -1,11 +1,11 @@
 package umc.everyones.lck.data.dto.response.mypage
 
-import umc.everyones.lck.domain.model.response.mypage.UpdateProfilesModel
+import umc.everyones.lck.domain.model.response.mypage.UpdateProfilesResponseModel
 
 data class UpdateProfilesResponseDto(
-    val  updatedProfileImageUrl: String,
+    val updatedProfileImageUrl: String,
     val updatedNickname: String
 ){
-    fun toUpdateProfilesModel() =
-        UpdateProfilesModel(updatedProfileImageUrl, updatedNickname)
+    fun toUpdateProfilesResponseModel() =
+        UpdateProfilesResponseModel(updatedProfileImageUrl, updatedNickname)
 }

app/src/main/java/umc/everyones/lck/data/repositoryImpl/login/LoginRepositoryImpl.kt

@@ -3,10 +3,9 @@ package umc.everyones.lck.data.repositoryImpl.login
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import umc.everyones.lck.data.datasource.login.LoginDataSource
-import umc.everyones.lck.data.dto.BaseResponse
 import umc.everyones.lck.domain.model.request.login.CommonLoginRequestModel
 import umc.everyones.lck.domain.model.request.login.NicknameAuthUserRequestModel
-import umc.everyones.lck.domain.model.response.login.CommonLoginResponseModel
+import umc.everyones.lck.domain.model.request.login.RefreshAuthUserRequestModel
 import umc.everyones.lck.domain.model.response.login.LoginResponseModel
 import umc.everyones.lck.domain.repository.login.LoginRepository
 import javax.inject.Inject
@@ -17,14 +16,14 @@ class LoginRepositoryImpl @Inject constructor(
     override suspend fun signup(
         signupUserData: RequestBody,
         profileImage: MultipartBody.Part
-    ): Result<CommonLoginResponseModel> =
-        runCatching { loginDataSource.signup(signupUserData, profileImage).data.toCommonLoginResponseDto() }
+    ): Result<LoginResponseModel> =
+        runCatching { loginDataSource.signup(signupUserData, profileImage).data.toLoginResponseDto() }
 
     override suspend fun login(request:CommonLoginRequestModel): Result<LoginResponseModel> =
         runCatching { loginDataSource.login(request.toCommonLoginRequestDto()).data.toLoginResponseDto()}
 
-    override suspend fun refresh(request: CommonLoginRequestModel): Result<CommonLoginResponseModel> =
-        runCatching { loginDataSource.refresh(request.toCommonLoginRequestDto()).data.toCommonLoginResponseDto() }
+    override suspend fun refresh(request: RefreshAuthUserRequestModel): Result<LoginResponseModel> =
+        runCatching { loginDataSource.refresh(request.toRefreshAuthUserRequestDto()).data.toLoginResponseDto() }
 
     override suspend fun nickname(request: NicknameAuthUserRequestModel): Result<Boolean> =
         runCatching {loginDataSource.nickname(request.toNicknameAuthUserRequestDto()).data}

app/src/main/java/umc/everyones/lck/data/repositoryImpl/mypage/MypageRepositoryImpl.kt

@@ -3,17 +3,16 @@ package umc.everyones.lck.data.repositoryImpl.mypage
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import umc.everyones.lck.data.datasource.MypageDataSource
-import umc.everyones.lck.data.dto.request.mypage.CancelParticipateViewingPartyMypageRequestDto
+import umc.everyones.lck.data.dto.request.mypage.UpdateProfilesRequestDto
 import umc.everyones.lck.data.dto.response.NonBaseResponse
-import umc.everyones.lck.domain.model.request.mypage.CancelHostViewingPartyMypageModel
-import umc.everyones.lck.domain.model.request.mypage.CancelParticipateViewingPartyMypageModel
+import umc.everyones.lck.domain.model.request.mypage.UpdateProfilesRequestModel
 import umc.everyones.lck.domain.model.request.mypage.UpdateTeamModel
 import umc.everyones.lck.domain.model.response.mypage.CommentsMypageModel
 import umc.everyones.lck.domain.model.response.mypage.HostViewingPartyMypageModel
 import umc.everyones.lck.domain.model.response.mypage.InquiryProfilesModel
 import umc.everyones.lck.domain.model.response.mypage.ParticipateViewingPartyMypageModel
 import umc.everyones.lck.domain.model.response.mypage.PostsMypageModel
-import umc.everyones.lck.domain.model.response.mypage.UpdateProfilesModel
+import umc.everyones.lck.domain.model.response.mypage.UpdateProfilesResponseModel
 import umc.everyones.lck.domain.repository.MypageRepository
 import javax.inject.Inject
 
@@ -47,8 +46,8 @@ class MypageRepositoryImpl  @Inject constructor(
     override suspend fun withdraw(): Result<NonBaseResponse> =
         runCatching { mypageDataSource.withdraw() }
 
-    override suspend fun updateProfiles(profileImage: MultipartBody.Part?, updateProfileRequest: RequestBody): Result<UpdateProfilesModel> =
-        runCatching { mypageDataSource.updateProfiles(profileImage, updateProfileRequest).data.toUpdateProfilesModel() }
+    override suspend fun updateProfiles(profileImage: MultipartBody.Part, requestModel: UpdateProfilesRequestModel): Result<UpdateProfilesResponseModel> =
+        runCatching { mypageDataSource.updateProfiles(profileImage, requestModel.toUpdateProfilesRequestDto()).data.toUpdateProfilesResponseModel()}
 
     override suspend fun updateTeam(request: UpdateTeamModel): Result<Boolean> =
         runCatching { mypageDataSource.updateTeam(request.toUpdateTeamRequestDto()).data }

app/src/main/java/umc/everyones/lck/data/service/LoginService.kt

@@ -4,16 +4,13 @@ import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import retrofit2.http.Body
 import retrofit2.http.GET
-import retrofit2.http.Header
 import retrofit2.http.Multipart
 import retrofit2.http.POST
 import retrofit2.http.Part
-import retrofit2.http.Path
 import retrofit2.http.Query
 import umc.everyones.lck.data.dto.BaseResponse
 import umc.everyones.lck.data.dto.request.login.CommonLoginRequestDto
-import umc.everyones.lck.data.dto.request.login.NicknameAuthUserRequestDto
-import umc.everyones.lck.data.dto.response.login.CommonLoginResponseDto
+import umc.everyones.lck.data.dto.request.login.RefreshAuthUserRequestDto
 import umc.everyones.lck.data.dto.response.login.LoginResponseDto
 
 interface LoginService {
@@ -23,7 +20,7 @@ interface LoginService {
     suspend fun signup(
         @Part("signupUserData") signupUserData: RequestBody,
         @Part profileImage: MultipartBody.Part
-    ): BaseResponse<CommonLoginResponseDto>
+    ): BaseResponse<LoginResponseDto>
 
     @POST("/auth/login")
     suspend fun login(
@@ -32,8 +29,8 @@ interface LoginService {
 
     @POST("/auth/refresh")
     suspend fun refresh(
-        @Body request: CommonLoginRequestDto
-    ):BaseResponse<CommonLoginResponseDto>
+        @Body request: RefreshAuthUserRequestDto
+    ):BaseResponse<LoginResponseDto>
 
     @GET("auth/nickname")
     suspend fun nickname(

app/src/main/java/umc/everyones/lck/data/service/MypageService.kt

@@ -14,6 +14,7 @@ import umc.everyones.lck.data.UpdateProfileRequest
 import umc.everyones.lck.data.dto.BaseResponse
 import umc.everyones.lck.data.dto.request.mypage.CancelHostViewingPartyMypageRequestDto
 import umc.everyones.lck.data.dto.request.mypage.CancelParticipateViewingPartyMypageRequestDto
+import umc.everyones.lck.data.dto.request.mypage.UpdateProfilesRequestDto
 import umc.everyones.lck.data.dto.request.mypage.UpdateTeamRequestDto
 import umc.everyones.lck.data.dto.response.NonBaseResponse
 import umc.everyones.lck.data.dto.response.mypage.CommentsMypageResponseDto
@@ -73,12 +74,12 @@ interface MypageService {
     @Multipart
     @PATCH("my-pages/profiles")
     suspend fun updateProfiles(
-        @Part profileImage: MultipartBody.Part?,
-        @Part("updateProfileRequest") updateProfileRequest: RequestBody
+        @Part profileImage: MultipartBody.Part,
+        @Part("updateProfileRequest") request: RequestBody
     ): BaseResponse<UpdateProfilesResponseDto>
 
     @PATCH("my-pages/my-team")
     suspend fun updateTeam(
         @Body request: UpdateTeamRequestDto
     ): BaseResponse<Boolean>
-}
+}

app/src/main/java/umc/everyones/lck/di/NetworkModule.kt

@@ -36,7 +36,6 @@ object NetworkModule {
     const val NETWORK_EXCEPTION_OFFLINE_CASE = "network status is offline"
     const val NETWORK_EXCEPTION_BODY_IS_NULL = "result.json body is null"
 
-    // @Provides : 모듈 클래스 내에 해당 객체 생성
     @Provides
     @Singleton
     fun providesConverterFactory(): GsonConverterFactory {
@@ -47,23 +46,49 @@ object NetworkModule {
         )
     }
 
+    @Provides
+    @Singleton
+    fun providesRetrofit(
+        client: OkHttpClient,
+        gsonConverterFactory: GsonConverterFactory
+    ): Retrofit {
+        return Retrofit.Builder()
+            .baseUrl(EveryonesLCKApplication.getString(R.string.base_url))
+            .addConverterFactory(gsonConverterFactory)
+            .client(client)
+            .build()
+    }
+
     @Provides
     @Singleton
     fun providesOkHttpClient(
-        authInterceptor: AuthInterceptor
+        sharedPreferences: SharedPreferences,
+        gsonConverterFactory: GsonConverterFactory // GsonConverterFactory를 주입받습니다.
     ): OkHttpClient {
-        val interceptor = HttpLoggingInterceptor().apply {
+        val authInterceptor = AuthInterceptor(sharedPreferences) {
+            providesRetrofit(providesOkHttpClient(sharedPreferences, gsonConverterFactory), gsonConverterFactory)
+        }
+        val loggingInterceptor = HttpLoggingInterceptor().apply {
             level = HttpLoggingInterceptor.Level.BODY
         }
+
         return OkHttpClient.Builder().apply {
             addInterceptor(authInterceptor)
-            addInterceptor(interceptor)
+            addInterceptor(loggingInterceptor)
             connectTimeout(5, TimeUnit.SECONDS)
             readTimeout(5, TimeUnit.SECONDS)
             writeTimeout(5, TimeUnit.SECONDS)
         }.build()
     }
 
+    @Provides
+    @Singleton
+    fun provideAuthInterceptor(
+        sharedPreferences: SharedPreferences
+    ): AuthInterceptor {
+        return AuthInterceptor(sharedPreferences) { providesRetrofit(providesOkHttpClient(sharedPreferences, providesConverterFactory()), providesConverterFactory()) }
+    }
+
     @Provides
     @Singleton
     @Named("NaverClient")
@@ -82,19 +107,6 @@ object NetworkModule {
             .build()
     }
 
-    @Provides
-    @Singleton
-    fun providesRetrofit(
-        client: OkHttpClient,
-        gsonConverterFactory: GsonConverterFactory
-    ): Retrofit {
-        return Retrofit.Builder()
-            .baseUrl(EveryonesLCKApplication.getString(R.string.base_url))
-            .addConverterFactory(gsonConverterFactory)
-            .client(client)
-            .build()
-    }
-
     @Provides
     @Singleton
     fun provideMypageService(
@@ -108,23 +120,18 @@ object NetworkModule {
     @Named("naver")
     fun providesNaverRetrofit(
         @Named("NaverClient") client: OkHttpClient,
-    ): Retrofit{
+    ): Retrofit {
         return Retrofit.Builder()
             .client(client)
-            .baseUrl(EveryonesLCKApplication.getString(R.string. naver_url))
+            .baseUrl(EveryonesLCKApplication.getString(R.string.naver_url))
             .addConverterFactory(ScalarsConverterFactory.create())
             .addConverterFactory(GsonConverterFactory.create())
             .build()
     }
 
-    @Provides
-    @Singleton
-    fun provideAuthInterceptor(sharedPreferences: SharedPreferences): AuthInterceptor =
-        AuthInterceptor(sharedPreferences)
-
     @Provides
     @Singleton
     fun providesLoginService(retrofit: Retrofit): LoginService {
         return retrofit.create(LoginService::class.java)
     }
-}
+}