Feature/#26 feat sns login #30
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,12 +2,14 @@ package com.jjbaksa.jjbaksa.ui.social | |
|
|
||
| import android.content.Intent | ||
| import android.util.Log | ||
| import android.widget.Toast | ||
| import androidx.activity.result.ActivityResultLauncher | ||
| import androidx.activity.result.contract.ActivityResultContracts | ||
| import com.google.android.gms.auth.api.signin.GoogleSignInOptions | ||
| import com.google.firebase.auth.FirebaseAuth | ||
| import com.jjbaksa.jjbaksa.BuildConfig | ||
| import androidx.activity.result.ActivityResultCallback | ||
| import androidx.activity.viewModels | ||
| import com.google.android.gms.auth.api.signin.GoogleSignIn | ||
| import com.google.android.gms.auth.api.signin.GoogleSignInAccount | ||
| import com.google.android.gms.common.api.ApiException | ||
|
|
@@ -17,108 +19,66 @@ import com.google.firebase.auth.GoogleAuthProvider | |
| import com.jjbaksa.jjbaksa.R | ||
| import com.jjbaksa.jjbaksa.base.BaseActivity | ||
| import com.jjbaksa.jjbaksa.databinding.ActivitySocialLoginBinding | ||
| import com.jjbaksa.jjbaksa.ui.mainpage.MainPageActivity | ||
| import com.kakao.sdk.user.UserApiClient | ||
| import com.navercorp.nid.NaverIdLoginSDK | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
|
|
||
| @AndroidEntryPoint | ||
| class SocialLoginActivity : BaseActivity<ActivitySocialLoginBinding>() { | ||
| private lateinit var activityResultLauncher: ActivityResultLauncher<Intent> | ||
| private lateinit var firebaseAuth: FirebaseAuth | ||
| private var googleUserEmail: String = "" | ||
| private var googleAccount: String = "" | ||
| private var googleTokenId: String? = "" | ||
| val viewModel: SocialLoginViewModel by viewModels() | ||
|
|
||
| override val layoutId: Int | ||
| get() = R.layout.activity_social_login | ||
|
|
||
| override fun initView() { | ||
| initGoogleLogin() | ||
| initNaverLogin() | ||
| viewModel.getAutoLoginFlag() | ||
| } | ||
|
|
||
| override fun subscribe() { | ||
| viewModel.loginState.observe(this@SocialLoginActivity) { | ||
| if (it != null) { | ||
| if (it.isSuccess) { | ||
| goToMainActivity() | ||
|
There was a problem hiding this comment. 로그인 성공한 이후 뒤로가기하면 다시 로그인 화면이 나와서는 안됩니다. 뒤로가기시 로그인 화면이 나오지 않도록 처리해주세요 There was a problem hiding this comment. 960849f 에서 수정했습니다. |
||
| } else { | ||
| if (it.erroMessage.isNotEmpty()) { | ||
| showToast(it.erroMessage) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun initEvent() { | ||
| with(binding) { | ||
| buttonKakaoLogin.setOnClickListener { | ||
wnehdals marked this conversation as resolved.
Show resolved
Hide resolved
|
||
wnehdals marked this conversation as resolved.
Show resolved
Hide resolved
|
||
imseongwoo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (UserApiClient.instance.isKakaoTalkLoginAvailable(this@SocialLoginActivity)) { | ||
| UserApiClient.instance.loginWithKakaoTalk(this@SocialLoginActivity, callback = viewModel.kakaoLoginCallback) | ||
| } else { | ||
| UserApiClient.instance.loginWithKakaoAccount(this@SocialLoginActivity, callback = viewModel.kakaoLoginCallback) | ||
| } | ||
| } | ||
| buttonNaverLogin.setOnClickListener { | ||
| NaverIdLoginSDK.authenticate(this@SocialLoginActivity, viewModel.oAuthLoginCallback) | ||
| } | ||
|
|
||
| buttonGoogleLogin.setOnClickListener { | ||
| val googleSignInOptions = | ||
| GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN) | ||
| .requestIdToken(getString(R.string.default_web_client_id)) | ||
| .requestEmail() | ||
| .build() | ||
|
|
||
| val googleSignInClient = | ||
| GoogleSignIn.getClient(this@SocialLoginActivity, googleSignInOptions) | ||
|
|
||
| val signInIntent: Intent = googleSignInClient.signInIntent | ||
| activityResultLauncher.launch(signInIntent) | ||
| } | ||
|
|
@@ -147,10 +107,9 @@ class SocialLoginActivity : BaseActivity<ActivitySocialLoginBinding>() { | |
| if (activityResult.resultCode == RESULT_OK) { | ||
| val task = GoogleSignIn.getSignedInAccountFromIntent(activityResult.data) | ||
| task.getResult(ApiException::class.java)?.let { account -> | ||
| googleTokenId = account.idToken | ||
| if (googleTokenId != null && googleTokenId != "") { | ||
| Log.d(TAG, googleTokenId.toString()) | ||
| val authCredential: AuthCredential = | ||
| GoogleAuthProvider.getCredential(account.idToken, null) | ||
| firebaseAuthWithGoogle(authCredential, account) | ||
|
|
@@ -167,14 +126,28 @@ class SocialLoginActivity : BaseActivity<ActivitySocialLoginBinding>() { | |
| ) { | ||
| firebaseAuth = FirebaseAuth.getInstance() | ||
| firebaseAuth.signInWithCredential(authCredential) | ||
| .addOnCompleteListener(this) { | ||
| if (it.isSuccessful) { | ||
| val firebaseUser: FirebaseUser = firebaseAuth.currentUser!! | ||
| googleUserEmail = firebaseUser.email.toString() | ||
| showToast(firebaseUser.providerId) | ||
| Log.d(TAG, "providerId : ${firebaseUser.providerId}") | ||
| Log.d(TAG, googleTokenId.toString()) | ||
| } else { | ||
| showToast("signInWithCredential:failure") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun goToMainActivity() { | ||
| Intent(this, MainPageActivity::class.java).also { startActivity(it) } | ||
| } | ||
|
|
||
| fun showToast(msg: String) { | ||
| Toast.makeText(this, msg, Toast.LENGTH_SHORT).show() | ||
| } | ||
|
|
||
| companion object { | ||
| const val TAG = "SocialLogin" | ||
| } | ||
| } | ||
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.
Use JsonReader.setLenient(true) to accept malformed JSON 이라는 에러가 발생해서 gson 객체 설정 후 retrofit 객체에 추가하였습니다.