🚑 :: deviceToken

Service/Sources/Data/DataSource/Remote/DataSource/AuthRemote.swift

@@ -6,12 +6,14 @@ final class AuthRemote: BaseRemote<AuthAPI> {
     private override init() {}
 
     func login(code: String) -> Single<TokenDTO> {
-        return request(.login(code: code, deviceToken: Messaging.messaging().fcmToken ?? ""))
+        return fetchDeviceToken()
+            .flatMap { self.request(.login(code: code, deviceToken: $0)) }
             .map(TokenDTO.self)
     }
 
     func refresh() -> Completable {
-        return request(.refresh(deviceToken: Messaging.messaging().fcmToken ?? ""))
+        return fetchDeviceToken()
+            .flatMap { self.request(.refresh(deviceToken: $0)) }
             .asCompletable()
     }
 
@@ -20,3 +22,15 @@ final class AuthRemote: BaseRemote<AuthAPI> {
             .asCompletable()
     }
 }
+
+private extension AuthRemote {
+    /// 디바이스 토큰 가져오는 API
+    func fetchDeviceToken() -> Single<String> {
+        return Single<String>.create { single in
+            Messaging.messaging().token { token, _ in
+                single(.success(token ?? ""))
+            }
+            return Disposables.create()
+        }
+    }
+}

iOS/Sources/Application/AppDelegate.swift

@@ -45,6 +45,8 @@ extension AppDelegate: UNUserNotificationCenterDelegate, MessagingDelegate {
         didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data
     ) {
         Messaging.messaging().apnsToken = deviceToken
+        _ = AppDelegate.container.resolve(CheckIsLoginedUseCase.self)!
+            .execute()
     }
 
     func messaging(