코드 정리

Projects/Domain/Sources/Client/CoreLocalStorage.swift

@@ -0,0 +1,41 @@
+//
+//  LocalStorageClient.swift
+//  Domain
+//
+//  Created by Young Bin on 2023/08/10.
+//  Copyright © 2023 team.humanwave. All rights reserved.
+//
+
+import ComposableArchitecture
+import Foundation
+
+struct CoreLocalStorage {
+    private let storage: UserDefaults
+
+    init(storage: UserDefaults = .standard) {
+        self.storage = storage
+    }
+
+    /// 알아서 파싱해서 쓰시길.. 더 빡세게 잡으려면 우리가 귀찮아짐
+    public func get(_ key: some StorageKeyType) -> Any? {
+        storage.object(forKey: key.name)
+    }
+
+    public func set(_ value: Any?, forKey key: some StorageKeyType) {
+        storage.set(value, forKey: key.name)
+    }
+}
+
+extension CoreLocalStorage: DependencyKey {
+    static var liveValue = CoreLocalStorage()
+    static func testValue(storage: UserDefaults) -> CoreLocalStorage {
+        CoreLocalStorage(storage: storage)
+    }
+}
+
+extension DependencyValues {
+    var localStorage: CoreLocalStorage {
+        get { self[CoreLocalStorage.self] }
+        set { self[CoreLocalStorage.self] = newValue }
+    }
+}

Projects/Domain/Sources/User/KeymeUserStorage.swift

@@ -0,0 +1,72 @@
+//
+//  KeymeUserStorage.swift
+//  Domain
+//
+//  Created by 이영빈 on 2023/08/21.
+//  Copyright © 2023 team.humanwave. All rights reserved.
+//
+
+import ComposableArchitecture
+import Foundation
+protocol StorageKeyType {
+    var name: String { get }
+}
+
+public final class KeymeUserStorage {
+    @Dependency(\.localStorage) private var localStorage
+
+    var nickname: String?
+    var acesssToken: String?
+
+    public init() {
+        self.nickname = self.get(.nickname)
+        self.acesssToken = self.get(.acesssToken)
+    }
+
+    public func get<T>(_ key: UserStorageKey) -> T? {
+        return localStorage.get(key) as? T
+    }
+
+    public func set<T>(_ value: T?, forKey key: UserStorageKey) {
+        switch key {
+        case .acesssToken:
+            guard let flag = value as? String else { return }
+            self.acesssToken = flag
+        case .nickname:
+            guard let name = value as? String else { return }
+            self.nickname = name
+        }
+
+        localStorage.set(value, forKey: key)
+    }
+}
+
+public extension KeymeUserStorage {
+    enum UserStorageKey: StorageKeyType {
+        case acesssToken
+        case nickname
+
+        var name: String {
+            switch self {
+            case .acesssToken:
+                return "UserStorageKey_isLoggedIn"
+            case .nickname:
+                return "UserStorageKey_nickname"
+            }
+        }
+    }
+}
+
+extension KeymeUserStorage: DependencyKey {
+    public static var liveValue = KeymeUserStorage()
+    public static var testValue: KeymeUserStorage {
+        KeymeUserStorage() // FIXME:
+    }
+}
+
+extension DependencyValues {
+    public var userStorage: KeymeUserStorage {
+        get { self[KeymeUserStorage.self] }
+        set { self[KeymeUserStorage.self] = newValue }
+    }
+}

Projects/Features/Sources/Root/RootFeature.swift

@@ -15,7 +15,8 @@ import Network
 import ComposableArchitecture
 
 public struct RootFeature: Reducer {
-    @Dependency(\.localStorage) private var localStorage
+    @Dependency(\.userStorage) private var userStorage
+    @Dependency(\.keymeAPIManager) private var network
 
     public init() {}
 
@@ -55,47 +56,34 @@ public struct RootFeature: Reducer {
     public var body: some ReducerOf<Self> {
         Reduce { state, action in
             switch action {
-            case .login(.presented(let result)):
-//                switch result {
-//                case .succeeded:
-//                    localStorage.set(true, forKey: .isLoggedIn)
-//                    state.logInStatus = .loggedIn
-//                case .failed:
-//                    localStorage.set(false, forKey: .isLoggedIn)
-//                    state.logInStatus = .loggedOut
-                return .none
-
-            case .onboarding(.presented(let result)):
-                switch result {
-                case .succeeded:
-                    state.onboardingStatus?.status = .completed
-                case .failed:
-                    state.onboardingStatus?.status = .needsOnboarding
-                default:
-                    break
+            case .login(.presented(.signInWithAppleResponse(let response))):
+                let token: String?
+                switch response {
+                case .success(let body):
+                    token = body.data.token.accessToken
+                case .failure:
+                    token = nil
                 }
-                return .none
 
-            case .logInChecked(let result):
-                switch result {
-                case true:
-                    state.logInStatus = .loggedIn
-                case false:
-                    state.logInStatus = .loggedOut
-                }
+                userStorage.set(token, forKey: .acesssToken)
+                network.registerAuthorizationToken(token)
                 return .none
 
-            case .onboardingChecked(.success(let result)):
-                switch result {
-                case true:
-                    state.onboardingStatus?.status = .completed
-                case false:
-                    state.onboardingStatus?.status = .needsOnboarding
+            case .login(.presented(.signInWithKakaoResponse(let response))):
+                let token: String?
+                switch response {
+                case .success(let body):
+                    token = body.data.token.accessToken
+                case .failure:
+                    token = nil
                 }
+
+                userStorage.set(token, forKey: .acesssToken)
+                network.registerAuthorizationToken(token)
                 return .none
 
             case .checkLoginStatus:
-                let isLoggedIn = localStorage.get(.isLoggedIn) as? Bool ?? false
+                let isLoggedIn: Bool = userStorage.get(.acesssToken) == nil ? false : true
                 return .run { send in
                     await send(.logInChecked(isLoggedIn))
                 }
@@ -106,12 +94,29 @@ public struct RootFeature: Reducer {
                         TaskResult {
                             // TODO: API 갈아끼우기
 //                            try await Task.sleep(until: .now + .seconds(0.1), clock: .continuous)
-
                             return false
                         }
                     ))
                 }
 
+            case .logInChecked(let result):
+                switch result {
+                case true:
+                    state.logInStatus = .loggedIn
+                case false:
+                    state.logInStatus = .loggedOut
+                }
+                return .none
+
+            case .onboardingChecked(.success(let result)):
+                switch result {
+                case true:
+                    state.onboardingStatus?.status = .completed
+                case false:
+                    state.onboardingStatus?.status = .needsOnboarding
+                }
+                return .none
+
             default:
                 return .none
             }