[Merge] Live 환경 배포 및 업데이트 심사 (v1.9.1)

Atcha-iOS.xcodeproj/project.pbxproj

@@ -58,6 +58,7 @@
 		6D5E03CA2E2882290065AFBE /* Course.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D5E03C92E2882290065AFBE /* Course.swift */; };
 		6D5E03CD2E2882BB0065AFBE /* CourseSearchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D5E03CC2E2882BB0065AFBE /* CourseSearchRequest.swift */; };
 		6D5E03D02E28853E0065AFBE /* CourseSearchResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D5E03CF2E28853E0065AFBE /* CourseSearchResponse.swift */; };
+		6D6056C72F6A18BF0026FA9D /* DiscordWebhookManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D6056C62F6A18BF0026FA9D /* DiscordWebhookManager.swift */; };
 		6D61ABE32F57158000111C9B /* IntroViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D61ABE22F57158000111C9B /* IntroViewController.swift */; };
 		6D61ABE52F57158700111C9B /* IntroViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D61ABE42F57158700111C9B /* IntroViewModel.swift */; };
 		6D61ABE82F57174D00111C9B /* IntroDIContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D61ABE72F57174D00111C9B /* IntroDIContainer.swift */; };
@@ -394,6 +395,7 @@
 		6D5E03C92E2882290065AFBE /* Course.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Course.swift; sourceTree = "<group>"; };
 		6D5E03CC2E2882BB0065AFBE /* CourseSearchRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseSearchRequest.swift; sourceTree = "<group>"; };
 		6D5E03CF2E28853E0065AFBE /* CourseSearchResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseSearchResponse.swift; sourceTree = "<group>"; };
+		6D6056C62F6A18BF0026FA9D /* DiscordWebhookManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiscordWebhookManager.swift; sourceTree = "<group>"; };
 		6D61ABE22F57158000111C9B /* IntroViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntroViewController.swift; sourceTree = "<group>"; };
 		6D61ABE42F57158700111C9B /* IntroViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntroViewModel.swift; sourceTree = "<group>"; };
 		6D61ABE72F57174D00111C9B /* IntroDIContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntroDIContainer.swift; sourceTree = "<group>"; };
@@ -869,6 +871,31 @@
 			path = CourseSearchDTO;
 			sourceTree = "<group>";
 		};
+		6D6056C32F6A188F0026FA9D /* Discord */ = {
+			isa = PBXGroup;
+			children = (
+				6D6056C62F6A18BF0026FA9D /* DiscordWebhookManager.swift */,
+			);
+			path = Discord;
+			sourceTree = "<group>";
+		};
+		6D6056C42F6A18960026FA9D /* Alarm */ = {
+			isa = PBXGroup;
+			children = (
+				B61C448D2E3F57B600285A4B /* AlarmManager.swift */,
+			);
+			path = Alarm;
+			sourceTree = "<group>";
+		};
+		6D6056C52F6A18A20026FA9D /* Location */ = {
+			isa = PBXGroup;
+			children = (
+				6DC617A62F60EB1A002DD641 /* LocationSmoother.swift */,
+				6DC617A82F610238002DD641 /* HomeArrivalManager.swift */,
+			);
+			path = Location;
+			sourceTree = "<group>";
+		};
 		6D61ABE12F5714EF00111C9B /* Intro */ = {
 			isa = PBXGroup;
 			children = (
@@ -1199,12 +1226,12 @@
 		B61C448A2E3F57A900285A4B /* Manager */ = {
 			isa = PBXGroup;
 			children = (
+				6D6056C52F6A18A20026FA9D /* Location */,
+				6D6056C42F6A18960026FA9D /* Alarm */,
+				6D6056C32F6A188F0026FA9D /* Discord */,
 				6D26DFA62F289E58005097A4 /* HeadingManager */,
 				6DADA5952EA09B9500CA9BE2 /* Amplitude */,
-				B61C448D2E3F57B600285A4B /* AlarmManager.swift */,
 				6DD632B72E52E8D000C6A66E /* Proximity */,
-				6DC617A62F60EB1A002DD641 /* LocationSmoother.swift */,
-				6DC617A82F610238002DD641 /* HomeArrivalManager.swift */,
 			);
 			path = Manager;
 			sourceTree = "<group>";
@@ -2276,6 +2303,7 @@
 				6D368BB22E03BD2C00144EE7 /* SearchTextField.swift in Sources */,
 				B65C12E02E042D260016D2F0 /* UserRepository.swift in Sources */,
 				B6713CC02E129ABC00AF8486 /* RequestLocationAuthorizationRepositoryImpl.swift in Sources */,
+				6D6056C72F6A18BF0026FA9D /* DiscordWebhookManager.swift in Sources */,
 				6D368BA82E02E92000144EE7 /* BackOnlyNavigationBar.swift in Sources */,
 				6D368BB42E03BE9A00144EE7 /* AtchaTextField.swift in Sources */,
 				B673C48F2E0424F600EE4AD0 /* SplashViewController.swift in Sources */,
@@ -2511,7 +2539,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.9;
+				MARKETING_VERSION = 1.9.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atcha.iOS;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2558,7 +2586,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.9;
+				MARKETING_VERSION = 1.9.1;
 				OTHER_SWIFT_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.atcha.iOS;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2606,7 +2634,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.9;
+				MARKETING_VERSION = 1.9.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atcha.iOS;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Atcha-iOS/App/DIContainer/AppCompositionRoot.swift

@@ -18,59 +18,61 @@ final class AppCompositionRoot {
     let apiService: APIService
     let noHeaderApiService: APIService
     let locationStateHolder: LocationStateHolder
-
+    
     // MARK: Feature DI containers
     let splashDIContainer: SplashDIContainer
     let loginDIContainer: LoginDIContainer
     let onboardingDIContainer: OnboardingDIContainer
     let mainDIContainer: MainDIContainer
     let lockScreenDIContainer: LockScreenDIContainer
     let introDIContainer: IntroDIContainer
-
+    
     // MARK: - Init
     init() {
         // Core
         self.tokenStorage = TokenStorageImpl()
         self.networkDIContainer = NetworkDIContainer(tokenStorage: tokenStorage)
-        self.apiService = networkDIContainer.makeAPIService()
+        self.apiService = networkDIContainer.makeAPIService(useInterceptor: true)
         self.noHeaderApiService = networkDIContainer.makeAPIService(useInterceptor: false)
         self.locationStateHolder = LocationStateHolder()
-
+        
         // Features
-        self.splashDIContainer = SplashDIContainer(apiService: apiService)
-        self.loginDIContainer = LoginDIContainer(apiService: noHeaderApiService)
+        self.splashDIContainer = SplashDIContainer(apiService: apiService,
+                                                   tokenStorage: tokenStorage)
+        self.loginDIContainer = LoginDIContainer(apiService: apiService, tokenStorage: tokenStorage)
         self.onboardingDIContainer = OnboardingDIContainer(apiService: apiService,
-                                                           locationStateHolder: locationStateHolder)
+                                                           locationStateHolder: locationStateHolder, tokenStorage: tokenStorage)
         self.mainDIContainer = MainDIContainer(apiService: apiService,
-                                               locationStateHolder: locationStateHolder)
+                                               locationStateHolder: locationStateHolder,
+                                               tokenStorage: tokenStorage)
         self.lockScreenDIContainer = LockScreenDIContainer(apiService: apiService)
         self.introDIContainer = IntroDIContainer()
     }
 }
 
 // MARK: - Coordinator factories forwarding
 extension AppCompositionRoot: SplashCoordinatorFactory,
-                               LoginCoordinatorFactory,
-                               OnboardingCoordinatorFactory,
-                               MainCoordinatorFactory,
+                              LoginCoordinatorFactory,
+                              OnboardingCoordinatorFactory,
+                              MainCoordinatorFactory,
                               LockScreenCoordinatorFactory,
                               IntroCoordinatorFactory {
     func makeSplashCoordinator(navigationController: UINavigationController) -> SplashCoordinator {
         return splashDIContainer.makeSplashCoordinator(navigationController: navigationController)
     }
-
+    
     func makeLoginCoordinator(navigationController: UINavigationController) -> LoginCoordinator {
         return loginDIContainer.makeLoginCoordinator(navigationController: navigationController)
     }
-
+    
     func makeOnboardingCoordinator(navigationController: UINavigationController) -> OnboardingCoordinator {
         return onboardingDIContainer.makeOnboardingCoordinator(navigationController: navigationController)
     }
-
+    
     func makeMainCoordinator(navigationController: UINavigationController) -> MainCoordinator {
         return mainDIContainer.makeMainCoordinator(navigationController: navigationController)
     }
-
+    
     func makeLockScreenCoordinator(navigationController: UINavigationController) -> LockScreenCoordinator {
         return lockScreenDIContainer.makeLockScreenCoordinator(navigationController: navigationController)
     }

Atcha-iOS/App/DIContainer/Course/CourseDIContainer.swift

@@ -11,23 +11,32 @@ import UIKit
 final class CourseDIContainer {
     private let apiService: APIService
     private let locationStateHolder: LocationStateHolder
+    private let tokenStorage: TokenStorage
     private lazy var searchAddressUseCase = SearchAddressUseCaseImpl(repository: AddressRepositoryImpl(apiService: apiService))
     private lazy var requestUseCase = RequestLocationAuthorizationUseCaseImpl(repository: PermissionRepositoryImpl())
     private lazy var streamUseCase = ObserLocationStreamUseCaseImpl(repository: LocationStreamRepositoryImpl())
 
-    init(apiService: APIService, locationStateHolder: LocationStateHolder) {
+    init(apiService: APIService,
+         locationStateHolder: LocationStateHolder,
+         tokenStorage: TokenStorage) {
         self.apiService = apiService
         self.locationStateHolder = locationStateHolder
+        self.tokenStorage = tokenStorage
     }
 
-    func makeCourseSearchViewModel(startLat: String, startLon: String, startAddress: String) -> CourseSearchViewModel {
-        let courseUseCase = CourseUseCaseImpl(repository: CourseRepositoryImpl(apiService: apiService))
+    func makeCourseSearchViewModel(startLat: String, startLon: String, startAddress: String, context: CourseSearchContext) -> CourseSearchViewModel {
+        let courseUseCase = CourseUseCaseImpl(
+            repository: CourseRepositoryImpl(apiService: apiService, tokenStorage: tokenStorage)
+        )
+
         let alarmUseCase = AlarmUseCaseImpl(repository: AlarmRepositoryImpl(apiService: apiService))
+
         return CourseSearchViewModel(courseUseCase: courseUseCase,
                                      alarmUseCase: alarmUseCase,
                                      startLat: startLat,
                                      startLon: startLon,
-                                     startAddress: startAddress)
+                                     startAddress: startAddress,
+                                     context: context)
     }
 
     func makeCourseSearchViewController(viewModel: CourseSearchViewModel) -> UIViewController {

Atcha-iOS/App/DIContainer/Login/LoginDIContainer.swift

@@ -10,18 +10,23 @@ import Foundation
 
 final class LoginDIContainer {
     private let apiService: APIService
-
-    init(apiService: APIService) {
+    private let tokenStorage: TokenStorage
+
+    init(apiService: APIService, tokenStorage: TokenStorage) {
         self.apiService = apiService
+        self.tokenStorage = tokenStorage
     }
-
+    
     func makeLoginUseCase() -> LoginUseCase {
-        let repository: UserRepository = UserRepositoryImpl(apiService: apiService)
+        let repository: UserRepository = UserRepositoryImpl(apiService: apiService, tokenStorage: tokenStorage)
         return LoginUseCaseImpl(repository: repository)
     }
-
+    
     func makeLoginViewModel() -> LoginViewModel {
-        LoginViewModel(loginUseCase: makeLoginUseCase())
+        LoginViewModel(
+            loginUseCase: makeLoginUseCase(),
+            tokenStorage: tokenStorage 
+        )
     }
 
     func makeLoginCoordinator(navigationController: UINavigationController) -> LoginCoordinator {

Atcha-iOS/App/DIContainer/Main/MainDIContainer.swift

@@ -11,21 +11,26 @@ import Foundation
 final class MainDIContainer {
     private let apiService: APIService
     private let locationStateHolder: LocationStateHolder
+    private let tokenStorage: TokenStorage
+
     private lazy var searchAddressUseCase = SearchAddressUseCaseImpl(repository: AddressRepositoryImpl(apiService: apiService))
     private lazy var requestUseCase = RequestLocationAuthorizationUseCaseImpl(repository: PermissionRepositoryImpl())
     private lazy var streamUseCase = ObserLocationStreamUseCaseImpl(repository: LocationStreamRepositoryImpl())
     private lazy var busInfoUseCase = BusInfoUseCaseImpl(repository: BusInfoRepositoryImpl(apiService: apiService))
     private lazy var alarmUseCase = AlarmUseCaseImpl(repository: AlarmRepositoryImpl(apiService: apiService))
-    private lazy var courseUseCase = CourseUseCaseImpl(repository: CourseRepositoryImpl(apiService: apiService))
+    private lazy var courseUseCase = CourseUseCaseImpl(repository: CourseRepositoryImpl(apiService: apiService, tokenStorage: tokenStorage))
 
     private lazy var myPageDI: MyPageDIContainer = {
         MyPageDIContainer(apiService: apiService,
-                          locationStateHolder: locationStateHolder)
+                          tokenStorage: tokenStorage, locationStateHolder: locationStateHolder)
     }()
 
     private lazy var courseDI: CourseDIContainer = {
-        CourseDIContainer(apiService: apiService,
-                          locationStateHolder: locationStateHolder)
+        CourseDIContainer(
+            apiService: apiService,
+            locationStateHolder: locationStateHolder,
+            tokenStorage: tokenStorage
+        )
     }()
 
     private lazy var rotueDI: RouteDIContainer = {
@@ -45,16 +50,17 @@ final class MainDIContainer {
     }()
 
     private lazy var loginDI: LoginDIContainer = {
-        LoginDIContainer(apiService: apiService)
+        LoginDIContainer(apiService: apiService, tokenStorage: tokenStorage)
     }()
 
     private lazy var homeRegisterDI: HomeRegisterDIContainer = {
-        HomeRegisterDIContainer(apiService: apiService, locationStateHolder: locationStateHolder)
+        HomeRegisterDIContainer(apiService: apiService, locationStateHolder: locationStateHolder, tokenStorage: tokenStorage)
     }()
 
-    init(apiService: APIService, locationStateHolder: LocationStateHolder) {
+    init(apiService: APIService, locationStateHolder: LocationStateHolder, tokenStorage: TokenStorage) {
         self.apiService = apiService
         self.locationStateHolder = locationStateHolder
+        self.tokenStorage = tokenStorage
     }
 
     func makeMainiewModel() -> MainViewModel {

Atcha-iOS/App/DIContainer/NetworkDIContainer.swift

@@ -8,28 +8,51 @@
 import Foundation
 import Alamofire
 
+
 final class NetworkDIContainer {
     private let tokenStorage: TokenStorage
 
+    // 인터셉터가 있는 세션 (메모리 유지를 위해 프로퍼티로 선언)
+    private lazy var authenticatedSession: Session = makeSession(useInterceptor: true)
+
+    // 인터셉터가 없는 세션 (로그인용)
+    private lazy var publicSession: Session = makeSession(useInterceptor: false)
+
     init(tokenStorage: TokenStorage) {
         self.tokenStorage = tokenStorage
     }
 
-    func makeSession(useInterceptor: Bool = true) -> Session {
+    private func makeSession(useInterceptor: Bool) -> Session {
         let configuration = URLSessionConfiguration.default
         configuration.timeoutIntervalForRequest = NetworkConstant.timeoutInterval
 
-        let interceptor: RequestInterceptor? = useInterceptor ? TokenInterceptor(tokenStorage: tokenStorage) : nil
+        let interceptor: RequestInterceptor?
+        if useInterceptor {
+            interceptor = TokenInterceptor(
+                tokenStorage: tokenStorage,
+                refreshSession: publicSession 
+            )
+        } else {
+            interceptor = nil
+        }
+
+        let evaluators: [String: ServerTrustEvaluating] = [
+            "atcha.p-e.kr": DisabledTrustEvaluator(),
+            "atcha.online": DisabledTrustEvaluator()
+        ]
+        let trustManager = ServerTrustManager(evaluators: evaluators)
 
         return Session(
             configuration: configuration,
             interceptor: interceptor,
+            serverTrustManager: trustManager,
             eventMonitors: [NetworkLogger()]
         )
     }
 
+    // APIService 생성 시 미리 만들어둔(공유된) 세션을 주입합니다.
     func makeAPIService(useInterceptor: Bool = true) -> APIService {
-        return APIServiceImpl(session: makeSession(useInterceptor: useInterceptor))
+        let session = useInterceptor ? authenticatedSession : publicSession
+        return APIServiceImpl(session: session)
     }
 }
-

Atcha-iOS/App/DIContainer/Onboarding/OnboardingDIContainer.swift

@@ -11,23 +11,30 @@ import Foundation
 final class OnboardingDIContainer {
     private let apiService: APIService
     private let locationStateHolder: LocationStateHolder
+    private let tokenStorage: TokenStorage
 
     private lazy var homeDI: HomeRegisterDIContainer = {
-        HomeRegisterDIContainer(apiService: apiService, locationStateHolder: locationStateHolder)
+        HomeRegisterDIContainer(apiService: apiService,
+                                locationStateHolder: locationStateHolder,
+                                tokenStorage: tokenStorage)
     }()
 
     private lazy var pushDI: PushRegisterDIContainer = {
-        PushRegisterDIContainer(apiService: apiService, locationStateHolder: locationStateHolder)
+        PushRegisterDIContainer(apiService: apiService,
+                                locationStateHolder: locationStateHolder,
+                                tokenStorage: tokenStorage)
     }()
-
+    
     private lazy var permissionDI: PermissionDIContainer = {
         PermissionDIContainer(locationStateHolder: locationStateHolder)
     }()
 
     init(apiService: APIService,
-         locationStateHolder: LocationStateHolder) {
+         locationStateHolder: LocationStateHolder,
+         tokenStorage: TokenStorage) {
         self.apiService = apiService
         self.locationStateHolder = locationStateHolder
+        self.tokenStorage = tokenStorage
     }
 
     func makeHomeRegisterViewModel() -> HomeRegisterViewModel { homeDI.makeHomeRegisterViewModel(context: .onboarding) }