[Feat] Team-Sopetit#117 - 불필요한 코드 삭제 및 메소드 변경

Sopetit-iOS/Sopetit-iOS/Presentation/Auth/LoginScene/ViewController/LoginViewController.swift

@@ -27,6 +27,10 @@ final class LoginViewController: UIViewController {
  override func loadView() {
  super.loadView()
  self.view = loginView
+ print("✅✅✅")
+ print(UserManager.shared.getAccessToken)
+ print(UserManager.shared.getRefreshToken)
+ print("✅✅✅")
  }
 
  override func viewDidLoad() {

Sopetit-iOS/Sopetit-iOS/Presentation/DailyRoutine/AddDailyRoutineScene/ViewController/AddDailyRoutineViewController.swift

@@ -122,14 +122,6 @@ private extension AddDailyRoutineViewController {
  }
  keyWindow.rootViewController = UINavigationController(rootViewController: nav)
  }
-
- func presentToLoginView() {
- guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
- let keyWindow = windowScene.windows.first else {
- return
- }
- keyWindow.rootViewController = LoginViewController()
- }
 }
 
 extension AddDailyRoutineViewController: BottomSheetButtonDelegate {
@@ -263,7 +255,7 @@ extension AddDailyRoutineViewController {
  if success {
  self.getDailyThemes()
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:
@@ -291,7 +283,7 @@ extension AddDailyRoutineViewController {
  if success {
  self.getDailyRoutinesAPI()
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:
@@ -316,7 +308,7 @@ extension AddDailyRoutineViewController {
  if success {
  self.postDailyMember(routineId: routineId)
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:

Sopetit-iOS/Sopetit-iOS/Presentation/DailyRoutine/DailyRoutineScene/ViewController/DailyRoutineViewController.swift

@@ -170,14 +170,6 @@ private extension DailyRoutineViewController {
  }
  self.selectedList = []
  }
-
- func presentToLoginView() {
- guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
- let keyWindow = windowScene.windows.first else {
- return
- }
- keyWindow.rootViewController = LoginViewController()
- }
 }
 
 extension DailyRoutineViewController {
@@ -347,7 +339,7 @@ extension DailyRoutineViewController {
  if success {
  self.getDailyRoutine()
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:
@@ -370,7 +362,7 @@ extension DailyRoutineViewController {
  if success {
  self.deleteRoutineListAPI(routineIdList: routineIdList, count: count)
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:
@@ -395,7 +387,7 @@ extension DailyRoutineViewController {
  if success {
  self.patchRoutineAPI(routineId: routineId)
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:

Sopetit-iOS/Sopetit-iOS/Presentation/HappyRoutine/AddHappyRoutineScene/ViewController/AddHappyRoutineViewController.swift

@@ -112,14 +112,6 @@ private extension AddHappyRoutineViewController {
  }
  keyWindow.rootViewController = UINavigationController(rootViewController: nav)
  }
-
- func presentToLoginView() {
- guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
- let keyWindow = windowScene.windows.first else {
- return
- }
- keyWindow.rootViewController = LoginViewController()
- }
 }
 
 extension AddHappyRoutineViewController: UIGestureRecognizerDelegate {
@@ -222,7 +214,7 @@ private extension AddHappyRoutineViewController {
  if success {
  self.getHappinessRoutineAPI(routineId: routineId)
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:
@@ -247,7 +239,7 @@ private extension AddHappyRoutineViewController {
  if success {
  self.postHappinessRoutineAPI(subRoutineId: subRoutineId)
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:

Sopetit-iOS/Sopetit-iOS/Presentation/HappyRoutine/HappyRoutineScene/ViewController/HappyRoutineViewController.swift

@@ -172,14 +172,6 @@ extension HappyRoutineViewController: BottomSheetButtonDelegate {
  }
 
  func addButtonTapped() {}
-
- func presentToLoginView() {
- guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
- let keyWindow = windowScene.windows.first else {
- return
- }
- keyWindow.rootViewController = LoginViewController()
- }
 }
 
 // MARK: - Network
@@ -206,7 +198,7 @@ private extension HappyRoutineViewController {
  if success {
  self.getHappinessMemberAPI()
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:
@@ -227,7 +219,7 @@ private extension HappyRoutineViewController {
  if success {
  self.patchHappinessMemberRoutine(routineId: routineId)
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:
@@ -248,7 +240,7 @@ private extension HappyRoutineViewController {
  if success {
  self.deleteHappinessMemberRoutine(routineId: routineId)
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:
@@ -274,7 +266,7 @@ private extension HappyRoutineViewController {
  if success {
  self.getDollAPI()
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
 

Sopetit-iOS/Sopetit-iOS/Presentation/HappyRoutine/SelectHappyCategoryScene/ViewController/SelectHappyCategoryViewController.swift

@@ -56,14 +56,6 @@ extension SelectHappyCategoryViewController {
  HappyRoutineTagCollectionViewCell.register(target: selectHappyCategoryView.tagview.collectionView)
  HappyRoutineCategoryCollectionViewCell.register(target: selectHappyCategoryView.categoryCollectionView)
  }
-
- func presentToLoginView() {
- guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
- let keyWindow = windowScene.windows.first else {
- return
- }
- keyWindow.rootViewController = LoginViewController()
- }
 }
 
 extension SelectHappyCategoryViewController: UIGestureRecognizerDelegate {
@@ -178,7 +170,7 @@ private extension SelectHappyCategoryViewController {
  if success {
  self.gethappinessThemesAPI()
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:
@@ -205,7 +197,7 @@ private extension SelectHappyCategoryViewController {
  if success {
  self.getRoutinesHappinessAPI(themeId: themeId)
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:

Sopetit-iOS/Sopetit-iOS/Presentation/Home/HomeScene/ViewController/HomeViewController.swift

@@ -94,14 +94,6 @@ extension HomeViewController {
  break
  }
  }
-
- func presentToLoginView() {
- guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
- let keyWindow = windowScene.windows.first else {
- return
- }
- keyWindow.rootViewController = LoginViewController()
- }
 }
 
 // MARK: - Network
@@ -126,7 +118,7 @@ extension HomeViewController {
  if success {
  self.getHomeAPI(socialAccessToken: UserManager.shared.getAccessToken)
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:
@@ -167,7 +159,7 @@ extension HomeViewController {
  if success {
  self.patchCottonAPI(cottonType: cottonType, indexPath: indexPath)
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:

Sopetit-iOS/Sopetit-iOS/Presentation/Onboarding/RoutineChoiceScene/ViewController/RoutineChoiceViewController.swift

@@ -78,14 +78,6 @@ extension RoutineChoiceViewController {
  break
  }
  }
-
- func presentToLoginView() {
- guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
- let keyWindow = windowScene.windows.first else {
- return
- }
- keyWindow.rootViewController = LoginViewController()
- }
 }
 
 // MARK: - Network
@@ -103,6 +95,14 @@ extension RoutineChoiceViewController {
  }
  }
  self.collectionView.reloadData()
+ case .reissue:
+ ReissueService.shared.postReissueAPI(refreshToken: UserManager.shared.getRefreshToken) { success in
+ if success {
+ self.getRoutineAPI()
+ } else {
+ self.makeSessionExpiredAlert()
+ }
+ }
  case .requestErr, .serverErr:
  break
  default:
@@ -140,7 +140,7 @@ extension RoutineChoiceViewController {
  if success {
  self.postMemberAPI()
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:

Sopetit-iOS/Sopetit-iOS/Presentation/Setting/SettingScene/ViewController/SettingViewController.swift

@@ -141,14 +141,6 @@ extension SettingViewController: UITableViewDelegate {
  nav.hidesBottomBarWhenPushed = true
  self.navigationController?.pushViewController(nav, animated: true)
  }
-
- func presentToLoginView() {
- guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
- let keyWindow = windowScene.windows.first else {
- return
- }
- keyWindow.rootViewController = LoginViewController()
- }
 }
 
 extension SettingViewController: UITableViewDataSource {
@@ -253,7 +245,7 @@ extension SettingViewController {
  if success {
  self.postLogoutAPI()
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:

Sopetit-iOS/Sopetit-iOS/Presentation/Setting/SettingScene/ViewController/WithdrawViewController.swift

@@ -78,14 +78,6 @@ extension WithdrawViewController {
  }
  }
 
- func presentToLoginView() {
- guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
- let keyWindow = windowScene.windows.first else {
- return
- }
- keyWindow.rootViewController = LoginViewController()
- }
-
  func deleteResignAPI() {
  AuthService.shared.deleteResignAPI { networkResult in
  switch networkResult {
@@ -104,7 +96,7 @@ extension WithdrawViewController {
  if success {
  self.deleteResignAPI()
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr:

Sopetit-iOS/Sopetit-iOS/Presentation/Splash/SplashScene/ViewController/SplashViewController.swift

@@ -34,6 +34,10 @@ final class SplashViewController: UIViewController {
  override func loadView() {
 
  self.view = splashViews[randomNumber]
+ print("✅✅✅✅")
+ print(UserManager.shared.getAccessToken)
+ print(UserManager.shared.getRefreshToken)
+ print("✅✅✅✅")
  }
 
  override func viewDidLoad() {
@@ -52,7 +56,6 @@ final class SplashViewController: UIViewController {
 private extension SplashViewController {
 
  func setUI() {
- print(URLConstant.baseURL)
  Analytics.logEvent("view_splash", parameters: nil)
 
  self.updateAlertView.isHidden = true
@@ -114,14 +117,6 @@ private extension SplashViewController {
  self.navigationController?.pushViewController(nav, animated: true)
  }
 
- func presentToLoginView() {
- guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
- let keyWindow = windowScene.windows.first else {
- return
- }
- keyWindow.rootViewController = LoginViewController()
- }
-
  func presentToHomeView() {
  guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
  let keyWindow = windowScene.windows.first else {
@@ -176,7 +171,7 @@ private extension SplashViewController {
  if success {
  self.presentToHomeView()
  } else {
- self.presentToLoginView()
+ self.makeSessionExpiredAlert()
  }
  }
  case .requestErr, .serverErr: