Przeglądaj źródła

Merge branch 'feature/added_emlahio' of Neca/HRCenter into BE_dev

pull/124/head
safet.purkovic 3 lat temu
rodzic
commit
4e632ee669

+ 4
- 4
Diligent.WebAPI.Business/Services/AuthenticationService.cs Wyświetl plik

@@ -34,7 +34,7 @@ namespace Diligent.WebAPI.Business.Services

public async Task<ServiceResponseDTO<AuthenticateResponseDto>> Authenticate(AuthenticateRequestDto model)
{
_logger.LogError($"Checking credentials for user: {model.Username}");
_logger.LogInformation($"Checking credentials for user: {model.Username}");
var user = await _userManager.FindByNameAsync(model.Username);

// return null if user not found
@@ -73,13 +73,13 @@ namespace Diligent.WebAPI.Business.Services
};
}
var token = await GenerateToken(user);
_logger.LogError($"Successfull login token: {token}");
_logger.LogInformation($"Successfull login token: {token}");
return token;
}

public async Task<ServiceResponseDTO<AuthenticateResponseDto>> Authenticate(GoogleApiModel model)
{
_logger.LogError($"Checking token for google login {model.Token}");
_logger.LogInformation($"Checking token for google login {model.Token}");
if (!(await _httpClient.IsTokenValid(model.Token)))
{
_logger.LogError($"Token is not valid");
@@ -89,7 +89,7 @@ namespace Diligent.WebAPI.Business.Services
ErrorMessage = "Invalid Google Api Token"
};
}
_logger.LogError($"Checking if user exists in Db with email : {model.User.email}");
_logger.LogInformation($"Checking if user exists in Db with email : {model.User.email}");
var user = await _userManager.FindByEmailAsync(model.User.email);

// return null if user not found

+ 1
- 0
Diligent.WebAPI.Host/Diligent.WebAPI.Host.csproj Wyświetl plik

@@ -35,6 +35,7 @@
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="6.0.10" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="6.0.10" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
<PackageReference Include="Serilog.Sinks.ElmahIo" Version="4.2.25" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.2" />
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1" />

+ 9
- 5
Diligent.WebAPI.Host/appsettings.json Wyświetl plik

@@ -2,10 +2,11 @@
"Serilog": {
"Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File", "Serilog.Sinks.Seq" ],
"MinimumLevel": {
"Default": "Debug",
"Default": "Information",
"Override": {
"Microsoft": "Information",
"Microsoft.AspNetCore": "Warning"
"Microsoft": "Warning",
"Microsoft.AspNetCore": "Warning",
"Microsoft.EntityFrameworkCore.Database.Command": "Warning"
}
},
"WriteTo": [
@@ -17,8 +18,11 @@
"Args": { "path": "Logs/log.txt" }
},
{
"Name": "Seq",
"Args": { "ServerUrl": "http://localhost:5341" }
"Name": "ElmahIo",
"Args": {
"apiKey": "04f4d40349904838b2096bfa2aa90a93",
"logId": "30f3610f-f319-49c4-8507-4348bc92effa"
}
}
],
"Enrich": [ "FromLogContext", "WithMachineName", "WtihThreadId", "WithExceptionDetails" ]

Ładowanie…
Anuluj
Zapisz