From 106e62a9123a77394ee7a4825fef85ad54e07838 Mon Sep 17 00:00:00 2001 From: TekH Date: Mon, 22 Jun 2026 16:14:11 +0200 Subject: [PATCH] Refactor namespaces to EnvelopeGenerator.Server Renamed namespaces and related identifiers from EnvelopeGenerator.WebUI to EnvelopeGenerator.Server across the project. This change affects data models, services, controllers, and configuration files to ensure consistency with the new architecture. Updated @using directives in Razor components and other files to reflect the new namespace structure. Adjusted project references in EnvelopeGenerator.Server.csproj to point to the new EnvelopeGenerator.Server.Client project. Modified middleware and logging configurations to use the new EnvelopeGenerator.Server namespace, including changes in Program.cs and appsettings.json. Updated resource and file references to use the new EnvelopeGenerator.Server path, ensuring correct resource loading. Adjusted configuration options in Program.cs to use the new namespace for options classes, such as ApiOptions and PdfViewerOptions. Updated authentication scheme names and related constants to align with the new namespace structure. Revised comments and documentation to reflect the new namespace, ensuring clarity and consistency in the codebase. --- .../Data/Adjustment.cs | 2 +- .../Data/Customer.cs | 2 +- .../Data/DataItem.cs | 2 +- .../Data/DataItemList.cs | 2 +- .../Data/DeterministicRandom.cs | 2 +- .../Data/Term.cs | 2 +- .../Layout/MainLayout.razor | 2 +- .../Models/AnnotationDto.cs | 2 +- .../Models/Constants/SenderAppType.cs | 2 +- .../Models/Constants/UnitOfLength.cs | 2 +- .../Models/EnvelopeReceiverDto.cs | 2 +- .../Models/SignatureCaptureDto.cs | 2 +- .../Models/SignatureDto.cs | 4 ++-- .../Options/ApiOptions.cs | 2 +- .../Options/PdfViewerOptions.cs | 2 +- .../Pages/LoginReceiverPage.razor | 2 +- .../Pages/LoginSenderPage.razor | 2 +- .../PredefinedReports/Report.cs | 4 ++-- .../PredefinedReports/ReportsFactory.cs | 2 +- .../Program.cs | 10 ++++----- .../Services/AnnotationService.cs | 6 ++--- .../Services/AppVersionService.cs | 2 +- .../Services/AuthService.cs | 4 ++-- ...taSourceWizardJsonDataConnectionStorage.cs | 2 +- ...CustomJsonDataConnectionProviderFactory.cs | 2 +- .../Services/CustomReportProvider.cs | 4 ++-- .../Services/DocumentService.cs | 4 ++-- .../Services/EnvelopeReceiverService.cs | 6 ++--- .../Services/FontLoader.cs | 2 +- .../InMemoryReportStorageWebExtension.cs | 4 ++-- ...bjectDataSourceWizardCustomTypeProvider.cs | 2 +- .../Services/SignatureCacheService.cs | 6 ++--- .../Services/SignatureService.cs | 6 ++--- .../_Imports.razor | 8 +++---- .../EnvelopeGenerator.Server/AuthScheme.cs | 6 ++--- .../Components/App.razor | 2 +- .../Pages/EnvelopeReceiverPage.razor | 12 +++++----- .../EnvelopeReceiverPage_DxPdfViewer.razor | 2 +- .../EnvelopeReceiverPage_DxReportViewer.razor | 4 ++-- .../Pages/EnvelopeReceiverPage_embed.razor | 2 +- .../Components/_Imports.razor | 6 ++--- .../Controllers/AnnotationController.cs | 4 ++-- .../Controllers/AuthController.cs | 6 ++--- .../Controllers/CacheController.cs | 6 ++--- .../Controllers/ConfigController.cs | 4 ++-- .../Controllers/DocumentController.cs | 6 ++--- .../Controllers/EmailTemplateController.cs | 2 +- .../Controllers/EnvelopeController.cs | 4 ++-- .../Controllers/EnvelopeReceiverController.cs | 6 ++--- .../Controllers/HistoryController.cs | 2 +- .../Controllers/Interfaces/IAuthController.cs | 2 +- .../Controllers/LocalizationController.cs | 2 +- .../Controllers/ReadOnlyController.cs | 4 ++-- .../Controllers/SignatureController.cs | 4 ++-- .../Controllers/TfaRegistrationController.cs | 4 ++-- .../Documentation/AuthProxyDocumentFilter.cs | 4 ++-- .../EnvelopeGenerator.Server.csproj | 4 ++-- .../Extensions/ReceiverClaimExtensions.cs | 2 +- .../Extensions/SenderClaimExtensions.cs | 2 +- .../Middleware/ExceptionHandlingMiddleware.cs | 2 +- .../EnvelopeGenerator.Server/Models/Auth.cs | 2 +- .../Models/AuthTokenKeys.cs | 4 ++-- .../Models/ConnectionString.cs | 2 +- .../Models/ContactLink.cs | 2 +- .../Models/Culture.cs | 2 +- .../Models/Cultures.cs | 2 +- .../Models/CustomImages.cs | 2 +- .../Models/EnvelopeReceiverLogin.cs | 2 +- .../Models/ErrorViewModel.cs | 2 +- .../EnvelopeGenerator.Server/Models/Image.cs | 2 +- .../EnvelopeGenerator.Server/Models/Login.cs | 2 +- .../Models/MainViewModel.cs | 2 +- .../Models/PsPdfKitAnnotation/Annotation.cs | 4 ++-- .../PsPdfKitAnnotation/AnnotationParams.cs | 4 ++-- .../Models/PsPdfKitAnnotation/Background.cs | 2 +- .../Models/PsPdfKitAnnotation/Color.cs | 2 +- .../Models/PsPdfKitAnnotation/Extensions.cs | 2 +- .../Models/PsPdfKitAnnotation/IAnnotation.cs | 2 +- .../Models/TFARegParams.cs | 2 +- .../Options/CacheOptions.cs | 2 +- .../EnvelopeGenerator.Server/Program.cs | 22 +++++++++---------- .../EnvelopeGenerator.Server/appsettings.json | 2 +- 82 files changed, 142 insertions(+), 142 deletions(-) diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/Adjustment.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/Adjustment.cs index cf6354be..affe7385 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/Adjustment.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/Adjustment.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.WebUI.Client.Data { +namespace EnvelopeGenerator.Server.Client.Data { public class Adjustment { public static Adjustment CreateBalanceForward(DateTime dt, int random) diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/Customer.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/Customer.cs index 0b974fd0..d5199c91 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/Customer.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/Customer.cs @@ -1,7 +1,7 @@ using DevExpress.DataAccess.Sql; using DevExpress.DataAccess.Sql.DataApi; -namespace EnvelopeGenerator.WebUI.Client.Data { +namespace EnvelopeGenerator.Server.Client.Data { public class Customer { static List currentCustomers = new List(); diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/DataItem.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/DataItem.cs index 5961679a..04c57f9d 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/DataItem.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/DataItem.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.WebUI.Client.Data { +namespace EnvelopeGenerator.Server.Client.Data { public class DataItem { static readonly string[] accountType = new string[] { "Energy", "Manufacturing", "Estate", "Food", "Services" }; public string CustomerID { get; set; } diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/DataItemList.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/DataItemList.cs index c8ed814e..de62401b 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/DataItemList.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/DataItemList.cs @@ -1,6 +1,6 @@ using System.Collections; -namespace EnvelopeGenerator.WebUI.Client.Data { +namespace EnvelopeGenerator.Server.Client.Data { public class DataItemList : IList, IList { readonly int rowCount; diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/DeterministicRandom.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/DeterministicRandom.cs index b8485998..aa02a78c 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/DeterministicRandom.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/DeterministicRandom.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.WebUI.Client.Data { +namespace EnvelopeGenerator.Server.Client.Data { class DeterministicRandom { const int randomCount = 10000; static readonly int[] deterministicRandomNumbers; diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/Term.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/Term.cs index add90ab6..d3590ae2 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/Term.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Data/Term.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.WebUI.Client.Data { +namespace EnvelopeGenerator.Server.Client.Data { public struct Term { public static readonly Term[] Terms = new Term[] { new Term("Payment seven days after invoice date" ), diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Layout/MainLayout.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Layout/MainLayout.razor index 6473aa87..11582efb 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Layout/MainLayout.razor +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Layout/MainLayout.razor @@ -1,4 +1,4 @@ -@using EnvelopeGenerator.WebUI.Client.Services; +@using EnvelopeGenerator.Server.Client.Services; @inherits LayoutComponentBase
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/AnnotationDto.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/AnnotationDto.cs index 2a27a2ea..e87ad91f 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/AnnotationDto.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/AnnotationDto.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.WebUI.Client.Models; +namespace EnvelopeGenerator.Server.Client.Models; /// /// Represents a pre-assigned signature annotation position on a specific page. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/Constants/SenderAppType.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/Constants/SenderAppType.cs index 1a29b2e2..ae142bcf 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/Constants/SenderAppType.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/Constants/SenderAppType.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.WebUI.Client.Models.Constants +namespace EnvelopeGenerator.Server.Client.Models.Constants { public enum SenderAppType { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/Constants/UnitOfLength.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/Constants/UnitOfLength.cs index b27311af..4741db8e 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/Constants/UnitOfLength.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/Constants/UnitOfLength.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.WebUI.Client.Models.Constants; +namespace EnvelopeGenerator.Server.Client.Models.Constants; /// /// Represents the unit of measurement for coordinate values in signature positioning. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/EnvelopeReceiverDto.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/EnvelopeReceiverDto.cs index 88954e47..f99e8587 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/EnvelopeReceiverDto.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/EnvelopeReceiverDto.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.WebUI.Client.Models; +namespace EnvelopeGenerator.Server.Client.Models; /// /// Client-side model for the envelope receiver returned by diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/SignatureCaptureDto.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/SignatureCaptureDto.cs index 21977846..9a69f24f 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/SignatureCaptureDto.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/SignatureCaptureDto.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.WebUI.Client.Models; +namespace EnvelopeGenerator.Server.Client.Models; /// /// Represents a captured signature with metadata created by the receiver in the signature popup. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/SignatureDto.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/SignatureDto.cs index ce030e54..4713ab80 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/SignatureDto.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Models/SignatureDto.cs @@ -1,6 +1,6 @@ -using EnvelopeGenerator.WebUI.Client.Models.Constants; +using EnvelopeGenerator.Server.Client.Models.Constants; -namespace EnvelopeGenerator.WebUI.Client.Models; +namespace EnvelopeGenerator.Server.Client.Models; /// /// Represents a signature position on a PDF page. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Options/ApiOptions.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Options/ApiOptions.cs index bc472758..70d39969 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Options/ApiOptions.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Options/ApiOptions.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.WebUI.Client.Options; +namespace EnvelopeGenerator.Server.Client.Options; public class ApiOptions { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Options/PdfViewerOptions.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Options/PdfViewerOptions.cs index b4668314..9c1e2da7 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Options/PdfViewerOptions.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Options/PdfViewerOptions.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.WebUI.Client.Options; +namespace EnvelopeGenerator.Server.Client.Options; public class PdfViewerOptions { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/LoginReceiverPage.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/LoginReceiverPage.razor index 735d06ac..ff1abcee 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/LoginReceiverPage.razor +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/LoginReceiverPage.razor @@ -1,6 +1,6 @@ @page "/envelope/login/{EnvelopeKey}" @rendermode InteractiveWebAssembly -@using EnvelopeGenerator.WebUI.Client.Services +@using EnvelopeGenerator.Server.Client.Services @inject AuthService AuthService @inject NavigationManager Navigation diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/LoginSenderPage.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/LoginSenderPage.razor index 8c93d6b2..32d74e97 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/LoginSenderPage.razor +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/LoginSenderPage.razor @@ -1,6 +1,6 @@ @page "/sender/login" @rendermode InteractiveWebAssembly -@using EnvelopeGenerator.WebUI.Client.Services +@using EnvelopeGenerator.Server.Client.Services @inject AuthService AuthService @inject NavigationManager Navigation diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/PredefinedReports/Report.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/PredefinedReports/Report.cs index f47246c5..83333baa 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/PredefinedReports/Report.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/PredefinedReports/Report.cs @@ -1,5 +1,5 @@ using DevExpress.XtraReports.UI; -namespace EnvelopeGenerator.WebUI.Client.PredefinedReports { +namespace EnvelopeGenerator.Server.Client.PredefinedReports { public class Report : XtraReport { private TopMarginBand topMarginBand1; private XRPageInfo xrPageInfo4; @@ -1081,7 +1081,7 @@ namespace EnvelopeGenerator.WebUI.Client.PredefinedReports { objectConstructorInfo1.Parameters.AddRange(new DevExpress.DataAccess.ObjectBinding.Parameter[] { parameter1}); this.objectDataSource1.Constructor = objectConstructorInfo1; - this.objectDataSource1.DataSource = typeof(EnvelopeGenerator.WebUI.Client.Data.DataItemList); + this.objectDataSource1.DataSource = typeof(EnvelopeGenerator.Server.Client.Data.DataItemList); this.objectDataSource1.Name = "objectDataSource1"; // // Title diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/PredefinedReports/ReportsFactory.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/PredefinedReports/ReportsFactory.cs index 012609d0..8188a439 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/PredefinedReports/ReportsFactory.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/PredefinedReports/ReportsFactory.cs @@ -1,6 +1,6 @@ using DevExpress.XtraReports.UI; -namespace EnvelopeGenerator.WebUI.Client.PredefinedReports { +namespace EnvelopeGenerator.Server.Client.PredefinedReports { public static class ReportsFactory { public static readonly Dictionary> Reports = new() { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Program.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Program.cs index 496f0f1a..f256cf9c 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Program.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Program.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components.WebAssembly.Hosting; -using EnvelopeGenerator.WebUI.Client.Services; -using EnvelopeGenerator.WebUI.Client.Options; +using EnvelopeGenerator.Server.Client.Services; +using EnvelopeGenerator.Server.Client.Options; using DevExpress.Blazor.Reporting; using DevExpress.XtraReports.Web.Extensions; using DevExpress.DataAccess.Web; @@ -8,7 +8,7 @@ using DevExpress.XtraReports.Services; var builder = WebAssemblyHostBuilder.CreateDefault(args); -// HTTP Client (uses WebUI's YARP proxy) +// HTTP Client (uses Server's YARP proxy) builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) }); @@ -41,8 +41,8 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); -DevExpress.Utils.DeserializationSettings.RegisterTrustedClass(typeof(EnvelopeGenerator.WebUI.Client.Data.DataItemList)); -DevExpress.Utils.DeserializationSettings.RegisterTrustedClass(typeof(EnvelopeGenerator.WebUI.Client.PredefinedReports.Report)); +DevExpress.Utils.DeserializationSettings.RegisterTrustedClass(typeof(EnvelopeGenerator.Server.Client.Data.DataItemList)); +DevExpress.Utils.DeserializationSettings.RegisterTrustedClass(typeof(EnvelopeGenerator.Server.Client.PredefinedReports.Report)); builder.Services.AddSingleton(); builder.Services.AddSingleton(sp => sp.GetRequiredService()); diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/AnnotationService.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/AnnotationService.cs index ab6445ce..830b8206 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/AnnotationService.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/AnnotationService.cs @@ -1,10 +1,10 @@ using System.Net.Http.Json; using System.Text.Json; -using EnvelopeGenerator.WebUI.Client.Models; -using EnvelopeGenerator.WebUI.Client.Options; +using EnvelopeGenerator.Server.Client.Models; +using EnvelopeGenerator.Server.Client.Options; using Microsoft.Extensions.Options; -namespace EnvelopeGenerator.WebUI.Client.Services; +namespace EnvelopeGenerator.Server.Client.Services; /// /// Retrieves annotation positions from the API. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/AppVersionService.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/AppVersionService.cs index 7d18243d..b65f37a4 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/AppVersionService.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/AppVersionService.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.WebUI.Client.Services; +namespace EnvelopeGenerator.Server.Client.Services; /// /// Provides application version for cache busting static assets. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/AuthService.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/AuthService.cs index 6e1af9e6..562efcf8 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/AuthService.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/AuthService.cs @@ -1,9 +1,9 @@ using System.Net; using System.Net.Http.Json; -using EnvelopeGenerator.WebUI.Client.Options; +using EnvelopeGenerator.Server.Client.Options; using Microsoft.Extensions.Options; -namespace EnvelopeGenerator.WebUI.Client.Services; +namespace EnvelopeGenerator.Server.Client.Services; public enum EnvelopeLoginResult { Success, InvalidCode, NotFound, Error } diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CustomDataSourceWizardJsonDataConnectionStorage.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CustomDataSourceWizardJsonDataConnectionStorage.cs index bc4a08eb..306bf72a 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CustomDataSourceWizardJsonDataConnectionStorage.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CustomDataSourceWizardJsonDataConnectionStorage.cs @@ -2,7 +2,7 @@ using DevExpress.DataAccess.Web; using DevExpress.DataAccess.Wizard.Services; -namespace EnvelopeGenerator.WebUI.Client.Services; +namespace EnvelopeGenerator.Server.Client.Services; public class CustomDataSourceWizardJsonDataConnectionStorage : IDataSourceWizardJsonConnectionStorage { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CustomJsonDataConnectionProviderFactory.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CustomJsonDataConnectionProviderFactory.cs index 29666afa..1a2cda36 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CustomJsonDataConnectionProviderFactory.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CustomJsonDataConnectionProviderFactory.cs @@ -1,6 +1,6 @@ using DevExpress.DataAccess.Json; using DevExpress.DataAccess.Web; -namespace EnvelopeGenerator.WebUI.Client.Services; +namespace EnvelopeGenerator.Server.Client.Services; public class CustomJsonDataConnectionProviderFactory : IJsonDataConnectionProviderFactory { public IJsonDataConnectionProviderService Create() { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CustomReportProvider.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CustomReportProvider.cs index d26d0a20..39f3e74d 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CustomReportProvider.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/CustomReportProvider.cs @@ -1,8 +1,8 @@ using DevExpress.XtraReports.UI; using DevExpress.XtraReports.Services; -using EnvelopeGenerator.WebUI.Client.PredefinedReports; +using EnvelopeGenerator.Server.Client.PredefinedReports; -namespace EnvelopeGenerator.WebUI.Client.Services; +namespace EnvelopeGenerator.Server.Client.Services; public class CustomReportProvider : IReportProviderAsync { private readonly InMemoryReportStorageWebExtension reportStorage; diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/DocumentService.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/DocumentService.cs index b9cf4456..9a39c719 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/DocumentService.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/DocumentService.cs @@ -1,9 +1,9 @@ using System.Net; using System.Net.Http; using Microsoft.Extensions.Options; -using EnvelopeGenerator.WebUI.Client.Options; +using EnvelopeGenerator.Server.Client.Options; -namespace EnvelopeGenerator.WebUI.Client.Services; +namespace EnvelopeGenerator.Server.Client.Services; public class DocumentService(HttpClient http, IOptions apiOptions) { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/EnvelopeReceiverService.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/EnvelopeReceiverService.cs index 0abfc7a9..6383a4c5 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/EnvelopeReceiverService.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/EnvelopeReceiverService.cs @@ -1,11 +1,11 @@ using System.Net; using System.Net.Http.Json; using System.Text.Json; -using EnvelopeGenerator.WebUI.Client.Models; -using EnvelopeGenerator.WebUI.Client.Options; +using EnvelopeGenerator.Server.Client.Models; +using EnvelopeGenerator.Server.Client.Options; using Microsoft.Extensions.Options; -namespace EnvelopeGenerator.WebUI.Client.Services; +namespace EnvelopeGenerator.Server.Client.Services; /// /// Retrieves the for the authenticated receiver diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/FontLoader.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/FontLoader.cs index 32cb5bd2..8db77818 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/FontLoader.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/FontLoader.cs @@ -1,6 +1,6 @@ using DevExpress.Drawing; -namespace EnvelopeGenerator.WebUI.Client.Services; +namespace EnvelopeGenerator.Server.Client.Services; public static class FontLoader { public async static Task LoadFonts(HttpClient httpClient, List fontNames) { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/InMemoryReportStorageWebExtension.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/InMemoryReportStorageWebExtension.cs index c782432f..246da596 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/InMemoryReportStorageWebExtension.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/InMemoryReportStorageWebExtension.cs @@ -1,8 +1,8 @@ using DevExpress.XtraReports.UI; using DevExpress.XtraReports.Web.Extensions; -using EnvelopeGenerator.WebUI.Client.PredefinedReports; +using EnvelopeGenerator.Server.Client.PredefinedReports; -namespace EnvelopeGenerator.WebUI.Client.Services; +namespace EnvelopeGenerator.Server.Client.Services; public class InMemoryReportStorageWebExtension : ReportStorageWebExtension { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/ObjectDataSourceWizardCustomTypeProvider.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/ObjectDataSourceWizardCustomTypeProvider.cs index e4d67d00..fb83c9c3 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/ObjectDataSourceWizardCustomTypeProvider.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/ObjectDataSourceWizardCustomTypeProvider.cs @@ -1,6 +1,6 @@ using DevExpress.DataAccess.Web; -namespace EnvelopeGenerator.WebUI.Client.Services; +namespace EnvelopeGenerator.Server.Client.Services; public class ObjectDataSourceWizardCustomTypeProvider : IObjectDataSourceWizardTypeProvider { public IEnumerable GetAvailableTypes(string context) { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/SignatureCacheService.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/SignatureCacheService.cs index 1421ae9c..98f1284a 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/SignatureCacheService.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/SignatureCacheService.cs @@ -1,9 +1,9 @@ using System.Net.Http.Json; using Microsoft.Extensions.Options; -using EnvelopeGenerator.WebUI.Client.Options; -using EnvelopeGenerator.WebUI.Client.Models; +using EnvelopeGenerator.Server.Client.Options; +using EnvelopeGenerator.Server.Client.Models; -namespace EnvelopeGenerator.WebUI.Client.Services; +namespace EnvelopeGenerator.Server.Client.Services; /// /// Client service for managing cached signatures via API. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/SignatureService.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/SignatureService.cs index 0ee94bba..b87fb157 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/SignatureService.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/SignatureService.cs @@ -1,10 +1,10 @@ using System.Net.Http.Json; using System.Text.Json; -using EnvelopeGenerator.WebUI.Client.Models; -using EnvelopeGenerator.WebUI.Client.Options; +using EnvelopeGenerator.Server.Client.Models; +using EnvelopeGenerator.Server.Client.Options; using Microsoft.Extensions.Options; -namespace EnvelopeGenerator.WebUI.Client.Services; +namespace EnvelopeGenerator.Server.Client.Services; public class SignatureService(HttpClient http, IOptions apiOptions) { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/_Imports.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/_Imports.razor index 287f87f1..ed2136be 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/_Imports.razor +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/_Imports.razor @@ -7,10 +7,10 @@ @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.AspNetCore.Components.WebAssembly.Http @using Microsoft.JSInterop -@using EnvelopeGenerator.WebUI.Client -@using EnvelopeGenerator.WebUI.Client.Services -@using EnvelopeGenerator.WebUI.Client.Models -@using EnvelopeGenerator.WebUI.Client.Options +@using EnvelopeGenerator.Server.Client +@using EnvelopeGenerator.Server.Client.Services +@using EnvelopeGenerator.Server.Client.Models +@using EnvelopeGenerator.Server.Client.Options @using DevExpress.Blazor @using DevExpress.Blazor.PdfViewer @using DevExpress.Blazor.Reporting diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/AuthScheme.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/AuthScheme.cs index 84efbb5d..ecf1cf99 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/AuthScheme.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/AuthScheme.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.WebUI; +namespace EnvelopeGenerator.Server; /// /// Authentication scheme names for envelope generator. @@ -8,10 +8,10 @@ public static class AuthScheme /// /// Scheme name used for per-envelope receiver JWT authentication. /// - public const string Receiver = "EnvelopeGenerator.WebUI.ReceiverJWT"; + public const string Receiver = "EnvelopeGenerator.Server.ReceiverJWT"; /// /// Scheme name used for per-envelope sender JWT authentication. /// - public const string Sender = "EnvelopeGenerator.WebUI.SenderJWT"; + public const string Sender = "EnvelopeGenerator.Server.SenderJWT"; } diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/App.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/App.razor index 9136b0e1..fd5f981b 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/App.razor +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/App.razor @@ -8,7 +8,7 @@ - + diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeReceiverPage.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeReceiverPage.razor index 310764bf..3e3cfb87 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeReceiverPage.razor +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeReceiverPage.razor @@ -1,10 +1,10 @@ @page "/envelope/{EnvelopeKey}" @rendermode InteractiveServer -@using EnvelopeGenerator.WebUI.Client.Models -@using EnvelopeGenerator.WebUI.Client.Models.Constants -@using EnvelopeGenerator.WebUI.Client.Services +@using EnvelopeGenerator.Server.Client.Models +@using EnvelopeGenerator.Server.Client.Models.Constants +@using EnvelopeGenerator.Server.Client.Services @using Microsoft.Extensions.Options -@using EnvelopeGenerator.WebUI.Client.Options +@using EnvelopeGenerator.Server.Client.Options @using Microsoft.JSInterop @using DevExpress.Blazor @inject DocumentService DocumentService @@ -14,8 +14,8 @@ @inject IJSRuntime JSRuntime @inject SignatureService SignatureService @inject SignatureCacheService SignatureCacheService -@inject EnvelopeGenerator.WebUI.Client.Services.AuthService AuthService -@inject EnvelopeGenerator.WebUI.Client.Services.EnvelopeReceiverService EnvelopeReceiverService +@inject EnvelopeGenerator.Server.Client.Services.AuthService AuthService +@inject EnvelopeGenerator.Server.Client.Services.EnvelopeReceiverService EnvelopeReceiverService @inject AppVersionService AppVersion @inject ILogger logger @implements IAsyncDisposable diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeReceiverPage_DxPdfViewer.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeReceiverPage_DxPdfViewer.razor index 3904eedb..5070e918 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeReceiverPage_DxPdfViewer.razor +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeReceiverPage_DxPdfViewer.razor @@ -91,7 +91,7 @@ else protected override void OnInitialized() { Assembly assembly = Assembly.GetExecutingAssembly(); - Stream stream = assembly.GetManifestResourceStream("EnvelopeGenerator.WebUI.Resources.Invoice.pdf"); + Stream stream = assembly.GetManifestResourceStream("EnvelopeGenerator.Server.Resources.Invoice.pdf"); if (stream != null) { using (stream) diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeReceiverPage_DxReportViewer.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeReceiverPage_DxReportViewer.razor index bc145b52..1eb5d9ab 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeReceiverPage_DxReportViewer.razor +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeReceiverPage_DxReportViewer.razor @@ -3,8 +3,8 @@ @using XtraReport = DevExpress.XtraReports.UI.XtraReport @using DevExpress.Blazor.Reporting @using Microsoft.Extensions.Options -@using EnvelopeGenerator.WebUI.Client.Options -@using EnvelopeGenerator.WebUI.Client.Services +@using EnvelopeGenerator.Server.Client.Options +@using EnvelopeGenerator.Server.Client.Services @inject InMemoryReportStorageWebExtension ReportStorage @inject DocumentService DocumentService @inject IOptions AppOptions diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeReceiverPage_embed.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeReceiverPage_embed.razor index 36659b56..e5d61ee3 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeReceiverPage_embed.razor +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeReceiverPage_embed.razor @@ -92,7 +92,7 @@ else protected override void OnInitialized() { Assembly assembly = Assembly.GetExecutingAssembly(); - Stream stream = assembly.GetManifestResourceStream("EnvelopeGenerator.WebUI.Resources.Invoice.pdf"); + Stream stream = assembly.GetManifestResourceStream("EnvelopeGenerator.Server.Resources.Invoice.pdf"); if (stream != null) { using (stream) diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/_Imports.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/_Imports.razor index 185f4e28..f494bffa 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/_Imports.razor +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/_Imports.razor @@ -6,7 +6,7 @@ @using static Microsoft.AspNetCore.Components.Web.RenderMode @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop -@using EnvelopeGenerator.WebUI -@using EnvelopeGenerator.WebUI.Client -@using EnvelopeGenerator.WebUI.Components +@using EnvelopeGenerator.Server +@using EnvelopeGenerator.Server.Client +@using EnvelopeGenerator.Server.Components @using DevExpress.Blazor diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/AnnotationController.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/AnnotationController.cs index e0698b84..4847945b 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/AnnotationController.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/AnnotationController.cs @@ -1,6 +1,6 @@ using DigitalData.Core.Abstraction.Application.DTO; using DigitalData.Core.Exceptions; -using EnvelopeGenerator.API.Extensions; +using EnvelopeGenerator.Server.Extensions; using EnvelopeGenerator.Application.Common.Dto; using EnvelopeGenerator.Application.Common.Extensions; using EnvelopeGenerator.Application.Common.Interfaces.Services; @@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace EnvelopeGenerator.API.Controllers; +namespace EnvelopeGenerator.Server.Controllers; /// /// Manages annotations and signature lifecycle for envelopes. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/AuthController.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/AuthController.cs index 6a3500c9..a45e9899 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/AuthController.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/AuthController.cs @@ -1,6 +1,6 @@ using DigitalData.Auth.Claims; -using EnvelopeGenerator.API.Controllers.Interfaces; -using EnvelopeGenerator.API.Models; +using EnvelopeGenerator.Server.Controllers.Interfaces; +using EnvelopeGenerator.Server.Models; using EnvelopeGenerator.Domain.Constants; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; -namespace EnvelopeGenerator.API.Controllers; +namespace EnvelopeGenerator.Server.Controllers; /// /// Controller verantwortlich für die Benutzer-Authentifizierung, einschließlich Anmelden, Abmelden und Überprüfung des Authentifizierungsstatus. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/CacheController.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/CacheController.cs index 8379d4eb..0c8d0bc0 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/CacheController.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/CacheController.cs @@ -3,11 +3,11 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Options; using System.Text.Json; -using EnvelopeGenerator.API.Options; +using EnvelopeGenerator.Server.Options; using EnvelopeGenerator.Domain.Constants; -using EnvelopeGenerator.API.Extensions; +using EnvelopeGenerator.Server.Extensions; -namespace EnvelopeGenerator.API.Controllers; +namespace EnvelopeGenerator.Server.Controllers; /// /// Manages cached data for receivers using distributed cache. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/ConfigController.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/ConfigController.cs index 81aa23c0..17cf331d 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/ConfigController.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/ConfigController.cs @@ -1,9 +1,9 @@ -using EnvelopeGenerator.API.Models.PsPdfKitAnnotation; +using EnvelopeGenerator.Server.Models.PsPdfKitAnnotation; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; -namespace EnvelopeGenerator.API.Controllers; +namespace EnvelopeGenerator.Server.Controllers; /// /// Exposes configuration data required by the client applications. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/DocumentController.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/DocumentController.cs index f8468f81..01d476b3 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/DocumentController.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/DocumentController.cs @@ -1,13 +1,13 @@ using DigitalData.Auth.Claims; -using EnvelopeGenerator.API.Controllers.Interfaces; -using EnvelopeGenerator.API.Extensions; +using EnvelopeGenerator.Server.Controllers.Interfaces; +using EnvelopeGenerator.Server.Extensions; using EnvelopeGenerator.Application.Documents.Queries; using EnvelopeGenerator.Domain.Constants; using MediatR; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace EnvelopeGenerator.API.Controllers; +namespace EnvelopeGenerator.Server.Controllers; /// /// Provides access to envelope documents for authenticated receivers. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EmailTemplateController.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EmailTemplateController.cs index be670e42..78bd42ac 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EmailTemplateController.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EmailTemplateController.cs @@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore; using EnvelopeGenerator.Domain.Constants; using EnvelopeGenerator.Application.EmailTemplates.Queries; -namespace EnvelopeGenerator.API.Controllers; +namespace EnvelopeGenerator.Server.Controllers; /// /// Controller for managing temp templates. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeController.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeController.cs index c1bb54d2..a67d5f38 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeController.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeController.cs @@ -1,4 +1,4 @@ -using EnvelopeGenerator.API.Extensions; +using EnvelopeGenerator.Server.Extensions; using EnvelopeGenerator.Application.Envelopes.Commands; using EnvelopeGenerator.Application.Envelopes.Queries; using MediatR; @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; -namespace EnvelopeGenerator.API.Controllers; +namespace EnvelopeGenerator.Server.Controllers; /// /// Dieser Controller stellt Endpunkte für die Verwaltung von Umschlägen bereit. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeReceiverController.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeReceiverController.cs index 80472540..76e53604 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeReceiverController.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeReceiverController.cs @@ -3,7 +3,7 @@ using EnvelopeGenerator.Application.EnvelopeReceivers.Commands; using EnvelopeGenerator.Application.EnvelopeReceivers.Queries; using EnvelopeGenerator.Application.Envelopes.Queries; using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.API.Models; +using EnvelopeGenerator.Server.Models; using MediatR; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -13,10 +13,10 @@ using System.Data; using EnvelopeGenerator.Application.Common.SQL; using EnvelopeGenerator.Application.Common.Dto.Receiver; using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor; -using EnvelopeGenerator.API.Extensions; +using EnvelopeGenerator.Server.Extensions; using EnvelopeGenerator.Domain.Constants; -namespace EnvelopeGenerator.API.Controllers; +namespace EnvelopeGenerator.Server.Controllers; /// /// Controller für die Verwaltung von Umschlagempfängern. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/HistoryController.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/HistoryController.cs index 16418fa3..9d70a5c6 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/HistoryController.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/HistoryController.cs @@ -6,7 +6,7 @@ using EnvelopeGenerator.Application.Histories.Queries; using EnvelopeGenerator.Domain.Constants; using EnvelopeGenerator.Application.Common.Extensions; -namespace EnvelopeGenerator.API.Controllers; +namespace EnvelopeGenerator.Server.Controllers; /// /// Dieser Controller stellt Endpunkte für den Zugriff auf die Umschlaghistorie bereit. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/Interfaces/IAuthController.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/Interfaces/IAuthController.cs index cf31d972..92ac56ca 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/Interfaces/IAuthController.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/Interfaces/IAuthController.cs @@ -1,7 +1,7 @@ using System.Security.Claims; using Microsoft.AspNetCore.Authorization; -namespace EnvelopeGenerator.API.Controllers.Interfaces; +namespace EnvelopeGenerator.Server.Controllers.Interfaces; /// /// diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/LocalizationController.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/LocalizationController.cs index e2e02de2..6aa622c4 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/LocalizationController.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/LocalizationController.cs @@ -6,7 +6,7 @@ using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Localization; using EnvelopeGenerator.Application.Resources; -namespace EnvelopeGenerator.API.Controllers; +namespace EnvelopeGenerator.Server.Controllers; /// /// Controller für die Verwaltung der Lokalisierung und Spracheinstellungen. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/ReadOnlyController.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/ReadOnlyController.cs index db800c22..b00f17de 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/ReadOnlyController.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/ReadOnlyController.cs @@ -2,12 +2,12 @@ using DigitalData.Core.Abstraction.Application.DTO; using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly; using EnvelopeGenerator.Application.Common.Interfaces.Services; using EnvelopeGenerator.Domain.Constants; -using EnvelopeGenerator.API.Extensions; +using EnvelopeGenerator.Server.Extensions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; -namespace EnvelopeGenerator.API.Controllers; +namespace EnvelopeGenerator.Server.Controllers; /// /// Manages read-only envelope sharing flows. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/SignatureController.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/SignatureController.cs index bd3ff352..2c951983 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/SignatureController.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/SignatureController.cs @@ -1,4 +1,4 @@ -using EnvelopeGenerator.API.Extensions; +using EnvelopeGenerator.Server.Extensions; using EnvelopeGenerator.Application.Common.Dto; using EnvelopeGenerator.Application.Common.Extensions; using EnvelopeGenerator.Application.Documents.Queries; @@ -7,7 +7,7 @@ using MediatR; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace EnvelopeGenerator.API.Controllers; +namespace EnvelopeGenerator.Server.Controllers; /// /// diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/TfaRegistrationController.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/TfaRegistrationController.cs index f365c0df..0e3a8f80 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/TfaRegistrationController.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/TfaRegistrationController.cs @@ -3,7 +3,7 @@ using EnvelopeGenerator.Application.Common.Extensions; using EnvelopeGenerator.Application.Common.Interfaces.Services; using EnvelopeGenerator.Application.Resources; using EnvelopeGenerator.Domain.Constants; -using EnvelopeGenerator.API.Models; +using EnvelopeGenerator.Server.Models; using Ganss.Xss; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Options; -namespace EnvelopeGenerator.API.Controllers; +namespace EnvelopeGenerator.Server.Controllers; /// /// Exposes endpoints for registering and managing two-factor authentication for envelope receivers. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Documentation/AuthProxyDocumentFilter.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Documentation/AuthProxyDocumentFilter.cs index 8cb9c6c0..27ba9374 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Documentation/AuthProxyDocumentFilter.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Documentation/AuthProxyDocumentFilter.cs @@ -1,9 +1,9 @@ -using EnvelopeGenerator.API.Models; +using EnvelopeGenerator.Server.Models; using Microsoft.OpenApi.Any; using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerGen; -namespace EnvelopeGenerator.API.Documentation; +namespace EnvelopeGenerator.Server.Documentation; /// /// diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/EnvelopeGenerator.Server.csproj b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/EnvelopeGenerator.Server.csproj index b05029cf..62f114a9 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/EnvelopeGenerator.Server.csproj +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/EnvelopeGenerator.Server.csproj @@ -7,7 +7,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Extensions/ReceiverClaimExtensions.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Extensions/ReceiverClaimExtensions.cs index d851c1de..cc2611ab 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Extensions/ReceiverClaimExtensions.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Extensions/ReceiverClaimExtensions.cs @@ -2,7 +2,7 @@ using DigitalData.Auth.Claims; using Microsoft.IdentityModel.JsonWebTokens; using System.Security.Claims; -namespace EnvelopeGenerator.API.Extensions; +namespace EnvelopeGenerator.Server.Extensions; /// /// Provides helper methods for working with envelope-specific authentication claims. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Extensions/SenderClaimExtensions.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Extensions/SenderClaimExtensions.cs index 262968ed..44829fbe 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Extensions/SenderClaimExtensions.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Extensions/SenderClaimExtensions.cs @@ -1,6 +1,6 @@ using System.Security.Claims; -namespace EnvelopeGenerator.API.Extensions +namespace EnvelopeGenerator.Server.Extensions { /// /// Provides extension methods for extracting user information from a . diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Middleware/ExceptionHandlingMiddleware.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Middleware/ExceptionHandlingMiddleware.cs index 807d240e..8f4b252c 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Middleware/ExceptionHandlingMiddleware.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Middleware/ExceptionHandlingMiddleware.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.WebUI.Middleware; +namespace EnvelopeGenerator.Server.Middleware; using DigitalData.Core.Exceptions; using Microsoft.AspNetCore.Http; diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Auth.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Auth.cs index f08b6c95..40f48349 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Auth.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Auth.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.API.Models; +namespace EnvelopeGenerator.Server.Models; public record Auth(string? AccessCode = null, string? SmsCode = null, string? AuthenticatorCode = null, bool UserSelectSMS = default) { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/AuthTokenKeys.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/AuthTokenKeys.cs index 0d296df7..c62008dc 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/AuthTokenKeys.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/AuthTokenKeys.cs @@ -1,8 +1,8 @@ -namespace EnvelopeGenerator.WebUI.Models; +namespace EnvelopeGenerator.Server.Models; /// /// Represents the keys and default values used for authentication token handling -/// within the Envelope Generator WebUI. +/// within the Envelope Generator Server. /// public class AuthTokenKeys { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/ConnectionString.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/ConnectionString.cs index 553360fd..8d65b047 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/ConnectionString.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/ConnectionString.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.WebUI.Models; +namespace EnvelopeGenerator.Server.Models; /// /// Represents the database connection string for dependency injection. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/ContactLink.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/ContactLink.cs index 691dbc83..619e3ce4 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/ContactLink.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/ContactLink.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.API.Models +namespace EnvelopeGenerator.Server.Models { /// /// Represents a hyperlink for contact purposes with various HTML attributes. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Culture.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Culture.cs index b1386088..4ded33c6 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Culture.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Culture.cs @@ -1,6 +1,6 @@ using System.Globalization; -namespace EnvelopeGenerator.API.Models; +namespace EnvelopeGenerator.Server.Models; public class Culture { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Cultures.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Cultures.cs index 7b293c13..cf5653fd 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Cultures.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Cultures.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.API.Models; +namespace EnvelopeGenerator.Server.Models; public class Cultures : List { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/CustomImages.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/CustomImages.cs index fd212acd..862edf8d 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/CustomImages.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/CustomImages.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.API.Models; +namespace EnvelopeGenerator.Server.Models; public class CustomImages : Dictionary { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/EnvelopeReceiverLogin.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/EnvelopeReceiverLogin.cs index fa53ec61..5455b119 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/EnvelopeReceiverLogin.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/EnvelopeReceiverLogin.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.API.Models; +namespace EnvelopeGenerator.Server.Models; /// /// Request body for the envelope-receiver login endpoint. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/ErrorViewModel.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/ErrorViewModel.cs index b09ffded..a2aaaad9 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/ErrorViewModel.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/ErrorViewModel.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.API.Models; +namespace EnvelopeGenerator.Server.Models; public class ErrorViewModel { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Image.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Image.cs index d7abd148..d2e7233b 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Image.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Image.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.API.Models; +namespace EnvelopeGenerator.Server.Models; public class Image { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Login.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Login.cs index 926b1811..388593db 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Login.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/Login.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace EnvelopeGenerator.API.Models; +namespace EnvelopeGenerator.Server.Models; /// /// Repräsentiert ein Login-Modell mit erforderlichem Passwort und optionaler ID und Benutzername. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/MainViewModel.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/MainViewModel.cs index d49d323b..f2fd4748 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/MainViewModel.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/MainViewModel.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.API.Models; +namespace EnvelopeGenerator.Server.Models; public class MainViewModel { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/Annotation.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/Annotation.cs index 5dbb1aed..9b5bd7c7 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/Annotation.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/Annotation.cs @@ -1,7 +1,7 @@ -using EnvelopeGenerator.API.Models.PsPdfKitAnnotation; +using EnvelopeGenerator.Server.Models.PsPdfKitAnnotation; using System.Text.Json.Serialization; -namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation; +namespace EnvelopeGenerator.Server.Models.PsPdfKitAnnotation; public record Annotation : IAnnotation { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/AnnotationParams.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/AnnotationParams.cs index 019d872e..4b9c8114 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/AnnotationParams.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/AnnotationParams.cs @@ -1,7 +1,7 @@ -using EnvelopeGenerator.API.Models.PsPdfKitAnnotation; +using EnvelopeGenerator.Server.Models.PsPdfKitAnnotation; using System.Text.Json.Serialization; -namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation; +namespace EnvelopeGenerator.Server.Models.PsPdfKitAnnotation; public class AnnotationParams { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/Background.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/Background.cs index 19298196..6990d239 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/Background.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/Background.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation; +namespace EnvelopeGenerator.Server.Models.PsPdfKitAnnotation; /// /// The Background is an annotation for the PSPDF Kit. However, it has no function. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/Color.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/Color.cs index 0d3d4056..0dec55e5 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/Color.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/Color.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation; +namespace EnvelopeGenerator.Server.Models.PsPdfKitAnnotation; public record Color { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/Extensions.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/Extensions.cs index 1cc508fd..f0c68d1d 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/Extensions.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/Extensions.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation; +namespace EnvelopeGenerator.Server.Models.PsPdfKitAnnotation; public static class Extensions { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/IAnnotation.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/IAnnotation.cs index 735bf573..940f729a 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/IAnnotation.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/PsPdfKitAnnotation/IAnnotation.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation; +namespace EnvelopeGenerator.Server.Models.PsPdfKitAnnotation; public interface IAnnotation { diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/TFARegParams.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/TFARegParams.cs index ff363fdf..3b3ca77f 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/TFARegParams.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Models/TFARegParams.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.API.Models; +namespace EnvelopeGenerator.Server.Models; /// /// Represents the parameters for two-factor authentication (2FA) registration. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Options/CacheOptions.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Options/CacheOptions.cs index a5ebb277..530e555a 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Options/CacheOptions.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Options/CacheOptions.cs @@ -1,4 +1,4 @@ -namespace EnvelopeGenerator.WebUI.Options; +namespace EnvelopeGenerator.Server.Options; /// /// Configuration options for distributed caching. diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Program.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Program.cs index 331ee357..85eb17e9 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Program.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Program.cs @@ -1,8 +1,8 @@ -using EnvelopeGenerator.WebUI.Components; -using EnvelopeGenerator.WebUI.Models; -using EnvelopeGenerator.WebUI.Options; +using EnvelopeGenerator.Server.Components; +using EnvelopeGenerator.Server.Models; +using EnvelopeGenerator.Server.Options; using DevExpress.Blazor; -using EnvelopeGenerator.WebUI.Client.Services; +using EnvelopeGenerator.Server.Client.Services; using DigitalData.Core.API; using DigitalData.Core.Application; using EnvelopeGenerator.Infrastructure; @@ -23,10 +23,10 @@ using DigitalData.Core.Abstractions.Security.Extensions; using NLog.Web; using NLog; using DigitalData.Auth.Claims; -using EnvelopeGenerator.WebUI; +using EnvelopeGenerator.Server; var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger(); -logger.Info("EnvelopeGenerator.WebUI logging initialized!"); +logger.Info("EnvelopeGenerator.Server logging initialized!"); try { @@ -304,7 +304,7 @@ try return httpClient; }); - // Business Services (WebUI specific) + // Business Services (Server specific) builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); @@ -318,9 +318,9 @@ try builder.Services.AddDevExpressServerSideBlazorPdfViewer(); // Configuration Options - builder.Services.Configure( + builder.Services.Configure( builder.Configuration.GetSection("ApiOptions")); - builder.Services.Configure( + builder.Services.Configure( builder.Configuration.GetSection("PdfViewerOptions")); var app = builder.Build(); @@ -328,7 +328,7 @@ try deferredProvider.Factory = () => app.Services; // Exception handling middleware for API controllers - app.UseMiddleware(); + app.UseMiddleware(); // Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) @@ -375,7 +375,7 @@ try app.MapRazorComponents() .AddInteractiveServerRenderMode() .AddInteractiveWebAssemblyRenderMode() - .AddAdditionalAssemblies(typeof(EnvelopeGenerator.WebUI.Client._Imports).Assembly); + .AddAdditionalAssemblies(typeof(EnvelopeGenerator.Server.Client._Imports).Assembly); app.Run(); } diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/appsettings.json b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/appsettings.json index 4878e2c7..e763a015 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/appsettings.json +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/appsettings.json @@ -70,7 +70,7 @@ "throwConfigExceptions": true, "variables": { "logDirectory": "E:\\LogFiles\\Digital Data\\signFlow", - "logFileNamePrefix": "${shortdate}-ECM.EnvelopeGenerator.WebUI" + "logFileNamePrefix": "${shortdate}-ECM.EnvelopeGenerator.Server" }, "targets": { "infoLogs": {