숨 개선 마이(팔로우, 설정) 탭

SOOUM/SOOUM/Base/BaseNavigationViewController.swift

@@ -33,7 +33,7 @@ class BaseNavigationViewController: BaseViewController {
         $0.isHidden = true
     }
 
-    private(set) var navigationPopWithBottomBarHidden: Bool = false
+    private(set) var navigationPopWithBottomBarHidden: Bool = true
     private(set) var navigationPopGestureEnabled: Bool = true
     private(set) var navigationBarHeight: CGFloat = SOMNavigationBar.height
 

SOOUM/SOOUM/Base/BaseViewController.swift

@@ -7,6 +7,8 @@
 
 import UIKit
 
+import Network
+
 import RxKeyboard
 import RxSwift
 
@@ -15,15 +17,24 @@ import Then
 
 import Lottie
 
-
 class BaseViewController: UIViewController {
+
+    enum Text {
+        static let bottomToastEntryName: String = "bottomToastEntryName"
+        static let instabilityNetworkToastTitle: String = "네트워크 연결이 원활하지 않습니다. 네트워크 확인 후 재접속해주세요"
+    }
 
     var disposeBag = DisposeBag()
 
+    private let monitor = NWPathMonitor()
+
+    private let instabilityNetworkToastView = SOMBottomToastView(title: Text.instabilityNetworkToastTitle, actions: nil)
+
     let activityIndicatorView = SOMActivityIndicatorView()
     let loadingIndicatorView = SOMLoadingIndicatorView()
 
     private(set) var isEndEditingWhenWillDisappear: Bool = true
+    private(set) var bottomToastMessageOffset: CGFloat = 88 + 8
 
     override var hidesBottomBarWhenPushed: Bool {
         didSet {
@@ -47,7 +58,7 @@ class BaseViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        self.view.backgroundColor = .white
+        self.view.backgroundColor = .som.v2.white
         self.setupConstraints()
 
         self.activityIndicatorView.color = .black
@@ -74,6 +85,19 @@ class BaseViewController: UIViewController {
                 object.updatedKeyboard(withoutBottomSafeInset: withoutBottomSafeInset)
             }
             .disposed(by: self.disposeBag)
+
+        SimpleReachability.shared.isConnected
+            .skip(1)
+            .filter { $0 == false }
+            .observe(on: MainScheduler.asyncInstance)
+            .subscribe(with: self) { object, _ in
+                guard object.isViewLoaded, object.view.window != nil else { return }
+
+                var wrapper: SwiftEntryKitViewWrapper = object.instabilityNetworkToastView.sek
+                wrapper.entryName = Text.bottomToastEntryName
+                wrapper.showBottomToast(verticalOffset: object.bottomToastMessageOffset, displayDuration: 4)
+            }
+            .disposed(by: self.disposeBag)
     }
 
     /// Set auto layouts

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

@@ -164,6 +164,7 @@ extension AuthManager: AuthManagerDelegate {
                             provider.networkManager.registerFCMToken(from: #function)
                             return .just(true)
                         }
+                        .catchAndReturn(false)
                 } else {
                     return .just(false)
                 }
@@ -193,6 +194,7 @@ extension AuthManager: AuthManagerDelegate {
                             provider.networkManager.registerFCMToken(from: #function)
                             return .just(true)
                         }
+                        .catchAndReturn(false)
                 } else {
                     return .just(false)
                 }
@@ -265,15 +267,21 @@ extension AuthManager: AuthManagerDelegate {
                 },
                 onError: { object, error in
 
-                    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)
-                    }
+                    // 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))
+                        })
+                        .disposed(by: object.disposeBag)
                 }
             )
             .disposed(by: self.disposeBag)

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

@@ -5,13 +5,31 @@
 //  Created by 오현식 on 10/27/24.
 //
 
-import Foundation
-
 import Alamofire
 
