Merge pull request #177 from OMZigak/feat/#174-AuthService

[Feat] AuthService 구현
OMZigak · Jul 15, 2024 · 79e0f40 · 79e0f40
2 parents 439ab67 + df3642b
commit 79e0f40
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 27 deletions.
diff --git a/KkuMulKum.xcodeproj/project.pbxproj b/KkuMulKum.xcodeproj/project.pbxproj
@@ -7,9 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		782B406F2C3DBF93008B0CA7 /* ProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782B406E2C3DBF93008B0CA7 /* ProfileViewController.swift */; };
-		782B40722C3DBFA3008B0CA7 /* ProfileViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782B40712C3DBFA3008B0CA7 /* ProfileViewModel.swift */; };
-		782B40752C3DBFBA008B0CA7 /* ProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782B40742C3DBFBA008B0CA7 /* ProfileView.swift */; };
+		782B406F2C3DBF93008B0CA7 /* ProfileSetupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782B406E2C3DBF93008B0CA7 /* ProfileSetupViewController.swift */; };
+		782B40722C3DBFA3008B0CA7 /* ProfileSetupViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782B40712C3DBFA3008B0CA7 /* ProfileSetupViewModel.swift */; };
+		782B40752C3DBFBA008B0CA7 /* ProfileSetupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782B40742C3DBFBA008B0CA7 /* ProfileSetupView.swift */; };
 		782B407B2C3E395A008B0CA7 /* WelcomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782B407A2C3E395A008B0CA7 /* WelcomeView.swift */; };
 		782B407D2C3E3984008B0CA7 /* WelcomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782B407C2C3E3984008B0CA7 /* WelcomeViewController.swift */; };
 		782B407F2C3E44B7008B0CA7 /* WelcomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782B407E2C3E44B7008B0CA7 /* WelcomeViewModel.swift */; };
