Mirror override fix

Author: cxxpxr

UnityProject/Assets/Mirror/Authenticators.meta

@@ -13,6 +13,9 @@ public class BasicAuthenticator : NetworkAuthenticator
         public string username;
         public string password;
 
+        // this is set if authentication fails to prevent garbage AuthRequestMessage spam
+        bool ServerAuthFailed;
+
         #region Messages
 
         public struct AuthRequestMessage : NetworkMessage
@@ -101,7 +104,13 @@ public void OnAuthRequestMessage(NetworkConnection conn, AuthRequestMessage msg)
                 conn.isAuthenticated = false;
 
                 // disconnect the client after 1 second so that response message gets delivered
-                StartCoroutine(DelayedDisconnect(conn, 1));
+                if (!ServerAuthFailed)
+                {
+                    // set this false so this coroutine can only be started once
+                    ServerAuthFailed = true;
+
+                    StartCoroutine(DelayedDisconnect(conn, 1));
+                }
             }
         }
 
@@ -141,21 +150,23 @@ public override void OnStopClient()
         /// Called on client from OnClientAuthenticateInternal when a client needs to authenticate
         /// </summary>
         /// <param name="conn">Connection of the client.</param>
-        public override void OnClientAuthenticate(NetworkConnection conn)
+        public override void OnClientAuthenticate()
         {
             AuthRequestMessage authRequestMessage = new AuthRequestMessage
             {
                 authUsername = username,
                 authPassword = password
             };
 
-            conn.Send(authRequestMessage);
+            NetworkClient.connection.Send(authRequestMessage);
         }
 
+        [Obsolete("Call OnAuthResponseMessage without the NetworkConnection parameter. It always points to NetworkClient.connection anyway.")]
+        public void OnAuthResponseMessage(NetworkConnection conn, AuthResponseMessage msg) => OnAuthResponseMessage(msg);
+
         /// <summary>
         /// Called on client when the server's AuthResponseMessage arrives
         /// </summary>
-        /// <param name="conn">Connection to client.</param>
         /// <param name="msg">The message payload</param>
         public void OnAuthResponseMessage(AuthResponseMessage msg)
         {
@@ -164,20 +175,17 @@ public void OnAuthResponseMessage(AuthResponseMessage msg)
                 // Debug.LogFormat(LogType.Log, "Authentication Response: {0}", msg.message);
 
                 // Authentication has been accepted
-                ClientAccept(NetworkClient.connection);
+                ClientAccept();
             }
             else
             {
                 Debug.LogError($"Authentication Response: {msg.message}");
 
                 // Authentication has been rejected
-                ClientReject(NetworkClient.connection);
+                ClientReject();
             }
         }
 
-        [Obsolete("Call OnAuthResponseMessage without the NetworkConnection parameter. It always points to NetworkClient.connection anyway.")]
-        public void OnAuthResponseMessage(NetworkConnection conn, AuthResponseMessage msg) => OnAuthResponseMessage(msg);
-
         #endregion
     }
 }

UnityProject/Assets/Mirror/Authenticators/BasicAuthenticator.cs

@@ -48,23 +48,21 @@ public override void OnServerAuthenticate(NetworkConnection conn)
                 StartCoroutine(BeginAuthentication(conn));
         }
 
-        public override void OnClientAuthenticate(NetworkConnection conn)
+        public override void OnClientAuthenticate()
         {
-            authenticator.OnClientAuthenticate(conn);
+            authenticator.OnClientAuthenticate();
             if (timeout > 0)
-                StartCoroutine(BeginAuthentication(conn));
+                StartCoroutine(BeginAuthentication(NetworkClient.connection));
         }
 
         IEnumerator BeginAuthentication(NetworkConnection conn)
         {
             // Debug.Log($"Authentication countdown started {conn} {timeout}");
-
             yield return new WaitForSecondsRealtime(timeout);
 
             if (!conn.isAuthenticated)
             {
                 // Debug.Log($"Authentication Timeout {conn}");
-
                 conn.Disconnect();
             }
         }

UnityProject/Assets/Mirror/Authenticators/BasicAuthenticator.cs.meta

@@ -1,61 +1 @@
-using Mirror.Cloud.ListServerService;
-using UnityEngine;
-
-namespace Mirror.Cloud
-{
-    /// <summary>
-    /// Used to requests and responses from the mirror api
-    /// </summary>
-    public interface IApiConnector
-    {
-        ListServer ListServer { get; }
-    }
-
-    /// <summary>
-    /// Used to requests and responses from the mirror api
-    /// </summary>
-    [DisallowMultipleComponent]
-    [AddComponentMenu("Network/CloudServices/ApiConnector")]
-    [HelpURL("https://mirror-networking.com/docs/api/Mirror.Cloud.ApiConnector.html")]
-    public class ApiConnector : MonoBehaviour, IApiConnector, ICoroutineRunner
-    {
-        #region Inspector
-        [Header("Settings")]
-
-        [Tooltip("Base URL of api, including https")]
-        [SerializeField] string ApiAddress = "";
-
-        [Tooltip("Api key required to access api")]
-        [SerializeField] string ApiKey = "";
-
-        [Header("Events")]
-
-        [Tooltip("Triggered when server list updates")]
-        [SerializeField] ServerListEvent _onServerListUpdated = new ServerListEvent();
-        #endregion
-
-        IRequestCreator requestCreator;
-
-        public ListServer ListServer { get; private set; }
-
-        void Awake()
-        {
-            requestCreator = new RequestCreator(ApiAddress, ApiKey, this);
-
-            InitListServer();
-        }
-
-        void InitListServer()
-        {
-            IListServerServerApi serverApi = new ListServerServerApi(this, requestCreator);
-            IListServerClientApi clientApi = new ListServerClientApi(this, requestCreator, _onServerListUpdated);
-            ListServer = new ListServer(serverApi, clientApi);
-        }
-
-        public void OnDestroy()
-        {
-            ListServer?.ServerApi.Shutdown();
-            ListServer?.ClientApi.Shutdown();
-        }
-    }
-}
+// removed 2021-05-13

UnityProject/Assets/Mirror/Authenticators/Mirror.Authenticators.asmdef.meta

@@ -1,25 +1 @@
-using System;
-
-namespace Mirror.Cloud
-{
-    public interface IBaseApi
-    {
-        /// <summary>
-        /// Cleans up any data created by the instance
-        /// <para>For Example: removing server from list</para>
-        /// </summary>
-        void Shutdown();
-    }
-
-    public abstract class BaseApi
-    {
-        protected readonly ICoroutineRunner runner;
-        protected readonly IRequestCreator requestCreator;
-
-        protected BaseApi(ICoroutineRunner runner, IRequestCreator requestCreator)
-        {
-            this.runner = runner ?? throw new ArgumentNullException(nameof(runner));
-            this.requestCreator = requestCreator ?? throw new ArgumentNullException(nameof(requestCreator));
-        }
-    }
-}
+// removed 2021-05-13