From 553623610035a50866bad5143de2b502f58fc320 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Tue, 22 Apr 2025 18:11:44 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?=
 =?UTF-8?q?or=20=EC=86=8C=EC=85=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=EC=8B=9C=20pushToken=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/kr/co/vividnext/sodalive/main/MainActivity.kt |  9 +++++++--
 .../co/vividnext/sodalive/user/login/LoginViewModel.kt | 10 ++++++++--
 .../sodalive/user/login/SocialLoginRequest.kt          |  1 +
 .../co/vividnext/sodalive/user/signup/SignUpRequest.kt |  1 +
 .../vividnext/sodalive/user/signup/SignUpViewModel.kt  |  1 +
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt
index 318b510..ad1c8b1 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt
+++ b/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,7 +529,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
             val pushToken = it.result
             if (pushToken != null) {
                 SharedPreferenceManager.pushToken = pushToken
-                viewModel.pushTokenUpdate(pushToken)
+                if (
+                    SharedPreferenceManager.token.isNotBlank() &&
+                    SharedPreferenceManager.token.length > 10
+                ) {
+                    viewModel.pushTokenUpdate(pushToken)
+                }
             }
         }
     }
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginViewModel.kt
index 834bb61..7d870b2 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginViewModel.kt
+++ b/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())
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/user/login/SocialLoginRequest.kt b/app/src/main/java/kr/co/vividnext/sodalive/user/login/SocialLoginRequest.kt
index 3e0450b..930e999 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/user/login/SocialLoginRequest.kt
+++ b/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
 )
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/user/signup/SignUpRequest.kt b/app/src/main/java/kr/co/vividnext/sodalive/user/signup/SignUpRequest.kt
index 188f7af..c45b11a 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/user/signup/SignUpRequest.kt
+++ b/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,
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/user/signup/SignUpViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/user/signup/SignUpViewModel.kt
index 5c0b06d..0b49762 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/user/signup/SignUpViewModel.kt
+++ b/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!!