Skip to content

Fix/#350 자동로그인 오류 해결 #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
5 commits merged into from
Feb 17, 2026
+70 −40
Merged

Fix/#350 자동로그인 오류 해결 #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c7bd38
chore: #350 실기기 빌드 인증서 오류 수정
y-eonee Feb 6, 2026
d5fdc6c
refactor: #350 버튼 여러번 터치해도 한번만 api 호출되도록 수정
y-eonee Feb 7, 2026
d694897
refactor: #350 실패처리 추가
y-eonee Feb 12, 2026
9cb62d5
refactor: #350 actor로 토큰서비스 변경
y-eonee Feb 12, 2026
b129609
chore: #350 주석수정
y-eonee Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions ByeBoo-iOS/ByeBoo-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
CODE_SIGN_ENTITLEMENTS = "ByeBoo-iOS/ByeBoo-Dev.entitlements";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Z6682N5G5D;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -294,11 +294,11 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.2;
MARKETING_VERSION = 1.1.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.heartz.ByeBoo-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.heartz.ByeBoo-iOS";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.heartz.ByeBoo-iOS";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
Expand All @@ -317,9 +317,9 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "ByeBoo-iOS/ByeBoo-Prod.entitlements";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Z6682N5G5D;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -336,11 +336,11 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.2;
MARKETING_VERSION = 1.1.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.heartz.ByeBoo-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.heartz.ByeBoo-iOS";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.heartz.ByeBoo-iOS";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
Expand Down Expand Up @@ -480,7 +480,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.2;
MACOSX_DEPLOYMENT_TARGET = 15.2;
Expand All @@ -502,7 +502,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.2;
MACOSX_DEPLOYMENT_TARGET = 15.2;
Expand Down
78 changes: 51 additions & 27 deletions ByeBoo-iOS/ByeBoo-iOS/Data/Persistence/Service/TokenService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,37 @@ import Foundation

import Alamofire