-
 class ErrorInterceptor: RequestInterceptor {
 
+    enum Text {
+        static let networkErrorDialogTitle: String = "네트워크 상태가 불안정해요"
+        static let networkErrorDialogMessage: String = "네트워크 연결상태를 확인 후 다시 시도해 주세요."
+        static let confirmActionTitle: String = "확인"
+
+        static let unknownErrorDialogTitle: String = "일시적인 오류가 발생했어요"
+        static let unknownErrorDialogMessage: String = "같은 문제가 반복된다면 ‘문의하기'를 눌러 숨 팀에 알려주세요."
+        static let closeActionButtonTitle: String = "닫기"
+        static let inquiryActionTitle: String = "문의하기"
+
+        static let adminMailStrUrl: String = "[email protected]"
+        static let identificationInfo: String = "식별 정보: "
+        static let inquiryMailTitle: String = "[문의하기]"
+        static let inquiryMailGuideMessage: String = """
+            \n
+            문의 내용: 식별 정보 삭제에 주의하여 주시고, 이곳에 자유롭게 문의하실 내용을 적어주세요.
+            단, 본 양식에 비방, 욕설, 허위 사실 유포 등의 부적절한 내용이 포함될 경우,
+            관련 법령에 따라 민·형사상 법적 조치가 이루어질 수 있음을 알려드립니다.
+        """
+    }
+
     private let lock = NSLock()
 
     private let retryLimit: Int = 1
@@ -25,29 +43,150 @@ class ErrorInterceptor: RequestInterceptor {
     func retry(_ request: Request, for session: Session, dueTo error: any Error, completion: @escaping (RetryResult) -> Void) {
         self.lock.lock(); defer { self.lock.unlock() }
 
-        guard let response = request.task?.response as? HTTPURLResponse,
-            response.statusCode == 401
-        else {
-            completion(.doNotRetryWithError(error))
-            return
+        /// API 호출 중 네트워크 오류 발생
+        if let afError = error.asAFError,
+           case let .sessionTaskFailed(underlyingError) = afError,
+           let urlError = underlyingError as? URLError {
+
+            let networkErrors = [
+                URLError.timedOut,
+                URLError.notConnectedToInternet,
+                URLError.networkConnectionLost,
+                URLError.cannotConnectToHost
+            ]
+            if networkErrors.contains(urlError.code) {
+                self.showNetworkErrorDialog()
+                completion(.doNotRetry)
+                return
+            }
         }
 
-        // 재인증 과정은 1번만 진행한다.
-        guard request.retryCount < retryLimit else {
+        guard let response = request.task?.response as? HTTPURLResponse else {
             completion(.doNotRetryWithError(error))
             return
         }
 
-        let token = self.provider.authManager.authInfo.token
-        self.provider.authManager.reAuthenticate(token) { result in
+        switch response.statusCode {
+        /// AccessToken 재인증
+        case 401:
+            // 재인증 과정은 1번만 진행한다.
+            guard request.retryCount < self.retryLimit else {
+                let retryError = NSError(
+                    domain: "SOOUM",
+                    code: -99,
+                    userInfo: [
+                        NSLocalizedDescriptionKey: "Retry error: ReAuthenticate process is performed only once."
+                    ]
+                )
+                completion(.doNotRetryWithError(retryError))
+                return
+            }
 
-            switch result {
-            case .success:
-                completion(.retry)
-            case let .failure(error):
-                Log.error("ReAuthenticate failed. \(error.localizedDescription)")
-                completion(.doNotRetry)
+            let token = self.provider.authManager.authInfo.token
+            self.provider.authManager.reAuthenticate(token) { result in
+
+                switch result {
+                case .success:
+                    completion(.retry)
+                case let .failure(error):
+                    Log.error("ReAuthenticate failed. \(error.localizedDescription)")
+                    completion(.doNotRetry)
+                }
             }
+            return
+        case 403:
+            self.goToOnboarding()
+            completion(.doNotRetry)
+            return
+        case 500:
+            self.showUnknownErrorDialog()
+            completion(.doNotRetry)
+            return
+        default:
+            break
+        }
+
+        completion(.doNotRetryWithError(error))
+    }
+
+
+    // 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(
+            title: Text.confirmActionTitle,
+            style: .primary,
+            action: {
+                UIApplication.topViewController?.dismiss(animated: true)
+            }
+        )
+
+        DispatchQueue.main.async {
+            SOMDialogViewController.show(
+                title: Text.networkErrorDialogTitle,
+                message: Text.networkErrorDialogMessage,
+                textAlignment: .left,
+                actions: [confirmAction]
+            )
+        }
+    }
+
+    func showUnknownErrorDialog() {
+
+        let closeAction = SOMDialogAction(
+            title: Text.closeActionButtonTitle,
+            style: .gray,
+            action: {
+                UIApplication.topViewController?.dismiss(animated: true)
+            }
+        )
+
+        let inquireAction = SOMDialogAction(
+            title: Text.inquiryActionTitle,
+            style: .primary,
+            action: {
+                UIApplication.topViewController?.dismiss(animated: true) {
+                    let subject = Text.inquiryMailTitle.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? ""
+                    let guideMessage = """
+                        \(Text.identificationInfo)
+                        \(self.provider.authManager.authInfo.token.refreshToken)\n
+                        \(Text.inquiryMailGuideMessage)
+                    """
+                    let body = guideMessage.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? ""
+                    let mailToString = "mailto:\(Text.adminMailStrUrl)?subject=\(subject)&body=\(body)"
+
+                    if let mailtoUrl = URL(string: mailToString),
+                       UIApplication.shared.canOpenURL(mailtoUrl) {
+
+                        UIApplication.shared.open(mailtoUrl, options: [:], completionHandler: nil)
+                    }
+                }
+            }
+        )
+
+        DispatchQueue.main.async {
+            SOMDialogViewController.show(
+                title: Text.unknownErrorDialogTitle,
+                message: Text.unknownErrorDialogMessage,
+                textAlignment: .left,
+                actions: [closeAction, inquireAction]
+            )
         }
     }
 }

SOOUM/SOOUM/Data/Managers/NetworkManager/NetworkManager.swift

@@ -18,7 +18,7 @@ protocol NetworkManagerDelegate: AnyObject {
     func upload(
         _ data: Data,
         to url: URLConvertible
-    ) -> Observable<Result<Void, Error>>
+    ) -> Observable<Result<Int, Error>>
 
     func fetch<T: Decodable>(_ object: T.Type, request: BaseRequest) -> Observable<T>
     func perform(_ request: BaseRequest) -> Observable<Int>
@@ -139,16 +139,23 @@ extension NetworkManager: NetworkManagerDelegate {
     func upload(
         _ data: Data,
         to url: URLConvertible
-    ) -> Observable<Result<Void, Error>> {
+    ) -> Observable<Result<Int, Error>> {
         return Observable.create { [weak self] observer -> Disposable in
 
             let task = self?.session.upload(data, to: url, method: .put)
                 .validate(statusCode: 200..<500)
                 .response { response in
+                    let statusCode = response.response?.statusCode ?? 0
+
                     switch response.result {
                     case .success:
-                        observer.onNext(.success(()))
-                        observer.onCompleted()
+                        if let nsError = self?.setupError(with: statusCode) {
+                            Log.error(nsError.localizedDescription)
+                            observer.onError(nsError)
+                        } else {
+                            observer.onNext(.success(statusCode))
+                            observer.onCompleted()
+                        }
                     case let .failure(error):
                         Log.error("Network or response format error: \(error)")
                         observer.onError(error)

SOOUM/SOOUM/Data/Models/Responses/BlockUsersInfoResponse.swift

@@ -0,0 +1,32 @@
+//
+//  BlockUsersInfoResponse.swift
+//  SOOUM
+//
+//  Created by 오현식 on 11/9/25.
+//
+
+import Alamofire
+
+struct BlockUsersInfoResponse {
+
+    let blockUsers: [BlockUserInfo]
+}
+
+extension BlockUsersInfoResponse: EmptyResponse {
+
+    static func emptyValue() -> BlockUsersInfoResponse {
+        BlockUsersInfoResponse(blockUsers: [])
+    }
+}
+
+extension BlockUsersInfoResponse: Decodable {
+
+    enum CodingKeys: String, CodingKey {
+        case blockUsers
+    }
+
+    init(from decoder: any Decoder) throws {
+        let singleContainer = try decoder.singleValueContainer()
+        self.blockUsers = try singleContainer.decode([BlockUserInfo].self)
+    }
+}