Fix [#65] 세부사항 수정

DontBe-iOS/DontBe-iOS/Global/Extension/UIViewController+.swift

@@ -12,14 +12,3 @@ extension UIViewController {
         return UIApplication.shared.windows.filter({$0.isKeyWindow}).first?.windowScene?.statusBarManager?.statusBarFrame.height ?? 20
     }
 }
-
-extension UINavigationController: UIGestureRecognizerDelegate {
-    override open func viewDidLoad() {
-        super.viewDidLoad()
-        interactivePopGestureRecognizer?.delegate = self
-    }
-
-    public func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
-        return viewControllers.count > 1
-    }
-}

DontBe-iOS/DontBe-iOS/Network/Foundation/NetworkService.swift

@@ -1,5 +1,5 @@
 //
-//  KakaoLoginService.swift
+//  NetworkService.swift
 //  DontBe-iOS
 //
 //  Created by 변희주 on 1/14/24.
@@ -36,17 +36,20 @@ final class NetworkService: NetworkServiceType {
             request.addValue($0.value, forHTTPHeaderField: $0.key)
         }
 
-        // 리퀘스트 바디 설정 (구조체)
-        do {
-            let jsonData = try JSONEncoder().encode(body)
-            request.httpBody = jsonData
-        } catch {
-            print("Failed to encode request body: \(error)")
+        if type == .get {
+            request.httpBody = nil
+        } else {
+            // 리퀘스트 바디 설정 (구조체)
+            do {
+                let jsonData = try JSONEncoder().encode(body)
+                request.httpBody = jsonData
+            } catch {
+                print("Failed to encode request body: \(error)")
+            }
         }
 
         return request
     }
