태그 화면 개선

SOOUM/SOOUM/App/AppDelegate.swift

@@ -84,15 +84,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 extension AppDelegate: UNUserNotificationCenterDelegate {
 
-    /// Foreground(앱 켜진 상태)에서도 알림 오는 설정
+    /// Foreground(앱 켜진 상태)에서 알림 왔을 때, 설정 및 데이터 수신
     func userNotificationCenter(
         _ center: UNUserNotificationCenter,
         willPresent notification: UNNotification,
         withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void
     ) {
         // 계정 이관 성공 시 (런치 화면 > 온보딩 화면)으로 전환
         let userInfo = notification.request.content.userInfo
-        self.setupOnboardingWhenTransferSuccessed(userInfo)
+        guard let infoDic = userInfo as? [String: Any] else { return }
+
+        let info = PushNotificationInfo(infoDic)
+        if info.isTransfered { self.setupOnboarding() }
 
         var options: UNNotificationPresentationOptions
         if let isReAddedNotifications = userInfo["isReAddedNotifications"] as? Bool, isReAddedNotifications {
@@ -109,14 +112,17 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
         didReceive response: UNNotificationResponse,
         withCompletionHandler completionHandler: @escaping () -> Void
     ) {
-        // let userInfo: [AnyHashable: Any] = response.notification.request.content.userInfo
-        // if let infoDic = userInfo as? [String: Any] {
-        //
-        //     let info = NotificationInfo(infoDic)
-        //     // 계정 이관 성공 알림일 경우 (런치 화면 > 온보딩 화면), 아닐 경우 메인 홈 탭바 화면 전환
-        //     self.provider.pushManager.setupRootViewController(info, terminated: info.isTransfered)
-        // }
-
+        // 계정 이관 성공 알림일 경우 온보딩 화면, 아닐 경우 메인 홈 탭바 화면 전환
+        let userInfo: [AnyHashable: Any] = response.notification.request.content.userInfo
+        guard let infoDic = userInfo as? [String: Any] else { return }
+
+        let info = PushNotificationInfo(infoDic)
+        if info.isTransfered {
+            self.setupOnboarding()
+        } else {
+            self.setupMainTabBar(info)
+        }
+
         completionHandler()
     }
 
@@ -127,7 +133,10 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
         fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void
     ) {
         // 계정 이관 성공 시 (런치 화면 > 온보딩 화면)으로 전환
-        self.setupOnboardingWhenTransferSuccessed(userInfo)
+        guard let infoDic = userInfo as? [String: Any] else { return }
+
+        let info = PushNotificationInfo(infoDic)
+        if info.isTransfered { self.setupLaunchScreen(info) }
 
         completionHandler(.newData)
     }
@@ -205,13 +214,39 @@ extension AppDelegate {
         cache.memoryStorage.config.totalCostLimit = memoryLimit
     }
 
-    private func setupOnboardingWhenTransferSuccessed(_ userInfo: [AnyHashable: Any]?) {
-        // guard let infoDic = userInfo as? [String: Any] else { return }
-
-        // let info = NotificationInfo(infoDic)
-        // if info.isTransfered {
-        // 
-        //     self.provider.pushManager.setupRootViewController(info, terminated: true)
-        // }
+    func setupOnboarding() {
+
+        guard let windowScene: UIWindowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+            let window: UIWindow = windowScene.windows.first(where: { $0.isKeyWindow })
+        else { return }
+
+        let onboardingViewController = OnboardingViewController()
+        onboardingViewController.reactor = OnboardingViewReactor(dependencies: self.appDIContainer)
+        onboardingViewController.modalTransitionStyle = .crossDissolve
+        window.rootViewController = UINavigationController(rootViewController: onboardingViewController)
+    }
+
+    func setupLaunchScreen(_ info: PushNotificationInfo) {
+
+        guard let windowScene: UIWindowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+            let window: UIWindow = windowScene.windows.first(where: { $0.isKeyWindow })
+        else { return }
+
+        let launchScreenViewController = LaunchScreenViewController()
+        launchScreenViewController.reactor = LaunchScreenViewReactor(dependencies: self.appDIContainer, pushInfo: info)
+        launchScreenViewController.modalTransitionStyle = .crossDissolve
+        window.rootViewController = UINavigationController(rootViewController: launchScreenViewController)
+    }
+
+    func setupMainTabBar(_ info: PushNotificationInfo) {
+
+        guard let windowScene: UIWindowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+            let window: UIWindow = windowScene.windows.first(where: { $0.isKeyWindow })
+        else { return }
+
+        let mainTabBarController = MainTabBarController()
+        mainTabBarController.reactor = MainTabBarReactor(dependencies: self.appDIContainer, pushInfo: info)
+        mainTabBarController.modalTransitionStyle = .crossDissolve
+        window.rootViewController = UINavigationController(rootViewController: mainTabBarController)
     }
 }

SOOUM/SOOUM/App/SceneDelegate.swift

@@ -35,13 +35,11 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
         /// 앱이 완전히 종료되었을 때 push notification에 대한 응답을 했을 때 실행할 코드 작성
         if let response: UNNotificationResponse = connectionOptions.notificationResponse {
-            // let userInfo: [AnyHashable: Any] = response.notification.request.content.userInfo
-
-            // if let infoDic: [String: Any] = userInfo as? [String: Any] {
-            //
-            //     let info = NotificationInfo(infoDic)
-            //     appDelegate.provider.pushManager.setupRootViewController(info, terminated: true)
-            // }
+            let userInfo: [AnyHashable: Any] = response.notification.request.content.userInfo
+            if let infoDic = userInfo as? [String: Any] {
+                let info = PushNotificationInfo(infoDic)
+                appDelegate.setupLaunchScreen(info)
+            }
         }
     }
 

