save API key in Keychain

ski-u · Dec 17, 2024 · ba0ec5e · ba0ec5e
1 parent 4c7d02f
commit ba0ec5e
Show file tree

Hide file tree

Showing 8 changed files with 169 additions and 4 deletions.
diff --git a/Features/.swiftpm/xcode/xcshareddata/xcschemes/Settings.xcscheme b/Features/.swiftpm/xcode/xcshareddata/xcschemes/Settings.xcscheme
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1610"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "Settings"
+               BuildableName = "Settings"
+               BlueprintName = "Settings"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "SettingsTests"
+               BuildableName = "SettingsTests"
+               BlueprintName = "SettingsTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "Settings"
+            BuildableName = "Settings"
+            BlueprintName = "Settings"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Features/Package.swift b/Features/Package.swift
@@ -102,6 +102,7 @@ let package = Package(
             name: "Settings",
             dependencies: [
                 "APIClientLive",
+                "APIKeyClient",
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
                 .product(name: "LicenseList", package: "LicenseList"),
             ]

diff --git a/Features/Sources/Settings/APIKey/APIKeySetting.swift b/Features/Sources/Settings/APIKey/APIKeySetting.swift
@@ -1,5 +1,6 @@
 import APIClient
 import APIClientLive
+import APIKeyClient
 import ComposableArchitecture
 import Models
 
@@ -22,20 +23,28 @@ public struct APIKeySetting {
     }
 
     public enum Action: Equatable {
+        case onAppear
         case setAPIKeyInput(String)
         case updateButtonTapped
     }
+
+    @Dependency(\.apiKeyClient) private var apiKeyClient
 
     public init() {}
 
     public func reduce(into state: inout State, action: Action) -> Effect<Action> {
         switch action {
+        case .onAppear:
+            state.apiKeyInput = apiKeyClient.getKey() ?? .init(rawValue: "")
+            return .none
+
         case let .setAPIKeyInput(input):
             state.apiKeyInput = .init(rawValue: input)
             return .none
 
         case .updateButtonTapped:
-            // TODO: Persist API key
+            apiKeyClient.setKey(state.apiKeyInput)
+            // TODO: remove this logic
             APIClient.setAPIKey(state.apiKeyInput)
             return .none
         }

diff --git a/Features/Sources/Settings/APIKey/APIKeySettingView.swift b/Features/Sources/Settings/APIKey/APIKeySettingView.swift
@@ -33,6 +33,9 @@ struct APIKeySettingView: View {
                 .disabled(!viewStore.isEdited)
             }
         }
+        .onAppear {
+            viewStore.send(.onAppear)
+        }
     }
 
     private var link: some View {

diff --git a/Features/Sources/Settings/Settings/Settings.swift b/Features/Sources/Settings/Settings/Settings.swift
@@ -1,4 +1,6 @@
+import APIKeyClient
 import ComposableArchitecture
+import Models
 
 @Reducer
 public struct Settings {
@@ -9,19 +11,31 @@ public struct Settings {
 
     @ObservableState
     public struct State: Equatable {
+        var apiKey: APIKey
         var path = StackState<Path.State>()
 
-        public init() {}
+        public init(
+            apiKey: APIKey = .init(rawValue: "")
+        ) {
+            self.apiKey = apiKey
+        }
     }
 
     public enum Action {
+        case onAppear
         case path(StackActionOf<Path>)
         case popToRoot
     }
+
+    @Dependency(\.apiKeyClient) private var apiKeyClient
 
     public var body: some ReducerOf<Self> {
         Reduce { state, action in
             switch action {
+            case .onAppear:
+                state.apiKey = apiKeyClient.getKey() ?? .init(rawValue: "")
+                return .none
+
             case let .path(action):
                 switch action {
                 case let .element(id: id, action: .apiKeySetting(.updateButtonTapped)):

diff --git a/Features/Sources/Settings/Settings/SettingsView.swift b/Features/Sources/Settings/Settings/SettingsView.swift
@@ -28,7 +28,7 @@ public struct SettingsView: View {
 
                             Spacer()
 
-                            Text(APIClient.apiKey?.rawValue.masked ?? "None")
+                            Text(store.apiKey.rawValue.masked ?? "None")
                                 .foregroundStyle(Color.secondary)
                         }
                     }
@@ -77,6 +77,9 @@ public struct SettingsView: View {
                 APIKeySettingView(store: store)
             }
         }
+        .onAppear {
+            store.send(.onAppear)
+        }
     }
 }
 

diff --git a/Features/Tests/SettingsTests/APIKeySettingTests.swift b/Features/Tests/SettingsTests/APIKeySettingTests.swift
@@ -0,0 +1,38 @@
+import ComposableArchitecture
+@testable import Settings
+import Testing
+
+@MainActor
+struct APIKeySettingTests {
+    @Test
+    func setAPIKeyInput() async throws {
+        let store = TestStore(
+            initialState: APIKeySetting.State()
+        ) {
+            APIKeySetting()
+        }
+
+        await store.send(.setAPIKeyInput("test")) {
+            $0.apiKeyInput = .init(rawValue: "test")
+        }
+    }
+
+    @Test
+    func onAppear() async throws {
+        let store = TestStore(
+            initialState: APIKeySetting.State()
+        ) {
+            APIKeySetting()
+        }
+
+        store.dependencies.apiKeyClient.getKey = {
+            .init(rawValue: "test")
+        }
+
+        await store.send(.onAppear) {
+            $0.apiKeyInput = .init(rawValue: "test")
+        }
+    }
+
+    // TODO: add test case for `updateButtonTapped`
+}
diff --git a/Features/Tests/SettingsTests/SettingsTests.swift b/Features/Tests/SettingsTests/SettingsTests.swift
@@ -1,6 +1,24 @@
+import ComposableArchitecture
 import Testing
 
 @testable import Settings
 
 @MainActor
-struct SettingsTests {}
+struct SettingsTests {
+    @Test
+    func onAppear() async throws {
+        let store = TestStore(
+            initialState: Settings.State()
+        ) {
+            Settings()
+        }
+
+        store.dependencies.apiKeyClient.getKey = {
+            .init(rawValue: "test")
+        }
+
+        await store.send(.onAppear) {
+            $0.apiKey = .init(rawValue: "test")
+        }
+    }
+}