Skip to content

Commit

Permalink
[Network/#25] 카카오 연결
Browse files Browse the repository at this point in the history
  • Loading branch information
@kim-seonwoo
kim-seonwoo committed May 20, 2024
1 parent 8793811 commit b26e265
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 37 deletions.
22 changes: 13 additions & 9 deletions HMH_iOS/HMH_iOS/Global/HMH_iOSApp.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import KakaoSDKAuth
struct HMH_iOSApp: App {
@State private var isLoading: Bool = true
@AppStorage("isOnboarding") var isOnboarding : Bool = true
@AppStorage("isLogIn") var isLogIn : Bool = false
let kakaoAPIKey = Bundle.main.infoDictionary?["KAKAO_API_KEY"] as! String

init() {
Expand All @@ -24,19 +25,22 @@ struct HMH_iOSApp: App {
WindowGroup {
ZStack {
Color(.blackground)

if isLoading {
SplashView(isLoading: $isLoading)
} else {
if isOnboarding {
LoginView()
.onOpenURL { url in
if (AuthApi.isKakaoTalkLoginUrl(url)) {
_ = AuthController.handleOpenUrl(url: url)
}
}
if isLogIn {
TabBarView()
} else {
OnboardingContentView()
if isOnboarding {
LoginView()
.onOpenURL { url in
if (AuthApi.isKakaoTalkLoginUrl(url)) {
_ = AuthController.handleOpenUrl(url: url)
}
}
} else {
OnboardingContentView()
}
}
}
}
Expand Down
73 changes: 45 additions & 28 deletions HMH_iOS/HMH_iOS/Presentation/#/ViewModels/#ViewModel.swift
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
//
// LoginViewModel.swift
// HMH_iOS
//
// Created by Seonwoo Kim on 5/5/24.
//

import SwiftUI
import AuthenticationServices

import KakaoSDKUser

class LoginViewModel: NSObject, ObservableObject {
Expand All @@ -16,6 +8,9 @@ class LoginViewModel: NSObject, ObservableObject {
@AppStorage("acessToken") private var acessToken = ""
@AppStorage("refreshToken") private var refreshToken = ""
@AppStorage("socialToken") private var socialToken = ""
@AppStorage("socialPlatform") private var socialPlatform = ""
@AppStorage("isOnboarding") var isOnboarding : Bool?
@AppStorage("isLogIn") var isLoggedIn : Bool?

func handleAppleLogin() {
let request = ASAuthorizationAppleIDProvider().createRequest()
Expand All @@ -33,11 +28,10 @@ class LoginViewModel: NSObject, ObservableObject {
print("🍀",error)
}
if let oauthToken = oauthToken{
if let idToken = oauthToken.idToken {
self.updateLoginModel(platform: "KAKAO", idToken: idToken, name: "")
self.getSocialLoginData()

}
let idToken = oauthToken.accessToken
self.socialPlatform = "KAKAO"
self.socialToken = "Bearer " + idToken
self.getSocialLoginData()
}
}
} else {
Expand All @@ -47,27 +41,33 @@ class LoginViewModel: NSObject, ObservableObject {
}
if let oauthToken = oauthToken{
print("kakao success")
self.socialPlatform = "KAKAO"
let idToken = oauthToken.refreshToken
self.socialToken = "Bearer" + idToken
self.getSocialLoginData()
}
}
}
}

func updateLoginModel(platform: String, idToken: String, name: String) {
socialLoginInfo = SocialLoginInfo(platform: platform, idToken: idToken, name: name)
self.socialToken = "Bearer " + idToken
}

func getSocialLoginData() {
let provider = Providers.AuthProvider
let request = SocialLoginRequestDTO(socialPlatform: "KAKAO")
let request = SocialLoginRequestDTO(socialPlatform: socialPlatform)

provider.request(target: .socialLogin(data: request), instance: BaseResponse<SocialLogineResponseDTO>.self) { data in
if data.status == 403 {
@AppStorage("isOnboarding") var isOnboarding : Bool = false
} else if data.status == 200 {
guard let data = data.data else { return }
// UserManager.shared.updateToken(data.token.accessToken, data.token.refreshToken)
// UserManager.shared.updateUserId(data.userId)
DispatchQueue.main.async {
if data.status == 403 {
self.isOnboarding = true
self.isLoggedIn = false
} else if data.status == 200 {
guard let data = data.data else { return }
self.isOnboarding = true
self.isLoggedIn = true
self.idToken = data.token.accessToken
self.refreshToken = data.token.refreshToken
// UserManager.shared.updateToken(data.token.accessToken, data.token.refreshToken)
// UserManager.shared.updateUserId(data.userId)
}
}
}
}
Expand All @@ -78,10 +78,28 @@ extension LoginViewModel: ASAuthorizationControllerDelegate {
func authorizationController(controller: ASAuthorizationController, didCompleteWithAuthorization authorization: ASAuthorization) {
switch authorization.credential {
case let appleIDCredential as ASAuthorizationAppleIDCredential:
handleAppleIDCredential(appleIDCredential)
let userIdentifier = appleIDCredential.user
let fullName = appleIDCredential.fullName

if let identityToken = appleIDCredential.identityToken,
let identifyTokenString = String(data: identityToken, encoding: .utf8) {
if let unwrappedFullName = fullName, let givenName = unwrappedFullName.givenName, let familyName = unwrappedFullName.familyName {
// UserManager.shared.updateUserName(givenName, familyName)
} else {
print("fullName이 없거나 givenName 또는 familyName이 없습니다.")
}

// UserManager.shared.updateAppleToken(identifyTokenString)
// UserManager.shared.updateUserIdentifier(userIdentifier)
self.socialToken = identifyTokenString
}

self.socialPlatform = "APPLE"
self.getSocialLoginData()
default:
break
}

}

func handleAppleIDCredential(_ credential: ASAuthorizationAppleIDCredential) {
Expand All @@ -90,9 +108,8 @@ extension LoginViewModel: ASAuthorizationControllerDelegate {
let name = (fullName?.familyName ?? "") + (fullName?.givenName ?? "")
guard let idToken = String(data: credential.identityToken ?? Data(), encoding: .utf8) else { return print("no idToken!!") }

self.updateLoginModel(platform: "APPLE", idToken: idToken, name: name)
print(idToken)
self.socialToken = idToken
self.socialPlatform = "APPLE"
//성공 시 수행할 api 로직
self.getSocialLoginData()
}
Expand Down

0 comments on commit b26e265

Please # to comment.