Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

VCST-1431: Ignore expired password when using external sign in #5

Merged
merged 2 commits into from
Aug 9, 2024
Merged

VCST-1431: Ignore expired password when using external sign in #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a24093f
Ignore expired password when using external sign in
artem-dudarev Aug 8, 2024
79d29a8
Update dependencies
artem-dudarev Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/VirtoCommerce.XOrder.Core/VirtoCommerce.XOrder.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
<PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.800.0" />
<PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.802.0" />
<PackageReference Include="VirtoCommerce.XCatalog.Core" Version="3.800.0" />
<PackageReference Include="VirtoCommerce.XCart.Core" Version="3.800.0" />
<PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.803.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/VirtoCommerce.XOrder.Data/Queries/BaseQueries/BaseSearchOrderQueryBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ protected override Task AfterMediatorSend(IResolveFieldContext<object> context,

protected override async Task Authorize(IResolveFieldContext context, object resource, IAuthorizationRequirement requirement)
{
await _userManagerCore.CheckUserState(context.GetCurrentUserId(), allowAnonymous: false);
await _userManagerCore.CheckCurrentUserState(context, allowAnonymous: false);

await base.Authorize(context, resource, requirement);
}
Expand Down
2 changes: 1 addition & 1 deletion src/VirtoCommerce.XOrder.Data/Schemas/OrderSchema.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ private async Task<CartAggregate> GetCartAggregateAsync(string cartId)

private async Task AuthorizeAsync(IResolveFieldContext context, object resource, bool allowAnonymous)
{
await _userManagerCore.CheckUserState(context.GetCurrentUserId(), allowAnonymous);
await _userManagerCore.CheckCurrentUserState(context, allowAnonymous);
var authorizationResult = await _authorizationService.AuthorizeAsync(context.GetCurrentPrincipal(), resource, new CanAccessOrderAuthorizationRequirement());

if (!authorizationResult.Succeeded)
Expand Down
2 changes: 1 addition & 1 deletion src/VirtoCommerce.XOrder.Data/VirtoCommerce.XOrder.Data.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="VirtoCommerce.Platform.Security" Version="3.841.0" />
<PackageReference Include="VirtoCommerce.Platform.Security" Version="3.848.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\VirtoCommerce.XOrder.Core\VirtoCommerce.XOrder.Core.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions src/VirtoCommerce.XOrder.Web/module.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<version>3.802.0</version>
<version-tag></version-tag>

<platformVersion>3.841.0</platformVersion>
<platformVersion>3.848.0</platformVersion>
<dependencies>
<dependency id="VirtoCommerce.Xapi" version="3.800.0" />
<dependency id="VirtoCommerce.Xapi" version="3.802.0" />
<dependency id="VirtoCommerce.XCart" version="3.800.0" />
<dependency id="VirtoCommerce.XCatalog" version="3.800.0" />
<dependency id="VirtoCommerce.Orders" version="3.803.0" />
Expand Down
2 changes: 1 addition & 1 deletion tests/VirtoCommerce.XOrder.Tests/VirtoCommerce.XOrder.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoFixture" Version="4.18.1" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Loading