Skip to content

Commit 1648128

Browse files
committed
Update package,
cannot upgrade Masstransit rabbitMQ due to that: MassTransit/MassTransit#5840 (reply in thread) and mini correction
1 parent b81d178 commit 1648128

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

UbikLink.Common/UbikLink.Common.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.2" />
2121
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.2" />
2222
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.2" />
23-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.4.0" />
23+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.5.0" />
2424
<PackageReference Include="Yarp.ReverseProxy" Version="2.2.0" />
2525
</ItemGroup>
2626

UbikLink.Security.Api/Features/Users/Services/UserQueryService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ FROM subscriptions_users su
3939
AND su.subscription_id = t.subscription_id
4040
""";
4141

42-
var activeAndOwner = await con.QuerySingleOrDefaultAsync<(bool? Active,bool? Owner)>(sql, new { userId = user.Id, user.SelectedTenantId });
42+
var (Active, Owner) = await con.QuerySingleOrDefaultAsync<(bool? Active,bool? Owner)>(sql, new { userId = user.Id, user.SelectedTenantId });
4343

4444
if (con.State == System.Data.ConnectionState.Open)
4545
await con.CloseAsync();
@@ -48,8 +48,8 @@ FROM subscriptions_users su
4848
{
4949
AuthId = user.AuthId,
5050
Id = user.Id,
51-
IsActiveInSelectedSubscription = activeAndOwner.Active == null ? false : (bool)activeAndOwner.Active,
52-
IsSubOwnerOfTheSelectetdTenant = activeAndOwner.Owner == null ? false : (bool)activeAndOwner.Owner,
51+
IsActiveInSelectedSubscription = Active != null && (bool)Active,
52+
IsSubOwnerOfTheSelectetdTenant = Owner != null && (bool)Owner,
5353
SelectedTenantId = user.SelectedTenantId,
5454
Email = user.Email,
5555
Firstname = user.Firstname,

0 commit comments

Comments
 (0)