diff --git a/DEPENDENCIES b/DEPENDENCIES index a86a2707..f15f396b 100755 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -4,22 +4,20 @@ nuget/nuget/-/Castle.Core/5.1.1, Apache-2.0, approved, #13966 nuget/nuget/-/EFCore.NamingConventions/8.0.3, Apache-2.0, approved, #13983 nuget/nuget/-/FakeItEasy/8.3.0, MIT, approved, #16328 nuget/nuget/-/Fare/2.1.1, MIT, approved, clearlydefined -nuget/nuget/-/FluentAssertions/6.12.1, MIT AND Apache-2.0 AND BSD-3-Clause AND CC-BY-3.0-US AND (GPL-2.0-only OR MIT) AND OFL-1.1 AND WTFPL, approved, #13976 -nuget/nuget/-/Flurl.Signed/3.0.6, MIT, approved, #3501 +nuget/nuget/-/FluentAssertions/6.12.2, MIT AND Apache-2.0 AND BSD-3-Clause AND CC-BY-3.0-US AND (GPL-2.0-only OR MIT) AND OFL-1.1 AND WTFPL, approved, #13976 nuget/nuget/-/Humanizer.Core/2.14.1, MIT, approved, #10060 nuget/nuget/-/Json.More.Net/2.0.1.2, MIT AND OFL-1.1 AND CC-BY-SA-4.0, approved, #15173 nuget/nuget/-/JsonPointer.Net/5.0.0, MIT AND OFL-1.1 AND CC-BY-SA-4.0, approved, #15172 -nuget/nuget/-/JsonSchema.Net/7.0.2, MIT AND OFL-1.1 AND CC-BY-SA-4.0, approved, #15171 -nuget/nuget/-/Laraue.EfCoreTriggers.Common/8.1.1, MIT, approved, #16234 -nuget/nuget/-/Laraue.EfCoreTriggers.PostgreSql/8.1.1, MIT, approved, #16240 +nuget/nuget/-/JsonSchema.Net/7.2.3, MIT AND CC-BY-SA-4.0 AND OFL-1.1, approved, #16329 +nuget/nuget/-/Laraue.EfCoreTriggers.Common/8.1.2, MIT, approved, #16234 +nuget/nuget/-/Laraue.EfCoreTriggers.PostgreSql/8.1.2, MIT, approved, #16240 nuget/nuget/-/Mono.TextTemplating/2.2.1, MIT, approved, #15073 nuget/nuget/-/Newtonsoft.Json/13.0.1, MIT AND BSD-3-Clause, approved, #3266 -nuget/nuget/-/Newtonsoft.Json/13.0.3, MIT AND BSD-3-Clause, approved, #3266 nuget/nuget/-/Npgsql.EntityFrameworkCore.PostgreSQL/8.0.10, PostgreSQL AND MIT, approved, #13972 nuget/nuget/-/Npgsql/8.0.5, PostgreSQL, approved, #13963 nuget/nuget/-/PasswordGenerator/2.1.0, MIT, approved, #3192 nuget/nuget/-/SSH.NET/2023.0.0, MIT AND (MIT AND MS-PL) AND ISC, approved, #13965 -nuget/nuget/-/Serilog.AspNetCore/8.0.1, Apache-2.0 AND MIT, approved, #13967 +nuget/nuget/-/Serilog.AspNetCore/8.0.3, Apache-2.0 AND MIT, approved, #13967 nuget/nuget/-/Serilog.Enrichers.CorrelationId/3.0.1, MIT, approved, clearlydefined nuget/nuget/-/Serilog.Enrichers.Environment/2.3.0, Apache-2.0, approved, #13959 nuget/nuget/-/Serilog.Enrichers.Process/2.0.2, Apache-2.0, approved, clearlydefined @@ -28,25 +26,25 @@ nuget/nuget/-/Serilog.Enrichers.Thread/3.1.0, Apache-2.0, approved, clearlydefin nuget/nuget/-/Serilog.Extensions.Hosting/8.0.0, Apache-2.0, approved, #13962 nuget/nuget/-/Serilog.Extensions.Logging/8.0.0, Apache-2.0, approved, #13985 nuget/nuget/-/Serilog.Formatting.Compact/2.0.0, Apache-2.0, approved, #13981 -nuget/nuget/-/Serilog.Settings.Configuration/8.0.2, Apache-2.0, approved, #13988 +nuget/nuget/-/Serilog.Settings.Configuration/8.0.4, Apache-2.0, approved, #13988 nuget/nuget/-/Serilog.Sinks.Console/5.0.1, Apache-2.0, approved, #13980 nuget/nuget/-/Serilog.Sinks.Debug/2.0.0, Apache-2.0, approved, clearlydefined nuget/nuget/-/Serilog.Sinks.File/5.0.0, Apache-2.0, approved, #11116 nuget/nuget/-/Serilog/3.1.1, Apache-2.0, approved, #13978 nuget/nuget/-/SharpZipLib/1.4.2, MIT AND GFDL-1.3-or-later AND (Apache-2.0 AND MIT) AND WTFPL AND bzip2-1.0.6 AND LicenseRef-Permissive-license-with-conditions AND LicenseRef-Permission-Notice, approved, #10058 nuget/nuget/-/SshNet.Security.Cryptography/1.3.0, MIT, approved, clearlydefined -nuget/nuget/-/Swashbuckle.AspNetCore.Swagger/6.8.0, MIT AND Apache-2.0, approved, #16262 -nuget/nuget/-/Swashbuckle.AspNetCore.SwaggerGen/6.8.0, MIT AND Apache-2.0, approved, #16259 -nuget/nuget/-/Swashbuckle.AspNetCore.SwaggerUI/6.8.0, MIT AND Apache-2.0, approved, #16261 -nuget/nuget/-/Swashbuckle.AspNetCore/6.8.0, MIT AND Apache-2.0, approved, #16260 -nuget/nuget/-/Testcontainers.PostgreSql/3.10.0, MIT, approved, #16241 -nuget/nuget/-/Testcontainers/3.10.0, MIT, approved, #16236 -nuget/nuget/-/Xunit.Extensions.AssemblyFixture/2.4.1, MIT, approved, #3502 +nuget/nuget/-/Swashbuckle.AspNetCore.Swagger/6.9.0, MIT AND Apache-2.0, approved, #16817 +nuget/nuget/-/Swashbuckle.AspNetCore.SwaggerGen/6.9.0, MIT AND Apache-2.0, approved, #16820 +nuget/nuget/-/Swashbuckle.AspNetCore.SwaggerUI/6.9.0, MIT AND Apache-2.0, approved, #16818 +nuget/nuget/-/Swashbuckle.AspNetCore/6.9.0, MIT AND Apache-2.0, approved, #16816 +nuget/nuget/-/Testcontainers.PostgreSql/4.0.0, MIT, approved, #17048 +nuget/nuget/-/Testcontainers/4.0.0, MIT, approved, #17049 +nuget/nuget/-/Xunit.Extensions.AssemblyFixture/2.6.0, MIT, approved, #17055 nuget/nuget/-/xunit.abstractions/2.0.3, Apache-2.0, approved, clearlydefined -nuget/nuget/-/xunit.analyzers/1.11.0, Apache-2.0 AND MIT, approved, #14197 -nuget/nuget/-/xunit.assert/2.7.0, Apache-2.0 AND MIT, approved, #13971 -nuget/nuget/-/xunit.core/2.7.0, Apache-2.0, approved, #13979 -nuget/nuget/-/xunit.extensibility.core/2.7.0, Apache-2.0 AND MIT, approved, #13974 -nuget/nuget/-/xunit.extensibility.execution/2.7.0, Apache-2.0, approved, #13977 +nuget/nuget/-/xunit.analyzers/1.16.0, Apache-2.0 AND MIT, approved, #16332 +nuget/nuget/-/xunit.assert/2.9.2, Apache-2.0, approved, #16331 +nuget/nuget/-/xunit.core/2.9.2, Apache-2.0, approved, #16330 +nuget/nuget/-/xunit.extensibility.core/2.9.2, Apache-2.0 AND MIT, approved, #16334 +nuget/nuget/-/xunit.extensibility.execution/2.9.2, Apache-2.0 AND MIT, approved, #16333 nuget/nuget/-/xunit.runner.visualstudio/2.8.2, Apache-2.0 AND MIT, approved, #15181 -nuget/nuget/-/xunit/2.7.0, Apache-2.0 AND MIT, approved, #13969 +nuget/nuget/-/xunit/2.9.2, Apache-2.0 AND MIT, approved, #16327 diff --git a/docs/api/issuer-service.yaml b/docs/api/issuer-service.yaml index 0d1516a8..d0c9460b 100644 --- a/docs/api/issuer-service.yaml +++ b/docs/api/issuer-service.yaml @@ -99,28 +99,34 @@ paths: parameters: - name: page in: query + description: The page to get schema: type: integer format: int32 - name: size in: query + description: Amount of entries schema: type: integer format: int32 - name: companySsiDetailStatusId in: query + description: 'OPTIONAL: Filter for the status' schema: $ref: '#/components/schemas/CompanySsiDetailStatusId' - name: credentialTypeId in: query + description: 'OPTIONAL: The type of the credential that should be returned' schema: $ref: '#/components/schemas/VerifiedCredentialTypeId' - name: approvalType in: query + description: 'OPTIONAL: Search string for the company name' schema: $ref: '#/components/schemas/CompanySsiDetailApprovalType' - name: sorting in: query + description: Defines the sorting of the list schema: $ref: '#/components/schemas/CompanySsiDetailSorting' responses: @@ -276,6 +282,7 @@ paths: parameters: - name: credentialId in: path + description: Id of the entry that should be approved required: true schema: type: string @@ -320,6 +327,7 @@ paths: parameters: - name: credentialId in: path + description: Id of the entry that should be rejected required: true schema: type: string @@ -364,12 +372,14 @@ paths: parameters: - name: processId in: path + description: Id of the process to retrigger required: true schema: type: string format: uuid - name: processStepTypeId in: path + description: The step that should be retriggered required: true schema: $ref: '#/components/schemas/ProcessStepTypeId' @@ -413,6 +423,7 @@ paths: parameters: - name: credentialId in: path + description: Id of the credential that should be revoked required: true schema: type: string @@ -446,6 +457,7 @@ paths: parameters: - name: credentialId in: path + description: Id of the credential that should be revoked required: true schema: type: string @@ -479,12 +491,14 @@ paths: parameters: - name: processId in: path + description: Id of the process to retrigger required: true schema: type: string format: uuid - name: processStepTypeId in: path + description: The step that should be retriggered required: true schema: $ref: '#/components/schemas/ProcessStepTypeId' diff --git a/src/credentials/SsiCredentialIssuer.Expiry.App/SsiCredentialIssuer.Expiry.App.csproj b/src/credentials/SsiCredentialIssuer.Expiry.App/SsiCredentialIssuer.Expiry.App.csproj index bb826d72..c2f0278b 100644 --- a/src/credentials/SsiCredentialIssuer.Expiry.App/SsiCredentialIssuer.Expiry.App.csproj +++ b/src/credentials/SsiCredentialIssuer.Expiry.App/SsiCredentialIssuer.Expiry.App.csproj @@ -42,9 +42,9 @@ - - - + + + diff --git a/src/database/SsiCredentialIssuer.DbAccess/SsiCredentialIssuer.DbAccess.csproj b/src/database/SsiCredentialIssuer.DbAccess/SsiCredentialIssuer.DbAccess.csproj index 8d8449b0..e226f16e 100644 --- a/src/database/SsiCredentialIssuer.DbAccess/SsiCredentialIssuer.DbAccess.csproj +++ b/src/database/SsiCredentialIssuer.DbAccess/SsiCredentialIssuer.DbAccess.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/database/SsiCredentialIssuer.Entities/SsiCredentialIssuer.Entities.csproj b/src/database/SsiCredentialIssuer.Entities/SsiCredentialIssuer.Entities.csproj index baebca3d..b87ea663 100644 --- a/src/database/SsiCredentialIssuer.Entities/SsiCredentialIssuer.Entities.csproj +++ b/src/database/SsiCredentialIssuer.Entities/SsiCredentialIssuer.Entities.csproj @@ -27,16 +27,16 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - + + + + diff --git a/src/database/SsiCredentialIssuer.Migrations/SsiCredentialIssuer.Migrations.csproj b/src/database/SsiCredentialIssuer.Migrations/SsiCredentialIssuer.Migrations.csproj index 49092042..800417dd 100644 --- a/src/database/SsiCredentialIssuer.Migrations/SsiCredentialIssuer.Migrations.csproj +++ b/src/database/SsiCredentialIssuer.Migrations/SsiCredentialIssuer.Migrations.csproj @@ -33,7 +33,7 @@ true - + @@ -48,8 +48,8 @@ - - + + diff --git a/src/externalservices/Callback.Service/Callback.Service.csproj b/src/externalservices/Callback.Service/Callback.Service.csproj index 63cc8eb0..025a8649 100644 --- a/src/externalservices/Callback.Service/Callback.Service.csproj +++ b/src/externalservices/Callback.Service/Callback.Service.csproj @@ -29,8 +29,8 @@ - - + + diff --git a/src/externalservices/Portal.Service/Portal.Service.csproj b/src/externalservices/Portal.Service/Portal.Service.csproj index 95940877..1be7733f 100644 --- a/src/externalservices/Portal.Service/Portal.Service.csproj +++ b/src/externalservices/Portal.Service/Portal.Service.csproj @@ -29,8 +29,8 @@ - - + + diff --git a/src/externalservices/Wallet.Service/Wallet.Service.csproj b/src/externalservices/Wallet.Service/Wallet.Service.csproj index 378892f1..c01942fb 100644 --- a/src/externalservices/Wallet.Service/Wallet.Service.csproj +++ b/src/externalservices/Wallet.Service/Wallet.Service.csproj @@ -30,10 +30,10 @@ - + - - + + diff --git a/src/issuer/SsiCredentialIssuer.Service/SsiCredentialIssuer.Service.csproj b/src/issuer/SsiCredentialIssuer.Service/SsiCredentialIssuer.Service.csproj index 402b09ee..5d257130 100644 --- a/src/issuer/SsiCredentialIssuer.Service/SsiCredentialIssuer.Service.csproj +++ b/src/issuer/SsiCredentialIssuer.Service/SsiCredentialIssuer.Service.csproj @@ -44,8 +44,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/processes/Processes.Worker.Library/Processes.Worker.Library.csproj b/src/processes/Processes.Worker.Library/Processes.Worker.Library.csproj index 21ba176e..3e705e89 100644 --- a/src/processes/Processes.Worker.Library/Processes.Worker.Library.csproj +++ b/src/processes/Processes.Worker.Library/Processes.Worker.Library.csproj @@ -32,10 +32,10 @@ - - - - + + + + diff --git a/src/processes/Processes.Worker/Processes.Worker.csproj b/src/processes/Processes.Worker/Processes.Worker.csproj index ffd38e42..7d13c35a 100644 --- a/src/processes/Processes.Worker/Processes.Worker.csproj +++ b/src/processes/Processes.Worker/Processes.Worker.csproj @@ -42,8 +42,8 @@ - - + + diff --git a/tests/Tests.Shared/Tests.Shared.csproj b/tests/Tests.Shared/Tests.Shared.csproj index 5c6aa99a..8d117a01 100644 --- a/tests/Tests.Shared/Tests.Shared.csproj +++ b/tests/Tests.Shared/Tests.Shared.csproj @@ -25,9 +25,17 @@ enable enable - - - - + + + + + + + + + + + + diff --git a/tests/credentials/SsiCredentialIssuer.Expiry.App.Tests/SsiCredentialIssuer.Expiry.App.Tests.csproj b/tests/credentials/SsiCredentialIssuer.Expiry.App.Tests/SsiCredentialIssuer.Expiry.App.Tests.csproj index 2aee9f48..c9e4c305 100644 --- a/tests/credentials/SsiCredentialIssuer.Expiry.App.Tests/SsiCredentialIssuer.Expiry.App.Tests.csproj +++ b/tests/credentials/SsiCredentialIssuer.Expiry.App.Tests/SsiCredentialIssuer.Expiry.App.Tests.csproj @@ -29,14 +29,10 @@ - - - - - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -45,6 +41,7 @@ + diff --git a/tests/database/SsiCredentialIssuer.DbAccess.Tests/SsiCredentialIssuer.DbAccess.Tests.csproj b/tests/database/SsiCredentialIssuer.DbAccess.Tests/SsiCredentialIssuer.DbAccess.Tests.csproj index 19a6595d..fb8f6a0a 100644 --- a/tests/database/SsiCredentialIssuer.DbAccess.Tests/SsiCredentialIssuer.DbAccess.Tests.csproj +++ b/tests/database/SsiCredentialIssuer.DbAccess.Tests/SsiCredentialIssuer.DbAccess.Tests.csproj @@ -29,16 +29,12 @@ - - - - - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/externalservices/Callback.Service.Tests/Callback.Service.Tests.csproj b/tests/externalservices/Callback.Service.Tests/Callback.Service.Tests.csproj index 5147bd2a..2c20f07f 100644 --- a/tests/externalservices/Callback.Service.Tests/Callback.Service.Tests.csproj +++ b/tests/externalservices/Callback.Service.Tests/Callback.Service.Tests.csproj @@ -32,15 +32,11 @@ - - - - - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/externalservices/Portal.Service.Tests/Portal.Service.Tests.csproj b/tests/externalservices/Portal.Service.Tests/Portal.Service.Tests.csproj index 7ef741f7..845c9d6d 100644 --- a/tests/externalservices/Portal.Service.Tests/Portal.Service.Tests.csproj +++ b/tests/externalservices/Portal.Service.Tests/Portal.Service.Tests.csproj @@ -32,15 +32,11 @@ - - - - - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/externalservices/Wallet.Service.Tests/Wallet.Service.Tests.csproj b/tests/externalservices/Wallet.Service.Tests/Wallet.Service.Tests.csproj index c17c7180..22d47b5e 100644 --- a/tests/externalservices/Wallet.Service.Tests/Wallet.Service.Tests.csproj +++ b/tests/externalservices/Wallet.Service.Tests/Wallet.Service.Tests.csproj @@ -32,16 +32,12 @@ - - - - - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/issuer/SsiCredentialIssuer.Service.Tests/BusinessLogic/IssuerBusinessLogicTests.cs b/tests/issuer/SsiCredentialIssuer.Service.Tests/BusinessLogic/IssuerBusinessLogicTests.cs index dbd414b1..f159cc07 100644 --- a/tests/issuer/SsiCredentialIssuer.Service.Tests/BusinessLogic/IssuerBusinessLogicTests.cs +++ b/tests/issuer/SsiCredentialIssuer.Service.Tests/BusinessLogic/IssuerBusinessLogicTests.cs @@ -1120,7 +1120,7 @@ private void ConfigureHttpClientFactoryFixture(HttpResponseMessage httpResponseM #region GetCredentialsForBpn [Fact] - public async void GetCredentialsForBpn_WithVersion_ReturnExpected() + public async Task GetCredentialsForBpn_WithVersion_ReturnExpected() { OwnedVerifiedCredentialData[] ownedVerifiedCredentialData = [new OwnedVerifiedCredentialData( Guid.NewGuid(), @@ -1141,7 +1141,7 @@ public async void GetCredentialsForBpn_WithVersion_ReturnExpected() } [Fact] - public async void GetCredentialsForBpn_WithoutVersion_ReturnExpected() + public async Task GetCredentialsForBpn_WithoutVersion_ReturnExpected() { OwnedVerifiedCredentialData[] ownedVerifiedCredentialData = [new OwnedVerifiedCredentialData( Guid.NewGuid(), diff --git a/tests/issuer/SsiCredentialIssuer.Service.Tests/SsiCredentialIssuer.Service.Tests.csproj b/tests/issuer/SsiCredentialIssuer.Service.Tests/SsiCredentialIssuer.Service.Tests.csproj index e90238ac..a83ae52e 100644 --- a/tests/issuer/SsiCredentialIssuer.Service.Tests/SsiCredentialIssuer.Service.Tests.csproj +++ b/tests/issuer/SsiCredentialIssuer.Service.Tests/SsiCredentialIssuer.Service.Tests.csproj @@ -32,15 +32,11 @@ - - - - - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/processes/CredentialProcess.Library.Tests/CredentialProcess.Library.Tests.csproj b/tests/processes/CredentialProcess.Library.Tests/CredentialProcess.Library.Tests.csproj index 9eb5fc1c..8fc8e2ee 100644 --- a/tests/processes/CredentialProcess.Library.Tests/CredentialProcess.Library.Tests.csproj +++ b/tests/processes/CredentialProcess.Library.Tests/CredentialProcess.Library.Tests.csproj @@ -27,12 +27,8 @@ Org.Eclipse.TractusX.SsiCredentialIssuer.CredentialProcess.Library.Tests - - - - - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -41,5 +37,6 @@ + diff --git a/tests/processes/CredentialProcess.Worker.Tests/CredentialProcess.Worker.Tests.csproj b/tests/processes/CredentialProcess.Worker.Tests/CredentialProcess.Worker.Tests.csproj index 3b139da3..2e7a62c8 100644 --- a/tests/processes/CredentialProcess.Worker.Tests/CredentialProcess.Worker.Tests.csproj +++ b/tests/processes/CredentialProcess.Worker.Tests/CredentialProcess.Worker.Tests.csproj @@ -27,12 +27,8 @@ Org.Eclipse.TractusX.SsiCredentialIssuer.CredentialProcess.Worker.Tests - - - - - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -40,5 +36,6 @@ + diff --git a/tests/processes/Processes.Library.Tests/Processes.Library.Tests.csproj b/tests/processes/Processes.Library.Tests/Processes.Library.Tests.csproj index c72c4611..181ef5f7 100644 --- a/tests/processes/Processes.Library.Tests/Processes.Library.Tests.csproj +++ b/tests/processes/Processes.Library.Tests/Processes.Library.Tests.csproj @@ -27,12 +27,8 @@ Org.Eclipse.TractusX.SsiCredentialIssuer.Processes.Library.Tests - - - - - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -40,5 +36,6 @@ + diff --git a/tests/processes/Processes.Worker.Library.Tests/Processes.Worker.Library.Tests.csproj b/tests/processes/Processes.Worker.Library.Tests/Processes.Worker.Library.Tests.csproj index ab69599e..06218914 100644 --- a/tests/processes/Processes.Worker.Library.Tests/Processes.Worker.Library.Tests.csproj +++ b/tests/processes/Processes.Worker.Library.Tests/Processes.Worker.Library.Tests.csproj @@ -27,18 +27,15 @@ Org.Eclipse.TractusX.SsiCredentialIssuer.Processes.Worker.Library.Tests - - - - - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + +