From d3760652467b528655963c9e8ef6e61327221aaf Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Sun, 23 Jun 2024 11:22:06 +0200 Subject: [PATCH] =?UTF-8?q?Integrierte=20'Core'-Nuget-Pakete.=20EnvelopeRe?= =?UTF-8?q?ceiver-Tabelle=20f=C3=BCr=20Angular=20hinzugef=C3=BCgt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Contracts/IConfigService.cs | 3 +- .../IDocumentReceiverElementService.cs | 3 +- .../Contracts/IDocumentStatusService.cs | 4 +- .../Contracts/IEmailTemplateService.cs | 3 +- .../Contracts/IEnvelopeCertificateService.cs | 3 +- .../Contracts/IEnvelopeDocumentService.cs | 3 +- .../Contracts/IEnvelopeHistoryService.cs | 2 +- .../Contracts/IEnvelopeReceiverService.cs | 2 +- .../Contracts/IEnvelopeService.cs | 2 +- .../Contracts/IEnvelopeTypeService.cs | 3 +- .../Contracts/IReceiverService.cs | 3 +- .../Contracts/IUserReceiverService.cs | 2 +- .../EnvelopeGenerator.Application.csproj | 16 +--- .../Services/EnvelopeDocumentService.cs | 3 - EnvelopeGenerator.Common/Entities/Envelope.vb | 1 + .../EnvelopeGenerator.Domain.csproj | 7 ++ .../src/app/app.routes.ts | 10 +- .../envelope-table.component.html | 13 ++- .../envelope-table.component.ts | 93 ++++++++++++++++--- .../src/app/models/envelope-receiver.model.ts | 6 ++ .../Controllers/AuthController.cs | 10 +- .../EnvelopeGenerator.GeneratorAPI.csproj | 20 +--- EnvelopeGenerator.GeneratorAPI/Program.cs | 33 +++---- .../Contracts/IConfigRepository.cs | 2 +- .../IDocumentReceiverElementRepository.cs | 2 +- .../Contracts/IDocumentStatusRepository.cs | 2 +- .../Contracts/IEmailTemplateRepository.cs | 2 +- .../IEnvelopeCertificateRepository.cs | 2 +- .../Contracts/IEnvelopeDocumentRepository.cs | 2 +- .../Contracts/IEnvelopeHistoryRepository.cs | 2 +- .../Contracts/IEnvelopeReceiverRepository.cs | 2 +- .../Contracts/IEnvelopeRepository.cs | 2 +- .../Contracts/IEnvelopeTypeRepository.cs | 2 +- .../Contracts/IReceiverRepository.cs | 2 +- .../Contracts/IUserReceiverRepository.cs | 2 +- .../EnvelopeGenerator.Infrastructure.csproj | 8 +- .../Controllers/Test/TestConfigController.cs | 4 +- .../Controllers/Test/TestControllerBase.cs | 3 +- .../Test/TestDocumentStatusController.cs | 4 +- .../Test/TestEmailTemplateController.cs | 2 - .../Test/TestEnvelopeCertificateController.cs | 4 +- .../Test/TestEnvelopeController.cs | 1 - .../Test/TestReceiverController.cs | 4 +- .../Test/TestUserReceiverController.cs | 4 +- .../EnvelopeGenerator.Web.csproj | 20 +--- EnvelopeGenerator.sln | 10 +- 46 files changed, 178 insertions(+), 155 deletions(-) create mode 100644 EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/models/envelope-receiver.model.ts diff --git a/EnvelopeGenerator.Application/Contracts/IConfigService.cs b/EnvelopeGenerator.Application/Contracts/IConfigService.cs index 83b08e2c..d53f0bdd 100644 --- a/EnvelopeGenerator.Application/Contracts/IConfigService.cs +++ b/EnvelopeGenerator.Application/Contracts/IConfigService.cs @@ -1,8 +1,7 @@ -using DigitalData.Core.Contracts.Application; +using DigitalData.Core.Abstractions.Application; using DigitalData.Core.DTO; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Infrastructure.Contracts; namespace EnvelopeGenerator.Application.Contracts { diff --git a/EnvelopeGenerator.Application/Contracts/IDocumentReceiverElementService.cs b/EnvelopeGenerator.Application/Contracts/IDocumentReceiverElementService.cs index 29ee0fd4..79dfe781 100644 --- a/EnvelopeGenerator.Application/Contracts/IDocumentReceiverElementService.cs +++ b/EnvelopeGenerator.Application/Contracts/IDocumentReceiverElementService.cs @@ -1,7 +1,6 @@ -using DigitalData.Core.Contracts.Application; +using DigitalData.Core.Abstractions.Application; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Infrastructure.Contracts; namespace EnvelopeGenerator.Application.Contracts { diff --git a/EnvelopeGenerator.Application/Contracts/IDocumentStatusService.cs b/EnvelopeGenerator.Application/Contracts/IDocumentStatusService.cs index e1217d3c..39852d9c 100644 --- a/EnvelopeGenerator.Application/Contracts/IDocumentStatusService.cs +++ b/EnvelopeGenerator.Application/Contracts/IDocumentStatusService.cs @@ -1,8 +1,6 @@ -using DigitalData.Core.Contracts.Application; +using DigitalData.Core.Abstractions.Application; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Infrastructure.Contracts; - namespace EnvelopeGenerator.Application.Contracts { public interface IDocumentStatusService : IBasicCRUDService diff --git a/EnvelopeGenerator.Application/Contracts/IEmailTemplateService.cs b/EnvelopeGenerator.Application/Contracts/IEmailTemplateService.cs index 59971c09..dc1a8b39 100644 --- a/EnvelopeGenerator.Application/Contracts/IEmailTemplateService.cs +++ b/EnvelopeGenerator.Application/Contracts/IEmailTemplateService.cs @@ -1,8 +1,7 @@ -using DigitalData.Core.Contracts.Application; +using DigitalData.Core.Abstractions.Application; using DigitalData.Core.DTO; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Infrastructure.Contracts; using static EnvelopeGenerator.Common.Constants; namespace EnvelopeGenerator.Application.Contracts diff --git a/EnvelopeGenerator.Application/Contracts/IEnvelopeCertificateService.cs b/EnvelopeGenerator.Application/Contracts/IEnvelopeCertificateService.cs index b676eb0e..9f0238a0 100644 --- a/EnvelopeGenerator.Application/Contracts/IEnvelopeCertificateService.cs +++ b/EnvelopeGenerator.Application/Contracts/IEnvelopeCertificateService.cs @@ -1,7 +1,6 @@ -using DigitalData.Core.Contracts.Application; +using DigitalData.Core.Abstractions.Application; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Infrastructure.Contracts; namespace EnvelopeGenerator.Application.Contracts { diff --git a/EnvelopeGenerator.Application/Contracts/IEnvelopeDocumentService.cs b/EnvelopeGenerator.Application/Contracts/IEnvelopeDocumentService.cs index b18f4272..9599644d 100644 --- a/EnvelopeGenerator.Application/Contracts/IEnvelopeDocumentService.cs +++ b/EnvelopeGenerator.Application/Contracts/IEnvelopeDocumentService.cs @@ -1,7 +1,6 @@ -using DigitalData.Core.Contracts.Application; +using DigitalData.Core.Abstractions.Application; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Infrastructure.Contracts; namespace EnvelopeGenerator.Application.Contracts { diff --git a/EnvelopeGenerator.Application/Contracts/IEnvelopeHistoryService.cs b/EnvelopeGenerator.Application/Contracts/IEnvelopeHistoryService.cs index de088544..2e8fa8b4 100644 --- a/EnvelopeGenerator.Application/Contracts/IEnvelopeHistoryService.cs +++ b/EnvelopeGenerator.Application/Contracts/IEnvelopeHistoryService.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Contracts.Application; +using DigitalData.Core.Abstractions.Application; using DigitalData.Core.DTO; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Application.DTOs.EnvelopeHistory; diff --git a/EnvelopeGenerator.Application/Contracts/IEnvelopeReceiverService.cs b/EnvelopeGenerator.Application/Contracts/IEnvelopeReceiverService.cs index 15a65457..1353103e 100644 --- a/EnvelopeGenerator.Application/Contracts/IEnvelopeReceiverService.cs +++ b/EnvelopeGenerator.Application/Contracts/IEnvelopeReceiverService.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Contracts.Application; +using DigitalData.Core.Abstractions.Application; using DigitalData.Core.DTO; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; diff --git a/EnvelopeGenerator.Application/Contracts/IEnvelopeService.cs b/EnvelopeGenerator.Application/Contracts/IEnvelopeService.cs index b4762e95..4a01e53d 100644 --- a/EnvelopeGenerator.Application/Contracts/IEnvelopeService.cs +++ b/EnvelopeGenerator.Application/Contracts/IEnvelopeService.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Contracts.Application; +using DigitalData.Core.Abstractions.Application; using DigitalData.Core.DTO; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; diff --git a/EnvelopeGenerator.Application/Contracts/IEnvelopeTypeService.cs b/EnvelopeGenerator.Application/Contracts/IEnvelopeTypeService.cs index f9452a2e..cfa434a3 100644 --- a/EnvelopeGenerator.Application/Contracts/IEnvelopeTypeService.cs +++ b/EnvelopeGenerator.Application/Contracts/IEnvelopeTypeService.cs @@ -1,7 +1,6 @@ -using DigitalData.Core.Contracts.Application; +using DigitalData.Core.Abstractions.Application; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Infrastructure.Contracts; namespace EnvelopeGenerator.Application.Contracts { diff --git a/EnvelopeGenerator.Application/Contracts/IReceiverService.cs b/EnvelopeGenerator.Application/Contracts/IReceiverService.cs index 651f649a..09cdb36a 100644 --- a/EnvelopeGenerator.Application/Contracts/IReceiverService.cs +++ b/EnvelopeGenerator.Application/Contracts/IReceiverService.cs @@ -1,7 +1,6 @@ -using DigitalData.Core.Contracts.Application; +using DigitalData.Core.Abstractions.Application; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Infrastructure.Contracts; namespace EnvelopeGenerator.Application.Contracts { diff --git a/EnvelopeGenerator.Application/Contracts/IUserReceiverService.cs b/EnvelopeGenerator.Application/Contracts/IUserReceiverService.cs index 3f8f89a8..17ae83c8 100644 --- a/EnvelopeGenerator.Application/Contracts/IUserReceiverService.cs +++ b/EnvelopeGenerator.Application/Contracts/IUserReceiverService.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Contracts.Application; +using DigitalData.Core.Abstractions.Application; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Infrastructure.Contracts; diff --git a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj b/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj index e15e049b..a960879f 100644 --- a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj +++ b/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj @@ -8,6 +8,10 @@ + + + + @@ -16,18 +20,6 @@ - - ..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.Application.dll - - - ..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.Contracts.dll - - - ..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.DTO.dll - - - ..\..\WebUserManager\DigitalData.UserManager.Application\bin\Debug\net7.0\DigitalData.Core.Infrastructure.dll - ..\..\EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.Application\bin\Debug\net7.0\DigitalData.EmailProfilerDispatcher.Application.dll diff --git a/EnvelopeGenerator.Application/Services/EnvelopeDocumentService.cs b/EnvelopeGenerator.Application/Services/EnvelopeDocumentService.cs index 8ecdb540..8f53a4df 100644 --- a/EnvelopeGenerator.Application/Services/EnvelopeDocumentService.cs +++ b/EnvelopeGenerator.Application/Services/EnvelopeDocumentService.cs @@ -1,12 +1,9 @@ using AutoMapper; using DigitalData.Core.Application; -using DigitalData.Core.Contracts.Application; -using Microsoft.Extensions.Localization; using EnvelopeGenerator.Application.Contracts; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Infrastructure.Contracts; -using EnvelopeGenerator.Application.Resources; namespace EnvelopeGenerator.Application.Services { diff --git a/EnvelopeGenerator.Common/Entities/Envelope.vb b/EnvelopeGenerator.Common/Entities/Envelope.vb index 4f83ae87..5f6af46c 100644 --- a/EnvelopeGenerator.Common/Entities/Envelope.vb +++ b/EnvelopeGenerator.Common/Entities/Envelope.vb @@ -32,6 +32,7 @@ Public Property History As New List(Of EnvelopeHistoryEntry) Public Property EnvelopeType As EnvelopeType Public Property DOC_RESULT As Byte() + Public Property Doc1 As Byte() Public ReadOnly Property EnvelopeTypeTitle As String Get diff --git a/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj b/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj index 5f342ff9..2aae1eea 100644 --- a/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj +++ b/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj @@ -6,6 +6,13 @@ enable + + + + + + + diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.routes.ts b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.routes.ts index 25dda167..4cb81b1f 100644 --- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.routes.ts +++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.routes.ts @@ -1,8 +1,10 @@ -import { RouterModule, Routes } from '@angular/router'; -import {EnvelopeTableComponent} from '../app/components/envelope-table/envelope-table.component' -import {HomeComponent} from '../app/components/home/home.component' +import { Routes } from '@angular/router'; +import { EnvelopeTableComponent } from '../app/components/envelope-table/envelope-table.component' +import { HomeComponent } from '../app/components/home/home.component' +import { authGuard } from './guards/auth.guard' + export const routes: Routes = [ { path: '', component: HomeComponent }, { path: 'login', component: HomeComponent }, - { path: 'envelope', component: EnvelopeTableComponent } + { path: 'envelope', component: EnvelopeTableComponent, canActivate: [authGuard] } ]; \ No newline at end of file diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.html b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.html index 240b43b6..f9ceda7d 100644 --- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.html +++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.html @@ -1 +1,12 @@ -

envelope-table works!

+ + \ No newline at end of file diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.ts b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.ts index c49c908d..a4c448b2 100644 --- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.ts +++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.ts @@ -1,24 +1,91 @@ import { Component } from '@angular/core'; import { EnvelopeReceiverService } from '../../services/envelope-receiver.service'; -import { error } from 'console'; +import { NgModule } from '@angular/core'; +import { GuiColumn, GuiColumnMenu, GuiGridModule, GuiInfoPanel, GuiLocalization, GuiPaging, GuiPagingDisplay, GuiSearching, GuiSorting, GuiSummaries } from '@generic-ui/ngx-grid'; @Component({ selector: 'app-envelope-table', standalone: true, - imports: [], + imports: [GuiGridModule], templateUrl: './envelope-table.component.html', styleUrl: './envelope-table.component.scss' }) export class EnvelopeTableComponent { - - constructor(private erService : EnvelopeReceiverService){ - erService.getEnvelopeReceiver().subscribe({ - next: (res) => { - console.log(res) - }, - error: (error) => { - console.log(error) - } - }); + + columnMenu: GuiColumnMenu = { + enabled: true, + sort: true, + columnsManager: true + }; + + sorting: GuiSorting = { + enabled: true, + multiSorting: true + }; + + paging: GuiPaging = { + enabled: true, + page: 1, + pageSize: 10, + pageSizes: [10, 25, 50], + pagerTop: true, + pagerBottom: true, + display: GuiPagingDisplay.ADVANCED + }; + + searching: GuiSearching = { + enabled: true + }; + + summaries: GuiSummaries = { + enabled: true + }; + + infoPanel: GuiInfoPanel = { + enabled:true, + infoDialog:false, + columnsManager:false, + schemaManager: true + }; + + localization: GuiLocalization = { + translationResolver: (key: string, value: string) => { + return '[de-DE]'; + } + }; + + source: Array = [] + + constructor(private erService: EnvelopeReceiverService) { + } -} + + ngOnInit() { + this.erService.getEnvelopeReceiver().subscribe({ + next: res => this.source = res, + error: console.error + }); + } + + columns: Array = [ + { + header: 'Title', + field: er => er.envelope.title + }, + { + header: "Status", + field: er => er.envelope.status + }, + { + header: 'Type', + field: er => er.envelope.contractType + }, + { + header: 'PrivateMessage', + field: 'privateMessage' + }, + { + header: 'AddedWhen', + field: 'addedWhen' + }]; +} \ No newline at end of file diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/models/envelope-receiver.model.ts b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/models/envelope-receiver.model.ts new file mode 100644 index 00000000..405c92ea --- /dev/null +++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/models/envelope-receiver.model.ts @@ -0,0 +1,6 @@ +export interface EnvelopeReceiver { + name: string | null + privateMessage: string | null + addedWhen: Date + changedWhen: Date | null +} diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/AuthController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/AuthController.cs index 0b4c8549..4948e122 100644 --- a/EnvelopeGenerator.GeneratorAPI/Controllers/AuthController.cs +++ b/EnvelopeGenerator.GeneratorAPI/Controllers/AuthController.cs @@ -1,14 +1,11 @@ -using DigitalData.Core.Contracts.Application; -using DigitalData.Core.DTO; +using DigitalData.Core.Abstractions.Application; using DigitalData.UserManager.Application.Contracts; using DigitalData.UserManager.Application.DTOs.User; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Localization; using System.Security.Claims; using DigitalData.UserManager.Application.DTOs.Auth; -using DigitalData.UserManager.Application; using Microsoft.AspNetCore.Authorization; namespace EnvelopeGenerator.GeneratorAPI.Controllers @@ -20,14 +17,12 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers private readonly ILogger _logger; private readonly IUserService _userService; private readonly IDirectorySearchService _dirSearchService; - private readonly IStringLocalizer _localizer; - public AuthController(ILogger logger, IUserService userService, IDirectorySearchService dirSearchService, IStringLocalizer localizer) + public AuthController(ILogger logger, IUserService userService, IDirectorySearchService dirSearchService) { _logger = logger; _userService = userService; _dirSearchService = dirSearchService; - _localizer = localizer; } //TODO: When a user group is created for signFlow, add a process to check if the user is in this group (like "PM_USER") @@ -69,7 +64,6 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers { IsPersistent = true, AllowRefresh = true, - ExpiresUtc = DateTime.UtcNow.AddMinutes(60) }; // Sign in diff --git a/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj b/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj index 7617ce5a..0870ff7d 100644 --- a/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj +++ b/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj @@ -7,6 +7,11 @@ + + + + + @@ -25,21 +30,6 @@ - - ..\..\WebCoreModules\DigitalData.Core.API\bin\Debug\net7.0\DigitalData.Core.API.dll - - - ..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.Application.dll - - - ..\..\WebCoreModules\DigitalData.Core.API\bin\Debug\net7.0\DigitalData.Core.Contracts.dll - - - ..\..\WebCoreModules\DigitalData.Core.API\bin\Debug\net7.0\DigitalData.Core.DTO.dll - - - ..\..\WebCoreModules\DigitalData.Core.Infrastructure\bin\Debug\net7.0\DigitalData.Core.Infrastructure.dll - ..\..\WebUserManager\DigitalData.UserManager.Application\bin\Debug\net7.0\DigitalData.UserManager.Application.dll diff --git a/EnvelopeGenerator.GeneratorAPI/Program.cs b/EnvelopeGenerator.GeneratorAPI/Program.cs index 43036a74..e038d12b 100644 --- a/EnvelopeGenerator.GeneratorAPI/Program.cs +++ b/EnvelopeGenerator.GeneratorAPI/Program.cs @@ -21,9 +21,9 @@ builder.Services.AddCors(options => { builder.WithOrigins(allowedOrigins) .SetIsOriginAllowedToAllowWildcardSubdomains() - .AllowCredentials() .AllowAnyMethod() - .AllowAnyHeader(); + .AllowAnyHeader() + .AllowCredentials(); }); }); @@ -36,24 +36,17 @@ var connStr = config.GetConnectionString("Default") ?? throw new InvalidOperatio builder.Services.AddDbContext(options => options.UseSqlServer(connStr)); // Authentication -if (builder.Environment.IsDevelopment()) - builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme) - .AddCookie(options => - { - options.Cookie.HttpOnly = true; - options.LoginPath = "/api/auth/login"; - options.LogoutPath = "/api/auth/logout"; - }); -else - builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme) - .AddCookie(options => - { - options.Cookie.HttpOnly = true; // Makes the cookie inaccessible to client-side scripts for security - options.Cookie.SecurePolicy = CookieSecurePolicy.SameAsRequest; // Ensures cookies are sent over HTTPS only - options.Cookie.SameSite = SameSiteMode.Strict; // Protects against CSRF attacks by restricting how cookies are sent with requests from external sites - options.LoginPath = "/api/auth/login"; - options.LogoutPath = "/api/auth/logout"; - }); +builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme) +.AddCookie(options => +{ + options.Cookie.HttpOnly = true; // Makes the cookie inaccessible to client-side scripts for security + options.Cookie.SecurePolicy = CookieSecurePolicy.SameAsRequest; // Ensures cookies are sent over HTTPS only + options.Cookie.SameSite = SameSiteMode.Strict; // Protects against CSRF attacks by restricting how cookies are sent with requests from external sites + options.LoginPath = "/api/auth/login"; + options.LogoutPath = "/api/auth/logout"; + options.ExpireTimeSpan = TimeSpan.FromMinutes(60); + options.SlidingExpiration = true; +}); // User manager builder.Services.AddUserManager(); diff --git a/EnvelopeGenerator.Infrastructure/Contracts/IConfigRepository.cs b/EnvelopeGenerator.Infrastructure/Contracts/IConfigRepository.cs index 120b3096..e1e311a3 100644 --- a/EnvelopeGenerator.Infrastructure/Contracts/IConfigRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Contracts/IConfigRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Contracts.Infrastructure; +using DigitalData.Core.Abstractions.Infrastructure; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Infrastructure.Contracts diff --git a/EnvelopeGenerator.Infrastructure/Contracts/IDocumentReceiverElementRepository.cs b/EnvelopeGenerator.Infrastructure/Contracts/IDocumentReceiverElementRepository.cs index 8b0519a8..943f3d42 100644 --- a/EnvelopeGenerator.Infrastructure/Contracts/IDocumentReceiverElementRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Contracts/IDocumentReceiverElementRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Contracts.Infrastructure; +using DigitalData.Core.Abstractions.Infrastructure; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Infrastructure.Contracts diff --git a/EnvelopeGenerator.Infrastructure/Contracts/IDocumentStatusRepository.cs b/EnvelopeGenerator.Infrastructure/Contracts/IDocumentStatusRepository.cs index 606ebd29..a10a9d24 100644 --- a/EnvelopeGenerator.Infrastructure/Contracts/IDocumentStatusRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Contracts/IDocumentStatusRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Contracts.Infrastructure; +using DigitalData.Core.Abstractions.Infrastructure; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Infrastructure.Contracts diff --git a/EnvelopeGenerator.Infrastructure/Contracts/IEmailTemplateRepository.cs b/EnvelopeGenerator.Infrastructure/Contracts/IEmailTemplateRepository.cs index 91c7802d..b29f1ab1 100644 --- a/EnvelopeGenerator.Infrastructure/Contracts/IEmailTemplateRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Contracts/IEmailTemplateRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Contracts.Infrastructure; +using DigitalData.Core.Abstractions.Infrastructure; using EnvelopeGenerator.Domain.Entities; using static EnvelopeGenerator.Common.Constants; diff --git a/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeCertificateRepository.cs b/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeCertificateRepository.cs index 45e531f5..c6b94778 100644 --- a/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeCertificateRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeCertificateRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Contracts.Infrastructure; +using DigitalData.Core.Abstractions.Infrastructure; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Infrastructure.Contracts diff --git a/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeDocumentRepository.cs b/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeDocumentRepository.cs index a91b0098..f895146c 100644 --- a/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeDocumentRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeDocumentRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Contracts.Infrastructure; +using DigitalData.Core.Abstractions.Infrastructure; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Infrastructure.Contracts diff --git a/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeHistoryRepository.cs b/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeHistoryRepository.cs index 47109f1e..a473b176 100644 --- a/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeHistoryRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeHistoryRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Contracts.Infrastructure; +using DigitalData.Core.Abstractions.Infrastructure; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Infrastructure.Contracts diff --git a/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeReceiverRepository.cs b/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeReceiverRepository.cs index 4fe78b62..451dc3f0 100644 --- a/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeReceiverRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeReceiverRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Contracts.Infrastructure; +using DigitalData.Core.Abstractions.Infrastructure; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Infrastructure.Contracts diff --git a/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeRepository.cs b/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeRepository.cs index 9f027a45..d2d1377f 100644 --- a/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Contracts.Infrastructure; +using DigitalData.Core.Abstractions.Infrastructure; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Infrastructure.Contracts diff --git a/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeTypeRepository.cs b/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeTypeRepository.cs index 8a3dd1c7..32902364 100644 --- a/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeTypeRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeTypeRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Contracts.Infrastructure; +using DigitalData.Core.Abstractions.Infrastructure; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Infrastructure.Contracts diff --git a/EnvelopeGenerator.Infrastructure/Contracts/IReceiverRepository.cs b/EnvelopeGenerator.Infrastructure/Contracts/IReceiverRepository.cs index 4c5ec027..bde2bd04 100644 --- a/EnvelopeGenerator.Infrastructure/Contracts/IReceiverRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Contracts/IReceiverRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Contracts.Infrastructure; +using DigitalData.Core.Abstractions.Infrastructure; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Infrastructure.Contracts diff --git a/EnvelopeGenerator.Infrastructure/Contracts/IUserReceiverRepository.cs b/EnvelopeGenerator.Infrastructure/Contracts/IUserReceiverRepository.cs index ba9dce31..5c8fcfe7 100644 --- a/EnvelopeGenerator.Infrastructure/Contracts/IUserReceiverRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Contracts/IUserReceiverRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Contracts.Infrastructure; +using DigitalData.Core.Abstractions.Infrastructure; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Infrastructure.Contracts diff --git a/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj b/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj index d1ca8d73..59585657 100644 --- a/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj +++ b/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj @@ -7,6 +7,8 @@ + + all @@ -20,12 +22,6 @@ - - ..\..\WebCoreModules\DigitalData.Core.Infrastructure\bin\Debug\net7.0\DigitalData.Core.Contracts.dll - - - ..\..\WebCoreModules\DigitalData.Core.Infrastructure\bin\Debug\net7.0\DigitalData.Core.Infrastructure.dll - ..\..\EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.Application\bin\Debug\net7.0\DigitalData.EmailProfilerDispatcher.Domain.dll diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestConfigController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestConfigController.cs index a46a354e..ad7e0ec3 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestConfigController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestConfigController.cs @@ -1,8 +1,6 @@ -using DigitalData.Core.API; -using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.Contracts; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Infrastructure.Contracts; namespace EnvelopeGenerator.Web.Controllers.Test { diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestControllerBase.cs b/EnvelopeGenerator.Web/Controllers/Test/TestControllerBase.cs index 5bf18e6c..e39b0ed8 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestControllerBase.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestControllerBase.cs @@ -1,6 +1,5 @@ using DigitalData.Core.API; -using DigitalData.Core.Contracts.Application; -using DigitalData.Core.Contracts.Infrastructure; +using DigitalData.Core.Abstractions.Application; using Microsoft.AspNetCore.Mvc; namespace EnvelopeGenerator.Web.Controllers.Test diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestDocumentStatusController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestDocumentStatusController.cs index 77e549c8..7f00ebef 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestDocumentStatusController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestDocumentStatusController.cs @@ -1,8 +1,6 @@ -using DigitalData.Core.API; -using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.Contracts; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Infrastructure.Contracts; namespace EnvelopeGenerator.Web.Controllers.Test { diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs index 77311d2f..9577d504 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs @@ -2,9 +2,7 @@ using EnvelopeGenerator.Application.Contracts; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Infrastructure.Contracts; using Microsoft.AspNetCore.Mvc; -using System.Security.Cryptography; using static EnvelopeGenerator.Common.Constants; namespace EnvelopeGenerator.Web.Controllers.Test diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeCertificateController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeCertificateController.cs index 406b3659..8ae92c8e 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeCertificateController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeCertificateController.cs @@ -1,8 +1,6 @@ -using DigitalData.Core.API; -using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.Contracts; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Infrastructure.Contracts; namespace EnvelopeGenerator.Web.Controllers.Test { diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs index 6588f28b..acaecb9c 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs @@ -2,7 +2,6 @@ using EnvelopeGenerator.Application.Contracts; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Infrastructure.Contracts; using Microsoft.AspNetCore.Mvc; namespace EnvelopeGenerator.Web.Controllers.Test diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestReceiverController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestReceiverController.cs index e215e0c9..8b214c59 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestReceiverController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestReceiverController.cs @@ -1,8 +1,6 @@ -using DigitalData.Core.API; -using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.Contracts; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Infrastructure.Contracts; namespace EnvelopeGenerator.Web.Controllers.Test { diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestUserReceiverController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestUserReceiverController.cs index 597dcf88..1d0f0195 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestUserReceiverController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestUserReceiverController.cs @@ -1,8 +1,6 @@ -using DigitalData.Core.API; -using EnvelopeGenerator.Application.Contracts; +using EnvelopeGenerator.Application.Contracts; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Infrastructure.Contracts; namespace EnvelopeGenerator.Web.Controllers.Test { diff --git a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj index 322ad5eb..62fadd3c 100644 --- a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj +++ b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj @@ -12,6 +12,11 @@ + + + + + @@ -47,21 +52,6 @@ D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Data.v21.2.dll - - ..\..\WebCoreModules\DigitalData.Core.API\bin\Debug\net7.0\DigitalData.Core.API.dll - - - ..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.Application.dll - - - ..\..\WebCoreModules\DigitalData.Core.Contracts\bin\Debug\net7.0\DigitalData.Core.Contracts.dll - - - ..\..\WebCoreModules\DigitalData.Core.API\bin\Debug\net7.0\DigitalData.Core.DTO.dll - - - ..\..\WebCoreModules\DigitalData.Core.Infrastructure\bin\Debug\net7.0\DigitalData.Core.Infrastructure.dll - ..\..\EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.Application\bin\Debug\net7.0\DigitalData.EmailProfilerDispatcher.Application.dll diff --git a/EnvelopeGenerator.sln b/EnvelopeGenerator.sln index 3fca746c..650cab96 100644 --- a/EnvelopeGenerator.sln +++ b/EnvelopeGenerator.sln @@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnvelopeGenerator.Infrastru EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnvelopeGenerator.Application", "EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj", "{5A9984F8-51A2-4558-A415-EC5FEED7CF7D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.GeneratorAPI", "EnvelopeGenerator.GeneratorAPI\EnvelopeGenerator.GeneratorAPI.csproj", "{4FDAE4BA-F512-444A-9E18-111047D3EF02}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnvelopeGenerator.GeneratorAPI", "EnvelopeGenerator.GeneratorAPI\EnvelopeGenerator.GeneratorAPI.csproj", "{E5E12BA4-60C1-48BA-9053-0F8B62B38124}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -59,10 +59,10 @@ Global {5A9984F8-51A2-4558-A415-EC5FEED7CF7D}.Debug|Any CPU.Build.0 = Debug|Any CPU {5A9984F8-51A2-4558-A415-EC5FEED7CF7D}.Release|Any CPU.ActiveCfg = Release|Any CPU {5A9984F8-51A2-4558-A415-EC5FEED7CF7D}.Release|Any CPU.Build.0 = Release|Any CPU - {4FDAE4BA-F512-444A-9E18-111047D3EF02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4FDAE4BA-F512-444A-9E18-111047D3EF02}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4FDAE4BA-F512-444A-9E18-111047D3EF02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4FDAE4BA-F512-444A-9E18-111047D3EF02}.Release|Any CPU.Build.0 = Release|Any CPU + {E5E12BA4-60C1-48BA-9053-0F8B62B38124}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E5E12BA4-60C1-48BA-9053-0F8B62B38124}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E5E12BA4-60C1-48BA-9053-0F8B62B38124}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E5E12BA4-60C1-48BA-9053-0F8B62B38124}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE