FA/FA_WEB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Added Authorization which is not working

Browse Source
This commit is contained in:
Piotr Kus
2025-02-23 21:19:04 +01:00
parent 6774311433
commit 5bcf406465
29 changed files with 407 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OrdersManagement/Components/App.razor
View File

@@ -18,19 +18,6 @@
</head>
<body>
@inject AuthenticationStateProvider AuthenticationStateProvider
@inject NavigationManager NavigationManager
@{
var authState = AuthenticationStateProvider.GetAuthenticationStateAsync().Result;
var user = authState.User;
if (!(user.Identity is { IsAuthenticated: true }) && NavigationManager.Uri != NavigationManager.BaseUri + "login")
{
NavigationManager.NavigateTo("/login");
}
}
<Routes @rendermode="@InteractiveServer" />
<script src="_framework/blazor.web.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4" crossorigin="anonymous"></script>

11
OrdersManagement/Components/Pages/Admin/Users/LoginModule.razor
View File

@@ -1,4 +1,9 @@
@page "/login"
@rendermode InteractiveServer
@attribute [AllowAnonymous]
@using Microsoft.AspNetCore.Authorization
@using Microsoft.AspNetCore.Components.Authorization
@using OrdersManagement.Models
@using Syncfusion.Blazor.Inputs
@@ -102,18 +107,18 @@
{
Console.WriteLine($"Próba logowania dla: {LoginModel.Login}");
var user = await UserService.AuthenticateUserAsync(LoginModel.Login, LoginModel.Password);
if (user != null)
{
Console.WriteLine($"Użytkownik {user.Login} znaleziony.");
if (user.IsTemporaryPassword)
{
ShowChangePassword = true;
StateHasChanged(); // Wymagane, aby odświeżyć UI
StateHasChanged();
}
else
{
await ((CustomAuthenticationStateProvider)AuthenticationStateProvider).MarkUserAsAuthenticated(user);
NavigationManager.NavigateTo("/");
NavigationManager.NavigateTo("/ScheduleOrders");
}
}
else

2
OrdersManagement/Components/Pages/CustomerOrder.razor
View File

@@ -1,5 +1,7 @@
@page "/CustomerOrder/{CustomerOrderId:guid}"
@rendermode InteractiveServer
@inject CustomerOrderService CustomerOrderService
@inject ScheduleOrderService ScheduleOrderService
@using SytelineSaAppEfDataModel.Dtos

3
OrdersManagement/Components/Pages/CustomerOrders.razor
View File

@@ -1,4 +1,7 @@
@page "/CustomerOrders"
@rendermode InteractiveServer
@inject CustomerOrderService CustomerOrderService
@inject NavigationManager NavigationManager
@using SytelineSaAppEfDataModel.Dtos

3
OrdersManagement/Components/Pages/EdiCustomerOrder.razor
View File

@@ -1,6 +1,9 @@
@page "/EdiCustomerOrder/{CustomerOrderId:guid}"
@rendermode InteractiveServer
@inject EdiCustomerOrderService EdiCustomerOrderService
@using Microsoft.AspNetCore.Authorization
@using SytelineSaAppEfDataModel.Dtos
@using Syncfusion.Blazor.Grids
@using Syncfusion.Blazor.Cards

12
OrdersManagement/Components/Pages/EdiCustomerOrders.razor
View File

@@ -1,6 +1,6 @@
@page "/EdiCustomerOrders"
@attribute [Authorize]
@rendermode InteractiveServer
@inject EdiCustomerOrderService EdiCustomerOrderService
@inject NavigationManager NavigationManager
@@ -108,7 +108,7 @@
<Content>
@if (_responses.Any(x => x.Status == 1))
{
foreach (ResponseModel response in _responses.Where(x => x.Status == 1))
foreach (ResponseModel? response in _responses.Where(x => x.Status == 1))
{
<p>Zamówienie EDI @response.Identifier zostało poprawnie zaksięgowane w Zamówieniach klienta pod
numerem '@response.ExternalIdentifier'</p>
@@ -116,7 +116,7 @@
}
@if (_responses.Any(x => x.Status == 0))
{
foreach (ResponseModel response in _responses.Where(x => x.Status == 0))
foreach (ResponseModel? response in _responses.Where(x => x.Status == 0))
{
<p>Błąd: Zamówienie EDI @response.Identifier nie zostało poprawnie zaksięgowane w Zamówieniach
klienta.<br/>Lista błędów:<br/>@response.Message</p>
@@ -138,7 +138,7 @@
private IEnumerable<EdiCustomerOrderDto> _ediCustomerOrders = [];
private List<EdiCustomerOrderDto> _selectedEdiCustomerOrders = new();
private List<ResponseModel> _responses = new();
private List<ResponseModel?> _responses = new();
private bool _isVisible;
private bool? _filter = false;
@@ -161,11 +161,11 @@
{
if (!_selectedEdiCustomerOrders.Any()) return false;
_responses = new List<ResponseModel>();
_responses = new List<ResponseModel?>();
foreach (EdiCustomerOrderDto selectedEdiCustomerOrder in _selectedEdiCustomerOrders)
{
ResponseModel response = await EdiCustomerOrderService.SendOrderToSyteline(selectedEdiCustomerOrder.RowPointer, selectedEdiCustomerOrder.CustomerOrderNumber);
ResponseModel? response = await EdiCustomerOrderService.SendOrderToSyteline(selectedEdiCustomerOrder.RowPointer, selectedEdiCustomerOrder.CustomerOrderNumber);
if (response.Status == 1)
{

8
OrdersManagement/Components/Pages/RedirectToLogin.razor Normal file
View File

@@ -0,0 +1,8 @@
@inject NavigationManager Navigation
@code {
protected override void OnInitialized()
{
Navigation.NavigateTo("/login");
}
}

4
OrdersManagement/Components/Pages/ScheduleOrder.razor
View File

@@ -1,8 +1,10 @@
@page "/ScheduleOrder/{ScheduleOrderId:int}"
@rendermode InteractiveServer
@using Microsoft.AspNetCore.Authorization
@using Syncfusion.Blazor.Grids
@using Syncfusion.Blazor.Lists
@inject ScheduleOrderDetailsService ScheduleOrderDetailsService
@inject ScheduleOrderService ScheduleOrderService
<div class="h-100 d-flex flex-column">

21
OrdersManagement/Components/Pages/ScheduleOrders.razor
View File

@@ -1,14 +1,14 @@
@page "/"
@attribute [Authorize]
@inherits LayoutComponentBase
@using Microsoft.AspNetCore.Authorization
@using Microsoft.AspNetCore.Components.Authorization
@using Microsoft.IdentityModel.Tokens
@using OrdersManagement.Components.Pages.Shared
@using Syncfusion.Blazor.Grids
@inject ScheduleOrderService ScheduleOrderService
@inject AuthenticationStateProvider AuthStateProvider
@* //@inject AuthTokenHandler TokenHandler *@
<div class="h-100 d-flex flex-column">
<h5>Zamówienia DELFOR</h5>
@@ -18,17 +18,19 @@
@code {
private IEnumerable<ScheduleOrderDto> _scheduleOrders = [];
protected override async Task OnInitializedAsync()
protected override async Task OnAfterRenderAsync(bool firstRender)
{
_scheduleOrders = await FetchScheduleOrdersAsync();
if (firstRender)
{
_scheduleOrders = await FetchScheduleOrdersAsync();
StateHasChanged();
}
}
private async Task<IEnumerable<ScheduleOrderDto>> FetchScheduleOrdersAsync()
{
_scheduleOrders = await ScheduleOrderService.GetScheduleOrdersAsync() ?? new List<ScheduleOrderDto>();
_scheduleOrders = _scheduleOrders.OrderByDescending(x => x.LastUpdateDate).ToList();
StateHasChanged();
return _scheduleOrders;
}
@@ -38,5 +40,4 @@
{
_gridRef = grid;
}
}
}

57
OrdersManagement/CustomAuthenticationStateProvider.cs
View File

@@ -1,29 +1,62 @@
using System.IdentityModel.Tokens.Jwt;
using System.Security.Claims;
using Blazored.LocalStorage;
using Microsoft.AspNetCore.Components.Authorization;
using OrdersManagementDataModel.Dtos;
namespace OrdersManagement;
public class CustomAuthenticationStateProvider : AuthenticationStateProvider
public class CustomAuthenticationStateProvider(ILocalStorageService localStorage) : AuthenticationStateProvider
{
private UserDto? _currentUser;
private string? _token;
private ClaimsPrincipal _currentUser = new(new ClaimsIdentity());
public override Task<AuthenticationState> GetAuthenticationStateAsync()
{
var identity = _currentUser != null ? new ClaimsIdentity([new Claim(ClaimTypes.Name, _currentUser.Login)], "CustomAuth") : new ClaimsIdentity();
return Task.FromResult(new AuthenticationState(new ClaimsPrincipal(identity)));
if (string.IsNullOrEmpty(_token))
{
return Task.FromResult(new AuthenticationState(new ClaimsPrincipal(new ClaimsIdentity())));
}
var handler = new JwtSecurityTokenHandler();
var jwtToken = handler.ReadJwtToken(_token);
var identity = new ClaimsIdentity(jwtToken.Claims, "jwt");
_currentUser = new ClaimsPrincipal(identity);
return Task.FromResult(new AuthenticationState(_currentUser));
}
public Task MarkUserAsAuthenticated(UserDto? user)
public async Task MarkUserAsAuthenticated(string? token)
{
_currentUser = user;
NotifyAuthenticationStateChanged(GetAuthenticationStateAsync());
return Task.CompletedTask;
_token = token;
await localStorage.SetItemAsync("authToken", token);
var handler = new JwtSecurityTokenHandler();
var jwtToken = handler.ReadJwtToken(token);
var identity = new ClaimsIdentity(jwtToken.Claims, "jwt");
_currentUser = new ClaimsPrincipal(identity);
NotifyAuthenticationStateChanged(Task.FromResult(new AuthenticationState(_currentUser)));
}
public void MarkUserAsLoggedOut()
public async Task MarkUserAsLoggedOut()
{
_currentUser = null;
NotifyAuthenticationStateChanged(GetAuthenticationStateAsync());
_token = null;
await localStorage.RemoveItemAsync("authToken");
_currentUser = new ClaimsPrincipal(new ClaimsIdentity());
NotifyAuthenticationStateChanged(Task.FromResult(new AuthenticationState(_currentUser)));
}
public async Task InitializeAsync()
{
_token = await localStorage.GetItemAsync<string>("authToken");
if (!string.IsNullOrEmpty(_token))
{
var handler = new JwtSecurityTokenHandler();
var jwtToken = handler.ReadJwtToken(_token);
var identity = new ClaimsIdentity(jwtToken.Claims, "jwt");
_currentUser = new ClaimsPrincipal(identity);
NotifyAuthenticationStateChanged(Task.FromResult(new AuthenticationState(_currentUser)));
}
}
public string? GetToken() => _token;
}

7
OrdersManagement/Models/LoginResponseDto.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace OrdersManagement.Models;
public class LoginResponseDto
{
public string? Token { get; set; }
public DateTime Expires { get; set; }
}

2
OrdersManagement/OrdersManagement.csproj
View File

@@ -9,6 +9,8 @@
<ItemGroup>
<PackageReference Include="BCrypt.Net-Core" Version="1.6.0" />
<PackageReference Include="Blazor.Bootstrap" Version="3.2.0" />
<PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.11" />
<PackageReference Include="Syncfusion.Blazor.Buttons" Version="28.2.3" />
<PackageReference Include="Syncfusion.Blazor.Cards" Version="28.2.3" />
<PackageReference Include="Syncfusion.Blazor.Core" Version="28.2.3" />

39
OrdersManagement/Program.cs
View File

@@ -1,44 +1,58 @@
using Microsoft.AspNetCore.Authentication.Cookies;
using Blazored.LocalStorage;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.IdentityModel.Tokens;
using OrdersManagement;
using OrdersManagement.Components;
using OrdersManagement.Services;
using Syncfusion.Blazor;
using System.Text;
var builder = WebApplication.CreateBuilder(args);
string faKrosnoApiUrl = builder.Configuration["FaKrosnoApiUrl"] ?? "http://localhost:5001";
builder.Services.AddSyncfusionBlazor();
builder.Services.AddBlazorBootstrap();
builder.Services.AddBlazoredLocalStorage();
builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
.AddCookie(options =>
builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
.AddJwtBearer(options =>
{
options.LoginPath = "/login";
options.LogoutPath = "/login";
options.TokenValidationParameters = new TokenValidationParameters
{
ValidateIssuer = true,
ValidateAudience = true,
ValidateLifetime = true,
ValidateIssuerSigningKey = true,
ValidIssuer = builder.Configuration["Jwt:Issuer"],
ValidAudience = builder.Configuration["Jwt:Audience"],
IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(builder.Configuration["Jwt:Key"]))
};
});
builder.Services.AddAuthorizationCore();
builder.Services.AddScoped<AuthenticationStateProvider, CustomAuthenticationStateProvider>();
builder.Services.AddScoped<UserService>();
builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(faKrosnoApiUrl) });
builder.Services.AddRazorComponents().AddInteractiveServerComponents();
builder.Services.AddHttpClient("FaKrosnoApi", client =>
{
client.BaseAddress = new Uri(faKrosnoApiUrl);
client.DefaultRequestHeaders.Accept.Add(new System.Net.Http.Headers.MediaTypeWithQualityHeaderValue("application/json"));
});
builder.Services.AddRazorComponents()
.AddInteractiveServerComponents();
// Usługi aplikacji
builder.Services.AddScoped<ScheduleOrderService>();
builder.Services.AddScoped<ScheduleOrderDetailsService>();
builder.Services.AddScoped<EdiCustomerOrderService>();
builder.Services.AddScoped<CustomerOrderService>();
builder.Services.AddScoped<HangfireService>();
builder.Services.AddScoped<RoleService>();
builder.Services.AddScoped<FunctionService>();
builder.Services.AddScoped<UserService>();
builder.Services.AddScoped<ErrorLogService>();
var app = builder.Build();
// Configure the HTTP request pipeline.
if (!app.Environment.IsDevelopment())
{
app.UseExceptionHandler("/Error", createScopeForErrors: true);
@@ -49,7 +63,6 @@ app.UseHttpsRedirection();
app.UseStaticFiles();
app.UseRouting();
// Włącz autentykację i autoryzację w pipeline
app.UseAuthentication();
app.UseAuthorization();

27
OrdersManagement/Services/CustomerOrderService.cs
View File

@@ -1,17 +1,36 @@
using Microsoft.AspNetCore.Components.Authorization;
using SytelineSaAppEfDataModel.Dtos;
namespace OrdersManagement.Services;
public class CustomerOrderService(HttpClient httpClient)
public class CustomerOrderService(
IHttpClientFactory httpClientFactory,
AuthenticationStateProvider authenticationStateProvider)
: ServiceBase<CustomerOrderDto>(httpClientFactory, authenticationStateProvider)
{
public async Task<IEnumerable<CustomerOrderDto>?> GetCustomerOrdersAsync()
{
return await httpClient.GetFromJsonAsync<IEnumerable<CustomerOrderDto>>("api/CustomerOrders");
try
{
return await GetListAsync("api/CustomerOrders");
}
catch (HttpRequestException ex)
{
Console.WriteLine($"Błąd HTTP w GetCustomerOrdersAsync: {ex.Message}");
return null;
}
}
public async Task<CustomerOrderDto?> GetCustomerOrderAsync(Guid customerOrderNumber)
{
return await httpClient.GetFromJsonAsync<CustomerOrderDto>(
$"api/CustomerOrders/by-order-number/?customerOrderNumber={customerOrderNumber}");
try
{
return await GetByIdAsync($"api/CustomerOrders/by-order-number/?customerOrderNumber={customerOrderNumber}");
}
catch (HttpRequestException ex)
{
Console.WriteLine($"Błąd HTTP w GetScheduleOrderAsync: {ex.Message}");
return null;
}
}
}

62
OrdersManagement/Services/EdiCustomerOrderService.cs
View File

@@ -1,41 +1,63 @@
using OrdersManagement.Models;
using Microsoft.AspNetCore.Components.Authorization;
using OrdersManagement.Models;
using SytelineSaAppEfDataModel.Dtos;
namespace OrdersManagement.Services
{
public class EdiCustomerOrderService(HttpClient httpClient)
public class EdiCustomerOrderService(IHttpClientFactory httpClientFactory, AuthenticationStateProvider authenticationStateProvider, ErrorLogService errorLogService) : ServiceBase<EdiCustomerOrderDto>(httpClientFactory, authenticationStateProvider)
{
public async Task<IEnumerable<EdiCustomerOrderDto>?> GetEdiCustomerOrdersAsync()
{
return await httpClient.GetFromJsonAsync<IEnumerable<EdiCustomerOrderDto>>("api/EdiCustomerOrders");
try
{
return await GetListAsync("api/EdiCustomerOrders");
}
catch (HttpRequestException ex)
{
Console.WriteLine($"Błąd HTTP w GetEdiCustomerOrdersAsync: {ex.Message}");
return null;
}
}
public async Task<EdiCustomerOrderDto?> GetEdiCustomerOrderAsync(Guid customerOrderNumber)
{
return await httpClient.GetFromJsonAsync<EdiCustomerOrderDto>(
$"api/EdiCustomerOrders/by-order-number/?customerOrderNumber={customerOrderNumber}");
try
{
return await GetByIdAsync($"api/EdiCustomerOrders/by-order-number/?customerOrderNumber={customerOrderNumber}");
}
catch (HttpRequestException ex)
{
Console.WriteLine($"Błąd HTTP w GetEdiCustomerOrdersAsync: {ex.Message}");
return null;
}
}
public async Task<ResponseModel> SendOrderToSyteline(Guid customerOrderNumber, string orderNumber)
public async Task<ResponseModel?> SendOrderToSyteline(Guid customerOrderNumber, string orderNumber)
{
HttpResponseMessage responseMessage = await httpClient.PostAsync(
$"api/EdiCustomerOrders/send-to-syteline?customerOrderNumber={customerOrderNumber}", null);
if (responseMessage.IsSuccessStatusCode)
try
{
return new ResponseModel(1, orderNumber, null, null);
HttpResponseMessage responseMessage = await PostAsync($"api/EdiCustomerOrders/send-to-syteline?customerOrderNumber={customerOrderNumber}");
if (responseMessage.IsSuccessStatusCode)
{
return new ResponseModel(1, orderNumber, null, null);
}
string? errorMessage = null;
IEnumerable<ErrorLogDto>? logs = await errorLogService.GetErrorLogsAsync(customerOrderNumber);
if (logs != null)
{
errorMessage = string.Join("\r\n", logs.Select(x => x.ErrMsg));
}
return new ResponseModel(0, orderNumber, errorMessage, null);
}
string? errorMessage = null;
IEnumerable<ErrorLogDto>? logs = await httpClient.GetFromJsonAsync<IEnumerable<ErrorLogDto>>(
$"api/ErrorLog/by-order-number/?customerOrderNumber={customerOrderNumber}");
if (logs != null)
catch (HttpRequestException ex)
{
errorMessage = string.Join("\r\n", logs.Select(x => x.ErrMsg));
Console.WriteLine($"Błąd HTTP w GetEdiCustomerOrdersAsync: {ex.Message}");
return null;
}
return new ResponseModel(0, orderNumber, errorMessage, null);
}
}
}

23
OrdersManagement/Services/ErrorLogService.cs Normal file
View File

@@ -0,0 +1,23 @@
using Microsoft.AspNetCore.Components.Authorization;
using SytelineSaAppEfDataModel.Dtos;
namespace OrdersManagement.Services;
public class ErrorLogService(
IHttpClientFactory httpClientFactory,
AuthenticationStateProvider authenticationStateProvider)
: ServiceBase<ErrorLogDto>(httpClientFactory, authenticationStateProvider)
{
public async Task<IEnumerable<ErrorLogDto>?> GetErrorLogsAsync(Guid customerOrderNumber)
{
try
{
return await GetListAsync($"api/CustomerOrders/by-order-number/?customerOrderNumber={customerOrderNumber}");
}
catch (HttpRequestException ex)
{
Console.WriteLine($"Błąd HTTP w GetCustomerOrdersAsync: {ex.Message}");
return null;
}
}
}

13
OrdersManagement/Services/ScheduleOrderDetailsService.cs
View File

@@ -1,13 +0,0 @@
using FaKrosnoEfDataModel.Dtos;
namespace OrdersManagement.Services
{
public class ScheduleOrderDetailsService(HttpClient httpClient)
{
public async Task<IEnumerable<ScheduleOrderDetailDto>?> GetScheduleOrderDetails(int scheduleOrderId)
{
return await httpClient.GetFromJsonAsync<IEnumerable<ScheduleOrderDetailDto>>(
$"api/scheduleOrderDetails/order/{scheduleOrderId}");
}
}
}

40
OrdersManagement/Services/ScheduleOrderService.cs
View File

@@ -1,18 +1,38 @@
using FaKrosnoEfDataModel.Dtos;
using System.Net.Http.Headers;
using Blazored.LocalStorage;
using FaKrosnoEfDataModel.Dtos;
using Microsoft.AspNetCore.Components.Authorization;
namespace OrdersManagement.Services
namespace OrdersManagement.Services;
public class ScheduleOrderService(
IHttpClientFactory httpClientFactory,
AuthenticationStateProvider authenticationStateProvider)
: ServiceBase<ScheduleOrderDto>(httpClientFactory, authenticationStateProvider)
{
public class ScheduleOrderService(HttpClient httpClient)
public async Task<IEnumerable<ScheduleOrderDto>?> GetScheduleOrdersAsync()
{
public async Task<IEnumerable<ScheduleOrderDto>?> GetScheduleOrdersAsync()
try
{
return await httpClient.GetFromJsonAsync<IEnumerable<ScheduleOrderDto>>("api/ScheduleOrders");
return await GetListAsync("api/ScheduleOrders");
}
public async Task<ScheduleOrderDto?> GetScheduleOrderAsync(int scheduleOrderId)
catch (HttpRequestException ex)
{
return await httpClient.GetFromJsonAsync<ScheduleOrderDto>(
$"api/ScheduleOrders/{scheduleOrderId}");
Console.WriteLine($"Błąd HTTP w GetScheduleOrdersAsync: {ex.Message}");
return null;
}
}
}
public async Task<ScheduleOrderDto?> GetScheduleOrderAsync(int scheduleOrderId)
{
try
{
return await GetByIdAsync($"api/ScheduleOrders/{scheduleOrderId}");
}
catch (HttpRequestException ex)
{
Console.WriteLine($"Błąd HTTP w GetScheduleOrderAsync: {ex.Message}");
return null;
}
}
}

52
OrdersManagement/Services/ServiceBase.cs Normal file
View File

@@ -0,0 +1,52 @@
using Microsoft.AspNetCore.Components.Authorization;
namespace OrdersManagement.Services;
public class ServiceBase<T> where T : class
{
private readonly AuthenticationStateProvider _authenticationStateProvider;
private readonly HttpClient _httpClient;
protected ServiceBase(IHttpClientFactory httpClientFactory, AuthenticationStateProvider authenticationStateProvider)
{
_authenticationStateProvider = authenticationStateProvider;
_httpClient = httpClientFactory.CreateClient("FaKrosnoApi");
_ = Configure();
}
protected async Task<IEnumerable<T>?> GetListAsync(string request)
{
var response = await _httpClient.GetAsync(request);
response.EnsureSuccessStatusCode();
return await response.Content.ReadFromJsonAsync<IEnumerable<T>>();
}
protected async Task<T?> GetByIdAsync(string request)
{
var response = await _httpClient.GetAsync(request);
response.EnsureSuccessStatusCode();
return await response.Content.ReadFromJsonAsync<T>();
}
protected async Task<HttpResponseMessage> PostAsync(string request)
{
var response = await _httpClient.PostAsync(request, null);
response.EnsureSuccessStatusCode();
return response;
}
private async Task Configure()
{
var token = await GetToken();
_httpClient.DefaultRequestHeaders.Authorization =
new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", token);
}
private async Task<string?> GetToken()
{
await ((CustomAuthenticationStateProvider)_authenticationStateProvider).InitializeAsync();
return ((CustomAuthenticationStateProvider)_authenticationStateProvider).GetToken();
}
}

46
OrdersManagement/Services/UserService.cs
View File

@@ -1,42 +1,62 @@
using Blazored.LocalStorage;
using Microsoft.AspNetCore.Components.Authorization;
using OrdersManagement.Models;
using OrdersManagementDataModel.Dtos;
namespace OrdersManagement.Services;
public class UserService(HttpClient httpClient)
public class UserService(IHttpClientFactory clientFactory, AuthenticationStateProvider authStateProvider)
{
private readonly HttpClient _httpClient = clientFactory.CreateClient("FaKrosnoApi");
public async Task<IEnumerable<UserDto>?> GetUsersAsync()
{
return await httpClient.GetFromJsonAsync<IEnumerable<UserDto>>("api/Users");
}
public async Task<UserDto?> AuthenticateUserAsync(string login, string password)
{
var response = await httpClient.PostAsJsonAsync("api/users/authenticate", new { Login = login, Password = password });
return response.IsSuccessStatusCode ? await response.Content.ReadFromJsonAsync<UserDto>() : null;
return await _httpClient.GetFromJsonAsync<IEnumerable<UserDto>>("api/Users");
}
public async Task<UserDto?> AuthenticateUserAsync(string login, string password)
{
try
{
var response = await _httpClient.PostAsJsonAsync("api/Users/login", new { Login = login, Password = password });
response.EnsureSuccessStatusCode();
var result = await response.Content.ReadFromJsonAsync<LoginResponseDto>();
if (result?.Token == null) return null;
await ((CustomAuthenticationStateProvider)authStateProvider).MarkUserAsAuthenticated(result.Token);
return await GetUserByUsernameAsync(login);
}
catch (Exception ex)
{
Console.WriteLine($"Błąd logowania: {ex.Message}");
return null;
}
}
public async Task<UserDto?> GetUserAsync(Guid userId)
{
return await httpClient.GetFromJsonAsync<UserDto>($"api/Users/by-id/?id={userId}");
return await _httpClient.GetFromJsonAsync<UserDto>($"api/Users/by-id/?id={userId}");
}
public async Task<UserDto?> GetUserByUsernameAsync(string username)
{
return await httpClient.GetFromJsonAsync<UserDto>($"api/Users/by-username/?username={username}");
return await _httpClient.GetFromJsonAsync<UserDto>($"api/Users/by-username/?username={username}");
}
public async Task<HttpResponseMessage> AddUserAsync(UserDto user)
{
return await httpClient.PostAsJsonAsync("api/Users", user);
return await _httpClient.PostAsJsonAsync("api/Users", user);
}
public async Task UpdateUserAsync(UserDto user)
{
await httpClient.PutAsJsonAsync("api/Users", user);
await _httpClient.PutAsJsonAsync("api/Users", user);
}
public async Task DeleteUserAsync(Guid userId)
{
await httpClient.DeleteAsync($"api/Users/?id={userId}");
await _httpClient.DeleteAsync($"api/Users/?id={userId}");
}
}

5
OrdersManagement/appsettings.json
View File

@@ -5,5 +5,10 @@
"Microsoft.AspNetCore": "Warning"
}
},
"Jwt": {
"Key": "a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6q7r8s9t0u1v2w3x4y5z6A7B8C9D0E1F",
"Issuer": "FaKrosnoApi",
"Audience": "FaKrosnoClient"
},
"AllowedHosts": "*"
}