Merge pull request #16 from modio/v2024.9

Syncing v2024.9

Author: johnw-modio

Platform/Editor/ModIO.Implementation.Platform/PlatformConfiguration_Editor.cs

@@ -9,13 +9,13 @@ internal static partial class PlatformConfiguration
     {
 #if UNITY_EDITOR_WIN
         /// <summary>Holds the value for the platform header value to use in requests.</summary>
-        public static string RESTAPI_HEADER = RestApiPlatform.Windows.ToString();
+        public static RestApiPlatform RESTAPI_HEADER = RestApiPlatform.Windows;
 #elif UNITY_EDITOR_OSX
         /// <summary>Holds the value for the platform header value to use in requests.</summary>
-        public static string RESTAPI_HEADER = RestApiPlatform.Mac.ToString();
+        public static RestApiPlatform RESTAPI_HEADER = RestApiPlatform.Mac;
 #elif UNITY_EDITOR_LINUX
         /// <summary>Holds the value for the platform header value to use in requests.</summary>
-        public static string RESTAPI_HEADER = RestApiPlatform.Linux.ToString();
+        public static RestApiPlatform RESTAPI_HEADER = RestApiPlatform.Linux;
 #endif
         public const bool SynchronizedDataJobs = false;
 

Platform/Mobile/Android.meta

@@ -0,0 +1,38 @@
+using UnityEngine;
+
+#if UNITY_ANDROID
+using GooglePlayGames;
+#endif
+
+namespace ModIO.Implementation.Platform
+{
+    public class ModioPlatformExampleGoogleGames : MonoBehaviour
+    {
+        private void Awake()
+        {
+#if UNITY_ANDROID
+            // Enable debug logging for Play Games Platform
+            PlayGamesPlatform.DebugLogEnabled = true;
+            PlayGamesPlatform.Activate();
+            
+            // Authenticate with Play Games Services
+            PlayGamesPlatform.Instance.Authenticate((success) =>
+            {
+                // Check if authentication was successful
+                if (success)
+                {
+                    // --- This is the important line to include in your own implementation ---
+                    ModioPlatformGoogleGames.SetAsPlatform();
+                }
+                else
+                {
+                    // Handle unsuccessful authentication:
+                    // Disable your integration with Play Games Services or show a login button to ask users to sign-in.
+                    // Clicking it should call PlayGamesPlatform.Instance.ManuallyAuthenticate(ProcessAuthentication);
+                }
+            });
+#endif
+        }
+
+    }
+}

Platform/Mobile/Android/ModioPlatformExampleGoogleGames.cs

@@ -0,0 +1,111 @@
+using UnityEngine;
+
+#if UNITY_ANDROID
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Google;
+#endif
+
+namespace ModIO.Implementation.Platform
+{
+    public class ModioPlatformExampleGoogleSignIn : MonoBehaviour
+    {
+        [SerializeField] string clientId = "<your client id here>";
+        string idToken;
+
+        private void Awake()
+        {
+#if UNITY_ANDROID
+            SignInSilently();
+#endif
+        }
+
+#if UNITY_ANDROID
+        async void SignInSilently()
+        {
+            if (Application.isEditor)
+                return;
+
+            GoogleSignIn.Configuration = new GoogleSignInConfiguration
+            {
+                WebClientId = clientId,
+                RequestIdToken = true
+            };
+            GoogleSignIn.Configuration.UseGameSignIn = false;
+            GoogleSignIn.Configuration.RequestIdToken = true;
+            Logger.Log(LogLevel.Verbose, "Calling SignIn Silently");
+
+            var task = GoogleSignIn.DefaultInstance.SignInSilently();
+            await task;
+            FinishSignIn(task);
+        }
+
+        public async Task SignIn()
+        {
+            if (Application.isEditor)
+                return;
+
+            GoogleSignIn.Configuration = new GoogleSignInConfiguration
+            {
+                WebClientId = clientId,
+                RequestIdToken = true
+            };
+            GoogleSignIn.Configuration.UseGameSignIn = false;
+            GoogleSignIn.Configuration.RequestIdToken = true;
+            Logger.Log(LogLevel.Verbose, "Calling SignIn");
+
+            var task = GoogleSignIn.DefaultInstance.SignIn();
+            await task;
+            FinishSignIn(task);
+        }
+
+        void FinishSignIn(Task<GoogleSignInUser> task)
+        {
+            if (task.IsFaulted)
+            {
+                using (IEnumerator<Exception> enumerator = task.Exception.InnerExceptions.GetEnumerator())
+                {
+                    if (enumerator.MoveNext())
+                    {
+                        GoogleSignIn.SignInException error = (GoogleSignIn.SignInException)enumerator.Current;
+                        Logger.Log(LogLevel.Verbose, "Error: " + error.Status + " " + error.Message);
+                    }
+                    else
+                    {
+                        Logger.Log(LogLevel.Verbose, task.Exception.Message);
+                    }
+                }
+            }
+            else if (task.IsCanceled)
+            {
+                Logger.Log(LogLevel.Verbose, "Google Sign In task was Canceled");
+            }
+            else
+            {
+                // --- This is the important line to include in your own implementation ---
+                ModioPlatformGoogleSignIn.SetAsPlatform(task.Result.IdToken);
+                Logger.Log(LogLevel.Verbose, "Sign in completed!");
+            }
+        }
+
+        public void SignOut()
+        {
+            if (Application.isEditor)
+                return;
+
+            Logger.Log(LogLevel.Verbose, "Calling SignOut");
+            GoogleSignIn.DefaultInstance.SignOut();
+        }
+
+        public void Disconnect()
+        {
+            if (Application.isEditor)
+                return;
+
+            Logger.Log(LogLevel.Verbose, "Calling Disconnect");
+            GoogleSignIn.DefaultInstance.Disconnect();
+        }
+#endif
+    }
+}

Platform/Mobile/Android/ModioPlatformExampleGoogleGames.cs.meta

@@ -0,0 +1,50 @@
+using System;
+
+#if UNITY_ANDROID
+using GooglePlayGames;
+using UnityEngine;
+#endif
+
+namespace ModIO.Implementation.Platform
+{
+    public class ModioPlatformGoogleGames : ModioPlatform, IModioSsoPlatform
+    {
+        public static void SetAsPlatform()
+        {
+            ActivePlatform = new ModioPlatformGoogleGames();
+        }
+        
+        public void PerformSso(TermsHash? displayedTerms, Action<Result> onComplete, string optionalThirdPartyEmailAddressUsedForAuthentication = null)
+        {
+#if UNITY_ANDROID
+            GetIdToken(token =>
+            {
+                ModIOUnity.AuthenticateUserViaGoogle(token,
+                    optionalThirdPartyEmailAddressUsedForAuthentication,
+                    displayedTerms,
+                    onComplete);
+            });
+#endif
+        }
+        
+#if UNITY_ANDROID
+        void GetIdToken(Action<string> onReceivedAuthCode)
+        {
+            if (Application.isEditor)
+                return;
+
+            try
+            {
+                // Request server-side auth code from Play Games Platform
+                var idToken = PlayGamesPlatform.Instance.GetIdToken();
+                Logger.Log(LogLevel.Verbose, $"Id Token: {idToken}");
+                onReceivedAuthCode?.Invoke(idToken);
+            }
+            catch (Exception e)
+            {
+                Logger.Log(LogLevel.Error, e.Message);
+            }
+        }
+#endif
+    }
+}

Platform/Mobile/Android/ModioPlatformExampleGoogleSignIn.cs

@@ -0,0 +1,26 @@
+using System;
+
+namespace ModIO.Implementation.Platform
+{
+    public class ModioPlatformGoogleSignIn : ModioPlatform, IModioSsoPlatform
+    {
+        private string idToken;
+        
+        public static void SetAsPlatform(string idToken)
+        {
+            ActivePlatform = new ModioPlatformGoogleSignIn
+            {
+                idToken = idToken,
+            };
+        }
+        public void PerformSso(TermsHash? displayedTerms, Action<Result> onComplete, string optionalThirdPartyEmailAddressUsedForAuthentication = null)
+        {
+#if UNITY_ANDROID
+            ModIOUnity.AuthenticateUserViaGoogle(idToken,
+                optionalThirdPartyEmailAddressUsedForAuthentication,
+                displayedTerms,
+                onComplete);
+#endif
+        }
+    }
+}

Platform/Mobile/Android/ModioPlatformExampleGoogleSignIn.cs.meta

@@ -0,0 +1,45 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &890429863644987089
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 24952581316947064}
+  - component: {fileID: 9178692787153453301}
+  m_Layer: 0
+  m_Name: ModioPlatformExampleGoogleGames
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &24952581316947064
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 890429863644987089}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &9178692787153453301
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 890429863644987089}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a8c3b83c1f3494b37a244bbff4ae835e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Platform/Mobile/Android/ModioPlatformGoogleGames.cs

@@ -0,0 +1,46 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &890429863644987089
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 24952581316947064}
+  - component: {fileID: -8228732916061347725}
+  m_Layer: 0
+  m_Name: ModioPlatformExampleGoogleSignIn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &24952581316947064
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 890429863644987089}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &-8228732916061347725
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 890429863644987089}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d7c2768ec28364d04adb96f24535f9bd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  clientId: 163019015440-9kjmrqfgi6aavepdn33a695dc2002l9m.apps.googleusercontent.com