Merge pull request #313 from boostcampwm2023/iOS/bug#312

bug: memberID 요청 전, 토큰을 저장하지 않았던 버그 수정
boostcampwm2023 · Dec 12, 2023 · 35779bd · 35779bd
2 parents b07571e + 5477193
commit 35779bd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/iOS/Layover/Layover/Network/AuthManager.swift b/iOS/Layover/Layover/Network/AuthManager.swift
@@ -13,7 +13,7 @@ protocol AuthManagerProtocol: AnyObject {
     var loginType: LoginType? { get set }
     var memberID: Int? { get set }
 
-    func login(accessToken: String?, refreshToken: String?, memberID: Int?, loginType: LoginType?)
+    func login(accessToken: String?, refreshToken: String?, loginType: LoginType?)
     func logout()
 }
 
@@ -23,10 +23,9 @@ enum LoginType: String, Codable {
 }
 
 extension AuthManagerProtocol {
-    func login(accessToken: String?, refreshToken: String?, memberID: Int?, loginType: LoginType?) {
+    func login(accessToken: String?, refreshToken: String?, loginType: LoginType?) {
         self.accessToken = accessToken
         self.refreshToken = refreshToken
-        self.memberID = memberID
         self.loginType = loginType
         isLoggedIn = true
     }

diff --git a/iOS/Layover/Layover/Scenes/Login/LoginWorker.swift b/iOS/Layover/Layover/Scenes/Login/LoginWorker.swift
@@ -90,8 +90,8 @@ extension LoginWorker: LoginWorkerProtocol {
 
             authManager.login(accessToken: result.data?.accessToken,
                               refreshToken: result.data?.refreshToken,
-                              memberID: await fetchMemberId(),
                               loginType: .kakao)
+            authManager.memberID = await fetchMemberID()
             return true
         } catch {
             os_log(.error, log: .data, "%@", error.localizedDescription)
@@ -119,16 +119,16 @@ extension LoginWorker: LoginWorkerProtocol {
 
             authManager.login(accessToken: result.data?.accessToken,
                               refreshToken: result.data?.refreshToken,
-                              memberID: await fetchMemberId(),
                               loginType: .apple)
+            authManager.memberID = await fetchMemberID()
             return true
         } catch {
             os_log(.error, log: .data, "%@", error.localizedDescription)
             return false
         }
     }
 
-    private func fetchMemberId() async -> Int? {
+    private func fetchMemberID() async -> Int? {
         let endPoint = userEndPointFactory.makeUserInformationEndPoint(with: nil)
         do {
             let responseData = try await provider.request(with: endPoint)

diff --git a/iOS/Layover/Layover/Scenes/SignUpScene/SignUpWorker.swift b/iOS/Layover/Layover/Scenes/SignUpScene/SignUpWorker.swift
@@ -52,8 +52,8 @@ extension SignUpWorker: SignUpWorkerProtocol {
 
             authManager.login(accessToken: data.accessToken,
                               refreshToken: data.refreshToken,
-                              memberID: await fetchMemberId(),
                               loginType: .kakao)
+            authManager.memberID = await fetchMemberID()
             return true
         } catch {
             os_log(.error, log: .data, "Failed to sign up with error: %@", error.localizedDescription)
@@ -72,16 +72,16 @@ extension SignUpWorker: SignUpWorkerProtocol {
             }
             authManager.login(accessToken: data.accessToken,
                               refreshToken: data.refreshToken,
-                              memberID: await fetchMemberId(),
                               loginType: .apple)
+            authManager.memberID = await fetchMemberID()
             return true
         } catch {
             os_log(.error, log: .data, "Failed to sign up with error: %@", error.localizedDescription)
             return false
         }
     }
 
-    private func fetchMemberId() async -> Int? {
+    private func fetchMemberID() async -> Int? {
         let endPoint = userEndPointFactory.makeUserInformationEndPoint(with: nil)
         do {
             let responseData = try await provider.request(with: endPoint)