Merge branch 'main' into fix/PC-630-check-firebase

Author: dev-summer

.gitignore

@@ -69,6 +69,8 @@ Derived/
 ### xcconfig ###
 *.xcconfig
 
+## key
+*.p8
 
 ### Tuist managed dependencies ###
 Tuist/.build

App/Sources/PieceApp.swift

@@ -1,5 +1,6 @@
 import DesignSystem
 import PCFirebase
+import LocalStorage
 import Router
 import KakaoSDKCommon
 import KakaoSDKAuth
@@ -26,6 +27,14 @@ struct PieceApp: App {
       return
     }
     KakaoSDK.initSDK(appKey: kakaoAppKey)
+    
+    // 앱 첫 실행 테스트 시, 아래 주석 해제
+    // PCUserDefaultsService.shared.resetFirstLaunch()
+    if PCUserDefaultsService.shared.checkFirstLaunch() {
+      PCUserDefaultsService.shared.initialize()
+      PCUserDefaultsService.shared.setDidSeeOnboarding(false)
+      PCKeychainManager.shared.deleteAll()
+    }
   }
 
   var body: some Scene {

Data/DTO/Sources/Withdraw/AppleOathTokenResponseDTO.swift

@@ -0,0 +1,12 @@
+//
+//  AppleOathTokenResponseDTO.swift
+//  DTO
+//
+//  Created by eunseou on 2/17/25.
+//
+
+import SwiftUI
+
+public struct AppleOathTokenResponseDTO: Codable {
+  public let access_token: String
+}

Data/DTO/Sources/Withdraw/AppleRevokeOauthTokenRequestDTO.swift

@@ -0,0 +1,15 @@
+//
+//  AppleOauthTokenRequestDTO.swift
+//  DTO
+//
+//  Created by eunseou on 2/17/25.
+//
+
+import SwiftUI
+import Entities
+
+public struct AppleRevokeOauthTokenRequestDTO: Encodable {
+  public let client_id: String
+  public let client_secret: String
+  public let token: String
+}

Data/DTO/Sources/Withdraw/WithdrawRequestDTO.swift

@@ -0,0 +1,17 @@
+//
+//  WithdrawRequestDTO.swift
+//  DTO
+//
+//  Created by eunseou on 2/17/25.
+//
+
+import SwiftUI
+import Entities
+
+public struct WithdrawRequestDTO: Encodable {
+  public let reason: String
+  
+  public init(reason: String) {
+    self.reason = reason
+  }
+}

Data/LocalStorage/Sources/Keychain/PCKeychain.swift

@@ -11,4 +11,7 @@ public enum PCKeychain: String, CaseIterable {
   case accessToken
   case refreshToken
   case role
+  
+  // apple auth
+  case appleAuthCode
 }

Data/LocalStorage/Sources/UserDefaults/PCUserDefaultsService.swift

@@ -29,6 +29,16 @@ public final class PCUserDefaultsService {
       _ = PCUserDefaults.setObjectFor(key: .blockContactsLastUpdatedDate, object: newValue)
     }
   }
