update TokenManager

Bone-Ash · Jul 26, 2024 · 774dcb3 · 774dcb3
1 parent 46d71f2
commit 774dcb3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 35 deletions.
diff --git a/Sources/GHG/Core/Keychain.swift b/Sources/GHG/Core/Keychain.swift
@@ -15,14 +15,10 @@ public struct KeychainManager {
     /// - Author: GH
     public static func saveAccessTokenToKeychain(_ accessToken: String) {
         KeychainSwift().set(accessToken, forKey: "AccessToken")
-    }
-
-    /// 从 Keychain 中读取 Access Token
-    /// - Returns: accessToken(String)
-    ///
-    /// - Author: GH
-    public static func getAccessTokenFromKeychain() -> String? {
-        return KeychainSwift().get("AccessToken")
+#if DEBUG
+        print("Access Token: \(accessToken)")
+        print("---Saved successfully!---")
+#endif
     }
 
     /// 保存 Refresh Token 至 Keychain
@@ -31,6 +27,18 @@ public struct KeychainManager {
     /// - Author: GH
     public static func saveRefreshTokenToKeychain(_ refreshToken: String) {
         KeychainSwift().set(refreshToken, forKey: "RefreshToken")
+#if DEBUG
+        print("Refresh Token: \(refreshToken)")
+        print("---Saved successfully!---")
+#endif
+    }
+
+    /// 从 Keychain 中读取 Access Token
+    /// - Returns: accessToken(String)
+    ///
+    /// - Author: GH
+    public static func getAccessTokenFromKeychain() -> String? {
+        return KeychainSwift().get("AccessToken")
     }
 
     /// 从 Keychain 中读取 Refresh Token
@@ -56,6 +64,10 @@ public struct KeychainManager {
     /// - Author: GH
     public static func saveDeviceTokenToKeychain(_ deviceToken: String) {
         KeychainSwift().set(deviceToken, forKey: "DeviceToken")
+#if DEBUG
+        print("Device Token: \(deviceToken)")
+        print("---Saved successfully!---")
+#endif
     }
 
     /// 从 Keychain 中读取 Device Token
@@ -79,6 +91,10 @@ public struct KeychainManager {
     /// - Author: GH
     public static func saveUUID(_ UUID: String) {
         KeychainSwift().set(UUID, forKey: "UUID")
+#if DEBUG
+        print("UUID: \(UUID)")
+        print("---Saved successfully!---")
+#endif
     }
 
     /// 从 Keychain 中读取 UUID

diff --git a/Sources/GHG/Core/Token.swift b/Sources/GHG/Core/Token.swift
@@ -88,31 +88,4 @@ public actor TokenManager {
         // Token 刷新的实现代码
         return ""
     }
-
-    /// 调用 Keychain Manager 的方法
-    /// - Parameter data: JSON 实例，会将 data 中 accessToken 字段提取并保存
-    ///
-    /// - Author: GH
-    public static func saveAccessToken(_ data: JSON) {
-        if let accessToken = data["accessToken"].string {
-            KeychainManager.saveAccessTokenToKeychain(accessToken)
-#if DEBUG
-            print("Access Token: \(accessToken)")
-            print("---Saved successfully!---")
-#endif
-        }
-    }
-    /// 调用 Keychain Manager 的方法
-    /// - Parameter data: JSON 实例，会将 data 中 refreshToken 字段提取并保存
-    ///
-    /// - Author: GH
-    public static func saveRefreshToken(_ data: JSON) {
-        if let refreshToken = data["refreshToken"].string {
-            KeychainManager.saveRefreshTokenToKeychain(refreshToken)
-#if DEBUG
-            print("Refresh Token: \(refreshToken)")
-            print("---Saved successfully!---")
-#endif
-        }
-    }
 }