Merge branch 'master' of http://git.dd:3000/AppStd/EnvelopeGenerator

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
 {

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
 {

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<DocumentStatusDto, DocumentStatus, int>

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

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
 {

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
 {

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;

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;

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;

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
 {

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
 {

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;

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -8,6 +8,10 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Application" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.DTO" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Infrastructure" Version="1.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.18" />
   </ItemGroup>
 
@@ -16,18 +20,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="DigitalData.Core.Application">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.Application.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.Contracts">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.Contracts.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.DTO">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.DTO.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.Infrastructure">
-      <HintPath>..\..\WebUserManager\DigitalData.UserManager.Application\bin\Debug\net7.0\DigitalData.Core.Infrastructure.dll</HintPath>
-    </Reference>
     <Reference Include="DigitalData.EmailProfilerDispatcher.Application">
       <HintPath>..\..\EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.Application\bin\Debug\net7.0\DigitalData.EmailProfilerDispatcher.Application.dll</HintPath>
     </Reference>

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
 {

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

EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurner.vb

@@ -15,6 +15,7 @@ Namespace Jobs.FinalizeDocument
 
         Private Const ANNOTATION_TYPE_IMAGE = "pspdfkit/image"
         Private Const ANNOTATION_TYPE_INK = "pspdfkit/ink"
+        Private Const ANNOTATION_TYPE_WIDGET = "pspdfkit/widget"
 
         Public Sub New(pLogConfig As LogConfig, pGDPictureLicenseKey As String)
             MyBase.New(pLogConfig)
@@ -77,6 +78,12 @@ Namespace Jobs.FinalizeDocument
                         Case ANNOTATION_TYPE_INK
                             AddInkAnnotation(oAnnotation)
 
+                        Case ANNOTATION_TYPE_WIDGET
+                            'Add form field values
+                            Dim formFieldValue = oAnnotationData.formFieldValues.FirstOrDefault(Function(fv) fv.name = oAnnotation.id)
+                            If formFieldValue IsNot Nothing Then
+                                AddFormFieldValue(oAnnotation, formFieldValue)
+                            End If
                     End Select
                 Next
 
@@ -137,6 +144,33 @@ Namespace Jobs.FinalizeDocument
 
         End Function
 
+        Private Function AddFormFieldValue(pAnnotation As Annotation, formFieldValue As FormFieldValue) As Boolean
+            Try
+                ' Convert pixels to Inches
+                Dim oBounds = pAnnotation.bbox.Select(AddressOf ToInches).ToList()
+
+                Dim oX = oBounds.Item(0)
+                Dim oY = oBounds.Item(1)
+                Dim oWidth = oBounds.Item(2)
+                Dim oHeight = oBounds.Item(3)
+
+                Manager.SelectPage(pAnnotation.pageIndex + 1)
+                ' Add the text annotation
+                Dim ant = Manager.AddTextAnnot(oX, oY, oWidth, oHeight, formFieldValue.value)
+
+                ' Set the font properties
+                ant.FontName = "Arial"
+                ant.FontSize = 8
+                ant.FontStyle = FontStyle.Italic
+                Manager.SaveAnnotationsToPage()
+                Return True
+            Catch ex As Exception
+                Logger.Warn("Could not add image annotation!")
+                Logger.Error(ex)
+                Return False
+            End Try
+        End Function
+
         Private Function ToPointF(pPoints As List(Of Single)) As PointF
             Dim oPoints = pPoints.Select(AddressOf ToInches).ToList()
             Return New PointF(oPoints.Item(0), oPoints.Item(1))
@@ -153,6 +187,7 @@ Namespace Jobs.FinalizeDocument
         Friend Class AnnotationData
             Public Property annotations As List(Of Annotation)
             Public Property attachments As Dictionary(Of String, Attachment)
+            Public Property formFieldValues As List(Of FormFieldValue)
         End Class
 
         Friend Class Annotation
@@ -174,5 +209,10 @@ Namespace Jobs.FinalizeDocument
             Public Property binary As String
             Public Property contentType As String
         End Class
+
+        Friend Class FormFieldValue
+            Public Property name As String
+            Public Property value As String
+        End Class
     End Class
 End Namespace

EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj

@@ -6,6 +6,13 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Application" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.DTO" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Infrastructure" Version="1.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\EnvelopeGenerator.Common\EnvelopeGenerator.Common.vbproj" />
   </ItemGroup>

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.routes.ts

@@ -1,8 +1,10 @@
-import { RouterModule, Routes } from '@angular/router';
+import { Routes } from '@angular/router';
-import {EnvelopeTableComponent} from '../app/components/envelope-table/envelope-table.component'
+import { EnvelopeTableComponent } from '../app/components/envelope-table/envelope-table.component'
-import {HomeComponent} from '../app/components/home/home.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] }
 ];

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.html

@@ -1 +1,12 @@
-<p>envelope-table works!</p>
+<gui-grid 
+[columns]="columns"
+[source]="source"
+[columnMenu]="columnMenu"
+[paging]="paging"
+[sorting]="sorting"
+[searching]="searching"
+[summaries]="summaries"
+[infoPanel]="infoPanel"
+[localization]="localization"
+>
+</gui-grid>

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){
+  columnMenu: GuiColumnMenu = {
-    erService.getEnvelopeReceiver().subscribe({
+    enabled: true,
-      next: (res) => {
+    sort: true,
-        console.log(res)
+    columnsManager: true
-      },
+  };
-      error: (error) => {
+
-        console.log(error)
+  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<any> = []
+
+  constructor(private erService: EnvelopeReceiverService) {
+    
   }
-}
+
+  ngOnInit() {
+    this.erService.getEnvelopeReceiver().subscribe({
+      next: res => this.source = res,
+      error: console.error
+    });
+  }
+
+  columns: Array<GuiColumn> = [
+    {
+      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'
+    }];
+}

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
+}

EnvelopeGenerator.GeneratorAPI/Controllers/AuthController.cs

@@ -1,14 +1,11 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
-using DigitalData.Core.DTO;
 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<AuthController> _logger;
         private readonly IUserService _userService;
         private readonly IDirectorySearchService _dirSearchService;
-        private readonly IStringLocalizer<Resource> _localizer;
 
-        public AuthController(ILogger<AuthController> logger, IUserService userService, IDirectorySearchService dirSearchService, IStringLocalizer<Resource> localizer)
+        public AuthController(ILogger<AuthController> 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

EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj

@@ -7,6 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.API" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Application" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.DTO" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Infrastructure" Version="1.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.15" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="System.DirectoryServices" Version="7.0.1" />
@@ -25,21 +30,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="DigitalData.Core.API">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.API\bin\Debug\net7.0\DigitalData.Core.API.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.Application">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.Application.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.Contracts">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.API\bin\Debug\net7.0\DigitalData.Core.Contracts.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.DTO">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.API\bin\Debug\net7.0\DigitalData.Core.DTO.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.Infrastructure">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Infrastructure\bin\Debug\net7.0\DigitalData.Core.Infrastructure.dll</HintPath>
-    </Reference>
     <Reference Include="DigitalData.UserManager.Application">
       <HintPath>..\..\WebUserManager\DigitalData.UserManager.Application\bin\Debug\net7.0\DigitalData.UserManager.Application.dll</HintPath>
     </Reference>

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<EGDbContext>(options => options.UseSqlServer(connStr));
 
 // Authentication
-if (builder.Environment.IsDevelopment())
+builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
-    builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
+.AddCookie(options =>
-        .AddCookie(options =>
+{
-        {
+    options.Cookie.HttpOnly = true;  // Makes the cookie inaccessible to client-side scripts for security
-            options.Cookie.HttpOnly = true;
+    options.Cookie.SecurePolicy = CookieSecurePolicy.SameAsRequest; // Ensures cookies are sent over HTTPS only
-            options.LoginPath = "/api/auth/login";
+    options.Cookie.SameSite = SameSiteMode.Strict; // Protects against CSRF attacks by restricting how cookies are sent with requests from external sites
-            options.LogoutPath = "/api/auth/logout";
+    options.LoginPath = "/api/auth/login";
-        });
+    options.LogoutPath = "/api/auth/logout";
-else
+    options.ExpireTimeSpan = TimeSpan.FromMinutes(60);
-    builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
+    options.SlidingExpiration = true;
-    .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";
-    });
 
 // User manager
 builder.Services.AddUserManager<EGDbContext>();

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

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

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

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;
 

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

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

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

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

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

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

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

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

EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj

@@ -7,6 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Infrastructure" Version="1.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
       <PrivateAssets>all</PrivateAssets>
@@ -20,12 +22,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="DigitalData.Core.Contracts">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Infrastructure\bin\Debug\net7.0\DigitalData.Core.Contracts.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.Infrastructure">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Infrastructure\bin\Debug\net7.0\DigitalData.Core.Infrastructure.dll</HintPath>
-    </Reference>
     <Reference Include="DigitalData.EmailProfilerDispatcher.Domain">
       <HintPath>..\..\EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.Application\bin\Debug\net7.0\DigitalData.EmailProfilerDispatcher.Domain.dll</HintPath>
     </Reference>

EnvelopeGenerator.Test/My Project/Application.Designer.vb

@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
+'     This code was generated by a tool.
-'     Laufzeitversion:4.0.30319.42000
+'     Runtime Version:4.0.30319.42000
 '
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     Changes to this file may cause incorrect behavior and will be lost if
-'     der Code erneut generiert wird.
+'     the code is regenerated.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
@@ -14,10 +14,10 @@ Option Explicit On
 
 Namespace My
     
-    'HINWEIS: Diese Datei wird automatisch generiert und darf nicht direkt bearbeitet werden.  Wenn Sie Änderungen vornehmen möchten
+    'NOTE: This file is auto-generated; do not modify it directly.  To make changes,
-    ' oder in dieser Datei Buildfehler auftreten, wechseln Sie zum Projekt-Designer.
+    ' or if you encounter build errors in this file, go to the Project Designer
-    ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im
+    ' (go to Project Properties or double-click the My Project node in
-    ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor.
+    ' Solution Explorer), and make changes on the Application tab.
     '
     Partial Friend Class MyApplication
         
@@ -32,7 +32,13 @@ Namespace My
         
         <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.EnvelopeGenerator.frmReportViewer
+            Me.MainForm = Global.EnvelopeGenerator.frmFinalizePDF
         End Sub
+        
+        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
+        Protected Overrides Function OnInitialize(ByVal commandLineArgs As System.Collections.ObjectModel.ReadOnlyCollection(Of String)) As Boolean
+            Me.MinimumSplashScreenDisplayTime = 0
+            Return MyBase.OnInitialize(commandLineArgs)
+        End Function
     End Class
 End Namespace

EnvelopeGenerator.Test/My Project/Application.myapp

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <MyApplicationData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MySubMain>true</MySubMain>
-  <MainForm>frmReportViewer</MainForm>
+  <MainForm>frmFinalizePDF</MainForm>
   <SingleInstance>false</SingleInstance>
   <ShutdownMode>0</ShutdownMode>
   <EnableVisualStyles>true</EnableVisualStyles>
   <AuthenticationMode>0</AuthenticationMode>
+  <MinimumSplashScreenDisplayTime>0</MinimumSplashScreenDisplayTime>
   <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
   <HighDpiMpde>false</HighDpiMpde>
 </MyApplicationData>

EnvelopeGenerator.Test/frmFinalizePDF.vb

@@ -14,18 +14,19 @@ Public Class frmFinalizePDF
     Private Viewer As GdViewer
     Private Manager As AnnotationManager
     Private PDFBurner As FinalizeDocument.PDFBurner
-
+    Private pGDPictureLicenseKey As String = "21182889975216572111813147150675976632"
 
     Private Sub frmFinalizePDF_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         LogConfig = New LogConfig(LogConfig.PathType.CustomPath, Application.StartupPath)
         Database = New MSSQLServer(LogConfig, MSSQLServer.DecryptConnectionString(CONNECTIONSTRING))
 
 
-        PDFBurner = New FinalizeDocument.PDFBurner(LogConfig, "PS231031-44053-15086")
+        PDFBurner = New FinalizeDocument.PDFBurner(LogConfig, pGDPictureLicenseKey)
 
+        Viewer = New GdViewer()
         Manager = New AnnotationManager()
         Dim oLicense = New LicenseManager()
-        oLicense.RegisterKEY("PS231031-44053-15086")
+        oLicense.RegisterKEY(pGDPictureLicenseKey)
     End Sub
 
     Private Function LoadAnnotationDataForReceiver() As String

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
 {

EnvelopeGenerator.Web/Controllers/Test/TestControllerBase.cs

@@ -1,6 +1,5 @@
 using DigitalData.Core.API;
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
-using DigitalData.Core.Contracts.Infrastructure;
 using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Web.Controllers.Test

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
 {

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

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
 {

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

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
 {

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
 {

EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj

@@ -12,6 +12,11 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.API" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Application" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.DTO" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Infrastructure" Version="1.0.0" />
     <PackageReference Include="HtmlSanitizer" Version="8.0.865" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
@@ -47,21 +52,6 @@
     <Reference Include="DevExpress.Data.v21.2">
       <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Data.v21.2.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Core.API">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.API\bin\Debug\net7.0\DigitalData.Core.API.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.Application">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.Application.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.Contracts">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Contracts\bin\Debug\net7.0\DigitalData.Core.Contracts.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.DTO">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.API\bin\Debug\net7.0\DigitalData.Core.DTO.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.Infrastructure">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Infrastructure\bin\Debug\net7.0\DigitalData.Core.Infrastructure.dll</HintPath>
-    </Reference>
     <Reference Include="DigitalData.EmailProfilerDispatcher.Application">
       <HintPath>..\..\EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.Application\bin\Debug\net7.0\DigitalData.EmailProfilerDispatcher.Application.dll</HintPath>
     </Reference>

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
+		{E5E12BA4-60C1-48BA-9053-0F8B62B38124}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FDAE4BA-F512-444A-9E18-111047D3EF02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5E12BA4-60C1-48BA-9053-0F8B62B38124}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4FDAE4BA-F512-444A-9E18-111047D3EF02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5E12BA4-60C1-48BA-9053-0F8B62B38124}.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}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE