Merge Release 3.3.4 into stable

.github/ISSUE_TEMPLATE/feature_request.md

@@ -10,7 +10,7 @@ assignees: ''
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]. 
 Also consider if this is an issue that the plugin handles, or something that the Epic Online Services
-SDK handles, E.G. "It would be nice if the EOS ran on the Plan 9 Operating System". Such requests are usually best posted to the Epic's [forum](https://eoshelp.epicgames.com/s/). 
+SDK handles, E.G. "It would be nice if the EOS ran on the Plan 9 Operating System". Such requests are usually best posted to the Epic's [forum](https://eoshelp.epicgames.com/). 
 
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.

.github/workflows/check-markdown-links.yml

@@ -0,0 +1,24 @@
+name: Check Markdown Links
+
+on:
+  push:
+    branches: ["feat/documentation-link-checker"]
+    #paths:
+    #  - '**/*.md'
+  pull_request:
+    paths:
+      - '**/*.md'
+
+jobs:
+  link-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+      - name: Install dependencies
+        run: pip install requests tqdm beautifulsoup4
+      - name: Run link checker
+        run: python tools/scripts/check_links.py

.gitignore

@@ -41,7 +41,10 @@
 # Autogenerated VS/MD/Consulo solution and project files
 ExportedObj/
 .consulo/
-*.csproj
+
+# Only exclude csproj files in the root of the repository
+/*.csproj
+
 *.unityproj
 *.sln
 *.suo

Assets/Plugins/Android/Core/AndroidConfig.cs

@@ -22,9 +22,33 @@
 
 namespace PlayEveryWare.EpicOnlineServices
 {
-    // Flags specifically for Android
+    // Flags specifically for Android. Note that labels for the baser
+    // PlatformConfig need to be specified here.
+    [ConfigGroup("Android Config", new[]
+    {
+     "Android-Specific Options",
+     "Deployment",
+     "Flags",
+     "Tick Budgets",
+     "Overlay Options"
+     }, false)]
     public class AndroidConfig : PlatformConfig
     {
+        [ConfigField("Google Login Client ID",
+            ConfigFieldType.Text,
+            "Get your project's Google Login Client ID from the " +
+            "Google Cloud dashboard",
+            0,
+            "https://console.cloud.google.com/apis/dashboard")]
+        public string GoogleLoginClientID;
+
+        [ConfigField("Google Login Nonce",
+            ConfigFieldType.Text,
+            "Use a nonce to improve sign-ing security on Android.",
+            0,
+            "https://developer.android.com/google/play/integrity/classic#nonce")]
+        public string GoogleLoginNonce;
+
         static AndroidConfig()
         {
             RegisterFactory(() => new AndroidConfig());

Assets/Plugins/Android/login.java

@@ -0,0 +1,121 @@
+/*
+* Copyright (c) 2024 PlayEveryWare
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+*/
+
+package com.playeveryware.googlelogin;
+
+import com.google.android.libraries.identity.googleid.GetSignInWithGoogleOption;
+import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential;
+import com.google.android.libraries.identity.googleid.GoogleIdTokenParsingException;
+
+import androidx.credentials.GetCredentialRequest;
+import androidx.credentials.GetCredentialResponse;
+import androidx.credentials.exceptions.GetCredentialException;
+import androidx.credentials.Credential;
+import androidx.credentials.CustomCredential;
+import androidx.credentials.CredentialManager;
+import androidx.credentials.CredentialManagerCallback;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.CancellationSignal;
+import android.util.Log;
+
+import java.util.concurrent.Executors;
+
+
+public class login extends Activity
+{
+    private String name;
+    private String token;
+    private static login instance;
+
+    public login()
+    {
+        this.instance = this;
+    }
+    public static login instance()
+    {
+        if(instance == null)
+        {
+            instance = new login();
+        }
+        return instance;
+    }
+
+    public String getResultName()
+    {
+        return name;
+    }
+    public String getResultIdToken()
+    {
+        return token;
+    }
+
+    public void SignInWithGoogle(String clientID, String nonce, Context context, CredentialManagerCallback callback)
+    {
+        GetSignInWithGoogleOption signInWithGoogleOption = new GetSignInWithGoogleOption.Builder(clientID)
+                .setNonce(nonce)
+                .build();
+
+        GetCredentialRequest request = new GetCredentialRequest.Builder()
+                .addCredentialOption(signInWithGoogleOption)
+                .build();
+
+        CredentialManager credentialManager = CredentialManager.create(this);
+        credentialManager.getCredentialAsync(context,request,new CancellationSignal(),Executors.newSingleThreadExecutor(),callback);
+    }
+
+    public void handleFailure(GetCredentialException e)
+    {
+        Log.e("Unity", "Received an invalid google id token response", e);
+    }
+
+    public void handleSignIn(GetCredentialResponse result)
+    {
+        Credential credential = result.getCredential();
+
+        if (credential instanceof CustomCredential) 
+        {
+            if (GoogleIdTokenCredential.TYPE_GOOGLE_ID_TOKEN_CREDENTIAL.equals(credential.getType())) 
+            {
+                try
+                {
+                    GoogleIdTokenCredential googleIdTokenCredential = GoogleIdTokenCredential.createFrom(credential.getData());
+                    name = googleIdTokenCredential.getDisplayName();
+                    token = googleIdTokenCredential.getIdToken();
+                }
+                catch (Exception e)
+                {
+                    if (e instanceof GoogleIdTokenParsingException)
+                    {
+                        Log.e("Unity", "Received an invalid google id token response", e);
+                    }
+                    else
+                    {
+                        Log.e("Unity", "Some exception", e);
+                    }
+                }
+            }
+        }
+    }
+}
+

