Expose more properties of the connection validator context in MQTTnet.Server. Migrate return code to reason code.

Source/MQTTnet.Server/Mqtt/MqttServerConnectionValidator.cs

@@ -7,12 +7,12 @@ using MQTTnet.Server.Scripting;
 
 namespace MQTTnet.Server.Mqtt
 {
-    public class MqttConnectionValidator : IMqttServerConnectionValidator
+    public class MqttServerConnectionValidator : IMqttServerConnectionValidator
     {
         private readonly PythonScriptHostService _pythonScriptHostService;
         private readonly ILogger _logger;
 
-        public MqttConnectionValidator(PythonScriptHostService pythonScriptHostService, ILogger<MqttConnectionValidator> logger)
+        public MqttServerConnectionValidator(PythonScriptHostService pythonScriptHostService, ILogger<MqttServerConnectionValidator> logger)
         {
             _pythonScriptHostService = pythonScriptHostService ?? throw new ArgumentNullException(nameof(pythonScriptHostService));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
@@ -24,18 +24,22 @@ namespace MQTTnet.Server.Mqtt
             {
                 var pythonContext = new PythonDictionary
                 {
-                    { "client_id", context.ClientId },
                     { "endpoint", context.Endpoint },
                     { "is_secure_connection", context.IsSecureConnection },
+                    { "client_id", context.ClientId },
                     { "username", context.Username },
                     { "password", context.Password },
-                    { "raw_password", context.RawPassword },
-                    { "result", PythonConvert.Pythonfy(context.ReturnCode) }
+                    { "raw_password", new Bytes(context.RawPassword) },
+                    { "clean_session", context.CleanSession},
+                    { "authentication_method", context.AuthenticationMethod},
+                    { "authentication_data", new Bytes(context.AuthenticationData)},
+
+                    { "result", PythonConvert.Pythonfy(context.ReasonCode) }
                 };
 
                 _pythonScriptHostService.InvokeOptionalFunction("on_validate_client_connection", pythonContext);
 
-                context.ReturnCode = PythonConvert.ParseEnum<MqttConnectReturnCode>((string)pythonContext["result"]);
+                context.ReasonCode = PythonConvert.ParseEnum<MqttConnectReasonCode>((string)pythonContext["result"]);
             }
             catch (Exception exception)
             {

Source/MQTTnet.Server/Mqtt/MqttServerService.cs

@@ -30,7 +30,7 @@ namespace MQTTnet.Server.Mqtt
         private readonly MqttClientDisconnectedHandler _mqttClientDisconnectedHandler;
         private readonly MqttClientSubscribedTopicHandler _mqttClientSubscribedTopicHandler;
         private readonly MqttClientUnsubscribedTopicHandler _mqttClientUnsubscribedTopicHandler;
-        private readonly MqttConnectionValidator _mqttConnectionValidator;
+        private readonly MqttServerConnectionValidator _mqttConnectionValidator;
         private readonly IMqttServer _mqttServer;
         private readonly MqttSubscriptionInterceptor _mqttSubscriptionInterceptor;
         private readonly PythonScriptHostService _pythonScriptHostService;
@@ -43,7 +43,7 @@ namespace MQTTnet.Server.Mqtt
             MqttClientDisconnectedHandler mqttClientDisconnectedHandler,
             MqttClientSubscribedTopicHandler mqttClientSubscribedTopicHandler,
             MqttClientUnsubscribedTopicHandler mqttClientUnsubscribedTopicHandler,
-            MqttConnectionValidator mqttConnectionValidator,
+            MqttServerConnectionValidator mqttConnectionValidator,
             MqttSubscriptionInterceptor mqttSubscriptionInterceptor,
             MqttApplicationMessageInterceptor mqttApplicationMessageInterceptor,
             MqttServerStorage mqttServerStorage,

Source/MQTTnet.Server/Mqtt/MqttServerStorage.cs

@@ -35,7 +35,7 @@ namespace MQTTnet.Server.Mqtt
                 return;
             }
 
-            _path = ExpandPath();
+            _path = PathHelper.ExpandPath(_mqttSettings.RetainedApplicationMessages.Path);
 
             // The retained application messages are stored in a separate thread.
             // This is mandatory because writing them to a slow storage (like RaspberryPi SD card) 
@@ -115,18 +115,5 @@ namespace MQTTnet.Server.Mqtt
                 return null;
             }
         }
-
-        private string ExpandPath()
-        {
-            var path = _mqttSettings.RetainedApplicationMessages.Path;
-
-            var uri = new Uri(path, UriKind.RelativeOrAbsolute);
-            if (!uri.IsAbsoluteUri)
-            {
-                path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, path);
-            }
-
-            return path;
-        }
     }
 }