From b558f2568805baace3a44d710a0354d7febe4645 Mon Sep 17 00:00:00 2001 From: Nick Leeman Date: Fri, 8 Sep 2023 13:01:23 +0200 Subject: [PATCH] Simplified token request settings. --- game.project | 2 -- .../.gradle/7.4.2/checksums/checksums.lock | Bin 0 -> 17 bytes .../dependencies-accessors.lock | Bin 0 -> 17 bytes .../dependencies-accessors/gc.properties | 0 .../.gradle/7.4.2/fileChanges/last-build.bin | Bin 0 -> 1 bytes .../.gradle/7.4.2/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .../android/.gradle/7.4.2/gc.properties | 0 .../buildOutputCleanup.lock | Bin 0 -> 17 bytes .../buildOutputCleanup/cache.properties | 2 ++ .../android/.gradle/vcs-1/gc.properties | 0 siwg/src/java/com/aterve/siwg/SiwgJNI.java | 17 +++-------- siwg/src/siwg.cpp | 27 ++---------------- 12 files changed, 9 insertions(+), 39 deletions(-) create mode 100644 siwg/manifests/android/.gradle/7.4.2/checksums/checksums.lock create mode 100644 siwg/manifests/android/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock create mode 100644 siwg/manifests/android/.gradle/7.4.2/dependencies-accessors/gc.properties create mode 100644 siwg/manifests/android/.gradle/7.4.2/fileChanges/last-build.bin create mode 100644 siwg/manifests/android/.gradle/7.4.2/fileHashes/fileHashes.lock create mode 100644 siwg/manifests/android/.gradle/7.4.2/gc.properties create mode 100644 siwg/manifests/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 siwg/manifests/android/.gradle/buildOutputCleanup/cache.properties create mode 100644 siwg/manifests/android/.gradle/vcs-1/gc.properties diff --git a/game.project b/game.project index 4b02af4..956e4a3 100644 --- a/game.project +++ b/game.project @@ -26,8 +26,6 @@ debuggable = 1 [siwg] app_id = 715670885775 client_id = 715670885775-j3p3nr6ith9su03p2im8d2p752hptg56.apps.googleusercontent.com -request_server_auth_code = 1 -request_id_token = 1 [ios] bundle_identifier = com.aterve.partydeck diff --git a/siwg/manifests/android/.gradle/7.4.2/checksums/checksums.lock b/siwg/manifests/android/.gradle/7.4.2/checksums/checksums.lock new file mode 100644 index 0000000000000000000000000000000000000000..1a5774eb7dda1f64232b24442d60dbec8b0dedb6 GIT binary patch literal 17 TcmZQRSLdxA7xHH>0~7!NGf)IE literal 0 HcmV?d00001 diff --git a/siwg/manifests/android/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock b/siwg/manifests/android/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 0000000000000000000000000000000000000000..ff054cb8036cf778bf9336c6098d5c15b6091732 GIT binary patch literal 17 TcmZQJSbr({Td8_H0~7!NGYkX) literal 0 HcmV?d00001 diff --git a/siwg/manifests/android/.gradle/7.4.2/dependencies-accessors/gc.properties b/siwg/manifests/android/.gradle/7.4.2/dependencies-accessors/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/siwg/manifests/android/.gradle/7.4.2/fileChanges/last-build.bin b/siwg/manifests/android/.gradle/7.4.2/fileChanges/last-build.bin new file mode 100644 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d GIT binary patch literal 1 IcmZPo000310RR91 literal 0 HcmV?d00001 diff --git a/siwg/manifests/android/.gradle/7.4.2/fileHashes/fileHashes.lock b/siwg/manifests/android/.gradle/7.4.2/fileHashes/fileHashes.lock new file mode 100644 index 0000000000000000000000000000000000000000..02100376f5e7166ec991cd796c9e229bd05bd429 GIT binary patch literal 17 TcmZSXa8LdnJ?YRD1}FdkIH&}) literal 0 HcmV?d00001 diff --git a/siwg/manifests/android/.gradle/7.4.2/gc.properties b/siwg/manifests/android/.gradle/7.4.2/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/siwg/manifests/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/siwg/manifests/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000000000000000000000000000000000000..c329b487352b798a71d93503368d0008effdc2bc GIT binary patch literal 17 TcmZQ}ninFkzAns@0Rk8SBMkz~ literal 0 HcmV?d00001 diff --git a/siwg/manifests/android/.gradle/buildOutputCleanup/cache.properties b/siwg/manifests/android/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..2087ef2 --- /dev/null +++ b/siwg/manifests/android/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Fri Sep 08 12:58:23 CEST 2023 +gradle.version=7.4.2 diff --git a/siwg/manifests/android/.gradle/vcs-1/gc.properties b/siwg/manifests/android/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/siwg/src/java/com/aterve/siwg/SiwgJNI.java b/siwg/src/java/com/aterve/siwg/SiwgJNI.java index ea861d3..ecda935 100644 --- a/siwg/src/java/com/aterve/siwg/SiwgJNI.java +++ b/siwg/src/java/com/aterve/siwg/SiwgJNI.java @@ -54,8 +54,6 @@ public class SiwgJNI { private Activity activity; private String client_id; - private boolean is_request_id_token; - private boolean is_request_auth_code; private boolean is_supported; // @@ -73,11 +71,9 @@ public class SiwgJNI { // Constructor // - public SiwgJNI(Activity activity, boolean is_disk_active, boolean is_request_auth_code, boolean is_request_id_token, String client_id) { + public SiwgJNI(Activity activity, String client_id) { this.activity = activity; this.client_id = client_id; - this.is_request_auth_code = is_request_auth_code; - this.is_request_id_token = is_request_id_token; // Check if device supports google sign in this.is_supported = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(activity) == ConnectionResult.SUCCESS; @@ -164,14 +160,9 @@ public class SiwgJNI { // Create Google Sign in (Default) GoogleSignInOptions.Builder builder = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN); - if (is_request_id_token && client_id != null) { - builder.requestIdToken(client_id); - } - - if (is_request_auth_code && client_id != null) { - builder.requestServerAuthCode(client_id); - } - + builder.requestIdToken(client_id); + builder.requestServerAuthCode(client_id); + // Request email builder.requestEmail(); diff --git a/siwg/src/siwg.cpp b/siwg/src/siwg.cpp index 90b2738..a3961e1 100644 --- a/siwg/src/siwg.cpp +++ b/siwg/src/siwg.cpp @@ -301,27 +301,8 @@ static void InitJNIMethods(JNIEnv* env, jclass cls) g_siwg.m_activityResult = env->GetMethodID(cls, "activityResult", "(IILandroid/content/Intent;)V"); } - -static void CheckInitializationParams(const char* client_id, bool request_server_auth_code, bool request_id_token) +static void InitializeJNI(const char* client_id) { - bool is_empty_client_id = client_id == 0 || strlen(client_id) == 0; - - if (is_empty_client_id && request_server_auth_code) - { - dmLogError("'siwg.client_id' must be defined to request server auth code!"); - } - - if (is_empty_client_id && request_id_token) - { - dmLogError("'siwg.client_id' must be defined to request id token!"); - } -} - -static void InitializeJNI(const char* client_id, bool request_server_auth_code, bool request_id_token) -{ - CheckInitializationParams(client_id, request_server_auth_code > 0, request_id_token > 0); - dmLogInfo("[SIWG] InitJNI Checked Params"); - dmAndroid::ThreadAttacher threadAttacher; JNIEnv* env = threadAttacher.GetEnv(); jclass cls = dmAndroid::LoadClass(env, "com.aterve.siwg.SiwgJNI"); @@ -333,7 +314,7 @@ static void InitializeJNI(const char* client_id, bool request_server_auth_code, jmethodID jni_constructor = env->GetMethodID(cls, "", "(Landroid/app/Activity;ZZZLjava/lang/String;)V"); jstring java_client_id = env->NewStringUTF(client_id); - g_siwg.m_SiwgJNI = env->NewGlobalRef(env->NewObject(cls, jni_constructor, threadAttacher.GetActivity()->clazz, true, request_server_auth_code, request_id_token, java_client_id)); + g_siwg.m_SiwgJNI = env->NewGlobalRef(env->NewObject(cls, jni_constructor, threadAttacher.GetActivity()->clazz, java_client_id)); env->DeleteLocalRef(java_client_id); dmLogInfo("[SIWG] InitJNI JNI Refrences Initialized"); } @@ -347,12 +328,10 @@ dmExtension::Result InitializeSIWG(dmExtension::Params* params) dmLogInfo("[SIWG] Initializing Extension..."); LuaInit(params->m_L); - int request_server_auth_code = dmConfigFile::GetInt(params->m_ConfigFile, "siwg.request_server_auth_code", 0); - int request_id_token = dmConfigFile::GetInt(params->m_ConfigFile, "siwg.request_id_token", 0); const char* client_id = dmConfigFile::GetString(params->m_ConfigFile, "siwg.client_id", 0); dmLogInfo("[SIWG] Loaded Settings"); - InitializeJNI(client_id, request_server_auth_code > 0, request_id_token > 0); + InitializeJNI(client_id); dmAndroid::RegisterOnActivityResultListener(OnActivityResult); dmLogInfo("[SIWG] Activity Result Listener Initialized");