[Merge] Live 환경 배포 및 심사 (v1.9.6)

Atcha-iOS.xcodeproj/project.pbxproj

@@ -2516,7 +2516,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 23SCTLK482;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2539,7 +2539,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.9.5;
+				MARKETING_VERSION = 1.9.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atcha.iOS;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2563,7 +2563,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Atcha-iOS/Atcha-iOS.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 23SCTLK482;
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2586,7 +2586,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.9.5;
+				MARKETING_VERSION = 1.9.6;
 				OTHER_SWIFT_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.atcha.iOS;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2611,7 +2611,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 23SCTLK482;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2634,7 +2634,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.9.5;
+				MARKETING_VERSION = 1.9.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atcha.iOS;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Atcha-iOS/App/AppConfig.swift

@@ -21,4 +21,6 @@ enum AppConfig {
     static var kakaoInitKey: String { required("KAKAO_INIT_KEY") }
     static var tmapApiKey: String { required("TMAP_API_KEY") }
     static var amplitudeApiKey: String { required("AMPLITUDE_API_KEY") }
+    static var errorWebhookURL: String { required("ERROR_WEBHOOK_URL") }
+    static var authWebhookURL: String { required("AUTH_WEBHOOK_URL") }
 }

Atcha-iOS/App/AppFlowCoordinator.swift

@@ -25,7 +25,7 @@ class AppFlowCoordinator {
         self.container = container
     }
 
