From af127b716e96349f5a15ac3a8e08d4b28d95d007 Mon Sep 17 00:00:00 2001 From: Marek Lesko Date: Wed, 30 Jul 2025 08:05:36 +0200 Subject: [PATCH] fix: update package versions for EntityFramework and adjust API endpoint in login component --- Api/Api.csproj | 8 ++++---- Api/Controllers/ProductController.cs | 5 ++--- Api/Program.cs | 4 ++-- Web/src/app/login/login.ts | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Api/Api.csproj b/Api/Api.csproj index dd16980..baa142e 100644 --- a/Api/Api.csproj +++ b/Api/Api.csproj @@ -12,11 +12,11 @@ - - runtime; build; native; contentfiles; analyzers; buildtransitive - all + + runtime; build; native; contentfiles; analyzers; buildtransitive + all - + diff --git a/Api/Controllers/ProductController.cs b/Api/Controllers/ProductController.cs index 4548fb3..422cbfe 100644 --- a/Api/Controllers/ProductController.cs +++ b/Api/Controllers/ProductController.cs @@ -6,8 +6,8 @@ using Microsoft.AspNetCore.Authorization; namespace Api.Controllers { [ApiController] - [Authorize] - [Route("api/[controller]")] + //[Authorize] + [Route("api/product")] public class ProductController : ControllerBase { private readonly AppDbContext _context; @@ -19,7 +19,6 @@ namespace Api.Controllers // GET: api/Product [HttpGet] - [Route("api/product")] public async Task>> GetProducts([FromQuery] int? id = null) { if (id.HasValue) diff --git a/Api/Program.cs b/Api/Program.cs index 0e315e5..185c8fd 100644 --- a/Api/Program.cs +++ b/Api/Program.cs @@ -31,8 +31,8 @@ namespace Api options.Authority = builder.Configuration["Authentication:PocketId:Authority"]; options.TokenValidationParameters = new Microsoft.IdentityModel.Tokens.TokenValidationParameters() { - ValidAudiences = builder.Configuration["Authentication:PocketId:ClientId"].Split(';').Select(i => i.Trim()).ToArray(), - ValidIssuers = builder.Configuration["Authentication:PocketId:Authority"].Split(';').Select(i => i.Trim()).ToArray() + ValidAudiences = builder.Configuration["Authentication:PocketId:ClientId"]?.Split(';').Select(i => i.Trim()).ToArray(), + ValidIssuers = builder.Configuration["Authentication:PocketId:Authority"]?.Split(';').Select(i => i.Trim()).ToArray() }; }); diff --git a/Web/src/app/login/login.ts b/Web/src/app/login/login.ts index 7d4cc07..d83f23e 100644 --- a/Web/src/app/login/login.ts +++ b/Web/src/app/login/login.ts @@ -13,7 +13,7 @@ export class Login implements OnInit { } ngOnInit(): void { - this.httpClient.get('http://localhost:5000/swagger/v1/swagger.json', { + this.httpClient.get('https://localhost:5001/api/product', { headers: new HttpHeaders({ Authorization: `Bearer ${this.as.getAccessToken()}` }).append('Content-Type', 'application/json') } ).subscribe(console.warn);