+  
+  // 처음 앱을 실행하는지
+  var isFirstLaunch: Bool {
+    get {
+      PCUserDefaults.objectFor(key: .isFirstLaunch) as? Bool ?? true
+    }
+    set {
+      _ = PCUserDefaults.setObjectFor(key: .isFirstLaunch, object: newValue)
+    }
+  }
 }
 
 public extension PCUserDefaultsService {
@@ -52,4 +62,19 @@ public extension PCUserDefaultsService {
   func setBlockContactsLastUpdatedDate(_ date: Date) {
     self.blockContactsLastUpdatedDate = date
   }
+  
+  /// 첫 실행 여부 확인
+  func checkFirstLaunch() -> Bool {
+    if isFirstLaunch {
+      isFirstLaunch = false
+      return true
+    }
+    return false
+  }
+  
+  // 강제로 첫 실행 플래그를 리셋 (테스트용)
+  func resetFirstLaunch() {
+    isFirstLaunch = true
+    didSeeOnboarding = false
+  }
 }

Data/LocalStorage/Sources/UserDefaults/UserDefaultsKeys.swift

@@ -6,6 +6,7 @@
 //
 
 public enum UserDefaultsKeys: String {
+  case isFirstLaunch
   case didSeeOnboarding
   case socialLoginType
   case blockContactsLastUpdatedDate // TODO: - 서버에서 준다고 해서 지우기

Data/PCNetwork/Sources/Endpoint/CommonEndpoint.swift

@@ -7,31 +7,38 @@
 
 import Alamofire
 import DTO
+import LocalStorage
 
 public enum CommonEndpoint: TargetType {
   case healthCheck
+  case withdrawWithPiece(WithdrawRequestDTO)
 
   public var method: Alamofire.HTTPMethod {
     switch self {
     case .healthCheck: .get
+    case .withdrawWithPiece: .delete
     }
   }
 
   public var path: String {
     switch self {
     case .healthCheck: "api/common/health"
+    case .withdrawWithPiece: "api/users"
     }
   }
 
   public var headers: [String : String] {
     switch self {
     case .healthCheck: [:]
+    case .withdrawWithPiece: [NetworkHeader.contentType : NetworkHeader.applicationJson,
+                     NetworkHeader.authorization: NetworkHeader.bearer(PCKeychainManager.shared.read(.accessToken) ?? "")]
     }
   }
 
   public var requestType: RequestType {
     switch self {
     case .healthCheck: .plain
+    case let .withdrawWithPiece(body): .body(body)
     }
   }
 }

Data/PCNetwork/Sources/Endpoint/LoginEndpoint.swift

@@ -13,6 +13,7 @@ public enum LoginEndpoint: TargetType {
   case loginWithOAuth(body: SocialLoginRequsetDTO)
   case sendSMSCode(body: SMSCodeRequestDTO)
   case verifySMSCode(body: VerifySMSCodeRequestDTO)
+  case socialLoginTokenRefresh(body: SocialLoginTokenRefreshRequestDTO)
 
   public var headers: [String : String] {
     switch self {
@@ -28,6 +29,8 @@ public enum LoginEndpoint: TargetType {
         NetworkHeader.contentType: NetworkHeader.applicationJson,
         NetworkHeader.authorization: NetworkHeader.bearer(PCKeychainManager.shared.read(.accessToken) ?? "")
       ]
+    case .socialLoginTokenRefresh(body: let body):
+      [:]
     }
   }
 
@@ -39,7 +42,7 @@ public enum LoginEndpoint: TargetType {
         .post
     case .verifySMSCode:
         .post
-//    case .socialLoginTokenRefresh: .patch
+    case .socialLoginTokenRefresh: .patch
     }
   }
 
@@ -51,8 +54,8 @@ public enum LoginEndpoint: TargetType {
       "api/register/sms/auth/code"
     case .verifySMSCode:
       "api/register/sms/auth/code/verify"
-//    case .socialLoginTokenRefresh:
-//     "/api/login/token/refresh"
+    case .socialLoginTokenRefresh:
+     "/api/login/token/refresh"
     }
   }
 
@@ -64,8 +67,8 @@ public enum LoginEndpoint: TargetType {
         .body(body)
     case .verifySMSCode(let body):
         .body(body)
-//    case let .socialLoginTokenRefresh(body):
-//        .body(body)
+    case let .socialLoginTokenRefresh(body):
+        .body(body)
     }
   }
 }

Data/PCNetwork/Sources/NetworkHeader.swift

@@ -17,4 +17,6 @@ enum NetworkHeader {
   static func bearer(_ token: String) -> String {
     return "Bearer \(token)"
   }
+  static let formUrlEncoded = "x-www-form-urlencoded"
+  static let application = "application"
 }

Data/PCNetwork/Sources/NetworkService.swift

@@ -8,6 +8,7 @@
 import DTO
 import Foundation
 import Alamofire
