Merge pull request #765 from PlayEveryWare/release-3.3.0

Release 3.3.0

Author: paulhazen

Assets/Plugins/Android/Editor.meta

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86dc58d785843505f8704b52f46ae0b408f68c4796a678b5e5f456173dc5aa7b
-size 81336
+oid sha256:13cfd9edf7058c4b110cb7c34b312dcbd894fffe038e8181d048555b76c105d5
+size 85024

Assets/Plugins/Linux/libDynamicLibraryLoaderHelper.so

@@ -80,7 +80,6 @@ namespace PlayEveryWare.EpicOnlineServices
     using LogoutOptions = Epic.OnlineServices.Auth.LogoutOptions;
     using OnLogoutCallback = Epic.OnlineServices.Auth.OnLogoutCallback;
 #endif
-
     /// <summary>
     /// One of the responsibilities of this class is to manage the lifetime of
     /// the EOS SDK and to be the interface for getting all the managed EOS interfaces.
@@ -468,7 +467,7 @@ private PlatformInterface CreatePlatformInterface(EOSConfig configData)
                 IPlatformSpecifics platformSpecifics = EOSManagerPlatformSpecificsSingleton.Instance;
 
                 EOSCreateOptions platformOptions = new EOSCreateOptions();
-                
+
                 platformOptions.options.CacheDirectory = platformSpecifics.GetTempDir();
                 platformOptions.options.IsServer = configData.isServer;
                 platformOptions.options.Flags =
@@ -497,7 +496,8 @@ private PlatformInterface CreatePlatformInterface(EOSConfig configData)
 
                 var clientCredentials = new ClientCredentials
                 {
-                    ClientId = configData.clientID, ClientSecret = configData.clientSecret
+                    ClientId = configData.clientID,
+                    ClientSecret = configData.clientSecret
                 };
                 platformOptions.options.ClientCredentials = clientCredentials;
 
@@ -521,7 +521,7 @@ private PlatformInterface CreatePlatformInterface(EOSConfig configData)
                 integratedPlatformOptionsContainer.Release();
 #endif
                 return platformInterface;
-               
+
             }
 
             //-------------------------------------------------------------------------
@@ -585,24 +585,23 @@ public void Init(IEOSCoroutineOwner coroutineOwner, string configFileName)
                         LoggingInterface.SetCallback(SimplePrintCallback);
                         hasSetLoggingCallback = true;
                     }
-#if UNITY_EDITOR
-                    SetLogLevel(LogCategory.AllCategories, LogLevel.VeryVerbose);
-#else
-                    SetLogLevel(LogCategory.AllCategories, LogLevel.Warning);
-#endif
 
                     InitializeOverlay(coroutineOwner);
                     return;
                 }
 
-#if !UNITY_EDITOR && !UNITY_SWITCH
-                // Set logging to VeryVerbose on EOS SDK bootstrap so we get the most logging information
-                SetLogLevel(LogCategory.AllCategories, LogLevel.VeryVerbose);
-#endif
                 s_state = EOSState.Starting;
 
                 LoadEOSLibraries();
 
+                // Set log level prior to platform interface initialization
+                // VeryVerbose for dynamic linking platforms, otherwise set levels from configs 
+#if UNITY_EDITOR
+                SetLogLevel(LogCategory.AllCategories, LogLevel.VeryVerbose);
+#else
+                InitializeLogLevels();
+#endif
+
                 var epicArgs = GetCommandLineArgsFromEpicLauncher();
 
                 if (!string.IsNullOrWhiteSpace(epicArgs.epicSandboxID))
@@ -672,16 +671,8 @@ public void Init(IEOSCoroutineOwner coroutineOwner, string configFileName)
                 SetEOSPlatformInterface(eosPlatformInterface);
                 UpdateEOSApplicationStatus();
 
-
                 InitializeOverlay(coroutineOwner);
 
