diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.ts b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.ts
index 5c19ac41..7080baf6 100644
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.ts
@@ -25,7 +25,7 @@ export class NavbarComponent {
async logInOut(): Promise
{
if (this.isLogedIn())
return this.authService.logoutAsync().then(() => {
- this.router.navigate(['/']);
+ this.router.navigate(['/login']);
})
else
this.router.navigate(['/login']);
diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/auth.service.ts b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/auth.service.ts
index 893b1edc..de68af4b 100644
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/auth.service.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/auth.service.ts
@@ -15,11 +15,21 @@ export class AuthService {
}
login(credentials: { username: string; password: string }): Observable {
- return this.http.post(`${this.url}/login`, credentials);
+ return this.http.post(`${this.url}/login`, credentials).pipe(
+ tap({
+ next: res => this.#IsAuthenticated = true,
+ error: () => this.#IsAuthenticated = false
+ })
+ )
}
logout(): Observable {
- return this.http.post(`${this.url}/logout`, {});
+ return this.http.post(`${this.url}/logout`, {}).pipe(
+ tap({
+ next: res => this.#IsAuthenticated = false,
+ error: () => this.#IsAuthenticated = true
+ })
+ );
}
async logoutAsync(): Promise {
diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/favicon.ico b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/favicon.ico
index 57614f9c..60c2c4ab 100644
Binary files a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/favicon.ico and b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/favicon.ico differ
diff --git a/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj b/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj
index 16a98050..d42159a2 100644
--- a/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj
+++ b/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj
@@ -9,15 +9,11 @@
-
-
-
-
diff --git a/EnvelopeGenerator.GeneratorAPI/wwwroot/favicon.ico b/EnvelopeGenerator.GeneratorAPI/wwwroot/favicon.ico
index 57614f9c..60c2c4ab 100644
Binary files a/EnvelopeGenerator.GeneratorAPI/wwwroot/favicon.ico and b/EnvelopeGenerator.GeneratorAPI/wwwroot/favicon.ico differ
diff --git a/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj b/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj
index a64184d2..f81afd68 100644
--- a/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj
+++ b/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj
@@ -15,7 +15,6 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestReceiverController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestReceiverController.cs
index 20bddb42..ff1a6a4f 100644
--- a/EnvelopeGenerator.Web/Controllers/Test/TestReceiverController.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/TestReceiverController.cs
@@ -1,10 +1,11 @@
-using EnvelopeGenerator.Application.Contracts;
+using DigitalData.Core.API;
+using EnvelopeGenerator.Application.Contracts;
using EnvelopeGenerator.Application.DTOs.Receiver;
using EnvelopeGenerator.Domain.Entities;
namespace EnvelopeGenerator.Web.Controllers.Test
{
- public class TestReceiverController : TestControllerBase
+ public class TestReceiverController : CRUDControllerBase
{
public TestReceiverController(ILogger logger, IReceiverService service) : base(logger, service)
{
diff --git a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj
index 6af0c024..8bed176f 100644
--- a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj
+++ b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj
@@ -40,9 +40,6 @@
-
-
-
@@ -67,8 +64,6 @@
-
-