Revert "File scoped namespaces"

This reverts commit d31d8f574e.

Wino.Core.Domain/Models/AutoDiscovery/AutoDiscoveryMinimalSettings.cs

@@ -1,8 +1,9 @@
-namespace Wino.Core.Domain.Models.AutoDiscovery;
-
-public class AutoDiscoveryMinimalSettings
+namespace Wino.Core.Domain.Models.AutoDiscovery
 {
-    public string DisplayName { get; set; }
-    public string Email { get; set; }
-    public string Password { get; set; }
+    public class AutoDiscoveryMinimalSettings
+    {
+        public string DisplayName { get; set; }
+        public string Email { get; set; }
+        public string Password { get; set; }
+    }
 }

Wino.Core.Domain/Models/AutoDiscovery/AutoDiscoveryProviderSetting.cs

@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
 
-namespace Wino.Core.Domain.Models.AutoDiscovery;
-
-public class AutoDiscoveryProviderSetting
+namespace Wino.Core.Domain.Models.AutoDiscovery
 {
-    [JsonPropertyName("protocol")]
-    public string Protocol { get; set; }
+    public class AutoDiscoveryProviderSetting
+    {
+        [JsonPropertyName("protocol")]
+        public string Protocol { get; set; }
 
-    [JsonPropertyName("address")]
-    public string Address { get; set; }
+        [JsonPropertyName("address")]
+        public string Address { get; set; }
 
-    [JsonPropertyName("port")]
-    public int Port { get; set; }
+        [JsonPropertyName("port")]
+        public int Port { get; set; }
 
-    [JsonPropertyName("secure")]
-    public string Secure { get; set; }
+        [JsonPropertyName("secure")]
+        public string Secure { get; set; }
 
-    [JsonPropertyName("username")]
-    public string Username { get; set; }
+        [JsonPropertyName("username")]
+        public string Username { get; set; }
+    }
 }

Wino.Core.Domain/Models/AutoDiscovery/AutoDiscoverySettings.cs

@@ -3,69 +3,70 @@ using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using Wino.Core.Domain.Entities.Shared;
 
-namespace Wino.Core.Domain.Models.AutoDiscovery;
-
-public class AutoDiscoverySettings
+namespace Wino.Core.Domain.Models.AutoDiscovery
 {
-    [JsonPropertyName("domain")]
-    public string Domain { get; set; }
-
-    [JsonPropertyName("password")]
-    public string Password { get; set; }
-
-    [JsonPropertyName("settings")]
-    public List<AutoDiscoveryProviderSetting> Settings { get; set; }
-
-    /// <summary>
-    /// Gets whether this domain requires additional steps for password like app-specific password or sth.
-    /// </summary>
-    public bool IsPasswordSupportLinkAvailable => !string.IsNullOrEmpty(Password) && Uri.TryCreate(Password, UriKind.Absolute, out _);
-
-    public AutoDiscoveryMinimalSettings UserMinimalSettings { get; set; }
-
-    public CustomServerInformation ToServerInformation()
+    public class AutoDiscoverySettings
     {
-        var imapSettings = GetImapSettings();
-        var smtpSettings = GetSmptpSettings();
+        [JsonPropertyName("domain")]
+        public string Domain { get; set; }
 
-        if (imapSettings == null || smtpSettings == null) return null;
+        [JsonPropertyName("password")]
+        public string Password { get; set; }
 
-        string imapUrl = imapSettings.Address;
-        string smtpUrl = smtpSettings.Address;
+        [JsonPropertyName("settings")]
+        public List<AutoDiscoveryProviderSetting> Settings { get; set; }
 
-        string imapUsername = imapSettings.Username;
-        string smtpUsername = smtpSettings.Username;
+        /// <summary>
+        /// Gets whether this domain requires additional steps for password like app-specific password or sth.
+        /// </summary>
+        public bool IsPasswordSupportLinkAvailable => !string.IsNullOrEmpty(Password) && Uri.TryCreate(Password, UriKind.Absolute, out _);
 
-        int imapPort = imapSettings.Port;
-        int smtpPort = smtpSettings.Port;
+        public AutoDiscoveryMinimalSettings UserMinimalSettings { get; set; }
 
-        var serverInfo = new CustomServerInformation
+        public CustomServerInformation ToServerInformation()
         {
-            Id = Guid.NewGuid(),
-            DisplayName = UserMinimalSettings.DisplayName,
-            Address = UserMinimalSettings.Email,
-            IncomingServerPassword = UserMinimalSettings.Password,
-            OutgoingServerPassword = UserMinimalSettings.Password,
-            IncomingAuthenticationMethod = Enums.ImapAuthenticationMethod.Auto,
-            OutgoingAuthenticationMethod = Enums.ImapAuthenticationMethod.Auto,
-            OutgoingServerSocketOption = Enums.ImapConnectionSecurity.Auto,
-            IncomingServerSocketOption = Enums.ImapConnectionSecurity.Auto,
-            IncomingServer = imapUrl,
-            OutgoingServer = smtpUrl,
-            IncomingServerPort = imapPort.ToString(),
-            OutgoingServerPort = smtpPort.ToString(),
-            IncomingServerType = Enums.CustomIncomingServerType.IMAP4,
-            IncomingServerUsername = imapUsername,
-            OutgoingServerUsername = smtpUsername,
-            MaxConcurrentClients = 5
-        };
+            var imapSettings = GetImapSettings();
+            var smtpSettings = GetSmptpSettings();
 
-        return serverInfo;
+            if (imapSettings == null || smtpSettings == null) return null;
+
+            string imapUrl = imapSettings.Address;
+            string smtpUrl = smtpSettings.Address;
+
+            string imapUsername = imapSettings.Username;
+            string smtpUsername = smtpSettings.Username;
+
+            int imapPort = imapSettings.Port;
+            int smtpPort = smtpSettings.Port;
+
+            var serverInfo = new CustomServerInformation
+            {
+                Id = Guid.NewGuid(),
+                DisplayName = UserMinimalSettings.DisplayName,
+                Address = UserMinimalSettings.Email,
+                IncomingServerPassword = UserMinimalSettings.Password,
+                OutgoingServerPassword = UserMinimalSettings.Password,
+                IncomingAuthenticationMethod = Enums.ImapAuthenticationMethod.Auto,
+                OutgoingAuthenticationMethod = Enums.ImapAuthenticationMethod.Auto,
+                OutgoingServerSocketOption = Enums.ImapConnectionSecurity.Auto,
+                IncomingServerSocketOption = Enums.ImapConnectionSecurity.Auto,
+                IncomingServer = imapUrl,
+                OutgoingServer = smtpUrl,
+                IncomingServerPort = imapPort.ToString(),
+                OutgoingServerPort = smtpPort.ToString(),
+                IncomingServerType = Enums.CustomIncomingServerType.IMAP4,
+                IncomingServerUsername = imapUsername,
+                OutgoingServerUsername = smtpUsername,
+                MaxConcurrentClients = 5
+            };
+
+            return serverInfo;
+        }
+
+        public AutoDiscoveryProviderSetting GetImapSettings()
+            => Settings?.Find(a => a.Protocol == "IMAP");
+
+        public AutoDiscoveryProviderSetting GetSmptpSettings()
+            => Settings?.Find(a => a.Protocol == "SMTP");
     }
-
-    public AutoDiscoveryProviderSetting GetImapSettings()
-        => Settings?.Find(a => a.Protocol == "IMAP");
-
-    public AutoDiscoveryProviderSetting GetSmptpSettings()
-        => Settings?.Find(a => a.Protocol == "SMTP");
 }