🔀 :: [#308] Auth Flow 비밀번호 검증 및 로그인 화면 전환 오류 수정

Projects/App/GOMS-iOS-V2Debug.entitlements

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
+</plist>

Projects/App/Sources/Application/AppDelegate.swift

@@ -3,28 +3,46 @@ import Firebase
 import UserNotifications
 import Feature
 import AudioToolbox
+import FirebaseMessaging
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
+
+
+
 
     let notificationViewModel = NotificationViewModel()
 
     func application(
         _ application: UIApplication,
         didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
     ) -> Bool {
+
+
+
+
         FirebaseApp.configure()
 
         UNUserNotificationCenter.current().delegate = self
-
         Messaging.messaging().delegate = self
 
+        Messaging.messaging().token { token, error in
+            if let token = token {
+                print("FCM", token)
+            }
+        }
+
         requestNotificationAuthorization()
 
         return true
     }
 
     private func requestNotificationAuthorization() {
+
+
+
+        print("빌드 버전:",
+              Bundle.main.infoDictionary?["CFBundleVersion"] ?? "nil")
         UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .badge, .sound, .carPlay]) { granted, error in
             if let error = error {
                 print("Error requesting notification authorization: \(error.localizedDescription)")

Projects/App/Sources/Application/SceneDelegate.swift

@@ -15,14 +15,14 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         let isSwitchOn = defaults.bool(forKey: "isSwitchOn")
         let adminIsSwitchOn = defaults.bool(forKey: "isSwitchMakeOn")
 
-        checkForUpdates { needsUpdate in
-            if needsUpdate {
-                print("업데이트 필요")
-                self.showUpdatePopup()
-            } else {
-                print("최신 버전입니다")
-            }
-        }
+        //*checkForUpdates { needsUpdate in
+         //   if needsUpdate {
+        //        print("업데이트 필요")
+        //        self.showUpdatePopup()
+        //    } else {
+         //       print("최신 버전입니다")
+          //  }
+       // }
 
         applySavedTheme()
 
@@ -133,24 +133,26 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     }
 
     private func showUpdatePopup() {
-        let alertController = UIAlertController(
-            title: "업데이트 알림",
-            message: "더 나은 서비스를 위해 곰스가 수정되었어요!\n원활한 사용을 위해 업데이트 후 이용해주세요!",
-            preferredStyle: .alert
-        )
-
-        let updateAction = UIAlertAction(title: "확인", style: .default) { _ in
-            if let url = URL(string: "https://apps.apple.com/kr/app/goms/id6502936560") {
-                UIApplication.shared.open(url)
-            }
-        }
+        DispatchQueue.main.async {
 
-        alertController.addAction(updateAction)
+            guard let rootVC = self.window?.rootViewController else { return }
 
-        DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
-            self.window?.rootViewController?.present(alertController, animated: true) {
-                print("업데이트 팝업 표시됨")
-            }
+            // 이미 다른 VC를 present 중이면 중복 방지
+            if rootVC.presentedViewController != nil { return }
+
+            let alertController = UIAlertController(
+                title: "업데이트 알림",
+                message: "원활한 사용을 위해 업데이트 후 이용해주세요!",
+                preferredStyle: .alert
+            )
+
+            alertController.addAction(UIAlertAction(title: "업데이트", style: .default) { _ in
+                if let url = URL(string: "앱스토어URL") {
+                    UIApplication.shared.open(url)
+                }
+            })
+
+            rootVC.present(alertController, animated: true)
         }
     }
 

Projects/App/Support/Info.plist

@@ -17,13 +17,15 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.1</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>CloudTypeBaseURL</key>
 	<string>$(CloudTypeBaseURL)</string>
 	<key>FirebaseAppDelegateProxyEnabled</key>
 	<true/>
+	<key>LSApplicationCategoryType</key>
+	<string>http://gsmsv-1.yujun.kr:23346</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>Localization native development region</key>
@@ -32,13 +34,15 @@
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
+		<key>NSAllowsArbitraryLoadsUsageDescription</key>
+		<false/>
 	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>QR 스캔을 위해 카메라를 허용해주세요.</string>
 	<key>SERVER_HOST</key>
 	<string> ${SERVER_HOST}</string>
 	<key>SchoolBaseURL</key>
-	<string>$(SchoolBaseURL)</string>
+	<string>http://gsmsv-1.yujun.kr:23346/api/v2</string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
@@ -82,5 +86,7 @@
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 </dict>
 </plist>

Projects/Feature/Resources/Colors.xcassets/GOMS_TextDefault.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "1.000",
-          "red" : "1.000"
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "display-p3",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.000",
-          "green" : "0.000",
-          "red" : "0.000"
+          "blue" : "0x00",
+          "green" : "0x00",
+          "red" : "0x00"
         }
       },
       "idiom" : "universal"