SOOUM/SOOUM/Data/Managers/AuthManager/AuthManager.swift

@@ -157,14 +157,16 @@ extension AuthManager: AuthManagerDelegate {
                         .map(\.token)
                         .flatMapLatest { token -> Observable<Bool> in
 
+                            // 사용자 닉네임 업데이트
+                            UserDefaults.standard.nickname = nickname
+
                             // session token 업데이트
                             object.authInfo.updateToken(token)
 
                             // FCM token 업데이트
                             provider.networkManager.registerFCMToken(from: #function)
                             return .just(true)
                         }
-                        .catchAndReturn(false)
                 } else {
                     return .just(false)
                 }
@@ -185,7 +187,8 @@ extension AuthManager: AuthManagerDelegate {
                     let request: AuthRequest = .login(encryptedDeviceId: encryptedDeviceId)
                     return provider.networkManager.perform(LoginResponse.self, request: request)
                         .map(\.token)
-                        .flatMapLatest { token -> Observable<Bool> in
+                        .withUnretained(self)
+                        .flatMapLatest { object, token -> Observable<Bool> in
 
                             // session token 업데이트
                             object.authInfo.updateToken(token)
@@ -194,7 +197,29 @@ extension AuthManager: AuthManagerDelegate {
                             provider.networkManager.registerFCMToken(from: #function)
                             return .just(true)
                         }
-                        .catchAndReturn(false)
+                        .catch { error in
+
+                            let errorCode = (error as NSError).code
+                            if case 404 = errorCode {
+
+                                // session token 삭제
+                                object.authInfo.initAuthInfo()
+
+                                // onboarding screen 전환
+                                DispatchQueue.main.async {
+                                    guard let appDelegate = UIApplication.shared.delegate as? AppDelegate,
+                                        let windowScene: UIWindowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+                                        let window: UIWindow = windowScene.windows.first(where: { $0.isKeyWindow })
+                                    else { return }
+
+                                    let onBoardingViewController = OnboardingViewController()
+                                    onBoardingViewController.reactor = OnboardingViewReactor(dependencies: appDelegate.appDIContainer)
+                                    onBoardingViewController.modalTransitionStyle = .crossDissolve
+                                    window.rootViewController = UINavigationController(rootViewController: onBoardingViewController)
+                                }
+                            }
+                            return .just(false)
+                        }
                 } else {
                     return .just(false)
                 }
@@ -266,20 +291,12 @@ extension AuthManager: AuthManagerDelegate {
                     object.isReAuthenticating = false
                 },
                 onError: { object, error in
-
-                    // TODO: 임시, 리프레쉬 토큰 만료 에러코드가 정의되지 않음
-                    // let errorCode = (error as NSError).code
-                    // if case 403 = errorCode {
-                    //
-                    //     object.certification()
-                    //         .subscribe(onNext: { isRegistered in
-                    //             object.excutePendingResults(isRegistered ? .success : .failure(error))
-                    //         })
-                    //         .disposed(by: object.disposeBag)
-                    // }
+                    /// 재인증 과정이 실패하면 항상 재로그인 시도
                     object.certification()
                         .subscribe(onNext: { isRegistered in
                             object.excutePendingResults(isRegistered ? .success : .failure(error))
+
+                            object.isReAuthenticating = false
                         })
                         .disposed(by: object.disposeBag)
                 }

SOOUM/SOOUM/Data/Managers/NetworkManager/Interceptor/ErrorInterceptor.swift

@@ -94,7 +94,7 @@ class ErrorInterceptor: RequestInterceptor {
                 }
             }
             return
-        case 403:
+        case 418:
             self.goToOnboarding()
             completion(.doNotRetry)
             return
@@ -112,21 +112,6 @@ class ErrorInterceptor: RequestInterceptor {
 
     // MARK: Error handling
 
-    func goToOnboarding() {
-
-        self.provider.authManager.initializeAuthInfo()
-
-        DispatchQueue.main.async {
-            if let window: UIWindow = UIApplication.currentWindow,
-               let appDelegate = UIApplication.shared.delegate as? AppDelegate {
-
-                let onboardingViewController = OnboardingViewController()
-                onboardingViewController.reactor = OnboardingViewReactor(dependencies: appDelegate.appDIContainer)
-                window.rootViewController = UINavigationController(rootViewController: onboardingViewController)
-            }
-        }
-    }
-
     func showNetworkErrorDialog() {
 
         let confirmAction = SOMDialogAction(
@@ -189,4 +174,24 @@ class ErrorInterceptor: RequestInterceptor {
             )
         }
     }
+
+
+    // MARK: go to onboarding
+
+    func goToOnboarding() {
+
+        self.provider.authManager.initializeAuthInfo()
+
+        DispatchQueue.main.async {
+            guard let appDelegate = UIApplication.shared.delegate as? AppDelegate,
+                let windowScene: UIWindowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+                let window: UIWindow = windowScene.windows.first(where: { $0.isKeyWindow })
+            else { return }
+
+            let onBoardingViewController = OnboardingViewController()
+            onBoardingViewController.reactor = OnboardingViewReactor(dependencies: appDelegate.appDIContainer)
+            onBoardingViewController.modalTransitionStyle = .crossDissolve
+            window.rootViewController = UINavigationController(rootViewController: onBoardingViewController)
+        }
+    }
 }

SOOUM/SOOUM/Data/Managers/PushManager/Models/PushNotificationInfo.swift

@@ -0,0 +1,35 @@
+//
+//  NotificationInfo.swift
+//  SOOUM
+//
+//  Created by 오현식 on 12/27/24.
+//
+
+import Foundation
+
+class PushNotificationInfo {
+
+    let notificationType: CommonNotificationInfo.NotificationType
+    let notificationId: String?
+    let targetCardId: String?
+
+    var isTransfered: Bool {
+        return self.notificationType == .transferSuccess
+    }
+
+    init(_ info: [String: Any]) {
+        let notificationType = info["notificationType"] as? String ?? ""
+        self.notificationType = CommonNotificationInfo.NotificationType(rawValue: notificationType) ?? .none
+        self.notificationId = info["notificationId"] as? String
+        self.targetCardId = info["targetCardId"] as? String
+
+        Log.info(
+            """
+            PushNotificationInfo:
+                notificationType: \(self.notificationType)
+                notificationId: \(self.notificationId ?? "")
+                targetCardId: \(self.targetCardId ?? "")
+            """
+        )
+    }
+}

SOOUM/SOOUM/Data/Models/Responses/FavoriteTagInfoResponse.swift

@@ -0,0 +1,27 @@
+//
+//  FavoriteTagInfoResponse.swift
+//  SOOUM
+//
+//  Created by 오현식 on 11/18/25.
+//
+
+import Alamofire
+
+struct FavoriteTagInfoResponse {
+
+    let tagInfos: [FavoriteTagInfo]
+}
+
+extension FavoriteTagInfoResponse: EmptyResponse {
+
+    static func emptyValue() -> FavoriteTagInfoResponse {
+        FavoriteTagInfoResponse(tagInfos: [])
+    }
+}
+
+extension FavoriteTagInfoResponse: Decodable {
+
+    enum CodingKeys: String, CodingKey {
+        case tagInfos = "favoriteTags"
+    }
+}

SOOUM/SOOUM/Data/Models/Responses/TagCardInfoResponse.swift

@@ -0,0 +1,35 @@
+//
+//  TagCardInfoResponse.swift
+//  SOOUM
+//
+//  Created by 오현식 on 11/18/25.
+//
+
+import Alamofire
+
+struct TagCardInfoResponse {
+
+    let cardInfos: [ProfileCardInfo]
+    let isFavorite: Bool
+}
+
+extension TagCardInfoResponse: EmptyResponse {
+
+    static func emptyValue() -> TagCardInfoResponse {
+        TagCardInfoResponse(cardInfos: [], isFavorite: false)
+    }
+}
+
+extension TagCardInfoResponse: Decodable {
+
+    enum CodingKeys: String, CodingKey {
+        case cardInfos = "cardContents"
+        case isFavorite
+    }
+
+    init(from decoder: any Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        self.cardInfos = try container.decode([ProfileCardInfo].self, forKey: .cardInfos)
+        self.isFavorite = try container.decode(Bool.self, forKey: .isFavorite)
+    }
+}