-                // Default back to quiet logs
-#if UNITY_EDITOR
-                SetLogLevel(LogCategory.AllCategories, LogLevel.VeryVerbose);
-#else
-                SetLogLevel(LogCategory.AllCategories, LogLevel.Warning);
-#endif
-
                 print("EOS loaded");
             }
 
@@ -770,6 +761,21 @@ public void SetLogLevel(LogCategory Category, LogLevel Level)
                 }
             }
 
+            //-------------------------------------------------------------------------
+            /// <summary>
+            /// Initialize log levels loaded from <see cref="LogLevelConfig" />.
+            /// Should only be called after EOS library loaded, especially for dynamic linking platforms
+            /// </summary>
+            private void InitializeLogLevels()
+            {
+                var logLevelList = LogLevelUtility.LogLevelList;
+
+                for (int logCategoryIndex = 0; logCategoryIndex < logLevelList.Count; logCategoryIndex++)
+                {
+                    SetLogLevel((LogCategory)logCategoryIndex, logLevelList[logCategoryIndex]);
+                }
+            }
+
             //-------------------------------------------------------------------------
             /// <summary>
             /// Retrieves a log level previously set with <c>SetLogLevel</c>
@@ -826,7 +832,10 @@ static private LoginOptions MakeLoginOptions(LoginCredentialType loginType,
             {
                 var loginCredentials = new Credentials
                 {
-                    Type = loginType, ExternalType = externalCredentialType, Id = id, Token = token
+                    Type = loginType,
+                    ExternalType = externalCredentialType,
+                    Id = id,
+                    Token = token
                 };
 
                 var defaultScopeFlags =
@@ -981,7 +990,9 @@ public void AuthLinkExternalAccountWithContinuanceToken(ContinuanceToken token,
                 var authInterface = GetEOSPlatformInterface().GetAuthInterface();
                 var linkOptions = new LinkAccountOptions
                 {
-                    ContinuanceToken = token, LinkAccountFlags = linkAccountFlags, LocalUserId = null
+                    ContinuanceToken = token,
+                    LinkAccountFlags = linkAccountFlags,
+                    LocalUserId = null
                 };
 
                 if (linkAccountFlags.HasFlag(LinkAccountFlags.NintendoNsaId))
@@ -1064,7 +1075,8 @@ public void StartConnectLoginWithEpicAccount(EpicAccountId epicAccountId,
 
                             connectLoginOptions.Credentials = new Epic.OnlineServices.Connect.Credentials
                             {
-                                Token = userAuthToken.Value.AccessToken, Type = ExternalCredentialType.Epic
+                                Token = userAuthToken.Value.AccessToken,
+                                Type = ExternalCredentialType.Epic
                             };
 
                             StartConnectLoginWithOptions(connectLoginOptions, onConnectLoginCallback);
@@ -1074,7 +1086,8 @@ public void StartConnectLoginWithEpicAccount(EpicAccountId epicAccountId,
                 {
                     connectLoginOptions.Credentials = new Epic.OnlineServices.Connect.Credentials
                     {
-                        Token = authToken.Value.AccessToken, Type = ExternalCredentialType.Epic
+                        Token = authToken.Value.AccessToken,
+                        Type = ExternalCredentialType.Epic
                     };
 
                     StartConnectLoginWithOptions(connectLoginOptions, onConnectLoginCallback);
@@ -1088,7 +1101,8 @@ public void StartConnectLoginWithOptions(ExternalCredentialType externalCredenti
                 var loginOptions = new Epic.OnlineServices.Connect.LoginOptions();
                 loginOptions.Credentials = new Epic.OnlineServices.Connect.Credentials
                 {
-                    Token = token, Type = externalCredentialType
+                    Token = token,
+                    Type = externalCredentialType
                 };
 
                 switch (externalCredentialType)
@@ -1100,7 +1114,8 @@ public void StartConnectLoginWithOptions(ExternalCredentialType externalCredenti
                         {
                             loginOptions.UserLoginInfo = new UserLoginInfo
                             {
-                                DisplayName = displayname, NsaIdToken = nsaIdToken,
+                                DisplayName = displayname,
+                                NsaIdToken = nsaIdToken,
                             };
                         }
 
@@ -1166,7 +1181,8 @@ public void StartConnectLoginWithDeviceToken(string displayName, OnConnectLoginC
 
                 connectLoginOptions.Credentials = new Epic.OnlineServices.Connect.Credentials
                 {
-                    Token = null, Type = ExternalCredentialType.DeviceidAccessToken,
+                    Token = null,
+                    Type = ExternalCredentialType.DeviceidAccessToken,
                 };
 
                 StartConnectLoginWithOptions(connectLoginOptions, onLoginCallback);
@@ -1694,13 +1710,13 @@ public void OnApplicationPause(bool isPaused)
                 s_isPaused = isPaused;
                 print($"EOSSingleton.OnApplicationPause: IsPaused {wasPaused} -> {s_isPaused}");
 
-//                // Poll for the latest application constrained state as we're about
-//                // to need it to determine the appropriate EOS application status
-//#if UNITY_PS4 || UNITY_GAMECORE_XBOXONE || UNITY_GAMECORE_SCARLETT
-//                UpdateApplicationConstrainedState(false);
-//#else
-//                UpdateApplicationConstrainedState(true);
-//#endif
+                //                // Poll for the latest application constrained state as we're about
+                //                // to need it to determine the appropriate EOS application status
+                //#if UNITY_PS4 || UNITY_GAMECORE_XBOXONE || UNITY_GAMECORE_SCARLETT
+                //                UpdateApplicationConstrainedState(false);
+                //#else
+                //                UpdateApplicationConstrainedState(true);
+                //#endif
             }
 
             //-------------------------------------------------------------------------
@@ -1710,13 +1726,13 @@ public void OnApplicationFocus(bool hasFocus)
                 s_hasFocus = hasFocus;
                 print($"EOSSingleton.OnApplicationFocus: HasFocus {hadFocus} -> {s_hasFocus}");
 
-//                // Poll for the latest application constrained state as we're about
-//                // to need it to determine the appropriate EOS application status
-//#if UNITY_PS4 || UNITY_GAMECORE_XBOXONE || UNITY_GAMECORE_SCARLETT
-//                UpdateApplicationConstrainedState(false);
-//#else
-//                UpdateApplicationConstrainedState(true);
-//#endif
+                //                // Poll for the latest application constrained state as we're about
+                //                // to need it to determine the appropriate EOS application status
+                //#if UNITY_PS4 || UNITY_GAMECORE_XBOXONE || UNITY_GAMECORE_SCARLETT
+                //                UpdateApplicationConstrainedState(false);
+                //#else
+                //                UpdateApplicationConstrainedState(true);
+                //#endif
             }
 
             //-------------------------------------------------------------------------

Assets/Plugins/Linux/libDynamicLibraryLoaderHelper.so.meta

@@ -35,7 +35,7 @@ public static class EOSPackageInfo
          * not involve editing source code files.
          */
 
-        public const string Version = "3.2.1";
+        public const string Version = "3.3.0";
 
         public const string PackageName = "com.playeveryware.eos";
     }

Assets/Plugins/Source/Core/EOSManager.cs

@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+namespace PlayEveryWare.EpicOnlineServices
+{
+    /// <summary>
+    /// Interface for classes that listen to events from the Auth Interface
+    /// within the EOS SDK.
+    /// </summary>
+    public interface IAuthInterfaceEventListener : IEOSOnAuthLogin, IEOSOnAuthLogout
+    {
+        /*
+         * As all usages of IEOSOnAuthLogin and IEOSOnAuthLogout have been
+         * removed and replaced with IAuthInterfaceEventListener, in a future
+         * iteration, it could be wise to remove both interfaces, and move the
+         * functions they define into this interface.
+         *
+         * In such an event, it would make sense to rename those methods as
+         * follows:
+         *
+         * OnAuthLogin -> OnLogin
+         * OnAuthLogout -> OnLogout
+         */
+    }
+}