feat: 회원가입 or 소셜 로그인 시 pushToken 추가

app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt

@@ -191,12 +191,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
                 viewModel.adTrackingAppLaunch(pid = pid)
             }
         }, 1000)
+        pushTokenUpdate()
 
         if (
             SharedPreferenceManager.token.isNotBlank() &&
             SharedPreferenceManager.token.length > 10
         ) {
-            pushTokenUpdate()
             updatePidAndGaid()
             getEventPopup()
 
@@ -529,10 +529,15 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
             val pushToken = it.result
             if (pushToken != null) {
                 SharedPreferenceManager.pushToken = pushToken
+                if (
+                    SharedPreferenceManager.token.isNotBlank() &&
+                    SharedPreferenceManager.token.length > 10
+                ) {
                     viewModel.pushTokenUpdate(pushToken)
                 }
             }
         }
+    }
 
     private fun updatePidAndGaid() {
         handler.postDelayed({

app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginViewModel.kt

@@ -27,7 +27,10 @@ class LoginViewModel(private val repository: UserRepository) : BaseViewModel() {
 
         compositeDisposable.add(
             repository.kakaoLogin(
-                request = SocialLoginRequest(marketingPid = SharedPreferenceManager.marketingPid),
+                request = SocialLoginRequest(
+                    pushToken = SharedPreferenceManager.pushToken,
+                    marketingPid = SharedPreferenceManager.marketingPid
+                ),
                 token = "Bearer $accessToken"
             )
                 .subscribeOn(Schedulers.io())
@@ -66,7 +69,10 @@ class LoginViewModel(private val repository: UserRepository) : BaseViewModel() {
 
         compositeDisposable.add(
             repository.googleLogin(
-                request = SocialLoginRequest(marketingPid = SharedPreferenceManager.marketingPid),
+                request = SocialLoginRequest(
+                    pushToken = SharedPreferenceManager.pushToken,
+                    marketingPid = SharedPreferenceManager.marketingPid
+                ),
                 token = "Bearer $idToken"
             )
                 .subscribeOn(Schedulers.io())

app/src/main/java/kr/co/vividnext/sodalive/user/login/SocialLoginRequest.kt

@@ -6,5 +6,6 @@ import com.google.gson.annotations.SerializedName
 @Keep
 data class SocialLoginRequest(
     @SerializedName("container") val container: String = "aos",
+    @SerializedName("pushToken") val pushToken: String?,
     @SerializedName("marketingPid") val marketingPid: String
 )

app/src/main/java/kr/co/vividnext/sodalive/user/signup/SignUpRequest.kt

@@ -7,6 +7,7 @@ import com.google.gson.annotations.SerializedName
 data class SignUpRequest(
     @SerializedName("email") val email: String,
     @SerializedName("password") val password: String,
+    @SerializedName("pushToken") val pushToken: String?,
     @SerializedName("marketingPid") val marketingPid: String,
     @SerializedName("isAgreeTermsOfService") val isAgreeTermsOfService: Boolean,
     @SerializedName("isAgreePrivacyPolicy") val isAgreePrivacyPolicy: Boolean,

app/src/main/java/kr/co/vividnext/sodalive/user/signup/SignUpViewModel.kt

@@ -40,6 +40,7 @@ class SignUpViewModel(private val repository: UserRepository) : BaseViewModel()
         val request = SignUpRequest(
             email = email,
             password = password,
+            pushToken = SharedPreferenceManager.pushToken,
             marketingPid = SharedPreferenceManager.marketingPid,
             isAgreeTermsOfService = _isAgreeTermsOfServiceLiveData.value!!,
             isAgreePrivacyPolicy = _isAgreePrivacyPolicyLiveData.value!!