Skip to content

Commit 8cf8263

Browse files
committed
fix: 로그아웃 FCM 토큰 해제 방어 코드 추가
1 parent 9f4155d commit 8cf8263

4 files changed

Lines changed: 24 additions & 5 deletions

File tree

Application/DevLogInfra/Sources/Service/AuthServiceImpl.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,11 @@ final class AuthServiceImpl: AuthService {
124124
logger.info("Clearing current auth session")
125125

126126
do {
127-
try await messaging.deleteToken()
127+
if messaging.fcmToken != nil {
128+
try await messaging.deleteToken()
129+
}
128130
} catch {
129131
logger.error("Failed to delete FCM token while clearing session", error: error)
130-
record(error, code: .deleteMessagingToken)
131132
}
132133

133134
do {

Application/DevLogInfra/Sources/Service/SocialLogin/AppleAuthenticationServiceImpl.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,13 @@ final class AppleAuthenticationServiceImpl: AuthenticationService {
122122
try await infoRef.updateData(["fcmToken": FieldValue.delete()])
123123
}
124124

125-
try await messaging.deleteToken()
125+
if messaging.fcmToken != nil {
126+
do {
127+
try await messaging.deleteToken()
128+
} catch {
129+
logger.error("Failed to delete FCM token while signing out with Apple", error: error)
130+
}
131+
}
126132

127133
try Auth.auth().signOut()
128134
} catch {

Application/DevLogInfra/Sources/Service/SocialLogin/GithubAuthenticationServiceImpl.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,13 @@ final class GithubAuthenticationServiceImpl: NSObject, AuthenticationService {
107107
try await infoRef.updateData(["fcmToken": FieldValue.delete()])
108108
}
109109

110-
try await messaging.deleteToken()
110+
if messaging.fcmToken != nil {
111+
do {
112+
try await messaging.deleteToken()
113+
} catch {
114+
logger.error("Failed to delete FCM token while signing out with GitHub", error: error)
115+
}
116+
}
111117

112118
try Auth.auth().signOut()
113119
} catch {

Application/DevLogInfra/Sources/Service/SocialLogin/GoogleAuthenticationServiceImpl.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,13 @@ final class GoogleAuthenticationServiceImpl: AuthenticationService {
8686
GIDSignIn.sharedInstance.signOut()
8787
try await GIDSignIn.sharedInstance.disconnect()
8888

89-
try await messaging.deleteToken()
89+
if messaging.fcmToken != nil {
90+
do {
91+
try await messaging.deleteToken()
92+
} catch {
93+
logger.error("Failed to delete FCM token while signing out with Google", error: error)
94+
}
95+
}
9096

9197
try Auth.auth().signOut()
9298
} catch {

0 commit comments

Comments
 (0)