IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix warnings

Browse Source
This commit is contained in:
pavelbannov 2020-10-12 16:52:31 +03:00
parent 5e6ad050ab
commit 36034bf97a
47 changed files with 309 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/ASC.Common/Caching/KafkaCache.cs
View File

@ -130,11 +130,11 @@ namespace ASC.Common.Caching
try
{
var cr = c.Consume(Cts[channelName].Token);
if (cr != null && cr.Value != null && !(new Guid(cr.Key.Id.ToByteArray())).Equals(Key) && Actions.TryGetValue(channelName, out var act))
if (cr != null && cr.Message != null && cr.Message.Value != null && !(new Guid(cr.Message.Key.Id.ToByteArray())).Equals(Key) && Actions.TryGetValue(channelName, out var act))
{
try
{
act(cr.Value);
act(cr.Message.Value);
}
catch (Exception e)
{

12
common/ASC.Common/DIHelper.cs
View File

@ -172,27 +172,27 @@ namespace ASC.Common
public DIHelper AddWorkerQueue<T1>(int workerCount, int waitInterval, bool stopAfterFinsih, int errorCount)
{
Action<WorkerQueue<T1>> action = (a) =>
void action(WorkerQueue<T1> a)
{
a.workerCount = workerCount;
a.waitInterval = waitInterval;
a.stopAfterFinsih = stopAfterFinsih;
a.errorCount = errorCount;
};
AddToConfigured($"{typeof(WorkerQueue<T1>)}", action);
}
AddToConfigured($"{typeof(WorkerQueue<T1>)}", (Action<WorkerQueue<T1>>)action);
return this;
}
public DIHelper AddProgressQueue<T1>(int workerCount, int waitInterval, bool removeAfterCompleted, bool stopAfterFinsih, int errorCount) where T1 : class, IProgressItem
{
Action<ProgressQueue<T1>> action = (a) =>
void action(ProgressQueue<T1> a)
{
a.workerCount = workerCount;
a.waitInterval = waitInterval;
a.stopAfterFinsih = stopAfterFinsih;
a.errorCount = errorCount;
a.removeAfterCompleted = removeAfterCompleted;
};
AddToConfigured($"{typeof(ProgressQueue<T1>)}", action);
}
AddToConfigured($"{typeof(ProgressQueue<T1>)}", (Action<ProgressQueue<T1>>)action);
return this;
}
public DIHelper Configure<TOptions>(string name, Action<TOptions> configureOptions) where TOptions : class

3
common/ASC.Common/Logging/Log.cs
View File

@ -383,7 +383,8 @@ namespace ASC.Common.Logging
public void Configure(LogNLog options)
{
LogManager.Configuration = new NLog.Config.XmlLoggingConfiguration(Path.Combine(Configuration["pathToConf"], "nlog.config"), true);
LogManager.Configuration = new NLog.Config.XmlLoggingConfiguration(Path.Combine(Configuration["pathToConf"], "nlog.config"));
LogManager.ThrowConfigExceptions = false;
var settings = Configuration.GetSetting<NLogSettings>("log");
if (!string.IsNullOrEmpty(settings.Name))

2
common/ASC.Core.Common/Context/Impl/UserManager.cs
View File

@ -269,7 +269,7 @@ namespace ASC.Core
return findUsers.ToArray();
}
public UserInfo SaveUserInfo(UserInfo u, bool isVisitor = false)
public UserInfo SaveUserInfo(UserInfo u)
{
if (IsSystemUser(u.ID)) return SystemUsers[u.ID];
if (u.ID == Guid.Empty) PermissionContext.DemandPermissions(Constants.Action_AddRemoveUser);

2
common/ASC.Core.Common/Data/DbTenantService.cs
View File

@ -149,7 +149,7 @@ namespace ASC.Core.Data
{
if (string.IsNullOrEmpty(login)) throw new ArgumentNullException("login");
Func<IQueryable<TenantUserSecurity>> query = () => TenantsQuery()
IQueryable<TenantUserSecurity> query() => TenantsQuery()
.Where(r => r.Status == TenantStatus.Active)
.Join(TenantDbContext.Users, r => r.Id, r => r.Tenant, (tenant, user) => new
{

2
common/ASC.Core.Common/EF/IQueryableExtensions.cs
View File

@ -20,7 +20,7 @@ namespace ASC.Core.Common.EF
var sqlGenerator = factory.Create();
var command = sqlGenerator.GetCommand(selectExpression);
string sql = command.CommandText;
var sql = command.CommandText;
return sql;
}

284
common/ASC.Core.Common/Tests/CachedSubscriptionServiceTest.cs
View File

@ -21,148 +21,148 @@
* in every copy of the program you distribute.
* Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
#if DEBUG
namespace ASC.Core.Common.Tests
{
using System.Linq;
*/
using ASC.Common.Caching;
using ASC.Core.Caching;
using Microsoft.Extensions.Configuration;
//#if DEBUG
//namespace ASC.Core.Common.Tests
//{
// using System.Linq;
using NUnit.Framework;
[TestFixture]
public class CachedSubscriptionServiceTest
{
private readonly ISubscriptionService service;
public CachedSubscriptionServiceTest(IConfiguration configuration, ICacheNotify<SubscriptionRecord> cacheNotify, ICacheNotify<SubscriptionMethodCache> notify)
{
service = new CachedSubscriptionService(null, null);
}
[OneTimeSetUp]
public void ClearData()
{
service.RemoveSubscriptions(2024, "sourceId2", "actionId2");
service.RemoveSubscriptions(2024, "sourceId3", "actionId3", "objectId5");
service.RemoveSubscriptions(2024, "sourceId1", "actionId1", "objectId1");
var sm1 = new SubscriptionMethod { Tenant = 2024, ActionId = "actionId11", SourceId = "sourceId11", RecipientId = "recipientId11", };
service.SetSubscriptionMethod(sm1);
var sm2 = new SubscriptionMethod { Tenant = 2024, ActionId = "actionId22", SourceId = "sourceId22", RecipientId = "recipientId22", };
service.SetSubscriptionMethod(sm2);
}
[Test]
public void CachedSubscriptionMethod()
{
var sb1 = new SubscriptionRecord { Tenant = 2024, ActionId = "actionId1", SourceId = "sourceId1", ObjectId = "objectId1", RecipientId = "recipientId1", Subscribed = false };
service.SaveSubscription(sb1);
var sb2 = new SubscriptionRecord { Tenant = 2024, ActionId = "actionId2", SourceId = "sourceId2", ObjectId = "objectId2", RecipientId = "recipientId2", Subscribed = false };
service.SaveSubscription(sb2);
var sb3 = new SubscriptionRecord { Tenant = 2024, ActionId = "actionId2", SourceId = "sourceId2", ObjectId = "objectId3", RecipientId = "recipientId3", Subscribed = false };
service.SaveSubscription(sb3);
var sb4 = new SubscriptionRecord { Tenant = 2024, ActionId = "actionId2", SourceId = "sourceId2", ObjectId = "", RecipientId = "recipientId4", Subscribed = false };
service.SaveSubscription(sb4);
var subscriptions = service.GetSubscriptions(2024, "sourceId1", "actionId1", "recipientId1", "objectId1");
Assert.AreEqual(subscriptions.Count(), 1);
subscriptions = service.GetSubscriptions(2024, "sourceId1", "actionId1", null, "objectId1");
Assert.AreEqual(subscriptions.Count(), 1);
subscriptions = service.GetSubscriptions(2024, "sourceId1", "actionId1", null, null);
Assert.AreEqual(subscriptions.Count(), 0);
subscriptions = service.GetSubscriptions(2024, "sourceId2", "actionId2");
Assert.AreEqual(subscriptions.Count(), 3);
var subscription = service.GetSubscription(2024, "sourceId2", "actionId2", "recipientId3", "objectId3");
CompareSubscriptions(sb3, subscription);
var sb5 = new SubscriptionRecord { Tenant = 2024, ActionId = "actionId3", SourceId = "sourceId3", ObjectId = "objectId5", RecipientId = "recipientId5", Subscribed = false };
subscription = service.GetSubscription(2024, "sourceId3", "actionId3", "recipientId5", "objectId5");
Assert.IsNull(subscription);
service.SaveSubscription(sb5);
subscription = service.GetSubscription(2024, "sourceId3", "actionId3", "recipientId5", "objectId5");
CompareSubscriptions(sb5, subscription);
service.RemoveSubscriptions(2024, "sourceId2", "actionId2");
subscriptions = service.GetSubscriptions(2024, "sourceId2", "actionId2");
Assert.AreEqual(0, subscriptions.Count());
service.RemoveSubscriptions(2024, "sourceId3", "actionId3", "objectId5");
service.RemoveSubscriptions(2024, "sourceId1", "actionId1", "objectId1");
subscription = service.GetSubscription(2024, "sourceId3", "actionId3", "recipientId5", "objectId5");
Assert.IsNull(subscription);
subscription = service.GetSubscription(2024, "sourceId1", "actionId1", "recipientId1", "objectId1");
Assert.IsNull(subscription);
var sm1 = new SubscriptionMethod { Tenant = 2024, ActionId = "actionId11", SourceId = "sourceId11", RecipientId = "recipientId11", Methods = new string[] { "1", "2" } };
service.SetSubscriptionMethod(sm1);
var sm2 = new SubscriptionMethod { Tenant = 2024, ActionId = "actionId22", SourceId = "sourceId22", RecipientId = "recipientId22", Methods = new string[] { "3", "4" } };
service.SetSubscriptionMethod(sm2);
var methods = service.GetSubscriptionMethods(2024, "sourceId11", "actionId11", "recipientId11");
Assert.AreEqual(methods.Count(), 1);
CompareSubscriptionMethods(methods.ElementAt(0), sm1);
methods = service.GetSubscriptionMethods(2024, "sourceId22", "actionId22", "recipientId22");
Assert.AreEqual(methods.Count(), 1);
CompareSubscriptionMethods(methods.ElementAt(0), sm2);
sm2.Methods = null;
service.SetSubscriptionMethod(sm2);
methods = service.GetSubscriptionMethods(2024, "sourceId22", "actionId22", "recipientId11");
Assert.AreEqual(0, methods.Count());
sm1.Methods = null;
service.SetSubscriptionMethod(sm1);
methods = service.GetSubscriptionMethods(2024, "sourceId22", "actionId22", "recipientId22");
Assert.AreEqual(0, methods.Count());
}
private void CompareSubscriptions(SubscriptionRecord sb1, SubscriptionRecord sb2)
{
Assert.AreEqual(sb1.Tenant, sb2.Tenant);
Assert.AreEqual(sb1.ActionId, sb2.ActionId);
Assert.AreEqual(sb1.SourceId, sb2.SourceId);
Assert.AreEqual(sb1.RecipientId, sb2.RecipientId);
Assert.AreEqual(sb1.ObjectId, sb1.ObjectId);
Assert.AreEqual(sb1.Subscribed, sb2.Subscribed);
}
private void CompareSubscriptionMethods(SubscriptionMethod sm1, SubscriptionMethod sm2)
{
Assert.AreEqual(sm1.Tenant, sm2.Tenant);
Assert.AreEqual(sm1.ActionId, sm2.ActionId);
Assert.AreEqual(sm1.SourceId, sm2.SourceId);
Assert.AreEqual(sm1.RecipientId, sm2.RecipientId);
CollectionAssert.AreEqual(sm1.Methods, sm2.Methods);
}
}
}
#endif
// using ASC.Common.Caching;
// using ASC.Core.Caching;
// using Microsoft.Extensions.Configuration;
// using NUnit.Framework;
// [TestFixture]
// public class CachedSubscriptionServiceTest
// {
// private readonly ISubscriptionService service;
// public CachedSubscriptionServiceTest(IConfiguration configuration, ICacheNotify<SubscriptionRecord> cacheNotify, ICacheNotify<SubscriptionMethodCache> notify)
// {
// service = new CachedSubscriptionService(null, null);
// }
// [OneTimeSetUp]
// public void ClearData()
// {
// service.RemoveSubscriptions(2024, "sourceId2", "actionId2");
// service.RemoveSubscriptions(2024, "sourceId3", "actionId3", "objectId5");
// service.RemoveSubscriptions(2024, "sourceId1", "actionId1", "objectId1");
// var sm1 = new SubscriptionMethod { Tenant = 2024, ActionId = "actionId11", SourceId = "sourceId11", RecipientId = "recipientId11", };
// service.SetSubscriptionMethod(sm1);
// var sm2 = new SubscriptionMethod { Tenant = 2024, ActionId = "actionId22", SourceId = "sourceId22", RecipientId = "recipientId22", };
// service.SetSubscriptionMethod(sm2);
// }
// [Test]
// public void CachedSubscriptionMethod()
// {
// var sb1 = new SubscriptionRecord { Tenant = 2024, ActionId = "actionId1", SourceId = "sourceId1", ObjectId = "objectId1", RecipientId = "recipientId1", Subscribed = false };
// service.SaveSubscription(sb1);
// var sb2 = new SubscriptionRecord { Tenant = 2024, ActionId = "actionId2", SourceId = "sourceId2", ObjectId = "objectId2", RecipientId = "recipientId2", Subscribed = false };
// service.SaveSubscription(sb2);
// var sb3 = new SubscriptionRecord { Tenant = 2024, ActionId = "actionId2", SourceId = "sourceId2", ObjectId = "objectId3", RecipientId = "recipientId3", Subscribed = false };
// service.SaveSubscription(sb3);
// var sb4 = new SubscriptionRecord { Tenant = 2024, ActionId = "actionId2", SourceId = "sourceId2", ObjectId = "", RecipientId = "recipientId4", Subscribed = false };
// service.SaveSubscription(sb4);
// var subscriptions = service.GetSubscriptions(2024, "sourceId1", "actionId1", "recipientId1", "objectId1");
// Assert.AreEqual(subscriptions.Count(), 1);
// subscriptions = service.GetSubscriptions(2024, "sourceId1", "actionId1", null, "objectId1");
// Assert.AreEqual(subscriptions.Count(), 1);
// subscriptions = service.GetSubscriptions(2024, "sourceId1", "actionId1", null, null);
// Assert.AreEqual(subscriptions.Count(), 0);
// subscriptions = service.GetSubscriptions(2024, "sourceId2", "actionId2");
// Assert.AreEqual(subscriptions.Count(), 3);
// var subscription = service.GetSubscription(2024, "sourceId2", "actionId2", "recipientId3", "objectId3");
// CompareSubscriptions(sb3, subscription);
// var sb5 = new SubscriptionRecord { Tenant = 2024, ActionId = "actionId3", SourceId = "sourceId3", ObjectId = "objectId5", RecipientId = "recipientId5", Subscribed = false };
// subscription = service.GetSubscription(2024, "sourceId3", "actionId3", "recipientId5", "objectId5");
// Assert.IsNull(subscription);
// service.SaveSubscription(sb5);
// subscription = service.GetSubscription(2024, "sourceId3", "actionId3", "recipientId5", "objectId5");
// CompareSubscriptions(sb5, subscription);
// service.RemoveSubscriptions(2024, "sourceId2", "actionId2");
// subscriptions = service.GetSubscriptions(2024, "sourceId2", "actionId2");
// Assert.AreEqual(0, subscriptions.Count());
// service.RemoveSubscriptions(2024, "sourceId3", "actionId3", "objectId5");
// service.RemoveSubscriptions(2024, "sourceId1", "actionId1", "objectId1");
// subscription = service.GetSubscription(2024, "sourceId3", "actionId3", "recipientId5", "objectId5");
// Assert.IsNull(subscription);
// subscription = service.GetSubscription(2024, "sourceId1", "actionId1", "recipientId1", "objectId1");
// Assert.IsNull(subscription);
// var sm1 = new SubscriptionMethod { Tenant = 2024, ActionId = "actionId11", SourceId = "sourceId11", RecipientId = "recipientId11", Methods = new string[] { "1", "2" } };
// service.SetSubscriptionMethod(sm1);
// var sm2 = new SubscriptionMethod { Tenant = 2024, ActionId = "actionId22", SourceId = "sourceId22", RecipientId = "recipientId22", Methods = new string[] { "3", "4" } };
// service.SetSubscriptionMethod(sm2);
// var methods = service.GetSubscriptionMethods(2024, "sourceId11", "actionId11", "recipientId11");
// Assert.AreEqual(methods.Count(), 1);
// CompareSubscriptionMethods(methods.ElementAt(0), sm1);
// methods = service.GetSubscriptionMethods(2024, "sourceId22", "actionId22", "recipientId22");
// Assert.AreEqual(methods.Count(), 1);
// CompareSubscriptionMethods(methods.ElementAt(0), sm2);
// sm2.Methods = null;
// service.SetSubscriptionMethod(sm2);
// methods = service.GetSubscriptionMethods(2024, "sourceId22", "actionId22", "recipientId11");
// Assert.AreEqual(0, methods.Count());
// sm1.Methods = null;
// service.SetSubscriptionMethod(sm1);
// methods = service.GetSubscriptionMethods(2024, "sourceId22", "actionId22", "recipientId22");
// Assert.AreEqual(0, methods.Count());
// }
// private void CompareSubscriptions(SubscriptionRecord sb1, SubscriptionRecord sb2)
// {
// Assert.AreEqual(sb1.Tenant, sb2.Tenant);
// Assert.AreEqual(sb1.ActionId, sb2.ActionId);
// Assert.AreEqual(sb1.SourceId, sb2.SourceId);
// Assert.AreEqual(sb1.RecipientId, sb2.RecipientId);
// Assert.AreEqual(sb1.ObjectId, sb1.ObjectId);
// Assert.AreEqual(sb1.Subscribed, sb2.Subscribed);
// }
// private void CompareSubscriptionMethods(SubscriptionMethod sm1, SubscriptionMethod sm2)
// {
// Assert.AreEqual(sm1.Tenant, sm2.Tenant);
// Assert.AreEqual(sm1.ActionId, sm2.ActionId);
// Assert.AreEqual(sm1.SourceId, sm2.SourceId);
// Assert.AreEqual(sm1.RecipientId, sm2.RecipientId);
// CollectionAssert.AreEqual(sm1.Methods, sm2.Methods);
// }
// }
//}
//#endif

62
common/ASC.Core.Common/Tests/CookieStorageTest.cs
View File

@ -24,41 +24,41 @@
*/
#if DEBUG
namespace ASC.Core.Common.Tests
{
//#if DEBUG
//namespace ASC.Core.Common.Tests
//{
using ASC.Core.Security.Authentication;
// using ASC.Core.Security.Authentication;
using NUnit.Framework;
// using NUnit.Framework;
[TestFixture]
public class CookieStorageTest
{
[Test]
public void Validate(CookieStorage cookieStorage)
{
//var t1 = 1;
//var id1 = Guid.NewGuid();
//var login1 = "l1";
//var pwd1 = "p1";
//var it1 = 1;
//var expire1 = DateTime.UtcNow;
//var iu1 = 1;
// [TestFixture]
// public class CookieStorageTest
// {
// [Test]
// public void Validate(CookieStorage cookieStorage)
// {
// //var t1 = 1;
// //var id1 = Guid.NewGuid();
// //var login1 = "l1";
// //var pwd1 = "p1";
// //var it1 = 1;
// //var expire1 = DateTime.UtcNow;
// //var iu1 = 1;
//var cookie = cookieStorage.EncryptCookie(t1, id1, login1, pwd1, it1, expire1, iu1);
// //var cookie = cookieStorage.EncryptCookie(t1, id1, login1, pwd1, it1, expire1, iu1);
//cookieStorage.DecryptCookie(cookie, out var t2, out var id2, out var login2, out var pwd2, out var it2, out var expire2, out var iu2);
// //cookieStorage.DecryptCookie(cookie, out var t2, out var id2, out var login2, out var pwd2, out var it2, out var expire2, out var iu2);
//Assert.AreEqual(t1, t2);
//Assert.AreEqual(id1, id2);
//Assert.AreEqual(login1, login2);
//Assert.AreEqual(pwd1, pwd2);
//Assert.AreEqual(it1, it2);
//Assert.AreEqual(expire1, expire2);
//Assert.AreEqual(iu1, iu2);
}
}
}
#endif
// //Assert.AreEqual(t1, t2);
// //Assert.AreEqual(id1, id2);
// //Assert.AreEqual(login1, login2);
// //Assert.AreEqual(pwd1, pwd2);
// //Assert.AreEqual(it1, it2);
// //Assert.AreEqual(expire1, expire2);
// //Assert.AreEqual(iu1, iu2);
// }
// }
//}
//#endif

2
common/ASC.Core.Common/Tests/DbUserServiceTest.cs
View File

@ -131,7 +131,7 @@ namespace ASC.Core.Common.Tests
Service.SetUserPhoto(Tenant, user1.ID, new byte[] { 1, 2, 3 });
CollectionAssert.AreEquivalent(new byte[] { 1, 2, 3 }, Service.GetUserPhoto(Tenant, user1.ID));
var password = "password";
//var password = "password";
//Service.SetUserPassword(Tenant, user1.ID, password);
//Assert.AreEqual(password, Service.GetUserPassword(Tenant, user1.ID));

14
common/ASC.Data.Storage/Encryption/EncryptionSettings.cs
View File

@ -139,18 +139,18 @@ namespace ASC.Data.Storage.Encryption
throw new ArgumentException("min_required_non_alphanumeric_characters_incorrect", "numberOfNonAlphanumericCharacters");
}
byte[] array = new byte[length];
char[] array2 = new char[length];
int num = 0;
var array = new byte[length];
var array2 = new char[length];
var num = 0;
using (var rng = new RNGCryptoServiceProvider())
{
rng.GetBytes(array);
}
for (int i = 0; i < length; i++)
for (var i = 0; i < length; i++)
{
int num2 = (int)array[i] % 87;
var num2 = (int)array[i] % 87;
if (num2 < 10)
{
array2[i] = (char)(48 + num2);
@ -175,8 +175,8 @@ namespace ASC.Data.Storage.Encryption
if (num < numberOfNonAlphanumericCharacters)
{
Random random = new Random();
for (int j = 0; j < numberOfNonAlphanumericCharacters - num; j++)
var random = new Random();
for (var j = 0; j < numberOfNonAlphanumericCharacters - num; j++)
{
int num3;
do

2
common/ASC.Data.Storage/Encryption/Metadata.cs
View File

@ -73,7 +73,7 @@ namespace ASC.Data.Storage.Encryption
return iterations.Value;
}
if (!int.TryParse(Configuration["storage:encryption:iterations"], out int iterationsCount))
if (!int.TryParse(Configuration["storage:encryption:iterations"], out var iterationsCount))
{
iterationsCount = 4096;
}

5
common/ASC.Data.Storage/S3/S3Storage.cs
View File

@ -1161,11 +1161,6 @@ namespace ASC.Data.Storage.S3
return new AmazonS3Client(_accessKeyId, _secretAccessKeyId, cfg);
}
public Stream GetWriteStream(string domain, string path)
{
throw new NotSupportedException();
}
private class ResponseStreamWrapper : Stream

2
common/ASC.FederatedLogin/Profile/LoginProfile.cs
View File

@ -385,7 +385,7 @@ namespace ASC.FederatedLogin.Profile
InstanceCrypto = instanceCrypto;
}
protected LoginProfile(Signature signature, InstanceCrypto instanceCrypto, SerializationInfo info, StreamingContext context) : this(signature, instanceCrypto)
protected LoginProfile(Signature signature, InstanceCrypto instanceCrypto, SerializationInfo info) : this(signature, instanceCrypto)
{
if (info == null)
throw new ArgumentNullException("info");

4
common/ASC.VoipService/Twilio/TwilioResponseHelper.cs
View File

@ -119,7 +119,7 @@ namespace ASC.VoipService.Twilio
return AddVoiceMail(new VoiceResponse());
}
public VoiceResponse Wait(string queueId, string queueTime, string queueSize)
public VoiceResponse Wait(string queueTime, string queueSize)
{
var response = new VoiceResponse();
var queue = settings.Queue;
@ -140,7 +140,7 @@ namespace ASC.VoipService.Twilio
return response;
}
public VoiceResponse GatherQueue(string digits, string number, List<Agent> availableOperators)
public VoiceResponse GatherQueue(string digits, List<Agent> availableOperators)
{
var response = new VoiceResponse();

9
common/services/ASC.ApiSystem/Controllers/CalDavController.cs
View File

@ -92,7 +92,7 @@ namespace ASC.ApiSystem.Controllers
[HttpGet("change_to_storage")]
public IActionResult СhangeOfCalendarStorage(string change)
{
if (!GetTenant(change, out Tenant tenant, out object error))
if (!GetTenant(change, out var tenant, out var error))
{
return BadRequest(error);
}
@ -121,7 +121,7 @@ namespace ASC.ApiSystem.Controllers
[Authorize(AuthenticationSchemes = "auth.allowskip")]
public IActionResult CaldavDeleteEvent(string eventInfo)
{
if (!GetTenant(eventInfo, out Tenant tenant, out object error))
if (!GetTenant(eventInfo, out var tenant, out var error))
{
return BadRequest(error);
}
@ -229,9 +229,8 @@ namespace ASC.ApiSystem.Controllers
Log.Info(string.Format("CalDav calendarParam: {0}", calendarParam));
var userParam = calendarParam.Split('/')[0];
return GetUserData(userParam, out string email, out tenant, out error);
var userParam = calendarParam.Split('/')[0];
return GetUserData(userParam, out _, out tenant, out error);
}
private bool GetUserData(string userParam, out string email, out Tenant tenant, out object error)

6
common/services/ASC.ApiSystem/Controllers/PortalController.cs
View File

@ -369,7 +369,7 @@ namespace ASC.ApiSystem.Controllers
[Authorize(AuthenticationSchemes = "auth.allowskip")]
public IActionResult Remove([FromQuery] TenantModel model)
{
if (!CommonMethods.GetTenant(model, out Tenant tenant))
if (!CommonMethods.GetTenant(model, out var tenant))
{
Log.Error("Model without tenant");
@ -404,7 +404,7 @@ namespace ASC.ApiSystem.Controllers
[Authorize(AuthenticationSchemes = "auth.allowskip")]
public IActionResult ChangeStatus(TenantModel model)
{
if (!CommonMethods.GetTenant(model, out Tenant tenant))
if (!CommonMethods.GetTenant(model, out var tenant))
{
Log.Error("Model without tenant");
@ -456,7 +456,7 @@ namespace ASC.ApiSystem.Controllers
});
}
if (!CheckExistingNamePortal((model.PortalName ?? "").Trim(), out object error))
if (!CheckExistingNamePortal((model.PortalName ?? "").Trim(), out var error))
{
return BadRequest(error);
}

6
common/services/ASC.ApiSystem/Controllers/RegistrationController.cs
View File

@ -267,7 +267,7 @@ namespace ASC.ApiSystem.Controllers
Culture = lang,
FirstName = model.FirstName.Trim(),
LastName = model.LastName.Trim(),
PasswordHash = String.IsNullOrEmpty(model.PasswordHash) ? null : model.PasswordHash,
PasswordHash = string.IsNullOrEmpty(model.PasswordHash) ? null : model.PasswordHash,
Email = model.Email.Trim(),
TimeZoneInfo = tz,
MobilePhone = string.IsNullOrEmpty(model.Phone) ? null : model.Phone.Trim(),
@ -280,7 +280,7 @@ namespace ASC.ApiSystem.Controllers
if (!string.IsNullOrEmpty(model.PartnerId))
{
if (Guid.TryParse(model.PartnerId, out Guid guid))
if (Guid.TryParse(model.PartnerId, out var guid))
{
// valid guid
info.PartnerId = model.PartnerId;
@ -328,7 +328,7 @@ namespace ASC.ApiSystem.Controllers
string sendCongratulationsAddress = null;
if (!String.IsNullOrEmpty(model.PasswordHash))
if (!string.IsNullOrEmpty(model.PasswordHash))
{
isFirst = !CommonMethods.SendCongratulations(Request.Scheme, t, model.SkipWelcome, out sendCongratulationsAddress);
}

6
common/services/ASC.ApiSystem/Controllers/SettingsController.cs
View File

@ -73,7 +73,7 @@ namespace ASC.ApiSystem.Controllers
[Authorize(AuthenticationSchemes = "auth.allowskip")]
public IActionResult GetSettings([FromQuery] SettingsModel model)
{
if (!GetTenant(model, out int tenantId, out object error))
if (!GetTenant(model, out var tenantId, out var error))
{
return BadRequest(error);
}
@ -99,7 +99,7 @@ namespace ASC.ApiSystem.Controllers
[Authorize(AuthenticationSchemes = "auth.allowskip")]
public IActionResult SaveSettings([FromBody] SettingsModel model)
{
if (!GetTenant(model, out int tenantId, out object error))
if (!GetTenant(model, out var tenantId, out var error))
{
return BadRequest(error);
}
@ -162,7 +162,7 @@ namespace ASC.ApiSystem.Controllers
return true;
}
if (!CommonMethods.GetTenant(model, out Tenant tenant))
if (!CommonMethods.GetTenant(model, out var tenant))
{
error = new
{

4
common/services/ASC.ApiSystem/Controllers/TariffController.cs
View File

@ -79,7 +79,7 @@ namespace ASC.ApiSystem.Controllers
[Authorize(AuthenticationSchemes = "auth.allowskip")]
public IActionResult SetTariff(TariffModel model)
{
if (!CommonMethods.GetTenant(model, out Tenant tenant))
if (!CommonMethods.GetTenant(model, out var tenant))
{
Log.Error("Model without tenant");
@ -143,7 +143,7 @@ namespace ASC.ApiSystem.Controllers
[Authorize(AuthenticationSchemes = "auth.allowskip")]
public IActionResult GetTariff([FromQuery] TariffModel model)
{
if (!CommonMethods.GetTenant(model, out Tenant tenant))
if (!CommonMethods.GetTenant(model, out var tenant))
{
Log.Error("Model without tenant");

2
common/services/ASC.ApiSystem/Models/CoreSettingsModel.cs
View File

@ -31,7 +31,7 @@ namespace ASC.ApiSystem.Models
{
public class CoreSettingsModel
{
public Int32 Tenant { get; set; }
public int Tenant { get; set; }
[StringLength(255)]
public string Key { get; set; }

2
common/services/ASC.Data.Backup/Extensions/EnumerableExtensions.cs
View File

@ -68,7 +68,7 @@ namespace ASC.Data.Backup.Extensions
foreach (var keyValue in dic)
{
var parentKey = parentKeySelector(keyValue.Value.Entry);
if (parentKey != null && dic.TryGetValue(parentKeySelector(keyValue.Value.Entry), out TreeNode<TEntry> parent))
if (parentKey != null && dic.TryGetValue(parentKeySelector(keyValue.Value.Entry), out var parent))
{
parent.Children.Add(keyValue.Value);
keyValue.Value.Parent = parent;

4
common/services/ASC.Data.Backup/Program.cs
View File

@ -12,7 +12,7 @@ namespace ASC.Data.Backup
{
public static async Task Main(string[] args)
{
Host.CreateDefaultBuilder(args)
await Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(webBuilder =>
{
_ = webBuilder.UseStartup<Startup>();
@ -44,7 +44,7 @@ namespace ASC.Data.Backup
})
.UseConsoleLifetime()
.Build()
.Run();
.RunAsync();
}
}
}

6
common/services/ASC.Data.Backup/Storage/S3BackupStorage.cs
View File

@ -58,12 +58,12 @@ namespace ASC.Data.Backup.Storage
public string Upload(string storageBasePath, string localPath, Guid userId)
{
var key = String.Empty;
string key;
if (String.IsNullOrEmpty(storageBasePath))
if (string.IsNullOrEmpty(storageBasePath))
key = "backup/" + Path.GetFileName(localPath);
else
key = String.Concat(storageBasePath.Trim(new char[] { ' ', '/', '\\' }), "/", Path.GetFileName(localPath));
key = string.Concat(storageBasePath.Trim(new char[] { ' ', '/', '\\' }), "/", Path.GetFileName(localPath));
using (var fileTransferUtility = new TransferUtility(accessKeyId, secretAccessKey, RegionEndpoint.GetBySystemName(region)))
{

4
common/services/ASC.Data.Backup/Tasks/Modules/Helpers.cs
View File

@ -74,12 +74,12 @@ namespace ASC.Data.Backup.Tasks.Modules
}
public bool IsEmptyOrSystemUser(string id)
{
return string.IsNullOrEmpty(id) || Guid.TryParse(id, out Guid g) && SystemUsers.Contains(g);
return string.IsNullOrEmpty(id) || Guid.TryParse(id, out var g) && SystemUsers.Contains(g);
}
public bool IsEmptyOrSystemGroup(string id)
{
return string.IsNullOrEmpty(id) || Guid.TryParse(id, out Guid g) && SystemGroups.Contains(g);
return string.IsNullOrEmpty(id) || Guid.TryParse(id, out var g) && SystemGroups.Contains(g);
}
public string CreateHash(string s)

10
common/services/ASC.Data.Backup/Tasks/Modules/ModuleSpecificsBase.cs
View File

@ -108,7 +108,7 @@ namespace ASC.Data.Backup.Tasks.Modules
if (table.InsertMethod == InsertMethod.None)
return null;
if (!TryPrepareRow(dump, connection, columnMapper, table, row, out Dictionary<string, object> valuesForInsert))
if (!TryPrepareRow(dump, connection, columnMapper, table, row, out var valuesForInsert))
return null;
var columns = valuesForInsert.Keys.Intersect(table.Columns).ToArray();
@ -254,11 +254,11 @@ namespace ASC.Data.Backup.Tasks.Modules
{
value = mappedValue;
return true;
}
}
return value == null ||
Guid.TryParse(Convert.ToString(value), out Guid guidVal) ||
int.TryParse(Convert.ToString(value), out int intVal);
Guid.TryParse(Convert.ToString(value), out _) ||
int.TryParse(Convert.ToString(value), out _);
}
public virtual void PrepareData(DataTable data)

2
common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
View File

@ -96,7 +96,7 @@ namespace ASC.Data.Storage.Encryption
GetProgress(progressEncryption);
foreach (var tenant in Tenants)
{
Dictionary<string, DiscDataStore> dictionary = new Dictionary<string, DiscDataStore>();
var dictionary = new Dictionary<string, DiscDataStore>();
foreach (var module in Modules)
{
dictionary.Add(module, (DiscDataStore)storageFactory.GetStorage(ConfigPath, tenant.TenantId.ToString(), module));

4
common/services/ASC.Data.Storage.Encryption/Program.cs
View File

@ -36,7 +36,7 @@ namespace ASC.Data.Storage.Encryption
{
public static async Task Main(string[] args)
{
Host.CreateDefaultBuilder(args)
await Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(webBuilder =>
{
_ = webBuilder.UseStartup<Startup>();
@ -67,7 +67,7 @@ namespace ASC.Data.Storage.Encryption
})
.UseConsoleLifetime()
.Build()
.Run();
.RunAsync();
}
}
}

4
common/services/ASC.Data.Storage.Migration/Program.cs
View File

@ -17,7 +17,7 @@ namespace ASC.Data.Storage.Migration
{
public static async Task Main(string[] args)
{
Host.CreateDefaultBuilder(args)
await Host.CreateDefaultBuilder(args)
.ConfigureAppConfiguration((hostContext, config) =>
{
var buided = config.Build();
@ -59,7 +59,7 @@ namespace ASC.Data.Storage.Migration
})
.UseConsoleLifetime()
.Build()
.Run();
.RunAsync();
}
}
}

5
common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
View File

@ -265,7 +265,8 @@ namespace ASC.ElasticSearch
public async Task ReIndex()
{
Clear();
Clear();
await Task.CompletedTask;
//((IIndexer) this).IndexAll();
}
@ -474,7 +475,7 @@ namespace ASC.ElasticSearch
var sourceExprText = "";
while (!string.IsNullOrEmpty(name = TryGetName(expression, out MemberExpression member)))
while (!string.IsNullOrEmpty(name = TryGetName(expression, out var member)))
{
sourceExprText = "." + name + sourceExprText;
expression = member.Expression;

2
common/services/ASC.TelegramService/Core/Core.cs
View File

@ -112,7 +112,7 @@ namespace ASC.TelegramService.Core
private object[] ParseParams(MethodInfo cmd, string[] args)
{
List<object> parsedParams = new List<object>();
var parsedParams = new List<object>();
var cmdArgs = cmd.GetParameters();

4
common/services/ASC.TelegramService/Program.cs
View File

@ -36,7 +36,7 @@ namespace ASC.TelegramService
{
public static async Task Main(string[] args)
{
Host.CreateDefaultBuilder(args)
await Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(webBuilder =>
{
_ = webBuilder.UseStartup<Startup>();
@ -67,7 +67,7 @@ namespace ASC.TelegramService
})
.UseConsoleLifetime()
.Build()
.Run();
.RunAsync();
}
}
}

40
products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
View File

@ -822,7 +822,7 @@ namespace ASC.Files.Core.Data
foreach (var key in keys)
{
int newFolderId = 0;
var newFolderId = 0;
if (createIfNotExists && !folderIdsDictionary.TryGetValue(key, out var folderId))
{
var folder = ServiceProvider.GetService<Folder<int>>();
@ -1287,25 +1287,25 @@ namespace ASC.Files.Core.Data
if (services.TryAddScoped<IFolderDao<int>, FolderDao>())
{
_ = services.TryAddTransient<Folder<int>>();
_ = services.TryAddTransient<Folder<string>>();
return services
.AddFactoryIndexerService<DbFolder>()
.AddTenantManagerService()
.AddUserManagerService()
.AddFilesDbContextService()
.AddTenantUtilService()
.AddSetupInfo()
.AddTenantExtraService()
.AddTenantStatisticsProviderService()
.AddCoreBaseSettingsService()
.AddCoreConfigurationService()
.AddSettingsManagerService()
.AddAuthContextService()
.AddGlobalSpaceService();
}
_ = services.TryAddTransient<Folder<string>>();
return services;
}
return services
.AddFactoryIndexerService<DbFolder>()
.AddTenantManagerService()
.AddUserManagerService()
.AddFilesDbContextService()
.AddTenantUtilService()
.AddSetupInfo()
.AddTenantExtraService()
.AddTenantStatisticsProviderService()
.AddCoreBaseSettingsService()
.AddCoreConfigurationService()
.AddSettingsManagerService()
.AddAuthContextService()
.AddGlobalSpaceService();
}
return services;
}
}
}

16
products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs vendored
View File

@ -129,10 +129,6 @@ namespace ASC.Files.Thirdparty.ProviderDao
}
#endregion
public void Dispose()
{
}
}
public static class ProviderTagDaoExtention
@ -140,12 +136,12 @@ namespace ASC.Files.Thirdparty.ProviderDao
public static DIHelper AddProviderTagDaoService(this DIHelper services)
{
if (services.TryAddScoped<ITagDao<string>, ProviderTagDao>())
{
return services
.AddProviderDaoBaseService();
}
{
return services
.AddProviderDaoBaseService();
}
return services;
}
return services;
}
}
}

4
products/ASC.Files/Core/Utils/FileConverter.cs
View File

@ -520,7 +520,6 @@ namespace ASC.Web.Files.Utils
TenantManager tenantManager,
AuthContext authContext,
EntryManager entryManager,
IOptionsMonitor<ILog> options,
FilesSettingsHelper filesSettingsHelper,
GlobalFolderHelper globalFolderHelper,
FilesMessageService filesMessageService,
@ -558,7 +557,6 @@ namespace ASC.Web.Files.Utils
TenantManager tenantManager,
AuthContext authContext,
EntryManager entryManager,
IOptionsMonitor<ILog> options,
FilesSettingsHelper filesSettingsHelper,
GlobalFolderHelper globalFolderHelper,
FilesMessageService filesMessageService,
@ -568,7 +566,7 @@ namespace ASC.Web.Files.Utils
IServiceProvider serviceProvider,
IHttpContextAccessor httpContextAccesor)
: this(fileUtility, filesLinkUtility, daoFactory, setupInfo, pathProvider, fileSecurity,
fileMarker, tenantManager, authContext, entryManager, options, filesSettingsHelper,
fileMarker, tenantManager, authContext, entryManager, filesSettingsHelper,
globalFolderHelper, filesMessageService, fileShareLink, documentServiceHelper, documentServiceConnector,
serviceProvider)
{

2
products/ASC.People/Server/Controllers/PeopleController.cs
View File

@ -646,7 +646,7 @@ namespace ASC.Employee.Core.Controllers
}
}
_ = UserManager.SaveUserInfo(user, memberModel.IsVisitor);
_ = UserManager.SaveUserInfo(user);
MessageService.Send(MessageAction.UserUpdated, MessageTarget.Create(user.ID), user.DisplayUserName(false, DisplayUserSettingsHelper));
if (memberModel.Disable.HasValue && memberModel.Disable.Value)

6
web/ASC.Web.Api/Controllers/SettingsController.cs
View File

@ -1041,7 +1041,7 @@ namespace ASC.Api.Settings
throw new BillingException(Resource.ErrorNotAllowedOption, "WhiteLabel");
}
var result = new Dictionary<int, string>();
Dictionary<int, string> result;
if (model.IsDefault)
{
@ -1313,7 +1313,7 @@ namespace ASC.Api.Settings
if (currentUser.IsVisitor(UserManager) || currentUser.IsOutsider(UserManager))
throw new NotSupportedException("Not available.");
var codes = TfaManager.GenerateBackupCodes(currentUser).Select(r => new { r.IsUsed, r.Code }).ToList();
var codes = TfaManager.GenerateBackupCodes().Select(r => new { r.IsUsed, r.Code }).ToList();
MessageService.Send(MessageAction.UserConnectedTfaApp, MessageTarget.Create(currentUser.ID), currentUser.DisplayUserName(false, DisplayUserSettingsHelper));
return codes;
}
@ -1761,7 +1761,7 @@ namespace ASC.Api.Settings
[Read("encryption")]
public void StartEncryption(EncryptionSettingsModel settings)
{
EncryptionSettingsProto encryptionSettingsProto = new EncryptionSettingsProto
var encryptionSettingsProto = new EncryptionSettingsProto
{
NotifyUsers = settings.NotifyUsers,
Password = settings.Password,

4
web/ASC.Web.Api/Models/StorageWrapper.cs
View File

@ -59,7 +59,7 @@ namespace ASC.Api.Settings
private void StorageWrapperInit<T>(DataStoreConsumer consumer, BaseStorageSettings<T> current) where T : class, ISettings, new()
{
Id = consumer.Name;
Title = consumer.GetResourceString(consumer.Name) ?? consumer.Name;
Title = ConsumerExtension.GetResourceString(consumer.Name) ?? consumer.Name;
Current = consumer.Name == current.Module;
IsSet = consumer.IsSet;
@ -72,7 +72,7 @@ namespace ASC.Api.Settings
{
Name = r.Key,
Value = r.Value,
Title = consumer.GetResourceString(consumer.Name + r.Key) ?? r.Key
Title = ConsumerExtension.GetResourceString(consumer.Name + r.Key) ?? r.Key
}).ToList();
}
}

10
web/ASC.Web.Core/AuthService.cs
View File

@ -53,21 +53,21 @@ namespace ASC.Web.Studio.UserControls.Management
public AuthService(Consumer consumer)
{
Consumer = consumer;
Title = consumer.GetResourceString(consumer.Name) ?? consumer.Name;
Description = consumer.GetResourceString(consumer.Name + "Description");
Instruction = consumer.GetResourceString(consumer.Name + "InstructionV11");
Title = ConsumerExtension.GetResourceString(consumer.Name) ?? consumer.Name;
Description = ConsumerExtension.GetResourceString(consumer.Name + "Description");
Instruction = ConsumerExtension.GetResourceString(consumer.Name + "InstructionV11");
Props = new List<AuthKey>();
foreach (var item in consumer.ManagedKeys)
{
Props.Add(new AuthKey { Name = item, Value = Consumer[item], Title = consumer.GetResourceString(item) ?? item });
Props.Add(new AuthKey { Name = item, Value = Consumer[item], Title = ConsumerExtension.GetResourceString(item) ?? item });
}
}
}
public static class ConsumerExtension
{
public static string GetResourceString(this Consumer consumer, string resourceKey)
public static string GetResourceString(string resourceKey)
{
try
{

6
web/ASC.Web.Core/Extensions/EnumExtension.cs
View File

@ -28,12 +28,12 @@ namespace System
{
public static class EnumExtension
{
public static T TryParseEnum<T>(this Type enumType, string value, T defaultValue) where T : struct
public static T TryParseEnum<T>(string value, T defaultValue) where T : struct
{
return TryParseEnum<T>(enumType, value, defaultValue, out _);
return TryParseEnum(value, defaultValue, out _);
}
public static T TryParseEnum<T>(this Type enumType, string value, T defaultValue, out bool isDefault) where T : struct
public static T TryParseEnum<T>(string value, T defaultValue, out bool isDefault) where T : struct
{
isDefault = false;
try

2
web/ASC.Web.Core/Files/FileUtility.cs
View File

@ -457,7 +457,7 @@ namespace ASC.Web.Core.Files
private bool GetCanForcesave()
{
return !bool.TryParse(Configuration["files:docservice:forcesave"] ?? "", out bool canForcesave) || canForcesave;
return !bool.TryParse(Configuration["files:docservice:forcesave"] ?? "", out var canForcesave) || canForcesave;
}
#endregion

24
web/ASC.Web.Core/Helpers/ImageHelpers.cs
View File

@ -132,7 +132,7 @@ namespace ASC.Web.Studio.Helpers
set;
}
public ThumbnailGenerator(string tmpPath, bool crop, int width, int heigth, int widthPreview, int heightPreview)
public ThumbnailGenerator(bool crop, int width, int heigth, int widthPreview, int heightPreview)
{
_crop = crop;
_width = width;
@ -397,7 +397,7 @@ namespace ASC.Web.Studio.Helpers
public static void GenerateThumbnail(string path, string outputPath, ref ImageInfo imageInfo)
{
var _generator = new ThumbnailGenerator(null, true,
var _generator = new ThumbnailGenerator(true,
maxSize,
maxSize,
maxWidthPreview,
@ -408,7 +408,7 @@ namespace ASC.Web.Studio.Helpers
public static void GenerateThumbnail(string path, string outputPath, ref ImageInfo imageInfo, int maxWidth, int maxHeight)
{
var _generator = new ThumbnailGenerator(null, true,
var _generator = new ThumbnailGenerator(true,
maxWidth,
maxHeight,
maxWidthPreview,
@ -418,7 +418,7 @@ namespace ASC.Web.Studio.Helpers
}
public static void GenerateThumbnail(Stream stream, string outputPath, ref ImageInfo imageInfo, int maxWidth, int maxHeight)
{
var _generator = new ThumbnailGenerator(null, true,
var _generator = new ThumbnailGenerator(true,
maxWidth,
maxHeight,
maxWidthPreview,
@ -429,7 +429,7 @@ namespace ASC.Web.Studio.Helpers
public static void GenerateThumbnail(string path, string outputPath, ref ImageInfo imageInfo, int maxWidth, int maxHeight, IDataStore store)
{
var _generator = new ThumbnailGenerator(null, true,
var _generator = new ThumbnailGenerator(true,
maxWidth,
maxHeight,
maxWidthPreview,
@ -442,7 +442,7 @@ namespace ASC.Web.Studio.Helpers
}
public static void GenerateThumbnail(Stream stream, string outputPath, ref ImageInfo imageInfo, int maxWidth, int maxHeight, IDataStore store)
{
var _generator = new ThumbnailGenerator(null, true,
var _generator = new ThumbnailGenerator(true,
maxWidth,
maxHeight,
maxWidthPreview,
@ -457,7 +457,7 @@ namespace ASC.Web.Studio.Helpers
public static void GenerateThumbnail(Stream stream, string outputPath, ref ImageInfo imageInfo)
{
var _generator = new ThumbnailGenerator(null, true,
var _generator = new ThumbnailGenerator(true,
maxSize,
maxSize,
maxWidthPreview,
@ -468,7 +468,7 @@ namespace ASC.Web.Studio.Helpers
public static void GenerateThumbnail(Stream stream, string outputPath, ref ImageInfo imageInfo, IDataStore store)
{
var _generator = new ThumbnailGenerator(null, true,
var _generator = new ThumbnailGenerator(true,
maxSize,
maxSize,
maxWidthPreview,
@ -482,7 +482,7 @@ namespace ASC.Web.Studio.Helpers
public static void GeneratePreview(string path, string outputPath, ref ImageInfo imageInfo)
{
var _generator = new ThumbnailGenerator(null, true,
var _generator = new ThumbnailGenerator(true,
maxSize,
maxSize,
maxWidthPreview,
@ -493,7 +493,7 @@ namespace ASC.Web.Studio.Helpers
}
public static void GeneratePreview(Stream stream, string outputPath, ref ImageInfo imageInfo)
{
var _generator = new ThumbnailGenerator(null, true,
var _generator = new ThumbnailGenerator(true,
maxSize,
maxSize,
maxWidthPreview,
@ -504,7 +504,7 @@ namespace ASC.Web.Studio.Helpers
}
public static void GeneratePreview(Stream stream, string outputPath, ref ImageInfo imageInfo, IDataStore store)
{
var _generator = new ThumbnailGenerator(null, true,
var _generator = new ThumbnailGenerator(true,
maxSize,
maxSize,
maxWidthPreview,
@ -519,7 +519,7 @@ namespace ASC.Web.Studio.Helpers
public static void RotateImage(string path, string outputPath, bool back, IDataStore store)
{
var _generator = new ThumbnailGenerator(null, true,
var _generator = new ThumbnailGenerator(true,
maxSize,
maxSize,
maxWidthPreview,

8
web/ASC.Web.Core/QuotaSync.cs
View File

@ -48,9 +48,9 @@ namespace ASC.Web.Studio.Core.Quota
TenantId = tenantId;
TaskInfo = new DistributedTask();
ServiceProvider = serviceProvider;
}
public void RunJob(DistributedTask distributedTask, CancellationToken cancellationToken)
}
public void RunJob()//DistributedTask distributedTask, CancellationToken cancellationToken)
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<QuotaSyncScope>();
@ -93,7 +93,7 @@ namespace ASC.Web.Studio.Core.Quota
StorageFactory = storageFactory;
}
public void Deconstruct(out TenantManager tenantManager, out StorageFactoryConfig storageFactoryConfig, out StorageFactory storageFactory )
public void Deconstruct(out TenantManager tenantManager, out StorageFactoryConfig storageFactoryConfig, out StorageFactory storageFactory)
{
tenantManager = TenantManager;
storageFactoryConfig = StorageFactoryConfig;

10
web/ASC.Web.Core/Sms/SmsProvider.cs
View File

@ -130,7 +130,7 @@ namespace ASC.Web.Core.Sms
public abstract class SmsProvider : Consumer
{
protected readonly ILog Log;
protected static readonly ICache Cache = AscCache.Memory;
protected static readonly ICache MemoryCache = AscCache.Memory;
protected virtual string SendMessageUrlFormat { get; set; }
protected virtual string GetBalanceUrlFormat { get; set; }
@ -256,9 +256,9 @@ namespace ASC.Web.Core.Sms
var tenantCache = tenant == null ? Tenant.DEFAULT_TENANT : tenant.TenantId;
var key = "sms/smsc/" + tenantCache;
if (eraseCache) Cache.Remove(key);
if (eraseCache) MemoryCache.Remove(key);
var balance = Cache.Get<string>(key);
var balance = MemoryCache.Get<string>(key);
if (string.IsNullOrEmpty(balance))
{
@ -287,7 +287,7 @@ namespace ASC.Web.Core.Sms
balance = string.Empty;
}
Cache.Insert(key, balance, TimeSpan.FromMinutes(1));
MemoryCache.Insert(key, balance, TimeSpan.FromMinutes(1));
}
return balance;
@ -512,7 +512,7 @@ namespace ASC.Web.Core.Sms
private SecurityContext SecurityContext { get; }
private BaseCommonLinkUtility BaseCommonLinkUtility { get; }
public TwilioProviderCleaner(VoipDao voipDao, AuthContext authContext, TenantUtil tenantUtil, SecurityContext securityContext, TenantManager tenantManager, BaseCommonLinkUtility baseCommonLinkUtility, VoipDaoCache voipDaoCache)
public TwilioProviderCleaner(VoipDao voipDao, AuthContext authContext, TenantUtil tenantUtil, SecurityContext securityContext, BaseCommonLinkUtility baseCommonLinkUtility)
{
VoipDao = voipDao;
AuthContext = authContext;

6
web/ASC.Web.Core/Tfa/TfaManager.cs
View File

@ -119,7 +119,7 @@ namespace ASC.Web.Studio.Core.TFA
return Tfa.GenerateSetupCode(SetupInfo.TfaAppSender, user.Email, Encoding.UTF8.GetBytes(GenerateAccessToken(user)), size, true);
}
public bool ValidateAuthCode(UserInfo user, int tenantId, string code, bool checkBackup = true)
public bool ValidateAuthCode(UserInfo user, string code, bool checkBackup = true)
{
if (!TfaAppAuthSettings.IsVisibleSettings
|| !SettingsManager.Load<TfaAppAuthSettings>().EnableSetting)
@ -162,14 +162,14 @@ namespace ASC.Web.Studio.Core.TFA
if (!TfaAppUserSettings.EnableForUser(SettingsManager, user.ID))
{
_ = GenerateBackupCodes(user);
_ = GenerateBackupCodes();
return true;
}
return false;
}
public IEnumerable<BackupCode> GenerateBackupCodes(UserInfo user)
public IEnumerable<BackupCode> GenerateBackupCodes()
{
var count = SetupInfo.TfaAppBackupCodeCount;
var length = SetupInfo.TfaAppBackupCodeLength;

2
web/ASC.Web.Core/Users/UserManagerWrapper.cs
View File

@ -137,7 +137,7 @@ namespace ASC.Web.Core.Users
userInfo.ActivationStatus = !afterInvite ? EmployeeActivationStatus.Pending : EmployeeActivationStatus.Activated;
}
var newUserInfo = UserManager.SaveUserInfo(userInfo, isVisitor);
var newUserInfo = UserManager.SaveUserInfo(userInfo);
SecurityContext.SetUserPasswordHash(newUserInfo.ID, passwordHash);
if (CoreBaseSettings.Personal)

2
web/ASC.Web.Core/Users/UserPhotoManager.cs
View File

@ -726,7 +726,7 @@ namespace ASC.Web.Core.Users
public string SaveTempPhoto(byte[] data, long maxFileSize, int maxWidth, int maxHeight)
{
data = TryParseImage(data, maxFileSize, new Size(maxWidth, maxHeight), out var imgFormat, out var width, out var height);
data = TryParseImage(data, maxFileSize, new Size(maxWidth, maxHeight), out var imgFormat, out _, out _);
var fileName = Guid.NewGuid() + "." + CommonPhotoManager.GetImgFormatName(imgFormat);

7
web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
View File

@ -314,7 +314,7 @@ namespace ASC.Web.Core.WhiteLabel
var generalSize = GetSize(type, true);
var generalFileName = BuildLogoFileName(type, logoFileExt, true);
ResizeLogo(type, generalFileName, data, -1, generalSize, store);
ResizeLogo(generalFileName, data, -1, generalSize, store);
}
public void SetLogo(TenantWhiteLabelSettings tenantWhiteLabelSettings, Dictionary<int, string> logo, IDataStore storage = null)
@ -329,8 +329,7 @@ namespace ASC.Web.Core.WhiteLabel
if (!string.IsNullOrEmpty(currentLogoPath))
{
var fileExt = "png";
byte[] data = null;
byte[] data;
if (!currentLogoPath.StartsWith(xStart))
{
var fileName = Path.GetFileName(currentLogoPath);
@ -499,7 +498,7 @@ namespace ASC.Web.Core.WhiteLabel
};
}
private static void ResizeLogo(WhiteLabelLogoTypeEnum type, string fileName, byte[] data, long maxFileSize, Size size, IDataStore store)
private static void ResizeLogo(string fileName, byte[] data, long maxFileSize, Size size, IDataStore store)
{
//Resize synchronously
if (data == null || data.Length <= 0) throw new UnknownImageFormatException();