-
 
     func donNetwork<T: Decodable>(type: HttpMethod,
                                   baseURL: String,

DontBe-iOS/DontBe-iOS/Presentation/Login/ViewControllers/LoginViewController.swift

@@ -114,25 +114,15 @@ extension LoginViewController {
 
         output.userInfoPublisher
             .receive(on: RunLoop.main)
-            .sink { isFirstUser in
-                if isFirstUser {
+            .sink { value in
+                if value {
                     // 첫 로그인 유저면 여기
                     let viewController = JoinAgreementViewController(viewModel: JoinAgreeViewModel())
                     self.navigationController?.pushViewController(viewController, animated: true)
                 } else {
-                    // 이미 가입한 유저면 여기
-                    let isJoinedUser = loadUserData()?.isJoinedApp ?? false
-
-                    // 회원가입 약관동의를 한 유저
-                    if isJoinedUser {
-                        let viewController = OnboardingViewController()
+                    let viewController = OnboardingViewController()
                         viewController.originView.isFirstUser = false
                         self.navigationController?.pushViewController(viewController, animated: true)
-                    } else {
-                        // 회원가입 약관동의를 안한 유저
-                        let viewController = JoinAgreementViewController(viewModel: JoinAgreeViewModel())
-                        self.navigationController?.pushViewController(viewController, animated: true)
-                    }
                 }
             }
             .store(in: self.cancelBag)

DontBe-iOS/DontBe-iOS/Presentation/Login/ViewModels/LoginViewModel.swift

@@ -37,56 +37,49 @@ final class LoginViewModel: ViewModelType {
     func transform(from input: Input, cancelBag: CancelBag) -> Output {
         input.kakaoButtonTapped
             .sink {
-                Task {
-                    do {
-                        if UserApi.isKakaoTalkLoginAvailable() {
-                            let oauthToken = try await self.loginWithKakaoTalk()
-                            let isNewUser = try await self.getSocialLoginAPI(oauthToken: oauthToken)?.data?.isNewUser ?? false
-                            self.userInfoPublisher.send(isNewUser)
-                        } else {
-                            let oauthToken = try await self.loginWithKakaoAccount()
-                            let isNewUser = try await self.getSocialLoginAPI(oauthToken: oauthToken)?.data?.isNewUser ?? false
-                            self.userInfoPublisher.send(isNewUser)
-                        }
-                        print("👻👻👻👻👻카카오 로그인 성공👻👻👻👻👻")
-                    } catch {
-                        print(error)
-                    }
-                }
+                self.performKakaoLogin()
             }
-            .store(in: self.cancelBag)
+            .store(in: cancelBag)
 
         return Output(userInfoPublisher: userInfoPublisher)
     }
-}
-
-extension LoginViewModel {
-    private func loginWithKakaoTalk() async throws -> OAuthToken {
-        return try await withCheckedThrowingContinuation { continuation in
-            UserApi.shared.loginWithKakaoTalk { oauthToken, error in
-                if let error = error {
-                    continuation.resume(throwing: error)
-                } else if let oauthToken = oauthToken {
-                    continuation.resume(returning: oauthToken)
-                }
+
+    private func performKakaoLogin() {
+        if UserApi.isKakaoTalkLoginAvailable() {
+            UserApi.shared.loginWithKakaoTalk { [weak self] (oauthToken, error) in
+                self?.handleKakaoLoginResult(oauthToken: oauthToken, error: error)
+            }
+        } else {
+            UserApi.shared.loginWithKakaoAccount { [weak self] (oauthToken, error) in
+                self?.handleKakaoLoginResult(oauthToken: oauthToken, error: error)
             }
         }
     }
 
-    private func loginWithKakaoAccount() async throws -> OAuthToken {
-        return try await withCheckedThrowingContinuation { continuation in
-            UserApi.shared.loginWithKakaoAccount { oauthToken, error in
-                if let error = error {
-                    continuation.resume(throwing: error)
-                } else if let oauthToken = oauthToken {
-                    continuation.resume(returning: oauthToken)
+    private func handleKakaoLoginResult(oauthToken: OAuthToken?, error: Error?) {
+        if let error = error {
+            print(error)
+        } else if let accessToken = oauthToken?.accessToken {
+            Task {
+                do {
+                    let isNewUser = try await self.getSocialLoginAPI(accessToken: accessToken)?.data?.isNewUser ?? false
+                    let nickname = try await self.getSocialLoginAPI(accessToken: accessToken)?.data?.nickName ?? ""
+
+                    if !isNewUser && !nickname.isEmpty {
+                        self.userInfoPublisher.send(false)
+                    } else {
+                        self.userInfoPublisher.send(true)
+                    }
+                } catch {
+                    print(error)
                 }
             }
         }
     }
-
-    private func getSocialLoginAPI(oauthToken: OAuthToken) async throws -> BaseResponse<SocialLoginResponseDTO>? {
-        let accessToken = oauthToken.accessToken
+}
+
+extension LoginViewModel {
+    private func getSocialLoginAPI(accessToken: String) async throws -> BaseResponse<SocialLoginResponseDTO>? {
         do {
             let data: BaseResponse<SocialLoginResponseDTO>? = try await self.networkProvider.donNetwork(
                 type: .post,

DontBe-iOS/DontBe-iOS/Presentation/MyPage/ViewControllers/MyPageAccountInfoViewController.swift

@@ -9,7 +9,7 @@ import UIKit
 
 import SnapKit
 
-final class MyPageAccountInfoViewController: UIViewController {
+final class MyPageAccountInfoViewController: UIViewController, UIGestureRecognizerDelegate {
 
     // MARK: - Properties
 

DontBe-iOS/DontBe-iOS/Presentation/MyPage/ViewControllers/MyPageEditProfileViewController.swift

@@ -9,7 +9,7 @@ import UIKit
 
 import SnapKit
 
-final class MyPageEditProfileViewController: UIViewController {
+final class MyPageEditProfileViewController: UIViewController, UIGestureRecognizerDelegate {
 
     // MARK: - Properties
 

DontBe-iOS/DontBe-iOS/Presentation/MyPage/ViewControllers/MyPageViewController.swift

@@ -94,7 +94,8 @@ extension MyPageViewController {
         self.view.backgroundColor = .donBlack
         self.tabBarController?.tabBar.isTranslucent = true
         self.navigationController?.navigationBar.backgroundColor = .donBlack
-
+        self.navigationController?.navigationBar.barTintColor = .donBlack
+
         let image = ImageLiterals.MyPage.icnMenu
         let renderedImage = image.withRenderingMode(.alwaysOriginal)
         let hambergerButton = UIBarButtonItem(image: renderedImage,

DontBe-iOS/DontBe-iOS/Presentation/Onboarding/ViewControllers/OnboardingEndingViewController.swift

@@ -17,14 +17,7 @@ final class OnboardingEndingViewController: UIViewController {
     private var cancelBag = CancelBag()
     private let viewModel: OnboardingEndingViewModel
 
-    private lazy var startButtonTapped = self.originView.startButton.publisher(for: .touchUpInside).map { _
-        in saveUserData(UserInfo(isSocialLogined: 
-                                 loadUserData()?.isSocialLogined ?? true,
-                                 isFirstUser: false,
-                                 isJoinedApp: true,
-                                 isOnboardingFinished: true,
-                                 userNickname: loadUserData()?.userNickname ?? ""))
-    }.eraseToAnyPublisher()
+    private lazy var startButtonTapped = self.originView.startButton.publisher(for: .touchUpInside).map { _ in }.eraseToAnyPublisher()
     private lazy var skipButtonTapped = self.originView.laterButton.publisher(for: .touchUpInside).map { _ in }.eraseToAnyPublisher()
     private lazy var backButtonTapped = self.originView.backButton.publisher(for: .touchUpInside).map { _ in }.eraseToAnyPublisher()
 

DontBe-iOS/DontBe-iOS/Presentation/Onboarding/ViewModels/OnboardingEndingViewModel.swift

@@ -36,14 +36,27 @@ final class OnboardingEndingViewModel: ViewModelType {
             .sink { _ in
                 // 온보딩 완료 서버통신
                 // 서버통신 완료되면 신호
+                saveUserData(UserInfo(isSocialLogined:
+                                         loadUserData()?.isSocialLogined ?? true,
+                                         isFirstUser: false,
+                                         isJoinedApp: true,
+                                         isOnboardingFinished: true,
+                                         userNickname: loadUserData()?.userNickname ?? ""))
                 publisher.send("start")
+
             }
             .store(in: self.cancelBag)
 
         input.skipButtonTapped
             .sink { _ in
                 // 이때는 서버통신 X
                 publisher.send("skip")
+                saveUserData(UserInfo(isSocialLogined:
+                                         loadUserData()?.isSocialLogined ?? true,
+                                         isFirstUser: false,
+                                         isJoinedApp: true,
+                                         isOnboardingFinished: true,
+                                         userNickname: loadUserData()?.userNickname ?? ""))
             }
             .store(in: self.cancelBag)
 

DontBe-iOS/DontBe-iOS/Presentation/Post/ViewControllers/PostViewController.swift

@@ -7,7 +7,7 @@
 
 import UIKit
 
-final class PostViewController: UIViewController {
+final class PostViewController: UIViewController, UIGestureRecognizerDelegate {
 
     // MARK: - Properties
     var tabBarHeight: CGFloat = 0