-    func startApp() {
+    func startApp(launchType: LaunchType = .main) {
         let navigationController = UINavigationController()
         window.rootViewController = navigationController
         window.makeKeyAndVisible()
@@ -35,11 +35,14 @@ class AppFlowCoordinator {
             DispatchQueue.main.async {
                 AppDIContainer.shared.tokenStorage.clearAllTokens()
                 UserDefaultsWrapper.shared.set(false, forKey: UserDefaultsWrapper.Key.hasSeenIntro.rawValue)
-                self?.startApp()
+                self?.startApp(launchType: .fast)
             }
         }
 
-        let splashCoordinator = container.makeSplashCoordinator(navigationController: navigationController)
+        let splashCoordinator = container.makeSplashCoordinator(
+            navigationController: navigationController,
+            launchType: launchType
+        )
         splashCoordinator.routerHandler = { [weak self] router in
             guard let self = self else { return }
             switch router {
@@ -114,7 +117,7 @@ class AppFlowCoordinator {
         mainCoordinator.withdrawFinish = { [weak self] in
             DispatchQueue.main.async {
                 // 앱 데이터를 다 지웠으니, 스플래시부터 앱을 아예 새로 시작(리부팅)합니다!
-                self?.startApp()
+                self?.startApp(launchType: .fast)
             }
         }
 

Atcha-iOS/App/DIContainer/AppCompositionRoot.swift

@@ -57,8 +57,8 @@ extension AppCompositionRoot: SplashCoordinatorFactory,
                               MainCoordinatorFactory,
                               LockScreenCoordinatorFactory,
                               IntroCoordinatorFactory {
-    func makeSplashCoordinator(navigationController: UINavigationController) -> SplashCoordinator {
-        return splashDIContainer.makeSplashCoordinator(navigationController: navigationController)
+    func makeSplashCoordinator(navigationController: UINavigationController, launchType: LaunchType) -> SplashCoordinator {
+        return splashDIContainer.makeSplashCoordinator(navigationController: navigationController, launchType: launchType)
     }
 
     func makeLoginCoordinator(navigationController: UINavigationController) -> LoginCoordinator {

Atcha-iOS/App/DIContainer/CoordinatorFactory.swift

@@ -13,7 +13,7 @@ import Foundation
 /// to avoid service locator style lookups and to enable constructor injection of dependencies.
 
 protocol SplashCoordinatorFactory {
-    func makeSplashCoordinator(navigationController: UINavigationController) -> SplashCoordinator
+    func makeSplashCoordinator(navigationController: UINavigationController, launchType: LaunchType) -> SplashCoordinator
 }
 
 protocol LoginCoordinatorFactory {
@@ -45,8 +45,8 @@ extension AppDIContainer: SplashCoordinatorFactory,
                           MainCoordinatorFactory,
                           LockScreenCoordinatorFactory,
                           IntroCoordinatorFactory {
-    func makeSplashCoordinator(navigationController: UINavigationController) -> SplashCoordinator {
-        return splashDIContainer.makeSplashCoordinator(navigationController: navigationController)
+    func makeSplashCoordinator(navigationController: UINavigationController, launchType: LaunchType) -> SplashCoordinator {
+        return splashDIContainer.makeSplashCoordinator(navigationController: navigationController, launchType: launchType)
     }
 
     func makeLoginCoordinator(navigationController: UINavigationController) -> LoginCoordinator {

Atcha-iOS/App/DIContainer/Splash/SplashDIContainer.swift

@@ -32,21 +32,23 @@ final class SplashDIContainer {
         return UpdateAppVersionUseCaseImpl(repository: repository)
     }
 
-    func makeSplashViewModel() -> SplashViewModel {
+    func makeSplashViewModel(launchType: LaunchType) -> SplashViewModel {
         return SplashViewModel(
             fetchUserUseCase: makeFetchUserUseCase(),
             checkAppVersionUseCase: makeCheckAppVersionUseCase(),
             updateAppVersionUseCase: makeUpdateAppVersionUseCase(),
-            tokenStorage: tokenStorage
+            tokenStorage: tokenStorage,
+            launchType: launchType
         )
     }
 
     func makeSplashViewController(viewModel: SplashViewModel) -> SplashViewController {
         return SplashViewController(viewModel: viewModel)
     }
 
-    func makeSplashCoordinator(navigationController: UINavigationController) -> SplashCoordinator {
+    func makeSplashCoordinator(navigationController: UINavigationController, launchType: LaunchType) -> SplashCoordinator {
         SplashCoordinator(navigationController: navigationController,
-                          diContainer: self)
+                          diContainer: self,
+                          launchType: launchType)
     }
 }

Atcha-iOS/App/SceneDelegate.swift

@@ -17,9 +17,10 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
         guard let windowScene = (scene as? UIWindowScene) else { return }
         let window = UIWindow(windowScene: windowScene)
+        var launchType: LaunchType = .main
 
         appFlowCoordinator = AppFlowCoordinator(window: window, container: diContainer)
-        appFlowCoordinator?.startApp()
+        appFlowCoordinator?.startApp(launchType: launchType)
 
         self.window = window
     }

Atcha-iOS/Base.lproj/LaunchScreen.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23727" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="24506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24504"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>

Atcha-iOS/Core/Manager/Discord/DiscordWebhookManager.swift

@@ -11,8 +11,10 @@ final class DiscordWebhookManager {
     static let shared = DiscordWebhookManager()
     private init() {}
 
-    private let webhookURLString = "https://discord.com/api/webhooks/1483870710018474066/qyzNBI1Bwr7J5tQDrPx2-mOcej_9yLSOk5Bmlmza2D-4nSWqvWgcMd4CZDziG4vkpKrm"
+    private let errorWebhookURLString = AppConfig.errorWebhookURL
+    private let authWebhookURLString = AppConfig.authWebhookURL
 
+    // MARK: - 오류 로그
     func sendErrorLog(
         baseURL: String,
         statusCode: Int,
@@ -24,14 +26,10 @@ final class DiscordWebhookManager {
         requestBody: [String: Any]? = nil,
         requestParameters: [String: Any]? = nil
     ) {
-        guard let url = URL(string: webhookURLString) else { return }
+        guard let url = URL(string: errorWebhookURLString) else { return }
 
-        // Authorization 토큰 앞 30자만 노출
-        let headersText = requestHeaders.map { key, value in
-            return "\(key): \(value)"
-        }.joined(separator: "\n")
+        let headersText = requestHeaders.map { "\($0.key): \($0.value)" }.joined(separator: "\n")
 
-        // body JSON 변환
         let bodyText: String
         if let body = requestBody,
            let data = try? JSONSerialization.data(withJSONObject: body, options: .prettyPrinted),
@@ -54,22 +52,58 @@ final class DiscordWebhookManager {
             "content": "🚨 [Atcha-iOS] API 에러 발생!",
             "embeds": [[
                 "title": "서버 에러 상세 보고",
-                "color": 16711680,
+                "color": 16711680, // 빨강
                 "fields": [
-                    ["name": "Base URL",      "value": "`\(baseURL)`",           "inline": false],
-                    ["name": "Method & Path",     "value": "`\(method) \(path)`",          "inline": false],
-                    ["name": "HTTP Status",        "value": "\(statusCode)",                 "inline": true],
-                    ["name": "responseCode",       "value": responseCode,                    "inline": true],
-                    ["name": "App Version",        "value": AppInfoProvider.currentVersion,  "inline": true],
-                    ["name": "Error Message",      "value": message,                         "inline": false],
-                    ["name": "Request Headers",    "value": "```\n\(headersText)\n```",      "inline": false],
-                    ["name": "Request Parameters", "value": paramsText,                      "inline": false],
-                    ["name": "Request Body",       "value": bodyText,                        "inline": false]
+                    ["name": "Base URL",           "value": "`\(baseURL)`",                  "inline": false],
+                    ["name": "Method & Path",      "value": "`\(method) \(path)`",           "inline": false],
+                    ["name": "HTTP Status",        "value": "\(statusCode)",                  "inline": true],
+                    ["name": "responseCode",       "value": responseCode,                     "inline": true],
+                    ["name": "App Version",        "value": AppInfoProvider.currentVersion,   "inline": true],
+                    ["name": "Error Message",      "value": message,                          "inline": false],
+                    ["name": "Request Headers",    "value": "```\n\(headersText)\n```",       "inline": false],
+                    ["name": "Request Parameters", "value": paramsText,                       "inline": false],
+                    ["name": "Request Body",       "value": bodyText,                         "inline": false]
                 ],
                 "footer": ["text": "발생 시각: \(Date().kstString)"]
             ]]
         ]
 
+        sendToWebhook(url: url, payload: payload)
+    }
+
+    // MARK: - 로그인/탈퇴 로그
+    func sendAuthLog(event: AuthEvent, userID: String, provider: String? = nil, reason: String? = nil) {
+        guard let url = URL(string: authWebhookURLString) else { return }
+
+        var fields: [[String: Any]] = [
+            ["name": "이벤트",      "value": event.title,                   "inline": true],
+            ["name": "유저 ID",     "value": "`\(userID)`",                 "inline": true],
+            ["name": "App Version", "value": AppInfoProvider.currentVersion, "inline": true]
+        ]
+
+        if let provider {
+            fields.append(["name": "로그인 방식", "value": provider, "inline": true])
+        }
+
+        if let reason {
+            fields.append(["name": "탈퇴 사유", "value": reason, "inline": false])
+        }
+
+        let payload: [String: Any] = [
+            "content": event.headerMessage,
+            "embeds": [[
+                "title": event.embedTitle,
+                "color": event.color,
+                "fields": fields,
+                "footer": ["text": "발생 시각: \(Date().kstString)"]
+            ]]
+        ]
+
+        sendToWebhook(url: url, payload: payload)
+    }
+
+    // MARK: - 공통 전송
+    private func sendToWebhook(url: URL, payload: [String: Any]) {
         var request = URLRequest(url: url)
         request.httpMethod = "POST"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
@@ -79,6 +113,51 @@ final class DiscordWebhookManager {
     }
 }
 
+// MARK: - Auth Event 타입
+enum AuthEvent {
+    case login
+    case signup
+    case logout
+    case withdraw
+
+    var title: String {
+        switch self {
+        case .login:    return "로그인"
+        case .signup:   return "회원가입"
+        case .logout:   return "로그아웃"
+        case .withdraw: return "회원탈퇴"
+        }
+    }
+
+    var embedTitle: String {
+        switch self {
+        case .login:    return "로그인 이벤트"
+        case .signup:   return "회원가입 이벤트"
+        case .logout:   return "로그아웃 이벤트"
+        case .withdraw: return "회원탈퇴 이벤트"
+        }
+    }
+
+    var headerMessage: String {
+        switch self {
+        case .login:    return "✅ [Atcha-iOS] 로그인"
+        case .signup:   return "🎉 [Atcha-iOS] 회원가입"
+        case .logout:   return "👋 [Atcha-iOS] 로그아웃"
+        case .withdraw: return "❌ [Atcha-iOS] 회원탈퇴"
+        }
+    }
+
+    var color: Int {
+        switch self {
+        case .login:    return 3066993   // 초록
+        case .signup:   return 5814783   // 파랑  
+        case .logout:   return 16776960  // 노랑
+        case .withdraw: return 10038562  // 보라
+        }
+    }
+}
+
+// MARK: - Date Extension
 private extension Date {
     var kstString: String {
         let formatter = DateFormatter()

Atcha-iOS/Core/Network/Token/SessionController.swift

@@ -26,6 +26,8 @@ final class SessionController {
         storage.clearRefreshToken()
         UserDefaultsWrapper.shared.removeAll()
         AppDIContainer.shared.locationStateHolder.clear()
+        UserDefaultsWrapper.shared.set(true, forKey: UserDefaultsWrapper.Key.isGuest.rawValue)
+        UserDefaultsWrapper.shared.set(false, forKey: UserDefaultsWrapper.Key.hasSeenIntro.rawValue)
 
         // 로그인 화면으로
         DispatchQueue.main.async { [weak self] in

Atcha-iOS/Core/Network/Token/TokenInterceptor.swift

@@ -77,8 +77,6 @@ final class TokenInterceptor: RequestInterceptor, @unchecked Sendable {
             return
         }
 
-        let actualHeaders = request.request?.allHTTPHeaderFields ?? [:]
-
         guard let refreshToken = tokenStorage.refreshToken else {
             SessionController.shared.expireAndRouteToLogin()
             completion(.doNotRetry)
@@ -109,24 +107,7 @@ final class TokenInterceptor: RequestInterceptor, @unchecked Sendable {
                             waiters.forEach { $0(.doNotRetry) }
                             return
                         }
-
-                        let successBody = [
-                            "newAccessToken": p.accessToken,
-                            "newRefreshToken": p.refreshToken
-                        ]
-
-                        DiscordWebhookManager.shared.sendErrorLog(
-                            baseURL: NetworkConstant.baseURL,
-                            statusCode: 200,
-                            method: "GET",
-                            path: "/auth/reissue",
-                            responseCode: "REISSUE_SUCCESS",
-                            message: "토큰 재발급에 성공하여 새로운 토큰을 수신했습니다.",
-                            requestHeaders: actualHeaders,
-                            requestBody: successBody, // 여기서 받은 토큰 정보를 보냅니다.
-                            requestParameters: nil
-                        )
-
+
                         self.tokenStorage.accessToken = p.accessToken
                         self.tokenStorage.refreshToken = p.refreshToken
 

Atcha-iOS/DesignSource/AtchaImage/Icon.xcassets/Onboarding/setting_home_mark.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "setting_home_mark.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "setting_home_mark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "setting_home_mark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}