@@ -186,9 +186,9 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		782B406E2C3DBF93008B0CA7 /* ProfileViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewController.swift; sourceTree = "<group>"; };
-		782B40712C3DBFA3008B0CA7 /* ProfileViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewModel.swift; sourceTree = "<group>"; };
-		782B40742C3DBFBA008B0CA7 /* ProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileView.swift; sourceTree = "<group>"; };
+		782B406E2C3DBF93008B0CA7 /* ProfileSetupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileSetupViewController.swift; sourceTree = "<group>"; };
+		782B40712C3DBFA3008B0CA7 /* ProfileSetupViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileSetupViewModel.swift; sourceTree = "<group>"; };
+		782B40742C3DBFBA008B0CA7 /* ProfileSetupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileSetupView.swift; sourceTree = "<group>"; };
 		782B407A2C3E395A008B0CA7 /* WelcomeView.swift */ = {isa = PBXFileReference; indentWidth = 5; lastKnownFileType = sourcecode.swift; path = WelcomeView.swift; sourceTree = "<group>"; };
 		782B407C2C3E3984008B0CA7 /* WelcomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeViewController.swift; sourceTree = "<group>"; };
 		782B407E2C3E44B7008B0CA7 /* WelcomeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeViewModel.swift; sourceTree = "<group>"; };
@@ -391,23 +391,23 @@
 		782B406D2C3DBF7C008B0CA7 /* VIewController */ = {
 			isa = PBXGroup;
 			children = (
-				782B406E2C3DBF93008B0CA7 /* ProfileViewController.swift */,
+				782B406E2C3DBF93008B0CA7 /* ProfileSetupViewController.swift */,
 			);
 			path = VIewController;
 			sourceTree = "<group>";
 		};
 		782B40702C3DBF97008B0CA7 /* ViewModel */ = {
 			isa = PBXGroup;
 			children = (
-				782B40712C3DBFA3008B0CA7 /* ProfileViewModel.swift */,
+				782B40712C3DBFA3008B0CA7 /* ProfileSetupViewModel.swift */,
 			);
 			path = ViewModel;
 			sourceTree = "<group>";
 		};
 		782B40732C3DBFA8008B0CA7 /* View */ = {
 			isa = PBXGroup;
 			children = (
-				782B40742C3DBFBA008B0CA7 /* ProfileView.swift */,
+				782B40742C3DBFBA008B0CA7 /* ProfileSetupView.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -956,6 +956,7 @@
 		DD865B662C39210E00C351A2 /* Login */ = {
 			isa = PBXGroup;
 			children = (
+				78BD61212C440AC8005752FD /* Service */,
 				789873372C3D1B4800435E96 /* ViewController */,
 				789873362C3D1B3900435E96 /* VIewModel */,
 				789873352C3D1B3000435E96 /* View */,
@@ -1463,6 +1464,7 @@
 				DE6D4D112C3F14D80005584B /* MeetingInfoBannerView.swift in Sources */,
 				DE6D4D122C3F14D80005584B /* MeetingInfoView.swift in Sources */,
 				DD30721E2C3C0CC800416D9F /* PromiseInfoResponseModel.swift in Sources */,
+				78BD61232C440AD5005752FD /* AuthService.swift in Sources */,
 				DD931B722C3DA92700526452 /* EnterReadyInfoButtonView.swift in Sources */,
 				DD41BEFF2C41DAA40095A068 /* TardyEmptyView.swift in Sources */,
 				A3FB18512C3BF531001483E5 /* RegisterMeetingsResponseModel.swift in Sources */,
@@ -1478,7 +1480,7 @@
 				DD4393772C412F4500EC1799 /* CreateMeetingView.swift in Sources */,
 				789873342C3D1A7B00435E96 /* LoginView.swift in Sources */,
 				782B40822C3E4925008B0CA7 /* NicknameViewModel.swift in Sources */,
-				782B406F2C3DBF93008B0CA7 /* ProfileViewController.swift in Sources */,
+				782B406F2C3DBF93008B0CA7 /* ProfileSetupViewController.swift in Sources */,
 				A3FB18592C3BF77D001483E5 /* MeetingInfoResponseModel.swift in Sources */,
 				DD4909982C441215003ED304 /* TardyViewModel.swift in Sources */,
 				DEA932182C3F180800FDF637 /* MeetingPromisesModel.swift in Sources */,
@@ -1542,6 +1544,8 @@
 				DD3976862C41C2AD00E2A4C4 /* HomeView.swift in Sources */,
 				DD41BEFC2C41D54D0095A068 /* TardyPenaltyView.swift in Sources */,
 				789873322C3D1A7B00435E96 /* LoginViewController.swift in Sources */,
+				782B40722C3DBFA3008B0CA7 /* ProfileSetupViewModel.swift in Sources */,
+				DDAF1C8F2C3D6E3D008A37D3 /* BasePromiseSegmentedControl.swift in Sources */,
 				DD49099C2C441719003ED304 /* TardyService.swift in Sources */,
 				782B40722C3DBFA3008B0CA7 /* ProfileViewModel.swift in Sources */,
 				DDAF1C8F2C3D6E3D008A37D3 /* PagePromiseSegmentedControl.swift in Sources */,
@@ -1560,7 +1564,7 @@
 				DD3976872C41C2AD00E2A4C4 /* TodayPromiseView.swift in Sources */,
 				A3DD9C5A2C43F99800E58A13 /* SetReadyInfoView.swift in Sources */,
 				789873332C3D1A7B00435E96 /* LoginViewModel.swift in Sources */,
-				782B40752C3DBFBA008B0CA7 /* ProfileView.swift in Sources */,
+				782B40752C3DBFBA008B0CA7 /* ProfileSetupView.swift in Sources */,
 				DED5DBEE2C34529A006ECE7E /* BaseView.swift in Sources */,
 				A3DD9C402C41BAD000E58A13 /* MeetingListViewController.swift in Sources */,
 				A3DD9C3F2C41BAD000E58A13 /* MeetingListView.swift in Sources */,

diff --git a/KkuMulKum/Source/Onboarding/Login/Service/AuthService.swift b/KkuMulKum/Source/Onboarding/Login/Service/AuthService.swift
@@ -0,0 +1,31 @@
+//
+//  AuthServiceType.swift
+//  KkuMulKum
+//
+//  Created by 이지훈 on 7/14/24.
+//
+
+import Foundation
+
+protocol AuthServiceType {
+
+    // TODO: 토큰 관리를 위한 메서드 (키체인 생성이후 구현예정)
+    func saveToken(_ token: String)
+    func getToken() -> String?
+    func clearToken()
+}
+
+class AuthService: AuthServiceType {
+    func saveToken(_ token: String) {
+
+    }
+
+    func getToken() -> String? {
+
+        return nil
+    }
+
+    func clearToken() {
+    }
+
+}
diff --git a/KkuMulKum/Source/Onboarding/Login/VIewModel/LoginViewModel.swift b/KkuMulKum/Source/Onboarding/Login/VIewModel/LoginViewModel.swift
@@ -131,7 +131,8 @@ class LoginViewModel: NSObject {
 
 }
 
-extension LoginViewModel: ASAuthorizationControllerDelegate, ASAuthorizationControllerPresentationContextProviding {
+extension LoginViewModel: ASAuthorizationControllerDelegate,
+                            ASAuthorizationControllerPresentationContextProviding {
     func authorizationController(
         controller: ASAuthorizationController,
         didCompleteWithAuthorization authorization: ASAuthorization

diff --git a/KkuMulKum/Source/Onboarding/Login/ViewController/LoginViewController.swift b/KkuMulKum/Source/Onboarding/Login/ViewController/LoginViewController.swift
@@ -6,13 +6,11 @@
 //
 
 import UIKit
-import AuthenticationServices
 
 class LoginViewController: BaseViewController {
-
     private let loginView = LoginView()
     private let loginViewModel: LoginViewModel
-    
+
     init(viewModel: LoginViewModel = LoginViewModel()) {
         self.loginViewModel = viewModel
         super.init(nibName: nil, bundle: nil)
@@ -35,18 +33,12 @@ class LoginViewController: BaseViewController {
     override func setupAction() {
         super.setupAction()
 
-        let appleTapGesture = UITapGestureRecognizer(
-            target: self,
-            action: #selector(appleLoginTapped)
-        )
+        let appleTapGesture = UITapGestureRecognizer(target: self, action: #selector(appleLoginTapped))
         loginView.appleLoginImageView.addGestureRecognizer(appleTapGesture)
 
-        let kakaoTapGesture = UITapGestureRecognizer(
-            target: self,
-            action: #selector(kakaoLoginTapped)
-        )
+        let kakaoTapGesture = UITapGestureRecognizer(target: self, action: #selector(kakaoLoginTapped))
         loginView.kakaoLoginImageView.addGestureRecognizer(kakaoTapGesture)
-        
+
         loginView.dummyNextButton.addTarget(
             self,
             action: #selector(dummyNextButtonTapped),
@@ -83,7 +75,7 @@ class LoginViewController: BaseViewController {
     @objc private func kakaoLoginTapped() {
         loginViewModel.performKakaoLogin()
     }
-    
+
     @objc private func dummyNextButtonTapped() {
         let viewController = MainTabBarController()
         viewController.modalPresentationStyle = .fullScreen

diff --git a/...IewController/ProfileViewController.swift → ...ntroller/ProfileSetupViewController.swift b/...IewController/ProfileViewController.swift → ...ntroller/ProfileSetupViewController.swift
diff --git a/...Onboarding/Profile/View/ProfileView.swift → ...rding/Profile/View/ProfileSetupView.swift b/...Onboarding/Profile/View/ProfileView.swift → ...rding/Profile/View/ProfileSetupView.swift
@@ -13,7 +13,7 @@ import Then
 class ProfileSetupView: BaseView {
     let titleLabel = UILabel().then {
         $0.setText("프로필을 설정해 주세요", style: .head01, color: .gray8)
-        $0.textAlignment = .center
+        $0.textAlignment = .left
     }
 
     let profileImageView = UIImageView().then {
@@ -30,6 +30,7 @@ class ProfileSetupView: BaseView {
 
     let skipButton = UIButton().then {
         $0.setTitle("지금은 넘어가기", style: .body05, color: .gray5)
+        $0.addUnderline()
     }
 
     let confirmButton = UIButton().then {

diff --git a/.../Profile/ViewModel/ProfileViewModel.swift → ...ile/ViewModel/ProfileSetupViewModel.swift b/.../Profile/ViewModel/ProfileViewModel.swift → ...ile/ViewModel/ProfileSetupViewModel.swift
diff --git a/KkuMulKum/Source/Onboarding/Welcome/View/WelcomeView.swift b/KkuMulKum/Source/Onboarding/Welcome/View/WelcomeView.swift
@@ -54,7 +54,7 @@ class WelcomeView: BaseView {
           }
 
           descriptionLabel.snp.makeConstraints {
-               $0.top.equalTo(welcomeLabel.snp.bottom).offset(10)
+               $0.top.equalTo(welcomeLabel.snp.bottom).offset(18)
                $0.centerX.equalToSuperview()
                $0.leading.trailing.equalToSuperview().inset(20)
                $0.bottom.lessThanOrEqualTo(confirmButton.snp.top).offset(-20)