[Swift] RXSwift Refactoring in iOS

 

 

 

 

 

🕺

오늘 구현한 것 

hotfix로 JWT 토큰 만료 시, refresh하는 로직을 구현했습니다. 

https://github.com/GDSC-Wetox/Wetox-iOS/pull/16

[HOTFIX] Token Refresh 구현 by SohyeonKim-dev · Pull Request #16 · GDSC-Wetox/Wetox-iOS

제가 회원가입 및 로그인 과정을 Escaping Closure를 기반으로 구현했었는데요.,

이번 기회에 RXSwift Observable로 리팩토링하게 되었습니다. (드.디.어!)

프로젝트 마감이 10일 정도 남았습니다. (이렇게 개강도 곧 . . . 🤯)

끝까지 화이팅팅,, 💪

 

 

 

 

 

📌 기존의 MVC + escaping closure 기반의 코드 

//
//  AuthAPI.swift
//  Wetox-iOS
//
//  Created by 김소현 on 1/28/24.
//

import UIKit
import Moya

public class AuthAPI {
    static let shared = AuthAPI()
    var authProvider = MoyaProvider<AuthService>(plugins: [MoyaLoggerPlugin()])
    
    public init() { }
    
    // MARK: - 회원가입
    func register(registerRequest: RegisterRequest, profileImage: UIImage?, completion: @escaping (NetworkResult<Any>) -> Void) {
        authProvider.request(.register(registerRequest: registerRequest, profileImage: profileImage)) { (result) in
            switch result {
            case .success(let response):
                let statusCode = response.statusCode
                let data = response.data
                let networkResult = self.judgeRegisterStatus(by: statusCode, data)
                completion(networkResult)
                
            case .failure(let error):
                print("error: \(error)")
            }
        }
    }
    
    func login(tokenRequest: TokenRequest, completion: @escaping (NetworkResult<Any>) -> Void) {
        authProvider.request(.login(tokenRequest: tokenRequest)) { (result) in
            switch result {
            case .success(let response):
                let statusCode = response.statusCode
                let data = response.data
                let networkResult = self.judgeLoginStatus(by: statusCode, data)
                completion(networkResult)
                
            case .failure(let error):
                print("error: \(error)")
            }
        }
    }
    
    func logout(completion: @escaping (NetworkResult<Any>) -> Void) {
        authProvider.request(.logout) { (result) in
            switch result {
            case .success(let response):
                let statusCode = response.statusCode
                let data = response.data
                let networkResult = self.judgeLoginStatus(by: statusCode, data)
                completion(networkResult)
                
            case .failure(let error):
                print("error: \(error)")
            }
        }
    }
    
    private func judgeRegisterStatus(by statusCode: Int, _ data: Data) -> NetworkResult<Any> {
        let decoder = JSONDecoder()
        guard let decodedData = try? decoder.decode(RegisterResponse.self, from: data) else { return .pathError }
        
        switch statusCode {
        case 200:
            return .success(decodedData)
        case 400..<500:
            return .requestError
        case 500:
            return .serverError
        default:
            return .networkFail
        }
    }
    
    private func judgeLoginStatus(by statusCode: Int, _ data: Data) -> NetworkResult<Any> {
        let decoder = JSONDecoder()
        guard let decodedData = try? decoder.decode(TokenResponse.self, from: data) else { return .pathError }
        
        switch statusCode {
        case 200:
            return .success(decodedData)
        case 400..<500:
            return .requestError
        case 500:
            return .serverError
        default:
            return .networkFail
        }
    }
    
    private func judgeLogoutStatus(by statusCode: Int, _ data: Data) -> NetworkResult<Any> {
        let decoder = JSONDecoder()
        guard let decodedData = try? decoder.decode(String.self, from: data) else { return .pathError }
        
        switch statusCode {
        case 200:
            return .success(decodedData)
        case 400..<500:
            return .requestError
        case 500:
            return .serverError
        default:
            return .networkFail
        }
    }
}

 

 

 

📌 호출되는 부분

//
//  LoginViewController.swift
//  Wetox-iOS
//
//  Created by 김소현 on 1/24/24.
//

import UIKit
import SnapKit

import KakaoSDKUser
import KakaoSDKAuth
import AuthenticationServices

// 생략

