Merge pull request #58 from Team-HMH/fix/#54-Login

Fix [ #54] 중복 로그인 오류 해결

Author: kim-seonwoo

HMH_iOS/HMH_iOS/Global/Resource/String.swift

@@ -155,8 +155,8 @@ enum StringLiteral {
     }
 
     enum MyPageURL {
-        static var term = "https://hmhteam.notion.site/33acb29be57245f394eb93ddb2e3b8cc"
-        static var info = "https://www.notion.so/hmhteam/7006ac1eb36545c38ea2bdfc7e34d2cb?pvs=4"
+        static var term = "https://msmmx.notion.site/33acb29be57245f394eb93ddb2e3b8cc"
+        static var info = "https://msmmx.notion.site/7006ac1eb36545c38ea2bdfc7e34d2cb"
     }
 
     enum Prepare {

HMH_iOS/HMH_iOS/Network/Foundation/APIConstants.swift

@@ -8,39 +8,52 @@
 import Foundation
 import Moya
 
-struct APIConstants{
+struct APIConstants {
     static let contentType = "Content-Type"
     static let applicationJSON = "application/json"
     static let auth = "Authorization"
-    // 아래 주석은 네트워크 연결할 때 해제해주세요!
+    
     static var accessToken: String {
-        let socialToken = "Bearer " + UserManager.shared.accessToken
-        return socialToken
+        return "Bearer " + (UserManager.shared.accessToken ?? "")
     }
+    
     static var refreshToken: String {
-        let socialToken = "Bearer " + UserManager.shared.refreshToken
-        return socialToken
+        return "Bearer " + (UserManager.shared.refreshToken ?? "")
     }
+    
     static var appleAccessToken: String {
-        let socialToken = UserManager.shared.socialToken
-        return socialToken
+        return UserManager.shared.socialToken ?? ""
     }
 
     static let OS = "OS"
     static let iOS = "iOS"
 }
 
-extension APIConstants{
-    static let hasSocialTokenHeader = [contentType: applicationJSON,
-                                             auth : appleAccessToken]
-    static let hasTokenHeader = [contentType: applicationJSON,
-                                          OS: iOS,
-                                       auth : accessToken]
-    static let hasAccessTokenHeader = [contentType: applicationJSON,
-                                       auth : accessToken]
-    static let hasRefreshTokenHeader = [contentType: applicationJSON,
-                                              auth : refreshToken]
-    static let signUpHeader = [contentType: applicationJSON,
-                                     auth : appleAccessToken,
-                                        OS: iOS,]
+extension APIConstants {
+    static var hasSocialTokenHeader: [String: String] {
+        return [contentType: applicationJSON,
+                auth: appleAccessToken]
+    }
+    
+    static var hasTokenHeader: [String: String] {
+        return [contentType: applicationJSON,
+                OS: iOS,
+                auth: accessToken]
+    }
+    
+    static var hasAccessTokenHeader: [String: String] {
+        return [contentType: applicationJSON,
+                auth: accessToken]
+    }
+    
+    static var hasRefreshTokenHeader: [String: String] {
+        return [contentType: applicationJSON,
+                auth: refreshToken]
+    }
+    
+    static var signUpHeader: [String: String] {
+        return [contentType: applicationJSON,
+                auth: appleAccessToken,
+                OS: iOS]
+    }
 }

HMH_iOS/HMH_iOS/Presentation/Common/Manager/UserManager.swift

@@ -27,6 +27,13 @@ class UserManager: ObservableObject {
         appState = AppState(rawValue: appStateString) ?? .login
     }
 
+    func clearLogout() {
+        accessToken = ""
+        refreshToken = ""
+        socialToken = ""
+        appStateString = "login"
+    }
+    
     func revokeData() {
         accessToken = ""
         refreshToken = ""

HMH_iOS/HMH_iOS/Presentation/MyPage/ViewModels/MyPageViewModel.swift

@@ -93,7 +93,7 @@ class MyPageViewModel: ObservableObject {
     func logoutUser() {
         let provider = Providers.AuthProvider
         provider.request(target: .logout, instance: BaseResponse<EmptyResponseDTO>.self) { data in
-//            UserManager.shared.clearAll()
+            UserManager.shared.clearLogout()
         }
     }