+import LocalStorage
 
 public class NetworkService {
   public static let shared = NetworkService()

Data/Repository/Sources/Withdraw/WithdrawRepository.swift

@@ -0,0 +1,37 @@
+//
+//  WithdrawRepository.swift
+//  Repository
+//
+//  Created by eunseou on 2/17/25.
+//
+
+import DTO
+import Entities
+import PCNetwork
+import RepositoryInterfaces
+
+final class WithdrawRepository: WithdrawRepositoryInterface {
+private let networkService: NetworkService
+
+  init(networkService: NetworkService) {
+    self.networkService = networkService
+  }
+  
+  public func deleteUserAccount(reason: String) async throws -> VoidModel {
+    let body = WithdrawRequestDTO(reason: reason)
+    let endpoint = CommonEndpoint.withdrawWithPiece(body)
+    let response: VoidResponseDTO = try await networkService.request(endpoint: endpoint)
+    return response.toDomain()
+  }
+  public func withdrawWithApple() async throws -> VoidModel {
+    
+    // TODO: - 애플 전용 탈퇴 (미완)
+    /// 추후 서버와 맞춰볼 필요있음.
+    let body = WithdrawRequestDTO(reason: "")
+    let endpoint = CommonEndpoint.withdrawWithPiece(body)
+    let response: VoidResponseDTO = try await networkService.request(endpoint: endpoint)
+    return response.toDomain()
+  }
+}
+
+

Domain/RepositoryInterfaces/Sources/Withdraw/WithdrawRepositoryInterface.swift

@@ -0,0 +1,14 @@
+//
+//  WithdrawRepositoryInterface.swift
+//  RepositoryInterfaces
+//
+//  Created by eunseou on 2/17/25.
+//
+
+import SwiftUI
+import Entities
+
+public protocol WithdrawRepositoryInterface {
+  func deleteUserAccount(reason: String) async throws -> VoidModel
+  func withdrawWithApple() async throws -> VoidModel
+}

Domain/UseCases/Sources/Common/DeleteUserAccountUseCase.swift

@@ -0,0 +1,26 @@
+//
+//  deleteUserAccountUseCase.swift
+//  UseCases
+//
+//  Created by eunseou on 2/17/25.
+//
+
+import SwiftUI
+import Entities
+import RepositoryInterfaces
+
+public protocol DeleteUserAccountUseCase {
+  func execute(reason: String) async throws -> VoidModel
+}
+
+final class DeleteUserAccountUseCaseImpl: DeleteUserAccountUseCase {
+  private let repository: WithdrawRepositoryInterface
+  
+  public init(repository: WithdrawRepositoryInterface) {
+    self.repository = repository
+  }
+  
+  func execute(reason: String) async throws -> VoidModel {
+    return try await repository.deleteUserAccount(reason: reason)
+  }
+}

Domain/UseCases/Sources/Common/RevokeAppleOauthTokenUseCase.swift

@@ -0,0 +1,26 @@
+//
+//  GetAppleOauthToken.swift
+//  UseCases
+//
+//  Created by eunseou on 2/17/25.
+//
+
+import SwiftUI
+import Entities
+import RepositoryInterfaces
+
+public protocol RevokeAppleOauthTokenUseCase {
+  func execute() async throws -> VoidModel
+}
+
+final class RevokeAppleOauthTokenUseCaseImpl: RevokeAppleOauthTokenUseCase {
+  private let repository: WithdrawRepositoryInterface
+  
+  public init(repository: WithdrawRepositoryInterface) {
+    self.repository = repository
+  }
+  
+  func execute() async throws -> VoidModel {
+    return try await repository.withdrawWithApple()
+  }
+}

Presentation/DesignSystem/Project.swift

@@ -28,6 +28,6 @@ let project = Project.dynamicResourceFramework(
   infoPlist: .extendingDefault(with: infoPlist),
   dependencies: [
     .utility(target: .PCFoundationExtension),
-    .externalDependency(dependency: .Lottie),
+    .externalDependency(dependency: .Lottie)
   ]
 )

Presentation/Feature/Login/Sources/Login/LoginViewModel.swift

@@ -164,6 +164,7 @@ extension LoginViewModel: ASAuthorizationControllerDelegate, ASAuthorizationCont
 
     print("🍎 identityToken : \(identityToken)")
     print("🍎 authorizationCode : \(authorizationCode)")
+    PCKeychainManager.shared.save(.appleAuthCode, value: authorizationCode)
 
     Task {
       do {

Presentation/Feature/Onboarding/Sources/OnboardingView.swift

@@ -31,6 +31,7 @@ struct OnboardingView: View {
     .onAppear {
       viewModel.handleAction(.onAppear)
     }
+    .toolbar(.hidden)
   }
 
   private var topBar: some View {