Refactor async methods and improve code formatting

Updated various async methods by refactoring code for improved readability and consistency. This includes changing types from IReadOnlyDictionary to Dictionary in a few places, handling stream operations with 'await using', and ensuring consistent formatting and indentation across the code. Additionally, enhanced error handling in file operations and addressed deprecated synchronous calls by transitioning to asynchronous patterns.

common/ASC.ActiveDirectory/Base/Data/LdapLogin.cs

@@ -45,7 +45,7 @@ public static LdapLogin ParseLogin(string login)
         string username;
         string domain = null;
 
-        if (login.Contains("\\"))
+        if (login.Contains('\\'))
         {
             var splited = login.Split('\\');
 
@@ -58,7 +58,7 @@ public static LdapLogin ParseLogin(string login)
             username = splited[1];
 
         }
-        else if (login.Contains("@"))
+        else if (login.Contains('@'))
         {
             var splited = login.Split('@');
 

common/ASC.ActiveDirectory/Base/Data/LdapObjectExtension.cs

@@ -222,7 +222,7 @@ public async Task<UserInfo> ToUserInfoAsync(LdapObject ldapUser, LdapUserImporte
 
         if (string.IsNullOrEmpty(mail))
         {
-            user.Email = userName.Contains("@") ? userName : string.Format("{0}@{1}", userName, ldapUserImporter.LDAPDomain);
+            user.Email = userName.Contains('@') ? userName : string.Format("{0}@{1}", userName, ldapUserImporter.LDAPDomain);
             user.ActivationStatus = EmployeeActivationStatus.AutoGenerated;
         }
         else

common/ASC.ActiveDirectory/Base/LdapUserImporter.cs

@@ -721,7 +721,7 @@ public async Task<List<Tuple<UserInfo, LdapObject>>> FindLdapUsersAsync(string l
 
         string email = null;
 
-        if (!string.IsNullOrEmpty(Settings.MailAttribute) && !string.IsNullOrEmpty(ldapLogin.Domain) && login.Contains("@"))
+        if (!string.IsNullOrEmpty(Settings.MailAttribute) && !string.IsNullOrEmpty(ldapLogin.Domain) && login.Contains('@'))
         {
             email = ldapLogin.ToString();
             exps.Add(Expression.Equal(Settings.MailAttribute, email));

common/ASC.ActiveDirectory/ComplexOperations/Data/LdapChangeEnums.cs

@@ -62,13 +62,13 @@ public static class LdapUserMapping
 {
     public static readonly List<string> Fields =
     [
-        Enum.GetName(typeof(LdapItemChangeKey), LdapItemChangeKey.FirstName),
-        Enum.GetName(typeof(LdapItemChangeKey), LdapItemChangeKey.LastName),
-        Enum.GetName(typeof(LdapItemChangeKey), LdapItemChangeKey.Mail),
-        Enum.GetName(typeof(LdapItemChangeKey), LdapItemChangeKey.Phone),
-        Enum.GetName(typeof(LdapItemChangeKey), LdapItemChangeKey.Title),
-        Enum.GetName(typeof(LdapItemChangeKey), LdapItemChangeKey.Location),
-        Enum.GetName(typeof(LdapItemChangeKey), LdapItemChangeKey.Sid),
-        Enum.GetName(typeof(LdapItemChangeKey), LdapItemChangeKey.Member)
+        Enum.GetName(LdapItemChangeKey.FirstName),
+        Enum.GetName(LdapItemChangeKey.LastName),
+        Enum.GetName(LdapItemChangeKey.Mail),
+        Enum.GetName(LdapItemChangeKey.Phone),
+        Enum.GetName(LdapItemChangeKey.Title),
+        Enum.GetName(LdapItemChangeKey.Location),
+        Enum.GetName(LdapItemChangeKey.Sid),
+        Enum.GetName(LdapItemChangeKey.Member)
     ];
 }

common/ASC.ActiveDirectory/ComplexOperations/LdapOperationJob.cs

@@ -138,7 +138,7 @@ protected override async Task DoJob()
                 case LdapOperationType.Save:
                 case LdapOperationType.SaveTest:
 
-                    logger.InfoStartOperation(Enum.GetName(typeof(LdapOperationType), _operationType));
+                    logger.InfoStartOperation(Enum.GetName(_operationType));
 
                     await SetProgress(1, _resource.LdapSettingsStatusCheckingLdapSettings);
 
@@ -180,7 +180,7 @@ protected override async Task DoJob()
                     break;
                 case LdapOperationType.Sync:
                 case LdapOperationType.SyncTest:
-                    logger.InfoStartOperation(Enum.GetName(typeof(LdapOperationType), _operationType));
+                    logger.InfoStartOperation(Enum.GetName(_operationType));
 
                     _novellLdapUserImporter.Init(_ldapSettings, _resource);
                     break;
@@ -570,7 +570,7 @@ private async Task GiveUsersRights(Dictionary<LdapSettings.AccessRight, string>
 
                             var cleared = false;
 
-                            foreach (var r in Enum.GetValues(typeof(LdapSettings.AccessRight)).Cast<LdapSettings.AccessRight>())
+                            foreach (var r in Enum.GetValues<LdapSettings.AccessRight>())
                             {
                                 var prodId = LdapSettings.AccessRightsGuids[r];
 

common/ASC.ActiveDirectory/LdapUtils.cs

@@ -79,7 +79,7 @@ public static bool IsLoginAccepted(LdapLogin ldapLogin, UserInfo ldapUser, strin
             return false;
         }
 
-        var alterEmail = ldapUser.UserName.Contains("@")
+        var alterEmail = ldapUser.UserName.Contains('@')
             ? ldapUser.UserName
             : string.Format("{0}@{1}", ldapUser.UserName, ldapDomain);
 
@@ -102,7 +102,7 @@ private static string GetLdapAccessableEmail(string email)
                 return email;
             }
 
-            var dotIndex = login.Domain.LastIndexOf(".", StringComparison.Ordinal);
+            var dotIndex = login.Domain.LastIndexOf('.');
 
             var accessableEmail = dotIndex > -1 ? string.Format("{0}@{1}", login.Username, login.Domain.Remove(dotIndex)) : email;
 
@@ -185,7 +185,7 @@ public static string GetUserInfoString(this UserInfo userInfo)
             userInfo.Title,
             userInfo.Location,
             userInfo.GetContactsString(),
-            Enum.GetName(typeof(EmployeeStatus), userInfo.Status));
+            Enum.GetName(userInfo.Status));
     }
 
     public static string UnescapeLdapString(string ldapString)

common/ASC.ActiveDirectory/Novell/NovellLdapHelper.cs

@@ -180,14 +180,14 @@ public override List<LdapObject> GetUsers(string filter = null, int limit = -1)
 
         try
         {
-            if (!string.IsNullOrEmpty(Settings.UserFilter) && !Settings.UserFilter.StartsWith("(") &&
-                !Settings.UserFilter.EndsWith(")"))
+            if (!string.IsNullOrEmpty(Settings.UserFilter) && !Settings.UserFilter.StartsWith('(') &&
+                !Settings.UserFilter.EndsWith(')'))
             {
                 Settings.UserFilter = string.Format("({0})", Settings.UserFilter);
             }
 
-            if (!string.IsNullOrEmpty(filter) && !filter.StartsWith("(") &&
-                !filter.EndsWith(")"))
+            if (!string.IsNullOrEmpty(filter) && !filter.StartsWith('(') &&
+                !filter.EndsWith(')'))
             {
                 filter = string.Format("({0})", Settings.UserFilter);
             }
@@ -250,8 +250,8 @@ public override List<LdapObject> GetGroups(Criteria criteria = null)
 
         try
         {
-            if (!string.IsNullOrEmpty(Settings.GroupFilter) && !Settings.GroupFilter.StartsWith("(") &&
-                !Settings.GroupFilter.EndsWith(")"))
+            if (!string.IsNullOrEmpty(Settings.GroupFilter) && !Settings.GroupFilter.StartsWith('(') &&
+                !Settings.GroupFilter.EndsWith(')'))
             {
                 Settings.GroupFilter = string.Format("({0})", Settings.GroupFilter);
             }

common/ASC.Api.Core/Auth/AuthorizationPolicyProvider.cs

@@ -25,14 +25,9 @@
 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
 
 namespace ASC.Api.Core.Auth;
-public class AuthorizationPolicyProvider : IAuthorizationPolicyProvider
+public class AuthorizationPolicyProvider(IOptions<AuthorizationOptions> options) : IAuthorizationPolicyProvider
 {
-    public AuthorizationPolicyProvider(IOptions<AuthorizationOptions> options)
-    {
-        FallbackPolicyProvider = new DefaultAuthorizationPolicyProvider(options);
-    }
-
-    public DefaultAuthorizationPolicyProvider FallbackPolicyProvider { get; }
+    public DefaultAuthorizationPolicyProvider FallbackPolicyProvider { get; } = new(options);
 
     public Task<AuthorizationPolicy> GetDefaultPolicyAsync()
     {

common/ASC.Api.Core/Auth/JwtBearerAuthHandler.cs

@@ -36,38 +36,23 @@
 namespace ASC.Api.Core.Auth;
 
 [Scope]
-public class JwtBearerAuthHandler : AuthenticationHandler<AuthenticationSchemeOptions>
+public class JwtBearerAuthHandler(
+    IOptionsMonitor<AuthenticationSchemeOptions> options,
+    ILoggerFactory logger,
+    UrlEncoder encoder,
+    SecurityContext securityContext,
+    IHttpContextAccessor httpContextAccessor,
+    BaseCommonLinkUtility baseCommonLinkUtility,
+    IConfiguration configuration,
+    IHttpClientFactory httpClientFactory)
+    : AuthenticationHandler<AuthenticationSchemeOptions>(options, logger, encoder)
 {
-    private readonly SecurityContext _securityContext;
-    private readonly IHttpContextAccessor _httpContextAccessor;
-    private readonly IConfiguration _configuration;
-    private readonly BaseCommonLinkUtility _linkUtility;
-    private readonly ILogger<JwtBearerAuthHandler> _logger;
-    private readonly IHttpClientFactory _httpClientFactory;
-
-    public JwtBearerAuthHandler(
-        IOptionsMonitor<AuthenticationSchemeOptions> options,
-        ILoggerFactory logger,
-        UrlEncoder encoder,
-        SecurityContext securityContext,
-        IHttpContextAccessor httpContextAccessor,
-        BaseCommonLinkUtility baseCommonLinkUtility,
-        IConfiguration configuration,
-        IHttpClientFactory httpClientFactory)
-        : base(options, logger, encoder)
-    {
-        _securityContext = securityContext;
-        _httpContextAccessor = httpContextAccessor;
-        _configuration = configuration;
-        _linkUtility = baseCommonLinkUtility;
-        _logger = logger.CreateLogger<JwtBearerAuthHandler>();
-        _httpClientFactory = httpClientFactory;
-    }
+    private readonly ILogger<JwtBearerAuthHandler> _logger = logger.CreateLogger<JwtBearerAuthHandler>();
 
     protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
     {
-        var serverRootPath = _linkUtility.ServerRootPath;
-        var authority = _configuration["core:oidc:authority"];
+        var serverRootPath = baseCommonLinkUtility.ServerRootPath;
+        var authority = configuration["core:oidc:authority"];
 
         if (string.IsNullOrEmpty(authority))
         {
@@ -82,8 +67,8 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
         var audience = serverRootPath;
         var httpDocumentRetriever = new HttpDocumentRetriever();
 
-        var showPIIEnable = bool.TryParse(_configuration["core:oidc:showPII"], out var showPII) && showPII;
-        var requireHttpsEnable = bool.TryParse(_configuration["core:oidc:requireHttps"], out var requireHttps) && requireHttps;
+        var showPIIEnable = bool.TryParse(configuration["core:oidc:showPII"], out var showPII) && showPII;
+        var requireHttpsEnable = bool.TryParse(configuration["core:oidc:requireHttps"], out var requireHttps) && requireHttps;
 
         IdentityModelEventSource.ShowPII = showPIIEnable;
         httpDocumentRetriever.RequireHttps = requireHttpsEnable;
@@ -92,7 +77,7 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
                                                                                         new OpenIdConnectConfigurationRetriever(),
                                                                                         httpDocumentRetriever);
 
-        var accessToken = _httpContextAccessor?.HttpContext?.Request.Headers["Authorization"].ToString();
+        var accessToken = httpContextAccessor?.HttpContext?.Request.Headers["Authorization"].ToString();
 
         if (string.IsNullOrEmpty(accessToken))
         {
@@ -108,7 +93,7 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
 
         JwtSecurityToken validatedToken;
 
-        var validationTokenEnable = !(bool.TryParse(_configuration["core:oidc:disableValidateToken"], out var disableValidateToken) && disableValidateToken);
+        var validationTokenEnable = !(bool.TryParse(configuration["core:oidc:disableValidateToken"], out var disableValidateToken) && disableValidateToken);
 
         if (validationTokenEnable)
         {
@@ -135,7 +120,7 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
 
         try
         {
-            await _securityContext.AuthenticateMeWithoutCookieAsync(userId, validatedToken.Claims.ToList());
+            await securityContext.AuthenticateMeWithoutCookieAsync(userId, validatedToken.Claims.ToList());
         }
         catch (Exception ex)
         {
@@ -184,7 +169,7 @@ private async Task<JwtSecurityToken> ValidateToken(string token,
             _ = new JwtSecurityTokenHandler()
                                  .ValidateToken(token, validationParameters, out var rawValidatedToken);
 
-            var httpClient = _httpClientFactory.CreateClient();
+            var httpClient = httpClientFactory.CreateClient();
 
             var response = await httpClient.IntrospectTokenAsync(new TokenIntrospectionRequest
             {

common/ASC.Common/Caching/RedisCacheNotify.cs

@@ -80,7 +80,7 @@ private List<Action<T>> GetInvocationList(CacheNotifyAction action)
     {
         var result = new List<Action<T>>();
 
-        foreach (var val in (CacheNotifyAction[])Enum.GetValues(typeof(CacheNotifyAction)))
+        foreach (var val in Enum.GetValues<CacheNotifyAction>())
         {
             if (!(val == action || Enum.IsDefined(typeof(CacheNotifyAction), (val & action))))
             {

common/ASC.Common/Data/TypeExtension.cs

@@ -34,7 +34,7 @@ public static string GetFormattedName(this Type type)
             var genericArguments = type.GetGenericArguments()
                                 .Select(x => x.Name)
                                 .Aggregate((x1, x2) => $"{x1}, {x2}");
-            return $"{type.Name[..type.Name.IndexOf("`")]}"
+            return $"{type.Name[..type.Name.IndexOf('`')]}"
                  + $"<{genericArguments}>";
         }
         return type.Name;

common/ASC.Common/Threading/DistributedLock/RedisLock/RedisLockHandle.cs

@@ -26,20 +26,13 @@
 
 namespace ASC.Common.Threading.DistributedLock.RedisLock;
 
-public class RedisLockHandle : LockHandleBase
+public class RedisLockHandle(IDistributedSynchronizationHandle handle) : LockHandleBase
 {
-    private readonly IDistributedSynchronizationHandle _handle;
-
-    public RedisLockHandle(IDistributedSynchronizationHandle handle)
-    {
-        _handle = handle;
-    }
-
     public override void Dispose()
     {
         CheckDispose();
 
-        _handle?.Dispose();
+        handle?.Dispose();
 
         _disposed = true;
     }
@@ -48,9 +41,9 @@ public override async ValueTask DisposeAsync()
     {
         CheckDispose();
 
-        if (_handle != null)
+        if (handle != null)
         {
-            await _handle.DisposeAsync();
+            await handle.DisposeAsync();
         }
 
         _disposed = true;

common/ASC.Common/Threading/DistributedLock/ZooKeeperLock/ZooKeeperLockHandle.cs

@@ -26,22 +26,15 @@
 
 namespace ASC.Common.Threading.DistributedLock.ZooKeeperLock;
 
-public class ZooKeeperLockHandle : LockHandleBase
+public class ZooKeeperLockHandle(IDistributedSynchronizationHandle handle) : LockHandleBase
 {
-    private readonly IDistributedSynchronizationHandle _handle;
-
-    public ZooKeeperLockHandle(IDistributedSynchronizationHandle handle)
-    {
-        _handle = handle;
-    }
-
     public override async ValueTask DisposeAsync()
     {
         CheckDispose();
 
-        if (_handle != null)
+        if (handle != null)
         {
-            await _handle.DisposeAsync();
+            await handle.DisposeAsync();
         }
 
         _disposed = true;
@@ -51,7 +44,7 @@ public override void Dispose()
     {
         CheckDispose();
 
-        _handle?.Dispose();
+        handle?.Dispose();
 
         _disposed = true;
     }

common/ASC.Common/Utils/SwaggerCustomDocumentFilter.cs

@@ -27,20 +27,13 @@
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-public class HideRouteDocumentFilter : IDocumentFilter
+public class HideRouteDocumentFilter(string routeToHide) : IDocumentFilter
 {
-    private readonly string _routeToHide;
-
-    public HideRouteDocumentFilter(string RouteToHide)
-    {
-        _routeToHide = RouteToHide;
-    }
-
     public void Apply(OpenApiDocument document, DocumentFilterContext context)
     {
-        if (document.Paths.ContainsKey(_routeToHide))
+        if (document.Paths.ContainsKey(routeToHide))
         {
-            document.Paths.Remove(_routeToHide);
+            document.Paths.Remove(routeToHide);
         }
     }
 }
@@ -62,7 +55,7 @@ public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
 
 public class TagDescriptionsDocumentFilter : IDocumentFilter
 {
-    private readonly Dictionary<string, string> _tagDescriptions = new Dictionary<string, string>
+    private readonly Dictionary<string, string> _tagDescriptions = new()
     {
         { "People", "Operations for working with people" },
         { "Portal", "Operations for working with portal" },

common/ASC.Common/Utils/SwaggerEnumFilter.cs

@@ -27,13 +27,8 @@
 namespace ASC.Api.Core.Extensions;
 
 [AttributeUsage(AttributeTargets.All)]
-public class SwaggerEnumAttribute : Attribute
+public class SwaggerEnumAttribute(string description = null) : Attribute
 {
-    public SwaggerEnumAttribute(string description = null)
-    {
-        Ignore = false;
-        Description = description;
-    }
-    public bool Ignore {  get; set; }
-    public string Description { get; set; }
+    public bool Ignore { get; set; }
+    public string Description { get; set; } = description;
 }