🎨 :: [#48] Add Sigin ViewModel error code 예외처리

School-of-Company · Nov 10, 2024 · f14b7b2 · f14b7b2
1 parent b4e9da0
commit f14b7b2
Show file tree

Hide file tree

Showing 2 changed files with 123 additions and 21 deletions.
diff --git a/Projects/App/Sources/Extension/EXPOToken.swift b/Projects/App/Sources/Extension/EXPOToken.swift
@@ -11,20 +11,45 @@ import Domain
 import Security
 import Foundation
 
+// 토큰과 만료 기간을 포함하는 구조체
+struct TokenData: Codable {
+    let token: String
+    let expirationDate: Date
+}
+
 public class KeyChain {
     public static let shared = KeyChain()
 
+    // 토큰 저장하기 (만료 기간과 함께)
     func create(key: String, token: String) {
-        let query: NSDictionary = [
-            kSecClass: kSecClassGenericPassword,
-            kSecAttrAccount: key,
-            kSecValueData: token.data(using: .utf8, allowLossyConversion: false) as Any
-        ]
-        SecItemDelete(query)
-        let status = SecItemAdd(query, nil)
-        assert(status == noErr, "failed to save Token")
+        // 먼저 토큰을 데이터로 변환하고 만료 기간을 설정
+        if let tokenData = token.data(using: .utf8) {
+            let query: NSDictionary = [
+                kSecClass: kSecClassGenericPassword,
+                kSecAttrAccount: key,
+                kSecValueData: tokenData
+            ]
+            SecItemDelete(query)  // 기존 데이터 삭제
+            let status = SecItemAdd(query, nil)
+            assert(status == noErr, "failed to save Token")
+        }
     }
 
+    // 토큰과 만료 기간을 JSON으로 저장하기
+    func saveTokenWithExpiration(key: String, token: String, expiresIn: TimeInterval) {
+        let expirationDate = Date().addingTimeInterval(expiresIn)  // 만료일 계산
+        let tokenData = TokenData(token: token, expirationDate: expirationDate)
+
+        if let encodedData = try? JSONEncoder().encode(tokenData),
+           let tokenString = String(data: encodedData, encoding: .utf8) {
+            create(key: key, token: tokenString)
+            print("Token 저장 완료: \(tokenString)")
+        } else {
+            print("TokenData 인코딩 실패")
+        }
+    }
+
+    // 저장된 토큰 읽기 (만료 기간 포함)
     public func read(key: String) -> String? {
         let query: NSDictionary = [
             kSecClass: kSecClassGenericPassword,
@@ -38,7 +63,7 @@ public class KeyChain {
 
         if status == errSecSuccess {
             if let retrievedData: Data = dataTypeRef as? Data {
-                let value = String(data: retrievedData, encoding: String.Encoding.utf8)
+                let value = String(data: retrievedData, encoding: .utf8)
                 return value
             } else { return nil }
         } else {
@@ -47,9 +72,27 @@ public class KeyChain {
         }
     }
 
+    // 토큰과 만료 기간을 함께 읽기
+    func loadTokenWithExpiration(key: String) -> TokenData? {
+        if let tokenString = read(key: key),
+           let tokenData = tokenString.data(using: .utf8) {
+            return try? JSONDecoder().decode(TokenData.self, from: tokenData)
+        }
+        return nil
+    }
+
+    // 만료 여부 확인
+    func isTokenExpired(key: String) -> Bool {
+        if let tokenData = loadTokenWithExpiration(key: key) {
+            return tokenData.expirationDate < Date()  // 현재 시간과 만료일 비교
+        }
+        return true  // 토큰이 없으면 만료된 것으로 간주
+    }
+
+    // 토큰 업데이트하기
     func updateItem(token: Any, key: Any) -> Bool {
         let prevQuery: [CFString: Any] = [kSecClass: kSecClassGenericPassword,
-                                              kSecAttrAccount: key]
+                                          kSecAttrAccount: key]
         let updateQuery: [CFString: Any] = [kSecValueData: (token as AnyObject).data(using: String.Encoding.utf8.rawValue) as Any]
 
         let result: Bool = {
@@ -63,6 +106,7 @@ public class KeyChain {
         return result
     }
 
+    // 토큰 삭제
     func delete(key: String) {
         let query: NSDictionary = [
             kSecClass: kSecClassGenericPassword,
@@ -83,3 +127,4 @@ public struct Const {
     }
 }
 
+
diff --git a/Projects/App/Sources/Feature/SignupFeature/Sources/SigninViewModel.swift b/Projects/App/Sources/Feature/SignupFeature/Sources/SigninViewModel.swift
@@ -84,32 +84,88 @@ public final class AuthViewModel: ObservableObject {
         let param = SigninRequest(nickname: email, password: password)
         authProvider.request(.signIn(param: param)) { [weak self] response in
             guard let self = self else { return }
+
             switch response {
             case .success(let result):
                 let statusCode = result.statusCode
                 do {
                     switch statusCode {
                     case 200:
-                        print(self.password)  // 로그인 성공 시 비밀번호 출력 (테스트 용도라면 나중에 삭제)
-
-                        // 서버 응답을 SigninResponse 타입으로 매핑
                         let signInResponse = try result.map(SigninResponse.self)
 
-                        // KeyChain에 토큰 저장
-                        KeyChain.shared.create(key: Const.KeyChainKey.accessToken, token: signInResponse.accessToken)
-                        KeyChain.shared.create(key: Const.KeyChainKey.refreshToken, token: signInResponse.refreshToken)
+                        KeyChain.shared.saveTokenWithExpiration(
+                            key: Const.KeyChainKey.accessToken,
+                            token: signInResponse.accessToken,
+                            expiresIn: Double(signInResponse.accessTokenExpiresIn) ?? 3600
+                        )
 
-                        // 토큰 출력
-                        print("Access Token: \(signInResponse.accessToken)")
-                        print("Refresh Token: \(signInResponse.refreshToken)")
+                        KeyChain.shared.saveTokenWithExpiration(
+                            key: Const.KeyChainKey.refreshToken,
+                            token: signInResponse.refreshToken,
+                            expiresIn: Double(signInResponse.refreshTokenExpiresIn) ?? 2592000
+                        )
 
-                        // 성공 시 토큰과 함께 completion 호출
                         DispatchQueue.main.async {
                             completion(statusCode, signInResponse.accessToken, signInResponse.refreshToken)
                         }
 
+                        if let savedAccessToken = KeyChain.shared.read(key: Const.KeyChainKey.accessToken),
+                           let savedRefreshToken = KeyChain.shared.read(key: Const.KeyChainKey.refreshToken) {
+                            print("Access Token 저장됨: \(savedAccessToken)")
+                            print("Refresh Token 저장됨: \(savedRefreshToken)")
+
+                            if let accessTokenExpiresIn = Double(signInResponse.accessTokenExpiresIn),
+                               let refreshTokenExpiresIn = Double(signInResponse.refreshTokenExpiresIn) {
+
+                                let accessTokenExpirationDate = Date(timeIntervalSinceNow: accessTokenExpiresIn)
+                                let refreshTokenExpirationDate = Date(timeIntervalSinceNow: refreshTokenExpiresIn)
+
+                                let dateFormatter = DateFormatter()
+                                dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
+                                dateFormatter.timeZone = TimeZone.current
+
+                                print("Access Token 만료 날짜: \(dateFormatter.string(from: accessTokenExpirationDate))")
+                                print("Refresh Token 만료 날짜: \(dateFormatter.string(from: refreshTokenExpirationDate))")
+                            } else {
+                                print("만료 시간 변환 오류: accessTokenExpiresIn 또는 refreshTokenExpiresIn이 Double로 변환되지 않음.")
+                                print("accessTokenExpiresIn: \(signInResponse.accessTokenExpiresIn), refreshTokenExpiresIn: \(signInResponse.refreshTokenExpiresIn)")
+
+                                let defaultDate = Date()
+                                let dateFormatter = DateFormatter()
+                                dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
+                                dateFormatter.timeZone = TimeZone.current
+                                print("기본 만료 날짜 (현재 시간): \(dateFormatter.string(from: defaultDate))")
+                            }
+                        } else {
+                            print("토큰 저장 실패: Keychain에서 값을 읽어올 수 없습니다.")
+                        }
+
+                    case 400:
+                        print("400ㅣ비밀번호가 일치하지 않습니다.")
+                        DispatchQueue.main.async {
+                            completion(statusCode, nil, nil)
+                        }
+
+                    case 403:
+                        print("403ㅣ아직 보류중입니다.")
+                        DispatchQueue.main.async {
+                            completion(statusCode, nil, nil)
+                        }
+
+                    case 404:
+                        print("404ㅣ계정을 찾지 못했습니다.")
+                        DispatchQueue.main.async {
+                            completion(statusCode, nil, nil)
+                        }
+
+                    case 500..<600:
+                        print("\(statusCode)ㅣ서버오류입니다.")
+                        DispatchQueue.main.async {
+                            completion(statusCode, nil, nil)
+                        }
+
                     default:
-                        print("Received unexpected status code: \(statusCode)")
+                        print("Unhandled status code: \(statusCode)")
                         DispatchQueue.main.async {
                             completion(statusCode, nil, nil)
                         }
@@ -130,6 +186,7 @@ public final class AuthViewModel: ObservableObject {
         }
     }
 
+
     // MARK: - Sign Up
     func signUp(completion: @escaping (Bool) -> Void) {
             let params = SignupRequest(name: name, nickname: nickname, email: email, password: password, phoneNumber: phoneNumber)