extension LoginViewController {
    func loginWithAPI(tokenRequest: TokenRequest) {
        AuthAPI.shared.login(tokenRequest: tokenRequest) { response in
            switch response {
                case .success(let loginData):
                    if let data = loginData as? TokenResponse {
                        UserDefaults.standard.set(tokenRequest.oauthProvider, forKey: Const.UserDefaultsKey.oauthProvider)
                        UserDefaults.standard.set(data.accessToken, forKey: Const.UserDefaultsKey.accessToken)
                        UserDefaults.standard.set(Date(), forKey: Const.UserDefaultsKey.updatedAt)
                        UserDefaults.standard.set(true, forKey: Const.UserDefaultsKey.isLogin)
                    }
                case .requestError:
                    print("loginWithAPI - requestError")
                case .pathError:
                    print("loginWithAPI - pathError")
                case .serverError:
                    print("loginWithAPI - serverError")
                case .networkFail:
                    print("loginWithAPI - networkFail")
            }
        }
    }
}

 

 

 

 

 

 

📌 new RXSwift 기반의 코드

• 아직 MVVM 형식으로 뷰모델까지는 분리를 못했다 🥲
• 기존에 클로저로 response를 가져온 로직을 rx Observable로 가져오도록 바뀌었습니다. 
• 나아가 expired token으로 발생할 오류에 대해, 재발급 request를 날릴 수 있도록 함수를 구현했습니다. 
• RXSwift 처음 써보는데요, 신기하네요 . . 다음번에는 더 잘 할 수 있을 것 같아요 :)  

//
//  AuthAPI.swift
//  Wetox-iOS
//
//  Created by 김소현 on 1/28/24.
//

import UIKit
import Moya
import RxSwift
import RxMoya

public class AuthAPI {
    static let authProvider = MoyaProvider<AuthService>(plugins: [MoyaLoggerPlugin()])
    
    static func register(registerRequest: RegisterRequest, profileImage: UIImage?) -> Observable<RegisterResponse> {
        let decoder = JSONDecoder()
        decoder.dateDecodingStrategy = .iso8601
        
        return AuthAPI.authProvider.rx.request(.register(registerRequest: registerRequest, profileImage: profileImage))
            .map(RegisterResponse.self, using: decoder)
            .asObservable()
            .catch { error in
                if let moyaError = error as? MoyaError {
                    switch moyaError {
                    case .statusCode(let response):
                        // HTTP 상태 코드에 따른 처리
                        print("HTTP Status Code: \(response.statusCode)")
                    case .jsonMapping(let response):
                        // JSON 매핑 에러 처리
                        print("JSON Mapping Error for Response: \(response)")
                    default:
                        // 기타 Moya 에러 처리
                        print("Other MoyaError: \(moyaError.localizedDescription)")
                    }
                }
                return Observable.error(error)
            }
    }
    
    static func login(tokenRequest: TokenRequest) -> Observable<TokenResponse> {
        let decoder = JSONDecoder()
        decoder.dateDecodingStrategy = .iso8601
        
        return AuthAPI.authProvider.rx.request(.login(tokenRequest: tokenRequest))
            .map(TokenResponse.self, using: decoder)
            .asObservable()
            .catch { error in
                handleTokenError(error: error, request: .login(tokenRequest: tokenRequest))
            }
    }
    
    static func handleTokenError(error: Error, request: AuthService) -> Observable<TokenResponse> {
        let decoder = JSONDecoder()
        decoder.dateDecodingStrategy = .iso8601
        
        if let moyaError = error as? MoyaError, moyaError.response?.statusCode == 401 {
            print("만료된 토큰에 대하여 재발급을 시도합니다.")
            
            let refreshTokenRequest = TokenRequest(oauthProvider: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.oauthProvider) ?? String(), 
                                                    openId: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.openId) ?? String())
            
            return AuthAPI.authProvider.rx.request(.login(tokenRequest: refreshTokenRequest))
                .map(TokenResponse.self, using: decoder)
                .asObservable()
        }
        else {
            return Observable.error(error)
        }
    }
}

 

 

 

📌 호출되는 부분

//
//  LoginViewController.swift
//  Wetox-iOS
//
//  Created by 김소현 on 1/24/24.
//

import UIKit
import SnapKit

import KakaoSDKUser
import KakaoSDKAuth
import AuthenticationServices
import RxSwift

// 생략

extension LoginViewController {
    func loginWithAPI(tokenRequest: TokenRequest) {
        AuthAPI.login(tokenRequest: tokenRequest)
            .subscribe(onNext: { tokenResponse in
                UserDefaults.standard.set(tokenRequest.oauthProvider, forKey: Const.UserDefaultsKey.oauthProvider)
                UserDefaults.standard.set(tokenResponse.accessToken, forKey: Const.UserDefaultsKey.accessToken)
                UserDefaults.standard.set(Date(), forKey: Const.UserDefaultsKey.updatedAt)
                UserDefaults.standard.set(true, forKey: Const.UserDefaultsKey.isLogin)
                print("로그인 성공: \(tokenResponse)")
            }, onError: { error in
                print("로그인 실패: \(error.localizedDescription)")
            })
            .disposed(by: disposeBag)
    }
}