#2 feat: add KakaoBtn Tap Action

TheClimeet · Oct 27, 2024 · 4eb6cb1 · 4eb6cb1
1 parent 9977344
commit 4eb6cb1
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 17 deletions.
diff --git a/Climeet-iOS/Climeet-iOS.xcodeproj/project.pbxproj b/Climeet-iOS/Climeet-iOS.xcodeproj/project.pbxproj
@@ -595,7 +595,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "Swift.Climeet.Climeet-iOS";
+				PRODUCT_BUNDLE_IDENTIFIER = com.climeet.climeet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -632,7 +632,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "Swift.Climeet.Climeet-iOS";
+				PRODUCT_BUNDLE_IDENTIFIER = com.climeet.climeet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/Climeet-iOS/Climeet-iOS/App/Climeet_iOSApp.swift b/Climeet-iOS/Climeet-iOS/App/Climeet_iOSApp.swift
@@ -23,7 +23,17 @@ struct ClimeetiOSApp: App {
 
     var body: some Scene {
         WindowGroup {
-            MainTabView()
+            AuthView(store: .init(initialState: .init(), reducer: { AuthReducer() }))
+                .onOpenURL { url in
+                    if AuthApi.isKakaoTalkLoginUrl(url) {
+                        _ = AuthController.handleOpenUrl(url: url)
+                    }
+
+                    NaverThirdPartyLoginConnection
+                        .getSharedInstance()
+                        .receiveAccessToken(url)
+                }
+//            MainTabView()
         }
     }
 
@@ -46,7 +56,7 @@ struct ClimeetiOSApp: App {
         instance?.setOnlyPortraitSupportInIphone(true)
 
         // NaverThirdPartyConstantsForApp.h에 선언한 상수 등록
-        instance?.serviceUrlScheme = "Swift.Climeet.Climeet-iOS"
+        instance?.serviceUrlScheme = "com.climeet.climeet"
         instance?.consumerKey = Env.NAVER_CLIENT_ID
         instance?.consumerSecret = Env.NAVER_CLIENT_SECRET
         instance?.appName = "Climeet"

diff --git a/Climeet-iOS/Climeet-iOS/Data/Client/KakaoClient.swift b/Climeet-iOS/Climeet-iOS/Data/Client/KakaoClient.swift
@@ -11,7 +11,7 @@ import KakaoSDKAuth
 import KakaoSDKCommon
 
 struct KakaoClient {
-    var login: @Sendable () async -> Result<String, AppError>
+    var login: @MainActor @Sendable () async -> Result<String, AppError>
     var me: @Sendable () async -> Result<KakaoDTO.Response, AppError>
 }
 

diff --git a/Climeet-iOS/Climeet-iOS/Presentation/Auth/AuthReducer.swift b/Climeet-iOS/Climeet-iOS/Presentation/Auth/AuthReducer.swift
@@ -10,14 +10,18 @@ import ComposableArchitecture
 
 @Reducer
 struct AuthReducer {
+    @Dependency(\.kakaoClient) var kakaoClient
+
     @ObservableState
     struct State: Equatable {
-
+        var token: String? = nil
     }
 
     enum Action: Equatable {
         case kakaoBtnDidTap
         case naverBtnDidTap
+        case kakaoLoginResponse(Result<String, AppError>)
+        case kakaoProfileResponse(Result<KakaoDTO.Response, AppError>)
     }
 
     init() {}
@@ -26,9 +30,26 @@ struct AuthReducer {
         Reduce { state, action in
             switch action {
             case .kakaoBtnDidTap:
-                return .none
+                return .run { send in
+                    let login = await kakaoClient.login()
+                    await send(.kakaoLoginResponse(login))
+                }
             case .naverBtnDidTap:
                 return .none
+            case .kakaoLoginResponse(.success(let oAuthToken)):
+                Log.debug("KakaoLogin API Success\n Token:", oAuthToken)
+                state.token = oAuthToken
+                return .run { send in
+                    let profile = await kakaoClient.me()
+                    await send(.kakaoProfileResponse(profile))
+                }
+            case .kakaoProfileResponse(.success(let userData)):
+                Log.debug("KakaoProfile API Success\n userData:", userData)
+                return .none
+            case .kakaoLoginResponse(.failure(let error)),
+                    .kakaoProfileResponse(.failure(let error)):
+                Log.debug("API fail", error)
+                return .none
             }
         }
     }

diff --git a/Climeet-iOS/Climeet-iOS/Presentation/Auth/AuthView.swift b/Climeet-iOS/Climeet-iOS/Presentation/Auth/AuthView.swift
@@ -47,7 +47,7 @@ extension AuthView {
     @ViewBuilder
     private func kakaoBtn() -> some View {
         Button {
-
+            self.store.send(.kakaoBtnDidTap)
         } label: {
             HStack {
                 Image(.kakaoLogo)
@@ -69,7 +69,7 @@ extension AuthView {
     @ViewBuilder
     private func naverBtn() -> some View {
         Button {
-
+            self.store.send(.naverBtnDidTap)
         } label: {
             HStack {
                 Image(.naverLogo)

diff --git a/Climeet-iOS/Climeet-iOS/Resources/Info.plist b/Climeet-iOS/Climeet-iOS/Resources/Info.plist
@@ -2,18 +2,18 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>MASTER_TOKEN</key>
-	<string>$(MASTER_TOKEN)</string>
+	<key>BASE_URL</key>
+	<string>${BASE_URL}</string>
 	<key>CLIMBER_TOKEN</key>
 	<string>$(CLIMBER_TOKEN)</string>
-	<key>NAVER_CLIENT_SECRET</key>
-	<string>$(NAVER_CLIENT_SECRET)</string>
-	<key>NAVER_CLIENT_ID</key>
-	<string>$(NAVER_CLIENT_ID)\</string>
 	<key>KAKAO_APP_KEY</key>
 	<string>$(KAKAO_APP_KEY)</string>
-	<key>BASE_URL</key>
-	<string>${BASE_URL}</string>
+	<key>MASTER_TOKEN</key>
+	<string>$(MASTER_TOKEN)</string>
+	<key>NAVER_CLIENT_ID</key>
+	<string>$(NAVER_CLIENT_ID)\</string>
+	<key>NAVER_CLIENT_SECRET</key>
+	<string>$(NAVER_CLIENT_SECRET)</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>