From 14a9ca9671e7ad4903203a99d9f039c572a45d32 Mon Sep 17 00:00:00 2001
From: CounterFire2023 <136581895+CounterFire2023@users.noreply.github.com>
Date: Thu, 25 Jan 2024 12:18:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9discord=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81,=20=E6=94=B9=E4=B8=BA=E9=80=9A=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84oauth=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cocos/platform/android/jni/JniImp.cpp             |  4 ++--
 cocos/platform/android/jni/JniImp.h               |  2 +-
 cocos/scripting/js-bindings/manual/jsb_global.cpp | 15 +++++++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/cocos/platform/android/jni/JniImp.cpp b/cocos/platform/android/jni/JniImp.cpp
index d61abab..5dc1e2b 100644
--- a/cocos/platform/android/jni/JniImp.cpp
+++ b/cocos/platform/android/jni/JniImp.cpp
@@ -372,9 +372,9 @@ void signWithEmailJNI(const std::string &funid)
     JniHelper::callStaticVoidMethod(JCSDK, "signWithEmail", funid);
 }
 
-void signWithDiscordJNI(const std::string &funid)
+void signWithOAuthJNI(const std::string &funid, const std::string &jsondata)
 {
-    JniHelper::callStaticVoidMethod(JCSDK, "signWithDiscord", funid);
+    JniHelper::callStaticVoidMethod(JCSDK, "signWithOAuth", funid, jsondata);
 }
 
 void callJcVoidMethodJNI(const std::string &funid, const std::string &method_name)
diff --git a/cocos/platform/android/jni/JniImp.h b/cocos/platform/android/jni/JniImp.h
index d430e06..98d6e31 100644
--- a/cocos/platform/android/jni/JniImp.h
+++ b/cocos/platform/android/jni/JniImp.h
@@ -45,7 +45,7 @@ void signOutGoogleJNI(const std::string &funid);
 void signWithFacebookJNI(const std::string &funid);
 void signWithTwitterJNI(const std::string &funid);
 void signWithEmailJNI(const std::string &funid);
-void signWithDiscordJNI(const std::string &funid);
+void signWithOAuthJNI(const std::string &funid, const std::string &jsondata);
 void callJcVoidMethodJNI(const std::string &funid, const std::string &method_name);
 void toWalletJNI(const std::string &url);
 void beginBuyJNI(const std::string &funid, const std::string &productid, const std::string &orderid);
diff --git a/cocos/scripting/js-bindings/manual/jsb_global.cpp b/cocos/scripting/js-bindings/manual/jsb_global.cpp
index 97b15f9..61aee70 100644
--- a/cocos/scripting/js-bindings/manual/jsb_global.cpp
+++ b/cocos/scripting/js-bindings/manual/jsb_global.cpp
@@ -969,23 +969,26 @@ static bool JSB_signWithEmail(se::State &s)
 }
 SE_BIND_FUNC(JSB_signWithEmail)
 
-static bool JSB_signWithDiscord(se::State &s)
+static bool JSB_signWithOAuth(se::State &s)
 {
   const auto &args = s.args();
   size_t argc = args.size();
   CC_UNUSED bool ok = true;
-  if (argc > 0)
+  if (argc > 1)
   {
     std::string funid;
     ok = seval_to_std_string(args[0], &funid);
     SE_PRECONDITION2(ok, false, "funid is invalid!");
-    signWithDiscordJNI(funid);
+    std::string jsondata;
+    ok = seval_to_std_string(args[1], &jsondata);
+    SE_PRECONDITION2(ok, false, "jsondata is invalid!");
+    signWithOAuthJNI(funid, jsondata);
     return true;
   }
-  SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1);
+  SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 2);
   return false;
 }
-SE_BIND_FUNC(JSB_signWithDiscord)
+SE_BIND_FUNC(JSB_signWithOAuth)
 
 static bool JSB_callJcVoidMethodJNI(se::State &s)
 {
@@ -1720,7 +1723,7 @@ bool jsb_register_global_variables(se::Object *global)
   __jsbObj->defineFunction("signWithFacebook", _SE(JSB_signWithFacebook));
   __jsbObj->defineFunction("signWithTwitter", _SE(JSB_signWithTwitter));
   __jsbObj->defineFunction("signWithEmail", _SE(JSB_signWithEmail));
-  __jsbObj->defineFunction("signWithDiscord", _SE(JSB_signWithDiscord));
+  __jsbObj->defineFunction("signWithOAuth", _SE(JSB_signWithOAuth));
   __jsbObj->defineFunction("callJcVoidMethodJNI", _SE(JSB_callJcVoidMethodJNI));
   __jsbObj->defineFunction("signOutGoogle", _SE(JSB_signOutGoogle));
   __jsbObj->defineFunction("showQRCode", _SE(JSB_showQRCode));