@@ -41,9 +41,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "1.000",
-          "red" : "1.000"
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
         }
       },
       "idiom" : "universal"

Projects/Feature/Sources/Scene/Auth/FindPassword/FindPasswordViewController.swift

@@ -57,7 +57,13 @@ public final class FindPasswordViewController: BaseViewController {
             viewModel.sendAuthCode { success, statusCode in
                 if statusCode == 204 {
                     self.successUI()
-                    let authCodeVC = AuthCodeViewController(viewModel: self.viewModel, previousViewController: self, email: self.emailTextField.text ?? "")
+                    let email = self.emailTextField.text ?? ""
+
+                    let authCodeVC = AuthCodeViewController(
+                        viewModel: self.viewModel,
+                        previousViewController: self,
+                        email: email
+                    )
                     self.navigationController?.pushViewController(authCodeVC, animated: true)
                 } else if statusCode == 404 {
                     self.nonExistentUser()
@@ -166,8 +172,7 @@ public final class FindPasswordViewController: BaseViewController {
 extension FindPasswordViewController: UITextFieldDelegate {
     public func textFieldDidChange(_ textField: UITextField) {
         if textField == emailTextField {
-            viewModel.setupEmail(email: emailTextField.text ?? "")
-        }
+            viewModel.setupEmail(email: emailTextField.text ?? "")      }
     }
 
     public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {

Projects/Feature/Sources/Scene/Auth/Intro/IntroViewController.swift

@@ -138,3 +138,4 @@ public final class IntroViewController: BaseViewController {
         }
     }
 }
+

Projects/Feature/Sources/Scene/Auth/NewPassword/NewPasswordViewController.swift

@@ -87,53 +87,68 @@ public final class NewPasswordViewController: BaseViewController {
 
     // MARK: - Seletors
     @objc func doneButtonTapped() {
-        let defaults = UserDefaults.standard
-        let localPassword = defaults.string(forKey: "localPass")
-        self.validatePassword()
-        let isValidPassword = self.validatePassword()
-            
-        viewModel.setupEmail(email: self.email)
-        viewModel.setupNewServePassword(newPassword: passwordTextField.text ?? "", checkPassword: checkPasswordTextField.text ?? "")
-        viewModel.setupPassword(password: localPassword ?? "")
-        viewModel.newPassword { [self] success, statusCode in
-            if !isValidPassword {
-                        self.passwordWrongRegularExpressionUI()
-                    
-        } else if passwordTextField.text != checkPasswordTextField.text {
-            self.passwordErrorUI()
+
+
+        print("🚨 DONE BUTTON TAPPED")
+        print("🚨 VC email:", email)
+
+        let isValidPassword = validatePassword()
+
+        if !isValidPassword {
+            passwordWrongRegularExpressionUI()
+            return
+        }
+
+        if passwordTextField.text != checkPasswordTextField.text {
+            passwordErrorUI()
             conditionsLabel.isHidden = true
-        } else if passwordTextField.text == "" {
-            self.passwordErrorUI()
+            return
+        }
+
+        if passwordTextField.text == "" {
+            passwordErrorUI()
+            return
         }
-            else if !success {
+
+        viewModel.setupNewServePassword(
+            newPassword: passwordTextField.text ?? "",
+            checkPassword: checkPasswordTextField.text ?? ""
+        )
+
+        print("🚨 CALLING newPassword API")
+
+        viewModel.newPassword { [self] success, statusCode in
+
+            if !success {
                 switch statusCode {
+
                 case 400:
                     print("400")
                     self.passwordOverlapErrorUI()
                     conditionsLabel.isHidden = false
+
                 case 404:
                     print("404")
+
                 default:
                     print("Error: \(statusCode)")
                 }
-            } else if success {
-                let defaults = UserDefaults.standard
+
+            } else {
+
                 UserDefaults.standard.set(self.checkPasswordTextField.text, forKey: "localPass")
-                let alert = UIAlertController(title: "재설정 완료", message: "비밀번호가 재설정되었습니다.\n로그인 화면으로 돌아갑니다.", preferredStyle: .alert)
-
-                let check = UIAlertAction(title: "확인", style: .default) { action in
+
+                let alert = UIAlertController(
+                    title: "재설정 완료",
+                    message: "비밀번호가 재설정되었습니다.\n로그인 화면으로 돌아갑니다.",
+                    preferredStyle: .alert
+                )
+
+                let check = UIAlertAction(title: "확인", style: .default) { _ in
                     let loginVC = IntroViewController()
                     self.navigationController?.pushViewController(loginVC, animated: true)
                 }
-
-                passwordOverlapErrorLabel.isHidden = true
-                passwordTextField.layer.borderWidth = 0
-                passwordTextField.setPlaceholderColor(.color.gomsTertiary.color)
-
-                passwordErrorLabel.isHidden = true
-                checkPasswordTextField.layer.borderWidth = 0
-                checkPasswordTextField.setPlaceholderColor(.color.gomsTertiary.color)
-
+
                 alert.addAction(check)
                 self.present(alert, animated: true)
             }

Projects/Feature/Sources/Scene/Auth/PsswordSetting/PasswordSettingViewController.swift

@@ -73,21 +73,49 @@ public final class PasswordSettingViewController: BaseViewController {
 
     // MARK: - Seletors
     @objc func signUpButtonTapped() {
-        viewModel.setupNewPassword(newPassword: passwordTextField.text ?? "", checkPassword: checkPasswordTextField.text ?? "")
-
+
+        view.endEditing(true)
+
+        let password = passwordTextField.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        let confirmPassword = checkPasswordTextField.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+
+        print("password:", password)
+        print("confirm:", confirmPassword)
+
+        guard password == confirmPassword else {
+            passwordErrorUI()
+            return
+        }
+
+        viewModel.setupNewPassword(newPassword: password, checkPassword: confirmPassword)
+
         DispatchQueue.main.async {
             self.present(self.loader, animated: true)
         }
-
-        viewModel.signUp { success in
-            if success {
-                self.signUpSuccessUI()
-                let signInVC = SignInViewController(viewModel: self.viewModel)
-                self.navigationController?.pushViewController(signInVC, animated: true)
-                self.loader.dismiss(animated: true)
-            } else {
-                self.passwordErrorUI()
-                self.loader.dismiss(animated: true)
+
+        viewModel.signUp { [weak self] success in
+            guard let self = self else { return }
+
+            DispatchQueue.main.async {
+
+                self.loader.dismiss(animated: true) {
+
+                    if success {
+
+                        self.signUpSuccessUI()
+
+                        let signInVC = SignInViewController(viewModel: AuthViewModel())
+
+                        self.navigationController?.setViewControllers([signInVC], animated: true)
+
+                    } else {
+
+                        self.passwordErrorUI()
+
+                    }
+
+                }
+
             }
         }
     }