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

Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign

Browse Source
This commit is contained in:
Viktor Fomin 2022-02-10 18:03:31 +03:00
commit 6fa92a8376
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
View File

@ -76,13 +76,14 @@ namespace ASC.Core
get
{
//TODO:if (CustomMode && HttpContext.Current != null && HttpContext.Current.Request.SailfishApp()) return true;
return personal ?? (bool)(personal = Configuration["core:personal"].Equals("true", StringComparison.OrdinalIgnoreCase));
return personal ?? (bool)(personal = string.Equals(Configuration["core:personal"], "true", StringComparison.OrdinalIgnoreCase));
}
}
public bool CustomMode
{
get { return customMode ?? (bool)(customMode = Configuration["core:custom-mode"].Equals("true", StringComparison.OrdinalIgnoreCase)); }
get { return customMode ?? (bool)(customMode = string.Equals(Configuration["core:custom-mode"], "true", StringComparison.OrdinalIgnoreCase));}
}
}

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

@ -175,13 +175,13 @@ namespace ASC.Core
public UserInfo GetUserBySid(string sid)
{
return GetUsersInternal()
.FirstOrDefault(u => u.Sid != null && u.Sid.Equals(sid, StringComparison.CurrentCultureIgnoreCase)) ?? Constants.LostUser;
.FirstOrDefault(u => u.Sid != null && string.Equals(u.Sid , sid, StringComparison.CurrentCultureIgnoreCase)) ?? Constants.LostUser;
}
public UserInfo GetSsoUserByNameId(string nameId)
{
return GetUsersInternal()
.FirstOrDefault(u => !string.IsNullOrEmpty(u.SsoNameId) && u.SsoNameId.Equals(nameId, StringComparison.CurrentCultureIgnoreCase)) ?? Constants.LostUser;
.FirstOrDefault(u => !string.IsNullOrEmpty(u.SsoNameId) && string.Equals(u.SsoNameId, nameId, StringComparison.CurrentCultureIgnoreCase)) ?? Constants.LostUser;
}
public bool IsUserNameExists(string username)
{

2
common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
View File

@ -134,7 +134,7 @@ namespace ASC.Security.Cryptography
var hash = GetMashineHashedData(BitConverter.GetBytes(ms), Encoding.ASCII.GetBytes(email));
var key2 = DoStringFromBytes(hash);
var key2_good = parts[1].Equals(key2, StringComparison.OrdinalIgnoreCase);
var key2_good = string.Equals(parts[1], key2, StringComparison.OrdinalIgnoreCase);
if (!key2_good) return ValidationResult.Invalid;
var ms_current = (long)(DateTime.UtcNow - _from).TotalMilliseconds;
return validInterval >= TimeSpan.FromMilliseconds(ms_current - ms) ? ValidationResult.Ok : ValidationResult.Expired;

2
common/Tests/ASC.Common.Tests/ASC.Common.Tests.csproj
View File

@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="log4net" Version="2.0.11" />
<PackageReference Include="log4net" Version="2.0.14" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="NUnit" Version="3.13.1" />
</ItemGroup>

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

@ -36,7 +36,7 @@ namespace ASC.Core.Common.Tests
[TestFixture]
public class ClientPaymentManagerTest
{
private readonly PaymentManager paymentManager = new PaymentManager(null, null, null);
private readonly PaymentManager paymentManager = new PaymentManager(null, null, null, null);
private readonly IServiceProvider serviceProvider;
[Test]

14
products/ASC.Files/Tests/ASC.Files.Tests.csproj
View File

@ -14,12 +14,12 @@
<PackageReference Include="Autofac.Configuration" Version="6.0.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
<PackageReference Include="Box.V2.Core" Version="3.24.0" />
<PackageReference Include="Confluent.Kafka" Version="1.5.2" />
<PackageReference Include="Confluent.Kafka" Version="1.8.2" />
<PackageReference Include="Dropbox.Api" Version="4.10.0" />
<PackageReference Include="EntityFramework" Version="6.4.4" />
<PackageReference Include="Google.Apis.Drive.v3" Version="1.49.0.2111" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
<PackageReference Include="Google.Protobuf" Version="3.19.1" />
<PackageReference Include="Google.Apis.Drive.v3" Version="1.55.0.2566" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
<PackageReference Include="Google.Protobuf" Version="3.19.4" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
@ -28,13 +28,13 @@
<PackageReference Include="Microsoft.SharePoint.Client" Version="14.0.4762.1000" />
<PackageReference Include="Moq" Version="4.14.7" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="NEST" Version="7.9.0" />
<PackageReference Include="NLog" Version="4.7.10" />
<PackageReference Include="NEST" Version="7.15.2" />
<PackageReference Include="NLog" Version="4.7.13" />
<PackageReference Include="nunit" Version="3.13.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
<PackageReference Include="UAParser" Version="3.1.44" />
<PackageReference Include="UAParser" Version="3.1.47" />
</ItemGroup>
<ItemGroup>