Merge pull request #74 from YAPP-Github/TNT-158-trainerSignup

[TNT-158] FCM 구현

TnT/Projects/Data/Sources/LocalStorage/KeyChainManager.swift

@@ -111,12 +111,14 @@ public extension KeyChainManager {
     enum Key {
         case sessionId
         case userId
+        case apns
 
         /// 키 고유 문자열
         var keyString: String {
             switch self {
             case .sessionId: return "com.TnT.sessionId"
             case .userId: return "com.TnT.userId"
+            case .apns: return "come.TnT.apns"
             }
         }
 
@@ -125,6 +127,7 @@ public extension KeyChainManager {
             switch self {
             case .sessionId: return KeyConverter(type: String.self, convert: { $0 })
             case .userId: return KeyConverter(type: Int.self, convert: { Int($0) })
+            case .apns: return KeyConverter(type: String.self, convert: { $0 })
             }
         }
     }

TnT/Projects/Data/Sources/Network/Service/SocialLogin/SocialLogInRepositoryImpl.swift

@@ -28,13 +28,10 @@ public struct SocialLogInRepositoryImpl: SocialLoginRepository {
     }
 
     public func appleLogin() async -> AppleLoginInfo? {
-        let result = await loginManager.appleLogin()
-
-        return result
+        return await loginManager.appleLogin()
     }
 
     public func kakaoLogin() async -> KakaoLoginInfo? {
-        let result = await loginManager.kakaoLogin()
-        return result
+        return await loginManager.kakaoLogin()
     }
 }

TnT/Projects/Domain/Sources/DTO/User/UserResponseDTO.swift

@@ -27,6 +27,16 @@ public struct PostSocialLoginResDTO: Decodable {
     public let isSignUp: Bool
     /// 회원 타입 (TRAINER, TRAINEE, UNREGISTERED)
     public let memberType: MemberTypeResDTO
+
+    /// Coding Keys를 활용해 Decodable 처리
+    enum CodingKeys: String, CodingKey {
+        case sessionId
+        case socialId
+        case socialEmail
+        case socialType
+        case isSignUp
+        case memberType
+    }
 }
 
 /// Trainer, Trainee, Unregistered로 구분되는 MemberTypeDTO
@@ -46,19 +56,61 @@ public enum MemberTypeResDTO: String, Decodable {
 /// 회원 정보 응답 DTO
 public struct PostSignUpResDTO: Decodable {
     /// 회원 타입 (trainer, trainee)
-    let memberType: String
+    public let memberType: String
     /// 세션 ID
-    let sessionId: String
+    public let sessionId: String
     /// 회원 이름
-    let name: String
+    public let name: String
     /// 프로필 이미지 URL
-    let profileImageUrl: String?
+    public let profileImageUrl: String?
+
+    public init(
+        memberType: String,
+        sessionId: String,
+        name: String,
+        profileImageUrl: String?
+    ) {
+        self.memberType = memberType
+        self.sessionId = sessionId
+        self.name = name
+        self.profileImageUrl = profileImageUrl
+    }
 }
 
+public enum MemberType: String, Decodable {
+    case trainer = "TRAINER"
+    case trainee = "TRAINEE"
+    case unregistered = "UNREGISTERED"
+
+    public init?(rawValue: String) {
+        switch rawValue.lowercased() {
+        case "TRAINER":
+            self = .trainer
+        case "TRAINEE":
+            self = .trainee
+        case "UNREGISTERED":
+            self = .unregistered
+        default:
+            return nil
+        }
+    }
+}
+
 /// 로그아웃 응답 DTO
 public struct PostLogoutResDTO: Decodable {
     let sessionId: String
 }
 
 /// 회원탈퇴 응답 DTO
 public typealias PostWithdrawalResDTO = EmptyResponse
+
+public extension PostSignUpResDTO {
+    func toEntity() -> PostSignUpResEntity {
+        return .init(
+            memberType: self.memberType,
+            sessionId: self.sessionId,
+            name: self.name,
+            profileImageUrl: self.profileImageUrl
+        )
+    }
+}

TnT/Projects/Domain/Sources/Entity/SocailLoginEntity.swift

@@ -49,4 +49,6 @@ public struct PostSocialLoginResEntity: Equatable {
     public let socialType: String?
     /// 가입 여부 (`true`: 이미 가입됨, `false`: 미가입)
     public let isSignUp: Bool
+    /// 멤버타입
+    public let membertype: MemberTypeResDTO
 }

TnT/Projects/Domain/Sources/Mapper/PostSocialMapper.swift

@@ -26,7 +26,8 @@ public extension PostSocialLoginResDTO {
             socialId: self.socialId,
             socialEmail: self.socialEmail,
             socialType: self.socialType,
-            isSignUp: self.isSignUp
+            isSignUp: self.isSignUp,
+            membertype: self.memberType
         )
     }
 }
@@ -52,15 +53,16 @@ public extension PostSignUpEntity {
             goalContents: self.goalContents ?? []
         )
     }
-}
-
-public extension PostSignUpResDTO {
-    func toEntity() -> PostSignUpResEntity {
-        return .init(
-            memberType: self.memberType,
-            sessionId: self.sessionId,
-            name: self.name,
-            profileImageUrl: self.profileImageUrl
+
+    /// `PostSocialLoginResDTO` → `PostSocialLoginResEntity` 변환
+    static func toResEntity(from dto: PostSocialLoginResDTO) -> PostSocialLoginResEntity {
+        return PostSocialLoginResEntity(
+            sessionId: dto.sessionId,
+            socialId: dto.socialId,
+            socialEmail: dto.socialEmail,
+            socialType: dto.socialType,
+            isSignUp: dto.isSignUp,
+            membertype: dto.memberType
         )
     }
 }

TnT/Projects/Presentation/Sources/Onboarding/Common/LoginFeature.swift

@@ -11,13 +11,20 @@ import SwiftUI
 
 import Domain
 import DIContainer
+import Data
 
 @Reducer
 public struct LoginFeature {
     @ObservableState
     public struct State: Equatable {
-        @Shared var signUpEntity: PostSignUpEntity
+        public var userType: UserType?
+        public var nickname: String?
+        public var socialType: LoginType?
+        public var socialEmail: String?
         public var postUserEntity: PostSocialEntity?
+        public var termState: Bool = false
+        public var fcmToken: String?
+        @Shared var signUpEntity: PostSignUpEntity
         @Presents var termFeature: TermFeature.State?
 
         public init(
@@ -32,7 +39,7 @@ public struct LoginFeature {
     @Dependency(\.userUseCase) private var userUseCase: UserUseCase
     @Dependency(\.userUseRepoCase) private var userUseCaseRepo: UserRepository
     @Dependency(\.socialLogInUseCase) private var socialLoginUseCase: SocialLoginUseCase
-    @Dependency(\.keyChainManager) var keyChainManager
+    @Dependency(\.keyChainManager) var keyChainManager: KeyChainManager
 
     public enum Action: ViewAction {
         /// 뷰에서 일어나는 액션을 처리합니다.(카카오,애플로그인 실행)
@@ -72,12 +79,14 @@ public struct LoginFeature {
                 switch view {
                 case .tappedAppleLogin:
                     return .run { @Sendable send in
-                        let result = await socialLoginUseCase.appleLogin()
-                        guard let result else { return }
+                        guard let result = await socialLoginUseCase.appleLogin() else { return }
+                        let fcmToken: String? = try keyChainManager.read(for: .apns)
 
-                        let entity = PostSocialEntity(
+                        /// 서버 <-> 소셜 로그인을 위한 객체 생성
+                        let entity: PostSocialEntity = PostSocialEntity(
                             socialType: .apple,
-                            fcmToken: "asdfg", // TODO: FCM 로직 나오면 추후 수정
+                            fcmToken: fcmToken ?? "",
+                            socialAccessToken: "",
                             idToken: result.identityToken
                         )
 
@@ -86,13 +95,15 @@ public struct LoginFeature {
 
                 case .tappedKakaoLogin:
                     return .run { @Sendable send in
-                        let result = await socialLoginUseCase.kakaoLogin()
-                        guard let result else { return }
+                        guard let result = await socialLoginUseCase.kakaoLogin() else { return }
+                        let fcmToken: String? = try keyChainManager.read(for: .apns)
 
-                        let entity = PostSocialEntity(
+                        /// 서버 <-> 소셜 로그인을 위한 객체 생성
+                        let entity: PostSocialEntity = PostSocialEntity(
                             socialType: .kakao,
-                            fcmToken: "asdfg", // TODO: FCM 로직 나오면 추후 수정
-                            socialAccessToken: result.accessToken
+                            fcmToken: fcmToken ?? "",
+                            socialAccessToken: result.accessToken,
+                            idToken: ""
                         )
 
                         await send(.postSocialLogin(entity: entity))
@@ -114,7 +125,8 @@ public struct LoginFeature {
                 return .none
 
             case .postSocialLogin(let entity):
-                let post = entity.toDTO()
+                let post: PostSocialLoginReqDTO = entity.toDTO()
+
                 return .run { send in
                     do {
                         let result = try await userUseCaseRepo.postSocialLogin(post)

TnT/Projects/Presentation/Sources/Onboarding/Common/TermFeature.swift

@@ -40,6 +40,7 @@ public struct TermFeature {
 
     public init() { }
 
+    @Dependency(\.dismiss) var dismiss
     public var body: some ReducerOf<Self> {
         Reduce { state, action in
             switch action {
@@ -54,7 +55,10 @@ public struct TermFeature {
                     return .none
 
                 case .nextButtonTapped:
-                    return .send(.setNavigating)
+                    return .concatenate(
+//                        .run { _ in await self.dismiss() },
+                        .send(.setNavigating)
+                    )
                 }
 
             case .setNavigating:

TnT/Projects/TnTApp/Sources/Application/AppDelegate.swift

@@ -7,25 +7,75 @@
 //
 
 import UIKit
+import Firebase
+import FirebaseMessaging
+import UserNotifications
+
+import Data
 
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
-    func application(_ application: UIApplication,
-                       didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        /// Firebase 설정
+        FirebaseApp.configure()
+        UNUserNotificationCenter.current().delegate = self
+        /// FCM 메시징 델리게이트 설정
+        Messaging.messaging().delegate = self
+
+        /// 알림 권한 요청
+        NotificationManager.shared.checkNotificationPermission()
+
+        /// APNs 등록 요청
+        UIApplication.shared.registerForRemoteNotifications()
+
         return true
     }
 
-    // MARK: UISceneSession Lifecycle
-    func application(
-        _ application: UIApplication,
-        configurationForConnecting connectingSceneSession: UISceneSession,
-        options: UIScene.ConnectionOptions
-    ) -> UISceneConfiguration {
-        return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
+    // MARK: - APNs 등록 성공
+    func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+        let tokenString = deviceToken.map { String(format: "%02.2hhx", $0) }.joined()
+        do {
+            try keyChainManager.save(deviceToken, for: .apns)
+        } catch {
+            print("KeyChain 저장 중 오류 발생 \(error.localizedDescription)")
+        }
+
+        print("✅ APNs Device Token: \(tokenString)")
+        Messaging.messaging().apnsToken = deviceToken
+    }
+
+    // MARK: - APNs 등록 실패
+    func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
+        print("❌ APNs 등록 실패: \(error.localizedDescription)")
     }
+}
 
-    func application(
-        _ application: UIApplication,
-        didDiscardSceneSessions sceneSessions: Set<UISceneSession>
-    ) {}
+// MARK: - UNUserNotificationCenterDelegate
+extension AppDelegate: UNUserNotificationCenterDelegate {
+    /// 포그라운드에서 알림 처리
+    func userNotificationCenter(
+        _ center: UNUserNotificationCenter,
+        willPresent notification: UNNotification,
+        withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void
+    ) {
+        completionHandler([.sound, .badge, .list, .banner])
+    }
+}
+
+// MARK: - MessagingDelegate (FCM 토큰 가져오기)
+extension AppDelegate: MessagingDelegate {
+    func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String?) {
+        guard let fcmToken = fcmToken else {
+            print("❌ FCM 토큰을 가져오지 못했습니다.")
+            return
+        }
+
+        do {
+            try keyChainManager.save(fcmToken, for: .apns)
+        } catch {
+            print("❌ FCM 토큰 저장 중 오류 발생: \(error.localizedDescription)")
+        }
+
+        print("✅ FCM 등록 토큰: \(fcmToken)")
+    }
 }