@react-native-kakao/user 2.4.8 → 2.4.9

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 2.4.9
+
+### Patch Changes
+
+- b9f4a65: Backport Kakao Account fallback after KakaoTalk login failure on v2.
+- @react-native-kakao/core@2.4.9
+
 ## 2.4.8
 
 ### Patch Changes

package/android/src/main/java/net/mjstudio/rnkakao/user/RNCKakaoUserModule.kt

@@ -12,6 +12,8 @@ import com.kakao.sdk.auth.model.Prompt.CREATE
 import com.kakao.sdk.auth.model.Prompt.LOGIN
 import com.kakao.sdk.auth.model.Prompt.SELECT_ACCOUNT
 import com.kakao.sdk.auth.model.Prompt.UNIFY_DAUM
+import com.kakao.sdk.common.model.ClientError
+import com.kakao.sdk.common.model.ClientErrorCause
 import com.kakao.sdk.user.UserApiClient
 import net.mjstudio.rnkakao.core.util.RNCKakaoResponseNotFoundException
 import net.mjstudio.rnkakao.core.util.RNCKakaoUtil
@@ -86,6 +88,29 @@ class RNCKakaoUserModule internal constructor(
         )
       }
     }
+    val requestedServiceTerms = serviceTerms?.filterIsInstance<String>()?.ifEmpty { null }
+    val requestedPrompts =
+      prompts
+        ?.filterIsInstance<String>()
+        ?.mapNotNull {
+          when (it) {
+            "Login" -> LOGIN
+            "Create" -> CREATE
+            "Cert" -> CERT
+            "UnifyDaum" -> UNIFY_DAUM
+            "SelectAccount" -> SELECT_ACCOUNT
+            else -> null
+          }
+        }?.ifEmpty { null }
+    val accountLogin = {
+      UserApiClient.instance.loginWithKakaoAccount(
+        context,
+        prompts = requestedPrompts,
+        nonce = nonce,
+        serviceTerms = requestedServiceTerms,
+        callback = callback,
+      )
+    }
 
     if (scopes?.filterIsInstance<String>()?.isEmpty() == false) {
       UserApiClient.instance.loginWithNewScopes(
@@ -100,32 +125,24 @@ class RNCKakaoUserModule internal constructor(
         ?.filterIsInstance<String>()
         ?.isEmpty() == true
     ) {
+      val talkCallback: (OAuthToken?, Throwable?) -> Unit = { token, error ->
+        if (error is ClientError && error.reason == ClientErrorCause.Cancelled) {
+          callback(token, error)
+        } else if (error != null || token == null) {
+          accountLogin()
+        } else {
+          callback(token, error)
+        }
+      }
+
       UserApiClient.instance.loginWithKakaoTalk(
         context,
         nonce = nonce,
-        serviceTerms = serviceTerms?.filterIsInstance<String>()?.ifEmpty { null },
-        callback = callback,
+        serviceTerms = requestedServiceTerms,
+        callback = talkCallback,
       )
     } else {
-      UserApiClient.instance.loginWithKakaoAccount(
-        context,
-        prompts =
-          prompts
-            ?.filterIsInstance<String>()
-            ?.mapNotNull {
-              when (it) {
-                "Login" -> LOGIN
-                "Create" -> CREATE
-                "Cert" -> CERT
-                "UnifyDaum" -> UNIFY_DAUM
-                "SelectAccount" -> SELECT_ACCOUNT
-                else -> null
-              }
-            }?.ifEmpty { null },
-        nonce = nonce,
-        serviceTerms = serviceTerms?.filterIsInstance<String>()?.ifEmpty { null },
-        callback = callback,
-      )
+      accountLogin()
     }
   }
 

package/ios/RNCKakaoUserManager.swift

@@ -60,17 +60,7 @@ import RNCKakaoCore
           RNCKakaoUtil.reject(reject, RNCKakaoError.responseNotFound(name: "token"))
         }
       }
-
-      if !scopes.isEmpty {
-        UserApi.shared.loginWithKakaoAccount(scopes: scopes, nonce: nonce, completion: callback)
-      } else if UserApi.isKakaoTalkLoginAvailable(), !useKakaoAccountLogin {
-        UserApi.shared
-          .loginWithKakaoTalk(
-            serviceTerms: emptyArrayToNil(serviceTerms),
-            nonce: nonce,
-            completion: callback
-          )
-      } else {
+      let accountLogin = {
         var _prompts: [Prompt] = []
         for p in prompts {
           if p == "Login" {
@@ -86,13 +76,39 @@ import RNCKakaoCore
             _prompts.append(.UnifyDaum)
           }
         }
-        UserApi.shared
-          .loginWithKakaoAccount(
-            prompts: emptyArrayToNil(_prompts),
-            serviceTerms: emptyArrayToNil(serviceTerms),
-            nonce: nonce,
-            completion: callback
-          )
+        UserApi.shared.loginWithKakaoAccount(
+          prompts: self.emptyArrayToNil(_prompts),
+          serviceTerms: self.emptyArrayToNil(serviceTerms),
+          nonce: nonce,
+          completion: callback
+        )
+      }
+
+      if !scopes.isEmpty {
+        UserApi.shared.loginWithKakaoAccount(scopes: scopes, nonce: nonce, completion: callback)
+      } else if UserApi.isKakaoTalkLoginAvailable(), !useKakaoAccountLogin {
+        let talkCallback = { (token: OAuthToken?, error: Error?) in
+          if let sdkError = error as? SdkError {
+            switch sdkError {
+            case .ClientFailed(.Cancelled, _),
+                 .AuthFailed(.AccessDenied, _):
+              callback(token, error)
+            default:
+              accountLogin()
+            }
+          } else if error != nil || token == nil {
+            accountLogin()
+          } else {
+            callback(token, error)
+          }
+        }
+        UserApi.shared.loginWithKakaoTalk(
+          serviceTerms: emptyArrayToNil(serviceTerms),
+          nonce: nonce,
+          completion: talkCallback
+        )
+      } else {
+        accountLogin()
       }
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-native-kakao/user",
   "description": "React Native Kakao User SDK",
-  "version": "2.4.8",
+  "version": "2.4.9",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
   "types": "lib/typescript/src/index.d.ts",
@@ -61,7 +61,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@react-native-kakao/core": "2.4.8",
+    "@react-native-kakao/core": "2.4.9",
     "@types/invariant": "^2",
     "@types/jest": "^29.5.5",
     "@types/react": "19.0.0",
@@ -74,7 +74,7 @@
     "zx": "8.8.5"
   },
   "peerDependencies": {
-    "@react-native-kakao/core": "2.4.8",
+    "@react-native-kakao/core": "2.4.9",
     "react": "*",
     "react-native": "*"
   },