Assets/Plugins/Android/mainTemplate.gradle

@@ -4,6 +4,9 @@ apply plugin: 'com.android.library'
 **APPLY_PLUGINS**
 
 dependencies {
+        implementation 'androidx.credentials:credentials-play-services-auth:1.3.0'
+        implementation 'androidx.credentials:credentials:1.3.0'
+        implementation 'com.google.android.libraries.identity.googleid:googleid:1.1.1'
 	implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 **DEPS**}

Assets/Plugins/Linux/Core/LinuxConfig.cs

@@ -22,10 +22,16 @@
 
 namespace PlayEveryWare.EpicOnlineServices
 {
-    using System;
-
-    // Flags specifically for Linux
-    [Serializable]
+    // Flags specifically for Linux. Note that labels for the baser
+    // PlatformConfig need to be specified here.
+    [ConfigGroup("Linux Config", new[]
+    {
+        "Linux-Specific Options",
+        "Deployment",
+        "Flags",
+        "Tick Budgets",
+        "Overlay Options"
+    }, false)]
     public class LinuxConfig : PlatformConfig
     {
         static LinuxConfig()

Assets/Plugins/Source/Editor/Build/BuildRunner.cs

@@ -22,7 +22,7 @@
 
 namespace PlayEveryWare.EpicOnlineServices.Editor.Build
 {
-    using Config;
+    using PlayEveryWare.EpicOnlineServices;
     using Utility;
     using UnityEditor.Build;
     using UnityEditor.Build.Reporting;
@@ -64,10 +64,9 @@ public static PlatformSpecificBuilder Builder
         /// <param name="report">The pre-process build report.</param>
         public void OnPreprocessBuild(BuildReport report)
         {
-            // Set the current platform that is being built against
-            if (PlatformManager.TryGetPlatform(report.summary.platform, out PlatformManager.Platform platform))
+            if (ScriptingDefineUtility.IsEOSDisabled(report))
             {
-                PlatformManager.CurrentPlatform = platform;
+                return;
             }
 
             // Run the static builder's prebuild.
@@ -76,7 +75,7 @@ public void OnPreprocessBuild(BuildReport report)
 #if !DISABLESTEAMWORKS
             // If we're using Steamworks, then look at the user's Steam configuration file
             // If the "steamApiInterfaceVersionsArray" is empty, try to set it for the user
-            SteamConfig config = SteamConfig.Get<SteamConfig>();
+            SteamConfig config = Config.Get<SteamConfig>();
             if (config != null && (config.steamApiInterfaceVersionsArray == null || config.steamApiInterfaceVersionsArray.Count == 0))
             {
                 config.steamApiInterfaceVersionsArray = SteamworksUtility.GetSteamInterfaceVersions();
@@ -88,7 +87,7 @@ public void OnPreprocessBuild(BuildReport report)
                 else
                 {
                     UnityEngine.Debug.Log($"BuildRunner: This project is using Steamworks, but has not yet configured the steamApiInterfaceVersionsArray. The builder has automatically configured this field and will now try to save the value.");
-                    config.Write(true, false);
+                    config.Write(true);
                 }
             }
 #endif
@@ -101,6 +100,11 @@ public void OnPreprocessBuild(BuildReport report)
         /// <param name="report">The report from the post-process build.</param>
         public void OnPostprocessBuild(BuildReport report)
         {
+            if (ScriptingDefineUtility.IsEOSDisabled(report))
+            {
+                return;
+            }
+
             // Run the static builder's postbuild
             s_builder?.PostBuild(report);
         }

Assets/Plugins/Source/Editor/Build/PlatformSpecificBuilder.cs

@@ -22,6 +22,7 @@
 
 namespace PlayEveryWare.EpicOnlineServices.Editor.Build
 {
+    using Common;
     using Config;
     using System.Collections.Generic;
     using System.IO;
@@ -241,19 +242,18 @@ private static void ConfigureVersion()
         /// </summary>
         private static async void AutoSetProductVersion()
         {
-            var eosConfig = await Config.GetAsync<EOSConfig>();
-            var prebuildConfig = await Config.GetAsync<PrebuildConfig>();
-            var previousProdVer = eosConfig.productVersion;
+            PrebuildConfig prebuildConfig = await Config.GetAsync<PrebuildConfig>();
+            ProductConfig productConfig = Config.Get<ProductConfig>();
 
-            if (prebuildConfig.useAppVersionAsProductVersion)
+            // If the product version is set by config, or if it already equals the product config, stop here.
+            if (!prebuildConfig.useAppVersionAsProductVersion || productConfig.ProductVersion == Application.version)
             {
-                eosConfig.productVersion = Application.version;
+                return;
             }
 
-            if (previousProdVer != eosConfig.productVersion)
-            {
-                await eosConfig.WriteAsync(true);
-            }
+            // Otherwise, set the new product version and write the config.
+            productConfig.ProductVersion = Application.version;
+            await productConfig.WriteAsync();
         }
 
         /// <summary>