[Feat] #197 - 토큰 재발급 정상 작동하도록 수정 / 플그 미등록 비활동 유저 자동로그인 처리 / 스플래시 이미지 변경

SOPT-iOS/Projects/Core/Sources/Enum/ServiceType.swift

@@ -29,7 +29,7 @@ public enum ServiceType {
         case .attendance: return ""
         case .member: return "https://playground.sopt.org/members"
         case .notice: return ""
-        case .crew: return "https://playground.sopt.org/group"
+        case .crew: return "https://playground.sopt.org/group?utm_source=playground_group&utm_medium=app_button&utm_campaign=app"
         }
     }
 }

SOPT-iOS/Projects/Core/Sources/Literals/UserDefaultKeyLIst.swift

@@ -49,6 +49,10 @@ extension UserDefaultKeyList.Auth {
             return UserType.visitor
         }
 
+        guard appAccessToken != "" else {
+            return UserType.unregisteredInactive
+        }
+
         return getUserActivation()
         ? UserType.active
         : UserType.inactive

SOPT-iOS/Projects/Data/Sources/Repository/MainRepository.swift

@@ -25,9 +25,19 @@ public class MainRepository {
 }
 
 extension MainRepository: MainRepositoryInterface {
-    public func getUserMainInfo() -> AnyPublisher<Domain.UserMainInfoModel?, Error> {
+    public func getUserMainInfo() -> AnyPublisher<Domain.UserMainInfoModel?, Never> {
         userService.getUserMainInfo()
             .map { $0.toDomain() }
+            .catch({ error in
+                var model: UserMainInfoModel?
+                if let error = error as? APIError,
+                   case .tokenReissuanceFailed = error {
+                    model = UserMainInfoModel(withError: false)
+                } else {
+                    model = UserMainInfoModel(withError: true)
+                }
+                return Just(model)
+            })
             .eraseToAnyPublisher()
     }
 

SOPT-iOS/Projects/Data/Sources/Repository/SignInRepository.swift

@@ -32,13 +32,15 @@ extension SignInRepository: SignInRepositoryInterface {
         authService.signIn(token: token)
             .catch ({ error in
                 guard
-                    let error = error as? SOPTAPPError,
+                    let error = error as? APIError,
                     case .network(let statusCode) = error,
                     statusCode == 400
                 else {
                     return self.userService.reissuance()
                 }
-
+                // NOTE: (@준호) 플그 미등록 + 비활동 유저의 경우 임시로 accessToken 빈 스트링 부여
+                // 자동로그인 시 활용하기 위함
+                UserDefaultKeyList.Auth.appAccessToken = ""
                 return Fail(error: error).eraseToAnyPublisher()
             })
             .map { entity in

SOPT-iOS/Projects/Domain/Sources/RepositoryInterface/MainRepositoryInterface.swift

@@ -11,6 +11,6 @@ import Core
 import Combine
 
 public protocol MainRepositoryInterface {
-    func getUserMainInfo() -> AnyPublisher<UserMainInfoModel?, Error>
+    func getUserMainInfo() -> AnyPublisher<UserMainInfoModel?, Never>
     func getServiceState() -> AnyPublisher<ServiceStateModel, Error>
 }

SOPT-iOS/Projects/Domain/Sources/UseCase/MainUseCase.swift

@@ -33,7 +33,6 @@ public class DefaultMainUseCase {
 extension DefaultMainUseCase: MainUseCase {
     public func getUserMainInfo() {
         repository.getUserMainInfo()
-            .replaceError(with: UserMainInfoModel.init(withError: true))
             .sink { event in
                 print("MainUseCase: \(event)")
             } receiveValue: { [weak self] userMainInfoModel in

SOPT-iOS/Projects/Features/MainFeature/Sources/MainScene/VC/MainVC.swift

@@ -130,7 +130,6 @@ extension MainVC {
     }
 
     private func bindViews() {
-        // FIXME: - 디버깅을 위한 임시 바인딩
         naviBar.rightButton.publisher(for: .touchUpInside)
             .withUnretained(self)
             .sink { owner, _ in
@@ -217,7 +216,7 @@ extension MainVC: UICollectionViewDelegate {
               return
           }
 
-          var needOfficialProject = service == .project && viewModel.userType == .visitor
+          let needOfficialProject = service == .project && viewModel.userType == .visitor
           let serviceDomainURL = needOfficialProject
           ? ExternalURL.SOPT.project
           : service.serviceDomainLink

SOPT-iOS/Projects/Features/SplashFeature/Sources/SplashScene/VC/SplashVC.swift

@@ -36,7 +36,7 @@ public class SplashVC: UIViewController, SplashViewControllable {
     // MARK: - UI Components
 
     private let logoImage = UIImageView().then {
-        $0.image = DSKitAsset.Assets.splashLogo.image.withRenderingMode(.alwaysOriginal)
+        $0.image = DSKitAsset.Assets.imgLogoBig.image.withRenderingMode(.alwaysOriginal)
         $0.contentMode = .scaleAspectFit
     }
 
@@ -57,7 +57,7 @@ extension SplashVC {
 
     private enum Metric {
         static let logoWidth = 184.adjusted
-        static let topInset = 151.adjustedH + 137.adjustedH + 5.adjustedH
+        static let topInset = 151.adjustedH + 137.adjustedH
     }
 
     private func setUI() {
@@ -143,7 +143,7 @@ extension SplashVC {
         let nextVC = factory.makeSignInVC().viewController
         nextVC.modalPresentationStyle = .fullScreen
         nextVC.modalTransitionStyle = .crossDissolve
-        self.present(nextVC, animated: true)
+        self.present(nextVC, animated: false)
     }
 
     private func presentNetworkAlertVC() {

SOPT-iOS/Projects/Modules/Network/Sources/API/AuthAPI.swift

@@ -65,4 +65,8 @@ extension AuthAPI: BaseAPI {
             return .requestParameters(parameters: bodyParameters ?? [:], encoding: parameterEncoding)
         }
     }
+
+    public var validationType: ValidationType {
+        return .none
+    }
 }

SOPT-iOS/Projects/Modules/Network/Sources/API/UserAPI.swift

@@ -88,4 +88,12 @@ extension UserAPI: BaseAPI {
             return .requestPlain
         }
     }
+
+    public var validationType: ValidationType {
+        switch self {
+        case .reissuance:
+            return .none
+        default : return .successCodes
+        }
+    }
 }

SOPT-iOS/Projects/Modules/Network/Sources/Foundation/APIError.swift

@@ -0,0 +1,21 @@
+//
+//  APIError.swift
+//  Network
+//
+//  Created by Junho Lee on 2023/04/21.
+//  Copyright © 2023 SOPT-iOS. All rights reserved.
+//
+
+import Foundation
+
+public enum APIError: Error, Equatable {
+    case network(statusCode: Int)
+    case unknown
+    case tokenReissuanceFailed
+
+    init(error: Error, statusCode: Int? = 0) {
+        guard let statusCode else { self = .unknown ; return }
+
+        self = .network(statusCode: statusCode)
+    }
+}

SOPT-iOS/Projects/Modules/Network/Sources/Foundation/AlamoInterceptor.swift

@@ -34,7 +34,7 @@ public class AlamoInterceptor: RequestInterceptor {
                 completion(.retry)
             } else {
                 print("토큰 갱신 실패: ", request.request?.url)
-                completion(.doNotRetryWithError(error))
+                completion(.doNotRetryWithError(APIError.tokenReissuanceFailed))
             }
         }
     }

SOPT-iOS/Projects/Modules/Network/Sources/Foundation/BaseAPI.swift

@@ -60,6 +60,10 @@ extension BaseAPI {
     public var headers: [String: String]? {
         return HeaderType.jsonWithToken.value
     }
+
+    public var validationType: ValidationType {
+        return .successCodes
+    }
 }
 
 public enum HeaderType {

SOPT-iOS/Projects/Modules/Network/Sources/Foundation/BaseService.swift

@@ -14,19 +14,6 @@ import Core
 import Alamofire
 import Moya
 
-
-public enum SOPTAPPError: Error {
-    case network(statusCode: Int)
-    case unknown
-
-    init(error: Error, statusCode: Int? = 0) {
-        guard let statusCode else { self = .unknown ; return }
-
-        self = .network(statusCode: statusCode)
-    }
-}
-
-
 open class BaseService<Target: TargetType> {
 
     typealias API = Target
@@ -38,9 +25,15 @@ open class BaseService<Target: TargetType> {
     lazy var provider = self.defaultProvider
 
     private lazy var defaultProvider: MoyaProvider<API> = {
+        let configuration = URLSessionConfiguration.default
+        configuration.timeoutIntervalForRequest = 10
+        configuration.timeoutIntervalForResource = 10
+        configuration.requestCachePolicy = .reloadIgnoringLocalCacheData
+        let interceptor = AlamoInterceptor()
+        let session = Session(configuration: configuration, interceptor: interceptor)
         let provider = MoyaProvider<API>(
             endpointClosure: endpointClosure,
-            session: DefaultAlamofireManager.shared,
+            session: session,
             plugins: [NetworkLoggerPlugin(verbose: true)]
         )
         return provider
@@ -96,7 +89,14 @@ extension BaseService {
                         promise(.failure(error))
                     }
                 case .failure(let error):
-                    promise(.failure(error))
+                    if case MoyaError.underlying(let error, _) = error,
+                       case AFError.requestRetryFailed(let retryError, _) = error,
+                       let retryError = retryError as? APIError,
+                       retryError == APIError.tokenReissuanceFailed {
+                        promise(.failure(retryError))
+                    } else {
+                        promise(.failure(error))
+                    }
                 }
             }
         }.eraseToAnyPublisher()
@@ -118,7 +118,7 @@ extension BaseService {
                         case 400...599:
                             // NOTE: (@승호) 여기에서 서버와 에러 처리 핸들링 해서 Error도 json Decode 해야 함
                             // 임시로 Error 처리
-                            throw SOPTAPPError(error: NSError(domain: "임시에러", code: -1001), statusCode: response.statusCode)
+                            throw APIError(error: NSError(domain: "임시에러", code: -1001), statusCode: response.statusCode)
                         default: break
                         }
                     } catch let error {