feat: Codable 객체를 Keychain에 저장 가능하도록 구현

14th-team5-iOS/Core/Sources/Bibbi/BBNetwork/BBAPISpec.swift

@@ -110,7 +110,7 @@ extension APISpecable {
 
         guard
             let queryParameters = try? queryParametersEncodable?.toDictionary()
-        ?? self.queryParameters?.toDictionary() ?? [:]
+            ?? self.queryParameters?.toDictionary() ?? [:]
         else { throw URLGenerationError.invalidUrl }
         queryParameters.forEach {
             urlQueryItems.append(URLQueryItem(name: $0.key, value: "\($0.value)"))

14th-team5-iOS/Core/Sources/Bibbi/BBNetwork/Network/BBNetworkHeader.swift

@@ -78,19 +78,16 @@ public extension BBNetworkHeader {
 private extension BBNetworkHeader {
 
     func fetchXAppKey() -> String {
-        // TODO: - Bundle에서 Key를 가져오도록 코드 수정하기
+        // TODO: - Bundle에서 가져오도록 코드 수정하기
         return "7c5aaa36-570e-491f-b18a-26a1a0b72959"
     }
 
     func fetchXAuthTokenValue() -> String {
         let keychain = KeychainWrapper.standard
-        guard
-            let string = keychain.string(forKey: .accessToken),
-            let encodedData = string.data(using: .utf8),
-            let accessToken = encodedData.decode(AccessToken.self)
-        else { return "" /* 예외 코드 작성 */ }
-
-        return accessToken.accessToken ?? "" /* 예외 코드 작성 */
+        if let authToken: AuthToken = keychain[.accessToken] {
+            return authToken.refreshToken
+        }
+        return "" // TODO: - 예외 코드 작성하기
     }
 
     func fetchXUserPlatform() -> String {
@@ -100,11 +97,10 @@ private extension BBNetworkHeader {
 
     func fetchXuserId() -> String {
         let userDefaults = UserDefaultsWrapper.standard
-        guard
-            let memberId = userDefaults.string(forKey: .memberId)
-        else { return "" /* 예외 코드 작성 */ }
-
-        return memberId /* 예외 코드 작성 */
+        if let memberId: String = userDefaults[.memberId] {
+            return memberId
+        }
+        return "" // TODO: - 예외 코드 작성하기
     }
 
     func fetchContentType() -> String {

14th-team5-iOS/Core/Sources/Bibbi/BBNetwork/Network/BBNetworkInterceptor.swift

@@ -16,9 +16,10 @@ final class BBNetworkInterceptor: Interceptor {
 
     // MARK: - Properties
 
-    private let keychain = KeychainWrapper.standard
     private let network = BBNoInterceptorNetworkSession()
+    private let keychain = KeychainWrapper.standard
 
+
     // MARK: - Retry
 
     public override func retry(
@@ -32,12 +33,12 @@ final class BBNetworkInterceptor: Interceptor {
             return
         }
 
-        guard let refreshToken = fetchRefreshToken(), let authToken = refreshAuthToken(refreshToken) else {
+        guard let authToken = fetchAuthToken(), let newAuthToken = refreshAuthToken(authToken) else {
             completion(.doNotRetryWithError(error))
             return
         }
 
-        saveAuthToken(authToken)
+        saveAuthToken(newAuthToken)
         completion(.retry)
     }
 
@@ -59,26 +60,23 @@ final class BBNetworkInterceptor: Interceptor {
 private extension BBNetworkInterceptor {
 
     /// 키체인에 토큰 정보를 저장합니다.
-    func saveAuthToken(_ token: AccessToken) {
-        if let encodedString = token.encodeToString() {
-            keychain[.accessToken] = encodedString
-        }
+    @discardableResult
+    func saveAuthToken(_ token: AuthToken) -> Bool {
+        KeychainWrapper.standard.set(token, forKey: "accessToken")
     }
 
     /// 키체인으로부터 토큰 정보를 불러옵니다.
-    func fetchRefreshToken() -> String? {
-        guard let tokenString = keychain.string(forKey: .accessToken),
-              let encodedData = tokenString.encodeToData(),
-              let refreshToken = encodedData.decode(AccessToken.self)?.refreshToken else {
-            return nil
+    func fetchAuthToken() -> AuthToken? {
+        if let authToken: AuthToken = KeychainWrapper.standard.object(forKey: .accessToken) {
+            return authToken
         }
-        return refreshToken
+        return nil
     }
 
     /// 토큰을 리프레시합니다.
-    func refreshAuthToken(_ refreshToken: String) -> AccessToken? {
+    func refreshAuthToken(_ refreshToken: AuthToken) -> AuthToken? {
         let spec = BBAPISpec(
-            method: .get,
+            method: .post,
             path: "/auth/refresh",
             bodyParameters: ["refreshToken": "\(refreshToken)"],
             headers: .unAuthorized
@@ -88,18 +86,20 @@ private extension BBNetworkInterceptor {
             return nil
         }
 
-        var tokenResult: AccessToken? = nil
-        let semaphore = DispatchSemaphore(value: 0)
-
-        network.session.request(urlRequest).validate().responseData { response in
-            if let data = response.data, let accessToken = data.decode(AccessToken.self) {
-                tokenResult = accessToken
+        var tokenResult: AuthToken? = nil
+        network.session.request(urlRequest).validate().response { response in
+            switch response.result {
+            case let .success(data):
+                if let accessToken = data?.decode(AuthToken.self) {
+                    tokenResult = accessToken
+                }
+            case let .failure(error):
+                // MARK: - Logger로 로그 출력하기
+                debugPrint("🔴리프레시 실패: \(String(describing: error.errorDescription))")
             }
-//            semaphore.signal()
         }
-
-//        semaphore.wait()
-
+
         return tokenResult
     }
 }
+

14th-team5-iOS/Core/Sources/Bibbi/BBStorages/KeychainWrapper/KeychainWrapper.swift

@@ -10,6 +10,7 @@ import Foundation
 final public class KeychainWrapper {
 
     // MARK: - Properties
+
     public static let standard = KeychainWrapper()
 
     private let SecMatchLimit: String! = kSecMatchLimit as String
@@ -30,7 +31,9 @@ final public class KeychainWrapper {
         return Bundle.main.bundleIdentifier ?? "KeychainWrapper"
     }()
 
+
     // MARK: - Intializer
+
     public init(
         serviceName: String,
         accessGroup: String? = nil
@@ -131,7 +134,7 @@ final public class KeychainWrapper {
         forKey key: String,
         withAccessibility accessibility: KeychainItemAccessibility? = nil,
         isSynchronizable: Bool = false
-    ) -> NSCoding? {
+    ) -> (any NSCoding)? {
         guard let keychainData = data(
             forKey: key,
             withAccessibility: accessibility,
@@ -143,6 +146,22 @@ final public class KeychainWrapper {
         return try? NSKeyedUnarchiver.unarchivedObject(ofClass: NSNumber.self, from: keychainData)
     }
 
+    public func object<T>(
+        forKey key: String,
+        withAccessibility accessibility: KeychainItemAccessibility? = nil,
+        isSynchronizable: Bool = false
+    ) -> T? where T: Decodable {
+        guard let keychainData = data(
+            forKey: key,
+            withAccessibility: accessibility,
+            isSynchronizable: isSynchronizable
+        ) else {
+            return nil
+        }
+
+        return try? JSONDecoder().decode(T.self, from: keychainData)
+    }
+
     public func data(
         forKey key: String,
         withAccessibility accessibility: KeychainItemAccessibility? = nil,
@@ -251,7 +270,7 @@ final public class KeychainWrapper {
 
     @discardableResult
     public func set(
-        _ value: NSCoding,
+        _ value: any NSCoding,
         forKey key: String,
         withAccessibility accessibiilty: KeychainItemAccessibility? = nil,
         isSynchronizable: Bool = false
@@ -271,6 +290,25 @@ final public class KeychainWrapper {
         }
     }
 
+    @discardableResult
+    public func set(
+        _ value: any Encodable,
+        forKey key: String,
+        withAccessibility accessibiilty: KeychainItemAccessibility? = nil,
+        isSynchronizable: Bool = false
+    ) -> Bool {
+        if let data = try? JSONEncoder().encode(value) {
+            return set(
+                data,
+                forKey: key,
+                withAccessibility: accessibiilty,
+                isSynchronizable: isSynchronizable
+            )
+        } else {
+            return false
+        }
+    }
+
     @discardableResult
     public func set(
         _ value: Data,
@@ -384,7 +422,8 @@ final public class KeychainWrapper {
     }
 
 
-    // MARK: - KeychainQueryDictionary
+    // MARK: - Keychain Query Dictionary
+
     private func setupKeychainQueryDictionary(
         forkey key: String,
         withAccessibility accessibility: KeychainItemAccessibility? = nil,

14th-team5-iOS/Core/Sources/Bibbi/BBStorages/KeychainWrapper/KeychainWrapperSubscript.swift

@@ -49,7 +49,15 @@ public extension KeychainWrapper {
         }
     }
 
-    subscript(key: Key) -> NSCoding? {
+    subscript(key: Key) -> (any NSCoding)? {
+        get { object(forKey: key) }
+        set {
+            guard let value = newValue else { return }
+            set(value, forKey: key.rawValue)
+        }
+    }
+
+    subscript<T>(key: Key) -> T? where T: Codable {
         get { object(forKey: key) }
         set {
             guard let value = newValue else { return }
@@ -89,7 +97,11 @@ public extension KeychainWrapper {
         string(forKey: key.rawValue)
     }
 
-    func object(forKey key: Key) -> NSCoding? {
+    func object(forKey key: Key) -> (any NSCoding)? {
+        object(forKey: key.rawValue)
+    }
+
+    func object<T>(forKey key: Key) -> T? where T: Decodable {
         object(forKey: key.rawValue)
     }
 

14th-team5-iOS/Core/Sources/Bibbi/BBStorages/UserDefaultsWrapper/Models/AuthToken.swift

@@ -0,0 +1,24 @@
+//
+//  AuthToken.swift
+//  Core
+//
+//  Created by 김건우 on 10/3/24.
+//
+
+import Foundation
+
+public struct AuthToken: Codable {
+
+    public let accessToken: String
+    public let refreshToken: String
+    public let isTemporaryToken: Bool
+
+    public init(accessToken: String, refreshToken: String, isTemporaryToken: Bool) {
+        self.accessToken = accessToken
+        self.refreshToken = refreshToken
+        self.isTemporaryToken = isTemporaryToken
+    }
+
+}
+
+extension AuthToken: Equatable { }

14th-team5-iOS/Core/Sources/Bibbi/BBStorages/UserDefaultsWrapper/UserDefaultsWrapper.swift

@@ -10,6 +10,7 @@ import Foundation
 final public class UserDefaultsWrapper {
 
     // MARK: - Properties
+
     public static let standard = UserDefaultsWrapper()
 
     private let userDefaults: UserDefaults!
@@ -20,7 +21,9 @@ final public class UserDefaultsWrapper {
         "UserDefaultsWrapper"
     }()
 
+
     // MARK: - Intializer
+
     convenience init() {
         self.init(suitName: UserDefaultsWrapper.defaultSuitName)
     }
@@ -166,4 +169,25 @@ final public class UserDefaultsWrapper {
         userDefaults.removePersistentDomain(forName: suitName)
     }
 
+
+    // MARK: - Register
+
+    /// 해당 키에 값이 비어있다면 넣을 기본 값을 등록합니다.
+    ///
+    /// 앱 델리게이트의 `application(_ application:didFinishLaunchingWithOptions:)` 메서드에서 등록해야 합니다.
+    /// - Parameter values: [UserDefaultsWrapper.Key: Any]
+    public func register(_ values: [Key: Any]) {
+        var newValues = [String: Any]()
+        values.forEach { newValues.updateValue($0.value, forKey: $0.key.rawValue) }
+        register(newValues)
+    }
+
+    /// 해당 키에 값이 비어있다면 넣을 기본 값을 등록합니다.
+    ///
+    /// 앱 델리게이트의 `application(_ application:didFinishLaunchingWithOptions:)` 메서드에서 등록해야 합니다.
+    /// - Parameter values: [String: Any]
+    public func register(_ values: [String: Any]) {
+        userDefaults.register(defaults: values)
+    }
+
 }

14th-team5-iOS/Core/Sources/Extensions/Dictionary+Ext.swift

@@ -7,15 +7,16 @@
 
 import Foundation
 
-public extension Dictionary where Key: RawRepresentable, Value: RawRepresentable {
+public extension Dictionary where Key == BBNetworkParameterKey, Value == BBNetworkParameterValue {
 
     /// RawReprsentable 프로토콜을 준수하는 Key와 Value를 가진 딕셔너리를 [String: Any]로 변환합니다.
     /// - Returns: [String: Any]
+    /// 
     /// - Authors: 김소월
     func toDictionary() -> [String: Any] {
         var dict = [String: Any]()
         self.forEach { key, value in
-            dict.updateValue(value.rawValue as Any, forKey: "\(key)")
+            dict.updateValue(value.rawValue as Any, forKey: "\(key.rawValue)")
         }
         return dict
     }