Update the way we use keychain

Author: intitni

Core/Sources/CodeiumService/CodeiumAuthService.swift

@@ -4,10 +4,13 @@ import KeychainAccess
 
 public final class CodeiumAuthService {
     public init() {}
-    let codeiumKeyKey = "codeiumKey"
+    let codeiumKeyKey = "codeiumAuthKey"
     let keychain: Keychain = {
         let info = Bundle.main.infoDictionary
         return Keychain(service: keychainService, accessGroup: keychainAccessGroup)
+            .attributes([
+                kSecUseDataProtectionKeychain as String: true,
+            ])
     }()
 
     var key: String? { try? keychain.getString(codeiumKeyKey) }

Core/Sources/ServiceUpdateMigration/ServiceUpdateMigrator.swift

@@ -1,5 +1,7 @@
+import Configs
 import Foundation
 import GitHubCopilotService
+import KeychainAccess
 import Preferences
 
 extension UserDefaultPreferenceKeys {
@@ -13,7 +15,7 @@ extension UserDefaultPreferenceKeys {
 
 public struct ServiceUpdateMigrator {
     public init() {}
-    
+
     public func migrate() async throws {
         let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String ?? "0"
 
@@ -24,7 +26,11 @@ public struct ServiceUpdateMigrator {
     func migrate(from oldVersion: String, to currentVersion: String) async throws {
         guard let old = Int(oldVersion) else { return }
         if old <= 135 {
-           try migrateFromLowerThanOrEqualToVersion135()
+            try migrateFromLowerThanOrEqualToVersion135()
+        }
+
+        if old <= 170 {
+            try migrateFromLowerThanOrEqualToVersion170()
         }
     }
 }
@@ -73,3 +79,17 @@ func migrateFromLowerThanOrEqualToVersion135() throws {
     )
 }
 
+func migrateFromLowerThanOrEqualToVersion170() throws {
+    let oldKeychain = Keychain(service: keychainService, accessGroup: keychainAccessGroup)
+    let newKeychain = oldKeychain.attributes([
+        kSecUseDataProtectionKeychain as String: true,
+    ])
+
+    if (try? oldKeychain.contains("codeiumKey")) ?? false,
+       let key = try? oldKeychain.getString("codeiumKey")
+    {
+        try newKeychain.set(key, key: "codeiumAuthKey")
+        try? oldKeychain.set("", key: "codeiumKey")
+    }
+}
+