🎨 :: [#44] Tuist 버전 변경 / 전체적인 코드 수정 / 각종 오류 해결

GPle-Team · Dec 30, 2024 · 6dc5245 · 6dc5245
1 parent c3617a4
commit 6dc5245
Show file tree

Hide file tree

Showing 18 changed files with 202 additions and 117 deletions.
diff --git a/.mise.toml b/.mise.toml
@@ -1,3 +1,3 @@
 [tools]
-tuist = "4.32.0"
+tuist = "4.9.0"
 
diff --git a/Projects/App/Sources/Feature/LoginFeature/Sources/LoginView.swift b/Projects/App/Sources/Feature/LoginFeature/Sources/LoginView.swift
@@ -5,37 +5,40 @@ struct LoginView: View {
     @StateObject var userInfoViewModel: UserInfoViewModel
 
     var body: some View {
+        NavigationStack {
         ZStack {
             GPleAsset.Color.back.swiftUIColor
                 .ignoresSafeArea()
             VStack(spacing: 0) {
                 Spacer()
-                
+
                 GPleAsset.Assets.gpleLogo.swiftUIImage
                     .padding(.bottom, 20)
-                
+
                 Text("GSM 사진 공유 서비스")
                     .foregroundStyle(GPleAsset.Color.gray400.swiftUIColor)
                     .font(GPleFontFamily.Pretendard.semiBold.swiftUIFont(size: 20))
                     .padding(.bottom, 90)
-                
+
                 Spacer()
-                
+
                 GPleAsset.Assets.map.swiftUIImage
                     .resizable()
                     .ignoresSafeArea()
                     .frame(width: 410, height: 500)
             }
-            
+
             VStack {
                 Spacer()
-                
+
                 LoginButton(loginViewModel: viewModel)
                     .padding(.bottom, 40)
             }
         }
+    }
         .fullScreenCover(isPresented: $viewModel.isSignedIn) {
             UserInfoView(viewModel: UserInfoViewModel())
         }
+        .navigationBarBackButtonHidden(true)
     }
 }
diff --git a/Projects/App/Sources/Feature/LoginFeature/Sources/LoginViewModel.swift b/Projects/App/Sources/Feature/LoginFeature/Sources/LoginViewModel.swift
@@ -6,7 +6,7 @@ import Domain
 final class LoginViewModel: ObservableObject {
     @Published var isSignedIn: Bool = false
     @Published var errorMessage: String?
-    
+
     private let provider = MoyaProvider<AuthAPI>()
 
     private func getGoogleClientID() -> String? {
@@ -25,7 +25,6 @@ final class LoginViewModel: ObservableObject {
             print("Google Client ID is missing.")
             return
         }
-
 
         let configuration = GIDConfiguration(clientID: clientID)
         GIDSignIn.sharedInstance.configuration = configuration
@@ -50,70 +49,87 @@ final class LoginViewModel: ObservableObject {
 
             print("CILENT_ID: \(clientID)")
             print("ID Token: \(idToken)")
-            self?.sendIdTokenToServer(idToken)
+            self?.sendIdTokenToServer(idToken) { success in
+                if success {
+                    print("토큰 저장 성공!")
+                } else {
+                    print("토큰 저장 실패.")
+                }
+            }
+
         }
     }
 
-    @MainActor
-    private func sendIdTokenToServer(_ idToken: String) {
+    public func sendIdTokenToServer(_ idToken: String, completion: @escaping (Bool) -> Void) {
         provider.request(.login(idToken: idToken)) { [weak self] result in
             switch result {
             case let .success(res):
                 do {
-
                     let loginResponse = try JSONDecoder().decode(Token.self, from: res.data)
-                    
+
                     let dateFormatter = DateFormatter()
                     dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
                     dateFormatter.timeZone = TimeZone(secondsFromGMT: 0)
 
-                    if let accessTokenExpirationDate = dateFormatter.date(from: loginResponse.accessExpiredAt),
-                       let refreshTokenExpirationDate = dateFormatter.date(from: loginResponse.refreshExpiredAt) {
+                    let accessTokenExpirationDate = dateFormatter.date(from: loginResponse.accessExpiredAt)
+                    let refreshTokenExpirationDate = dateFormatter.date(from: loginResponse.refreshExpiredAt)
 
-                        let accessTokenExpirationInterval = accessTokenExpirationDate.timeIntervalSinceNow
-                        let refreshTokenExpirationInterval = refreshTokenExpirationDate.timeIntervalSinceNow
+                    if accessTokenExpirationDate == nil {
+                        print("Access Token 만료 시간 변환 실패: 형식이 맞지 않음, 기본 값으로 처리됨.")
+                    }
+                    if refreshTokenExpirationDate == nil {
+                        print("Refresh Token 만료 시간 변환 실패: 형식이 맞지 않음, 기본 값으로 처리됨.")
+                    }
 
-                        KeyChain.shared.saveTokenWithExpiration(
-                            key: Const.KeyChainKey.accessToken,
-                            token: loginResponse.accessToken,
-                            expiresIn: accessTokenExpirationInterval
-                        )
+                    let accessTokenExpirationInterval = accessTokenExpirationDate?.timeIntervalSinceNow ?? 0
+                    let refreshTokenExpirationInterval = refreshTokenExpirationDate?.timeIntervalSinceNow ?? 0
 
-                        KeyChain.shared.saveTokenWithExpiration(
-                            key: Const.KeyChainKey.refreshToken,
-                            token: loginResponse.refreshToken,
-                            expiresIn: refreshTokenExpirationInterval
-                        )
+                    UserDefaults.standard.set(loginResponse.accessToken, forKey: "accessToken")
+                    UserDefaults.standard.set(loginResponse.refreshToken, forKey: "refreshToken")
 
-                        print("Access Token 만료 날짜: \(accessTokenExpirationDate)")
-                        print("Refresh Token 만료 날짜: \(refreshTokenExpirationDate)")
-                        print("토큰 저장 완료")
+                    if let savedAccessToken = UserDefaults.standard.string(forKey: "accessToken") {
+                        print("Access Token 저장 완료: \(savedAccessToken)")
                     } else {
-                        print("만료 시간 변환 오류: 유효한 날짜 형식이 아님.")
+                        print("Access Token 저장 실패")
                     }
-                    print("------------------------------------------------------------")
-
+
+                    if let savedRefreshToken = UserDefaults.standard.string(forKey: "refreshToken") {
+                        print("Refresh Token 저장 완료: \(savedRefreshToken)")
+                    } else {
+                        print("Refresh Token 저장 실패")
+                    }
+
+                    print("Access Token 만료 날짜: \(accessTokenExpirationDate ?? Date())")
+                    print("Refresh Token 만료 날짜: \(refreshTokenExpirationDate ?? Date())")
+                    print("토큰 저장 완료")
+
                     DispatchQueue.main.async {
-                        print("Access Token: \(loginResponse.accessToken)")
-                        print("Refresh Token: \(loginResponse.refreshToken)")
-                        print("Access Token Expiry: \(loginResponse.accessExpiredAt)")
-                        print("Refresh Token Expiry: \(loginResponse.refreshExpiredAt)")
                         self?.isSignedIn = true
                     }
+
+                    completion(true)
+
                 } catch {
                     DispatchQueue.main.async {
                         self?.errorMessage = "Failed to parse response: \(error.localizedDescription)"
                     }
+
+                    completion(false)
                 }
 
             case .failure(let error):
                 DispatchQueue.main.async {
                     self?.errorMessage = "Request failed: \(error.localizedDescription)"
                 }
+
+                completion(false)
             }
         }
     }
 
+
+
+
     func signOut() {
         GIDSignIn.sharedInstance.signOut()
         DispatchQueue.main.async {

diff --git a/Projects/App/Sources/Feature/MainFeature/Sources/LocationPostViewModel.swift b/Projects/App/Sources/Feature/MainFeature/Sources/LocationPostViewModel.swift
@@ -4,7 +4,7 @@ import Foundation
 
 final class LocationPostViewModel: ObservableObject {
     private let authProvider = MoyaProvider<MainAPI>()
-    private var accessToken: String = "Bearer eyJhbGciOiJIUzM4NCJ9.eyJzdWIiOiIyIiwiaWF0IjoxNzM0NjYyNTg4LCJleHAiOjE3NDQ2NjI1ODh9.FG4FVQ4oikC4HNy5h7gq0QyCIjVZtceIOKwAMnkULAt4y0lX5gGIF1s2Mdj9qr1H"
+    private var accessToken: String = UserDefaults.standard.string(forKey: "accessToken") ?? ""
 
     @Published public var gymPostList: [Post] = []
     @Published public var homePostList: [Post] = []

diff --git a/Projects/App/Sources/Feature/MainFeature/Sources/MainView.swift b/Projects/App/Sources/Feature/MainFeature/Sources/MainView.swift
@@ -109,6 +109,7 @@ struct MainView: View {
                 }
             }
         }
+        .navigationBarBackButtonHidden(true)
     }
 
     @ViewBuilder

diff --git a/Projects/App/Sources/Feature/MainFeature/Sources/MainViewModel.swift b/Projects/App/Sources/Feature/MainFeature/Sources/MainViewModel.swift
@@ -4,7 +4,7 @@ import Foundation
 
 public final class MainViewModel: ObservableObject {
     private let authProvider = MoyaProvider<MainAPI>()
-    private var accessToken: String = "Bearer eyJhbGciOiJIUzM4NCJ9.eyJzdWIiOiIyIiwiaWF0IjoxNzM0NjYyNTg4LCJleHAiOjE3NDQ2NjI1ODh9.FG4FVQ4oikC4HNy5h7gq0QyCIjVZtceIOKwAMnkULAt4y0lX5gGIF1s2Mdj9qr1H"
+    private var accessToken: String = UserDefaults.standard.string(forKey: "accessToken") ?? ""
 
     @Published public var allPostList: [Post] = []
     @Published public var gymPostList: [Post] = []

diff --git a/Projects/App/Sources/Feature/MyPageFeature/Sources/MyPageView.swift b/Projects/App/Sources/Feature/MyPageFeature/Sources/MyPageView.swift
@@ -5,6 +5,8 @@ struct MyPageView: View {
     @State private var topNavigationState = false
     @StateObject var postViewModel: PostViewModel
     @Environment(\.dismiss) private var dismiss
+    @State private var navigateToUserInfo = false
+    @State private var navigateToLogin = false
 
     var body: some View {
         NavigationStack {
@@ -49,18 +51,31 @@ struct MyPageView: View {
                         Spacer()
 
                         Menu {
-                            Button("프로필 변경", action: {
-                            })
+                            Button("프로필 변경", action: { navigateToUserInfo = true })
                             .font(GPleFontFamily.Pretendard.regular.swiftUIFont(size: 16))
-                            Button("로그아웃", action: { /* 액션 */ })
+                            Button("로그아웃", action: { navigateToLogin = true })
                                 .font(GPleFontFamily.Pretendard.regular.swiftUIFont(size: 16))
                                 .foregroundStyle(GPleAsset.Color.system.swiftUIColor)
-
                         } label: {
                             GPleAsset.Assets.point3.swiftUIImage
                                 .padding(.trailing, 20)
                                 .padding(.top, 8)
                         }
+
+                        NavigationLink(
+                                        destination: UserInfoView(viewModel: UserInfoViewModel()),
+                                        isActive: $navigateToUserInfo
+                                    ) {
+                                        EmptyView()
+                                    }
+
+                                    // 로그아웃 화면 네비게이션
+                                    NavigationLink(
+                                        destination: LoginView(viewModel: LoginViewModel(), userInfoViewModel: UserInfoViewModel()),
+                                        isActive: $navigateToLogin
+                                    ) {
+                                        EmptyView()
+                                    }
                     }
 
                     VStack(alignment: topNavigationState ? .trailing : .leading, spacing: 0) {

diff --git a/Projects/App/Sources/Feature/PostCreateFeature/Sources/PostCreateView.swift b/Projects/App/Sources/Feature/PostCreateFeature/Sources/PostCreateView.swift
@@ -442,7 +442,7 @@ struct PostCreateView: View {
                             ForEach(filteredUsers.indices, id: \.self) { index in
                                 let student = filteredUsers[index]
                                 searchUserList(
-                                    userProfileImage: student.profileImage,
+                                    userProfileImage: student.profileImage ?? "",
                                     userName: student.name,
                                     userYear: student.grade,
                                     userId: student.id

diff --git a/Projects/App/Sources/Feature/PostCreateFeature/Sources/PostViewModel.swift b/Projects/App/Sources/Feature/PostCreateFeature/Sources/PostViewModel.swift
@@ -10,7 +10,7 @@ public final class PostViewModel: ObservableObject {
     )
     private let userProvider = MoyaProvider<UserAPI>()
     private var title: String = ""
-    private var accessToken: String = "Bearer eyJhbGciOiJIUzM4NCJ9.eyJzdWIiOiIyIiwiaWF0IjoxNzM0NjYyNTg4LCJleHAiOjE3NDQ2NjI1ODh9.FG4FVQ4oikC4HNy5h7gq0QyCIjVZtceIOKwAMnkULAt4y0lX5gGIF1s2Mdj9qr1H"
+    private var accessToken: String = UserDefaults.standard.string(forKey: "accessToken") ?? ""
     private var userList: [Int] = []
     private var imageUrl: [String] = []
     private var imageUrlString: [String] = []

diff --git a/Projects/App/Sources/Feature/UserInfoFeature/Sources/UserInfoView.swift b/Projects/App/Sources/Feature/UserInfoFeature/Sources/UserInfoView.swift
@@ -2,13 +2,15 @@ import SwiftUI
 
 struct UserInfoView: View {
     @Environment(\.dismiss) private var dismiss
+    @State private var isSuccess: Bool = false
     @StateObject var viewModel: UserInfoViewModel
 
     var body: some View {
+        NavigationStack {
         ZStack(alignment: .leading) {
             GPleAsset.Color.back.swiftUIColor
                 .ignoresSafeArea()
-            
+
             VStack(alignment: .leading, spacing: 0) {
                 ZStack {
                     HStack {
@@ -19,74 +21,90 @@ struct UserInfoView: View {
                         }
                         Spacer()
                     }
-                    
+
                     Text("정보 입력")
                         .foregroundStyle(.white)
                         .font(GPleFontFamily.Pretendard.semiBold.swiftUIFont(size: 18))
                 }
                 .padding(.bottom, 16)
                 .padding(.top, 8)
                 .padding(.horizontal, 20)
-                
+
                 VStack(spacing: 0) {
                     HStack {
                         Text("정보를 입력해 주세요")
                             .font(GPleFontFamily.Pretendard.semiBold.swiftUIFont(size: 24))
                             .foregroundStyle(GPleAsset.Color.white.swiftUIColor)
-                        
+
                         Spacer()
                     }
                     .padding(.top, 20)
                     .padding(.bottom, 8)
-                    
+
                     HStack {
                         Text("원활한 서비스를 위해 정보를 입력해 주세요")
                             .font(GPleFontFamily.Pretendard.regular.swiftUIFont(size: 16))
                             .foregroundStyle(GPleAsset.Color.white.swiftUIColor)
-                        
+
                         Spacer()
                     }
                     .padding(.bottom, 20)
-                    
+
                     HStack {
                         Text("이름")
                             .font(GPleFontFamily.Pretendard.regular.swiftUIFont(size: 14))
                             .foregroundStyle(GPleAsset.Color.white.swiftUIColor)
-                        
+
                         Spacer()
                     }
                     .padding(.bottom, 4)
                 }
                 .padding(.horizontal, 20)
-                
+
                 GPleTextField("이름을 입력해 주세요", text: $viewModel.name)
-                
+
                 HStack {
                     Text("학번")
                         .font(GPleFontFamily.Pretendard.regular.swiftUIFont(size: 14))
                         .foregroundStyle(GPleAsset.Color.white.swiftUIColor)
-                    
+
                     Spacer()
                 }
                 .padding(.horizontal, 20)
                 .padding(.top, 20)
                 .padding(.bottom, 4)
-                
+
                 GPleTextField("학번을 입력해 주세요", text: $viewModel.number)
-                
+
                 Spacer()
-                
+
                 GPleButton(text: "완료",
                            horizontalPadding: 20,
                            verticalPadding: 16,
                            backColor: GPleAsset.Color.gray1000.swiftUIColor,
                            buttonState: viewModel.name.isEmpty == false && viewModel.number.isEmpty == false,
                            buttonOkColor: GPleAsset.Color.main.swiftUIColor
                 ) {
-                    viewModel.submitUserInfo()
+                    viewModel.submitUserInfo { success in
+                                            if success {
+                                                isSuccess = true
+                                                print("정보 전송 성공!!")
+                                            } else {
+                                                print("정보 전송 실패!!")
+                                            }
+                                        }
                 }
                 .padding(.bottom, 12)
+
+                NavigationLink(
+                    destination: MainView(viewModel: MainViewModel(), postViewModel: PostViewModel()),
+                                    isActive: $isSuccess
+                                ) {
+                                    EmptyView()
+                                }
             }
         }
     }
+        .navigationBarBackButtonHidden(true)
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,6 +109,7 @@ struct MainView: View { @@
                     }
                 }
             }
+            .navigationBarBackButtonHidden(true)
         }
         @ViewBuilder
@@ Expand Down @@