[Bug] 카카오/애플 로그인 관련 버그 디버깅 (#46)

Author: Daltonicc

Fitfty/Projects/Core/Sources/Error/SocialLoginError.swift

@@ -10,6 +10,7 @@ import Foundation
 
 enum SocialLoginError: Error {
     case noEmail
+    case noKakaoAvailable
     case loginFail
     case expiredToken
     case noToken
@@ -21,6 +22,8 @@ extension SocialLoginError: LocalizedError {
         switch self {
         case .noEmail:
             return NSLocalizedString("이메일 제공에 동의해주셔야 서비스 이용이 가능해요", comment: "No Email")
+        case .noKakaoAvailable:
+            return NSLocalizedString("카카오 로그인을 이용할 수 없는 계정이에요. 다른 소셜 로그인으로 가입해주세요", comment: "Kakao Login Is Not Available")
         case .loginFail:
             return NSLocalizedString("로그인에 실패했습니다. 잠시 후 다시 시도해주세요", comment: "Login Fail")
         case .expiredToken:

Fitfty/Projects/Core/Sources/SocialLoginManager.swift

@@ -30,23 +30,45 @@ final public class SocialLoginManager: NSObject {
 
     public func tryKakaoLogin(completionHandler: @escaping (Bool) -> Void,
                               failedHandler: @escaping (Error) -> Void) {
-        guard isKakaoLoginAvailable() else {
-            failedHandler(SocialLoginError.loginFail)
-            return
+        if isKakaoLoginAvailable() {
+            loginWithKakaoTalk(completionHandler: completionHandler,
+                               failedHandler: failedHandler)
+        } else {
+            loginWithKakaoAccount(completionHandler: completionHandler,
+                                  failedHandler: failedHandler)
         }
-        
+    }
+    
+    public func initailizeKakaoLoginSDK() {
+        KakaoSDK.initSDK(appKey: APIKey.kakaoAppKeyForLogin)
+    }
+    
+    private func loginWithKakaoTalk(completionHandler: @escaping (Bool) -> Void,
+                                    failedHandler: @escaping (Error) -> Void) {
         UserApi.shared.loginWithKakaoTalk { [weak self] (oauthToken, _) in
             if let accessToken = oauthToken?.accessToken {
                 self?.saveKakaoUserInfo()
-                self?.requestKakaoLogin(accessToken, completionHandler: completionHandler, failedHandler: failedHandler)
+                self?.requestKakaoLogin(accessToken,
+                                        completionHandler: completionHandler,
+                                        failedHandler: failedHandler)
             } else {
                 failedHandler(SocialLoginError.loginFail)
             }
         }
     }
 
-    public func initailizeKakaoLoginSDK() {
-        KakaoSDK.initSDK(appKey: APIKey.kakaoAppKeyForLogin)
+    private func loginWithKakaoAccount(completionHandler: @escaping (Bool) -> Void,
+                                       failedHandler: @escaping (Error) -> Void) {
+        UserApi.shared.loginWithKakaoAccount { [weak self] (oauthToken, _) in
+            if let accessToken = oauthToken?.accessToken {
+                self?.saveKakaoUserInfo()
+                self?.requestKakaoLogin(accessToken,
+                                        completionHandler: completionHandler,
+                                        failedHandler: failedHandler)
+            } else {
+                failedHandler(SocialLoginError.loginFail)
+            }
+        }
     }
 
     private func requestKakaoLogin(_ accessToken: String,
@@ -192,11 +214,6 @@ extension ASAuthorizationController: ASAuthorizationControllerDelegate {
             break
         }
 
-        guard hasEmail(email: email) else {
-            failedHandler?(SocialLoginError.noEmail)
-            return
-        }
-        
         let request = AppleLoginRequest(userIdentifier: userIdentifier,
                                         userName: fullName,
                                         userEmail: email,
@@ -205,7 +222,7 @@ extension ASAuthorizationController: ASAuthorizationControllerDelegate {
     }
 
     public func authorizationController(controller: ASAuthorizationController, didCompleteWithError error: Error) {
-        failedHandler?(error)
+        failedHandler?(SocialLoginError.loginFail)
     }
 }