Skip to content

Commit

Permalink
NuGet package upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
JZO001 committed Oct 30, 2022
1 parent c9e5e44 commit 8720c63
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<Reference Include="Forge.Wasm.BrowserStorages">
<HintPath>..\Forge.Yoda.Externals\Forge.Wasm.BrowserStorages.dll</HintPath>
</Reference-->
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.24.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.10" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Forge.Yoda.Apps.MAUI/Forge.Yoda.Apps.MAUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.24.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.10" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion Forge.Yoda.Apps.WinForms/Forge.Yoda.Apps.WinForms.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<Reference Include="Forge.Wasm.BrowserStorages">
<HintPath>..\Forge.Yoda.Externals\Forge.Wasm.BrowserStorages.dll</HintPath>
</Reference-->
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.24.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.10" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public async Task<ActionResult> Login([FromBody] LoginRequestViewModel request)
});
}

LoginResult result = await _userService.Login(request.Username, request.Password, keys);
LoginResult result = await _userService.Login(request.Username!, request.Password!, keys);
if (!result.Succeeded)
{
_logger.LogInformation($"User [{request.Username}] failed to log in the system. IsLockedOut: {result.IsLockedOut}, IsNotAllowed: {result.IsNotAllowed}, RequiresTwoFactor: {result.RequiresTwoFactor}, IP: [{ip}], User-Agent: [{userAgent}]");
Expand Down
6 changes: 3 additions & 3 deletions Forge.Yoda.Services.Authentication/Database/EntityBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ protected EntityBase()
/// <returns>
/// true if the current object is equal to the <paramref name="other" /> parameter; otherwise, false.
/// </returns>
public bool Equals(EntityBase other)
public bool Equals(EntityBase? other)
{
return Equals((object)other);
return Equals((object?)other);
}

/// <summary>
Expand All @@ -49,7 +49,7 @@ public bool Equals(EntityBase other)
/// <returns>
/// <c>true</c> if the specified <see cref="object" /> is equal to this instance; otherwise, <c>false</c>.
/// </returns>
public override bool Equals(object obj)
public override bool Equals(object? obj)
{
if (obj == null) return false;
if (ReferenceEquals(this, obj)) return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Forge.Security.Jwt.Service" Version="1.5.1" />
<PackageReference Include="Forge.Security.Jwt.Service" Version="1.5.2" />
<PackageReference Include="Forge.Security.Jwt.Service.Storage.SqlServer" Version="1.0.0" />
<PackageReference Include="Forge.Security.Jwt.Shared" Version="1.6.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
Expand Down
3 changes: 1 addition & 2 deletions Forge.Yoda.Services.Authentication/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using Microsoft.IdentityModel.Tokens;
using Swashbuckle.AspNetCore.Filters;
using System.Text;
using Forge.Yoda.Services.Authentication.Codes;

namespace Forge.Yoda.Services.Authentication
{
Expand Down Expand Up @@ -160,7 +159,7 @@ public void Configure(IApplicationBuilder app,
var serviceScopeFactory = app.ApplicationServices.GetRequiredService<IServiceScopeFactory>();
var serviceProvider = serviceScopeFactory.CreateScope().ServiceProvider;

InititalizationAtStartup initStartup = serviceProvider.GetService<InititalizationAtStartup>();
InititalizationAtStartup initStartup = serviceProvider.GetService<InititalizationAtStartup>()!;
Task.WaitAll(initStartup.Initialize(env.IsDevelopment()));

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Forge.Security.Jwt.Service" Version="1.5.1" />
<PackageReference Include="Forge.Security.Jwt.Service" Version="1.5.2" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
Expand Down
2 changes: 1 addition & 1 deletion Forge.Yoda.Services.WeatherForecastApi/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public static void Main(string[] args)

var app = builder.Build();

ILoggerFactory loggerFactory = (ILoggerFactory)app.Services.GetService(typeof(ILoggerFactory));
ILoggerFactory loggerFactory = (ILoggerFactory)app.Services.GetService(typeof(ILoggerFactory))!;
loggerFactory.AddLog4Net();

// Configure the HTTP request pipeline.
Expand Down

0 comments on commit 8720c63

Please sign in to comment.