-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[feat] 자체 로그인 api 연동 #146
Merged
Merged
[feat] 자체 로그인 api 연동 #146
Changes from all commits
Commits
Show all changes
31 commits
Select commit
Hold shift + click to select a range
3941db4
[feat] #141 로그인 서버 통신 dto 작성
jooyyoo 53dfaa0
[feat] #141 로그인 서버 통신 POST 서비스 추가
jooyyoo 3e74262
[feat] #141 로그인 서버통신 datasource, repository, reposiotryImpl 추가
jooyyoo f3ff73c
[feat] #141 로그인 서버통신 Body 추가 수정
jooyyoo 5d1e378
[refactor] #141 로그인 실패 바텀시트 버튼 아이디 변경
jooyyoo 60b83e9
[refactor] #141 authViewModel 변수명 변경으로 인한 리팩토링
jooyyoo e2ee84b
[feat] #141 로그인 실패 바텀 시트 프래그먼트 구현
jooyyoo 8cd03fd
[refactor] #141 닉네임 액티비티 바텀시트 래팩토링
jooyyoo 65eeba6
[feat] #141 로컬에 isLogin 변수 추가
jooyyoo 7964d42
[mod] #141 로그인 요청 dto 수정
jooyyoo 6d29270
[feat] #141 자체로그인 뷰모델, 액티비티 구현
jooyyoo 99c69e1
[chore] #141 klint 반영
jooyyoo 1be8e84
[chore] #141 klint 반영
jooyyoo 58d4bb4
Merge branch 'develop' into feat-login-api-connection
jooyyoo 20b0622
[del] #141 디벨롭에서 삭제된 파일
jooyyoo b95f879
[mod] #141 ResponseLogin 생성으로 인한 수정사항 반영
jooyyoo 198d7bc
Merge branch 'develop' into feat-login-api-connection
jooyyoo 242ab76
[chore] #141 merge develop 에 빠짐
jooyyoo cc93fdb
[mod] #141 서버 연동 데이터Response<> 추가
jooyyoo 376e95a
[mod] #141 로그인 실패 바텀 시트 수정
jooyyoo 1573f91
[mod] #141 응답, 요청 @SerializedName 추가
jooyyoo a78f9eb
[feat] #141 로그인 액티비티, 뷰모델 서버 연동 구현
jooyyoo c3dc2a6
[chore] #141 merge develop
jooyyoo 194832a
[chore] #141 klint 반영
jooyyoo c673d09
[chore] #141 klint 반영
jooyyoo 13941a2
Merge branch 'develop' into feat-login-api-connection
jooyyoo 7553fd0
[feat] #141 자체 로그인 구현 완료, 자동 로그인 구현
jooyyoo 6054f83
[chore] #141 삭제 된 항복 복구
jooyyoo 1cfede4
[chore] #141 로그 삭제
jooyyoo d346911
Merge branch 'develop' into feat-login-api-connection
jooyyoo d51c800
[chore] #141 klint 반영
jooyyoo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
app/src/main/java/com/sopt/geonppang/data/model/request/RequestLogin.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package com.sopt.geonppang.data.model.request | ||
|
||
import com.google.gson.annotations.SerializedName | ||
import kotlinx.serialization.Serializable | ||
|
||
@Serializable | ||
data class RequestLogin( | ||
@SerializedName("email") | ||
val email: String?, | ||
@SerializedName("password") | ||
val password: String?, | ||
) |
14 changes: 14 additions & 0 deletions
14
app/src/main/java/com/sopt/geonppang/data/model/response/ResponseLogin.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
package com.sopt.geonppang.data.model.response | ||
|
||
import com.google.gson.annotations.SerializedName | ||
import kotlinx.serialization.Serializable | ||
|
||
@Serializable | ||
data class ResponseLogin( | ||
@SerializedName("code") | ||
val code: String, | ||
@SerializedName("message") | ||
val message: String, | ||
@SerializedName("data") | ||
val data: String?, | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 48 additions & 4 deletions
52
app/src/main/java/com/sopt/geonppang/presentation/login/LogInViewModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,56 @@ | ||
package com.sopt.geonppang.presentation.login | ||
|
||
import androidx.lifecycle.MutableLiveData | ||
import androidx.lifecycle.ViewModel | ||
import androidx.lifecycle.viewModelScope | ||
import com.sopt.geonppang.data.datasource.local.GPDataSource | ||
import com.sopt.geonppang.data.model.request.RequestLogin | ||
import com.sopt.geonppang.domain.repository.AuthRepository | ||
import dagger.hilt.android.lifecycle.HiltViewModel | ||
import kotlinx.coroutines.flow.MutableStateFlow | ||
import kotlinx.coroutines.flow.asStateFlow | ||
import kotlinx.coroutines.launch | ||
import timber.log.Timber | ||
import javax.inject.Inject | ||
|
||
@HiltViewModel | ||
class LogInViewModel @Inject constructor() : ViewModel() { | ||
val loginEmail = MutableLiveData("") | ||
val loginPassword = MutableLiveData("") | ||
class LogInViewModel @Inject constructor( | ||
private val authRepository: AuthRepository, | ||
private val gpDataSource: GPDataSource | ||
) : ViewModel() { | ||
val loginEmail = MutableStateFlow("") | ||
val loginPassword = MutableStateFlow("") | ||
private val _loginState = MutableStateFlow<Boolean?>(null) | ||
val loginState get() = _loginState.asStateFlow() | ||
|
||
fun initLogin() { | ||
_loginState.value = null | ||
} | ||
|
||
fun login() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 로그 다 지워주삼염 |
||
viewModelScope.launch { | ||
authRepository.login(RequestLogin(loginEmail.value, loginPassword.value)) | ||
.onSuccess { loginResponse -> | ||
val responseHeader = loginResponse.headers() | ||
val accessToken = responseHeader[AUTHORIZATION].toString() | ||
if (loginResponse.code() == 200) { | ||
gpDataSource.accessToken = BEARER_PREFIX + accessToken | ||
gpDataSource.isLogin = true | ||
_loginState.value = true | ||
} | ||
if (loginResponse.code() == 400) { | ||
_loginState.value = false | ||
} | ||
if (loginResponse.code() == 500) { | ||
Timber.tag("서버 오류") | ||
} | ||
}.onFailure { throwable -> | ||
Timber.tag("로그인 실패 on Failure").e(throwable.message) | ||
} | ||
} | ||
} | ||
|
||
companion object { | ||
const val AUTHORIZATION = "Authorization" | ||
const val BEARER_PREFIX = "Bearer " | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
app/src/main/java/com/sopt/geonppang/presentation/login/LoginFailBottomDialogFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
package com.sopt.geonppang.presentation.login | ||
|
||
import android.os.Bundle | ||
import android.view.View | ||
import com.sopt.geonppang.R | ||
import com.sopt.geonppang.databinding.DialogBottomLoginFailBinding | ||
import com.sopt.geonppang.util.binding.BindingBottomSheetDialogFragment | ||
|
||
class LoginFailBottomDialogFragment : | ||
BindingBottomSheetDialogFragment<DialogBottomLoginFailBinding>(R.layout.dialog_bottom_login_fail) { | ||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
super.onViewCreated(view, savedInstanceState) | ||
binding.lifecycleOwner = this.viewLifecycleOwner | ||
|
||
addListeners() | ||
} | ||
|
||
private fun addListeners() { | ||
binding.btnLoginFailConfirm.setOnClickListener { | ||
dismiss() | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
나중에 말하는 거 까먹을까봐
나중에 여기 네이밍 수정 한 번 플리즈
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
앗 오키염 !