protocol TokenService {
protocol TokenService: Sendable {
func reissue() async throws
}

final class DefaultTokenService: TokenService {

actor DefaultTokenService: TokenService {
private var tokenTask: Task<Void, Error>?
private let keychainService: KeychainService

init(
keychainService: KeychainService
) {

init(keychainService: KeychainService) {
self.keychainService = keychainService
}

func reissue() async throws {

if let task = tokenTask {
return try await task.value
}

let task = Task {
try await fetchAuthReissue()
}

tokenTask = task
defer { tokenTask = nil }

return try await task.value
}

private func fetchAuthReissue() async throws {
let header: HeaderType = .withAuth(acessToken: keychainService.load(key: .refreshToken))
ByeBooLogger.debug("토큰 재발급 시작")

Expand All @@ -39,46 +56,53 @@ final class DefaultTokenService: TokenService {
.validate()
.responseDecodable(of: BaseResponse<TokenReissueResponseDTO>.self) { [weak self] response in
guard let self else { return }
Copy link
Collaborator

@juri123123 juri123123 Feb 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

여기서 continuation resume이 안되고 있어요 ! 누수가 발생할 가능성이 있어보입니다

ByeBooLogger.debug("💡Reissue \(response)")

switch response.result {
case .success(let data):
guard let data = data.data else {
ByeBooLogger.error(ByeBooError.noData)
continuation.resume(throwing: ByeBooError.noData)
return
}
ByeBooLogger.debug("토큰 재발급 완료")
self.keychainService.save(key: .accessToken, token: data.accessToken)
self.keychainService.save(key: .refreshToken, token: data.refreshToken)
continuation.resume(returning: ())
case .failure(let error):
ByeBooLogger.debug("토큰 재발급 실패, 키체인 삭제 후 로그인으로 이동")
self.clearKeychain()
DispatchQueue.main.async {
NotificationCenter.default.post(name: .navigateLoginViewController, object: nil)

Task {
await self.debugTokenReissueSuccess(data)
Copy link
Collaborator

@juri123123 juri123123 Feb 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이 친구가 하는 역할이 단순 디버그가 아니라면 함수명을 더 직관적으로 바꿔주면 좋을 것 같아요!

continuation.resume(returning: ())
}
if let data = response.data,
let statusCode = response.response?.statusCode,
let errorResponse = try? JSONDecoder().decode(EmptyResponse.self, from: data) {
ByeBooLogger.error(error)

case .failure(let error):
Task {
await self.debugTokenReissueFailure()
Copy link
Collaborator

@juri123123 juri123123 Feb 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이 친구 또한 ~

continuation.resume(throwing: error)
} else {
ByeBooLogger.error(ByeBooError.decodingError)
continuation.resume(throwing: ByeBooError.decodingError)
}
}
}
}
}
}

extension DefaultTokenService {

private func debugTokenReissueSuccess(_ data: TokenReissueResponseDTO) {
ByeBooLogger.debug("토큰 재발급 완료")
self.keychainService.save(key: .accessToken, token: data.accessToken)
self.keychainService.save(key: .refreshToken, token: data.refreshToken)
}

private func debugTokenReissueFailure() {
ByeBooLogger.debug("토큰 재발급 실패, 키체인 삭제 후 로그인으로 이동")
clearKeychain()
DispatchQueue.main.async {
NotificationCenter.default.post(name: .navigateLoginViewController, object: nil)
}
Comment on lines +93 to +95
Copy link
Collaborator

@juri123123 juri123123 Feb 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이 친구만 concurrency를 사용하지 않은 이유가 궁금해요 !

Copy link
Collaborator Author

@y-eonee y-eonee Feb 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

그냥 메인스레드에서 해주면 되겠지 ~ 라는 생각으로 썼는데 바꿔주면 좋을 것 같아서 반영했습니다 !!

}

private func clearKeychain() {
for key in KeyType.allCases {
let token = keychainService.load(key: key)
if !token.isEmpty {
keychainService.delete(key: key)
ByeBooLogger.debug("\(key) 삭제")
if !token.isEmpty {
keychainService.delete(key: key)
ByeBooLogger.debug("\(key) 삭제")
}
}
}

}
4 changes: 2 additions & 2 deletions ByeBoo-iOS/ByeBoo-iOS/Data/Repository/AuthRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ struct DefaultAuthRepository: AuthInterface {

func autoLogin() async throws -> Bool {
let isOnboardingCompleted: Bool = userDefaultsService.load(key: .isOnboardingCompleted) ?? false
ByeBooLogger.debug(isOnboardingCompleted)
ByeBooLogger.debug("온보딩 여부 \(isOnboardingCompleted)")

if !keychainService.load(key: .accessToken).isEmpty
&& !keychainService.load(key: .refreshToken).isEmpty
Expand Down Expand Up @@ -214,7 +214,7 @@ final class MockAuthRepository: AuthInterface {
func appleLogin(platform: LoginPlatform) async throws {
appleLoginCalled = true

var (identityToken, authorizationCode) = try await network.appleRequest()
let (identityToken, authorizationCode) = try await network.appleRequest()
let _ = userDefaultsService.save("APPLE", key: .loginPlatform)
keychainService.save(key: .authorization, token: identityToken)
keychainService.save(key: .authorizationCode, token: authorizationCode)
Expand Down
9 changes: 7 additions & 2 deletions ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Login/ViewController/LoginViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,14 @@ final class LoginViewController: BaseViewController {
extension LoginViewController{
@objc
private func kakaoLoginButtonDidTap() {
rootView.kakaoLoginButton.isUserInteractionEnabled = false
self.platform = .KAKAO
viewModel.action(.socialLoginButtonDidTap(platform: .KAKAO))
}

@objc
private func appleLoginButtonDidTap() {
rootView.appleLoginButton.isUserInteractionEnabled = false
self.platform = .APPLE
viewModel.action(.socialLoginButtonDidTap(platform: .APPLE))
}
Expand All @@ -57,12 +59,15 @@ extension LoginViewController{
extension LoginViewController {
private func bind() {
viewModel.output.isRegisteredPublisher
.throttle(for: .seconds(1.0), scheduler: DispatchQueue.main, latest: false)
.receive(on: DispatchQueue.main)
.sink { result in
self.rootView.appleLoginButton.isUserInteractionEnabled = true
self.rootView.kakaoLoginButton.isUserInteractionEnabled = true

switch result {
case .success(let isRegisterd):
ByeBooLogger.debug(isRegisterd)
ByeBooLogger.debug("온보딩 완료 여부 \(isRegisterd)")

let nextViewController: UIViewController
if isRegisterd {
nextViewController = ByeBooTabBar()
Expand Down
1 change: 1 addition & 0 deletions ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Login/ViewModel/SplashViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ extension SplashViewModel {
guard let error = error as? ByeBooError else {
return
}
autoLoginSubject.send(.failure((.noData)))
ByeBooLogger.debug(ByeBooError.networkConnect)
ByeBooLogger.error(error as ByeBooError)
}
Expand Down
Loading