From 221d5ae013e90cffc3a33a570b3820b0621c1e1a Mon Sep 17 00:00:00 2001 From: Phil Schneider Date: Sat, 13 Jan 2024 20:09:40 +0100 Subject: [PATCH] feat(nuget): adjust framework push process Refs: CPLP-3400 --- .github/workflows/nuget-package-push.yml | 3 +- .github/workflows/pre-checks.yml | 1 - DEPENDENCIES | 3 +- README.md | 23 +++++++++ .../nuget}/update-nuget-packages.md | 4 +- scripts/check_package_versions.sh | 2 +- scripts/check_package_versions_local.sh | 2 +- scripts/get_current_version.sh | 2 +- scripts/pack_and_push_packages.sh | 2 +- scripts/pack_and_push_packages_local.sh | 2 +- .../Administration.Service.csproj | 10 ++-- .../BusinessLogic/IdentityProviderSettings.cs | 2 +- .../Controllers/CompanyDataController.cs | 1 + .../Controllers/ConnectorsController.cs | 1 + .../Controllers/DocumentsController.cs | 2 +- .../Controllers/IdentityProviderController.cs | 2 +- .../Controllers/InvitationController.cs | 2 +- .../Controllers/NetworkController.cs | 2 +- .../Controllers/RegistrationController.cs | 1 + .../RegistrationStatusController.cs | 2 +- .../Controllers/ServiceAccountController.cs | 1 + .../SubscriptionConfigurationController.cs | 2 +- .../Controllers/UserController.cs | 1 + .../Bpdm.Library/Bpdm.Library.csproj | 2 +- .../Custodian.Library.csproj | 4 +- .../OfferProvider.Library.csproj | 2 +- .../OnboardingServiceProvider.Library.csproj | 2 +- .../SdFactory.Library.csproj | 2 +- .../Framework.Async/Directory.Build.props | 2 +- src/framework/Framework.Async/README.md | 31 +----------- .../Directory.Build.props | 26 ---------- .../Framework.Authorization/README.md | 48 ------------------- .../Framework.Cors/Directory.Build.props | 2 +- src/framework/Framework.Cors/README.md | 31 +----------- .../Framework.DBAccess/Directory.Build.props | 2 +- src/framework/Framework.DBAccess/README.md | 31 +----------- .../Directory.Build.props | 2 +- .../Framework.DateTimeProvider/README.md | 31 +----------- .../Directory.Build.props | 2 +- .../Framework.DependencyInjection/README.md | 31 +----------- .../Directory.Build.props | 2 +- .../Framework.ErrorHandling.Library/README.md | 31 +----------- .../Directory.Build.props | 2 +- .../Framework.ErrorHandling.Web/README.md | 31 +----------- .../Directory.Build.props | 2 +- .../Framework.HttpClientExtensions/README.md | 31 +----------- .../Framework.IO/Directory.Build.props | 2 +- src/framework/Framework.IO/README.md | 31 +----------- .../Framework.Linq/Directory.Build.props | 2 +- src/framework/Framework.Linq/README.md | 31 +----------- .../Framework.Logging/Directory.Build.props | 2 +- src/framework/Framework.Logging/README.md | 31 +----------- .../Framework.Models/Directory.Build.props | 2 +- src/framework/Framework.Models/README.md | 30 +----------- .../Framework.Seeding/Directory.Build.props | 2 +- src/framework/Framework.Seeding/README.md | 31 +----------- .../Framework.Swagger/Directory.Build.props | 2 +- src/framework/Framework.Swagger/README.md | 31 +----------- .../Framework.Token/Directory.Build.props | 2 +- src/framework/Framework.Token/README.md | 31 +----------- .../Framework.Web/Directory.Build.props | 2 +- src/framework/Framework.Web/README.md | 31 +----------- .../Framework.WebExtensions.csproj | 45 ----------------- .../Keycloak.Authentication.csproj | 1 + .../KeycloakClaimsTransformation.cs | 2 +- .../Keycloak.ErrorHandling.csproj | 2 +- .../Keycloak.Factory/Keycloak.Factory.csproj | 2 +- .../BusinessLogic/ClientsUpdater.cs | 1 - .../Keycloak.Seeding/Keycloak.Seeding.csproj | 6 +-- .../Mailing.SendMail/Mailing.SendMail.csproj | 2 +- .../Mailing.Template/Mailing.Template.csproj | 2 +- .../Maintenance.App/Maintenance.App.csproj | 2 +- .../Controllers/AppChangeController.cs | 2 +- .../AppReleaseProcessController.cs | 1 + .../Controllers/AppsController.cs | 1 + .../Offers.Library.Web.csproj | 2 +- .../Offers.Library/Offers.Library.csproj | 4 +- .../Controllers/ServiceChangeController.cs | 2 +- .../Controllers/ServiceReleaseController.cs | 1 + .../Controllers/ServicesController.cs | 1 + .../Controllers/NotificationController.cs | 1 + .../PortalBackend.DBAccess.csproj | 4 +- .../PortalBackend.Migrations.csproj | 4 +- .../PortalBackend.PortalEntities.csproj | 8 ++-- .../NetworkRegistrationHandler.cs | 2 +- .../IProcessTypeExecutor.cs | 1 + .../Processes.Worker.Library.csproj | 2 +- .../Processes.Worker/Processes.Worker.csproj | 2 +- .../Provisioning.Library.csproj | 4 +- .../Provisioning.Migrations.csproj | 4 +- .../Registration.Common.csproj | 4 +- .../Controllers/NetworkController.cs | 2 +- .../Controllers/RegistrationController.cs | 2 +- src/web/Web.Identity/Web.Identity.csproj | 3 +- .../Web.Initialization.csproj | 3 +- src/web/Web.Initialization/WebAppHelper.cs | 3 +- .../OpenInformationController.cs | 2 +- .../Web.PublicInfos/Web.PublicInfos.csproj | 1 + .../KeycloakClaimsTransformationTests.cs | 2 +- .../PortalBackend.DBAccess.Tests.csproj | 2 +- 100 files changed, 154 insertions(+), 667 deletions(-) rename {scripts => docs/nuget}/update-nuget-packages.md (92%) delete mode 100644 src/framework/Framework.Authorization/Directory.Build.props delete mode 100644 src/framework/Framework.Authorization/README.md delete mode 100644 src/framework/Framework.WebExtensions/Framework.WebExtensions.csproj diff --git a/.github/workflows/nuget-package-push.yml b/.github/workflows/nuget-package-push.yml index e117cab04d..4ef5d878f5 100644 --- a/.github/workflows/nuget-package-push.yml +++ b/.github/workflows/nuget-package-push.yml @@ -25,6 +25,7 @@ on: - 'src/framework/**' branches: - 'dev' + - 'release/v*.*.*-RC*' workflow_dispatch: jobs: @@ -63,4 +64,4 @@ jobs: - name: Create git tag uses: rickstaa/action-create-tag@v1 with: - tag: v${{ steps.nugetPackageVersion.outputs.version }} \ No newline at end of file + tag: v${{ steps.nugetPackageVersion.outputs.version }} diff --git a/.github/workflows/pre-checks.yml b/.github/workflows/pre-checks.yml index dc360f65eb..d70aae4c45 100644 --- a/.github/workflows/pre-checks.yml +++ b/.github/workflows/pre-checks.yml @@ -114,4 +114,3 @@ jobs: echo "the following packages need a version update: $script_output" exit 1 fi - \ No newline at end of file diff --git a/DEPENDENCIES b/DEPENDENCIES index 0f8e6299bf..693ffb866e 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -40,14 +40,15 @@ nuget/nuget/-/Serilog.Extensions.Hosting/7.0.0, Apache-2.0, approved, #10078 nuget/nuget/-/Serilog.Extensions.Logging/7.0.0, Apache-2.0, approved, #10070 nuget/nuget/-/Serilog.Formatting.Compact/1.1.0, Apache-2.0, approved, #11115 nuget/nuget/-/Serilog.Settings.Configuration/7.0.0, Apache-2.0, approved, #10069 +nuget/nuget/-/Serilog.Sinks.Console/4.0.1, Apache-2.0, approved, #12858 nuget/nuget/-/Serilog.Sinks.Console/4.1.0, Apache-2.0, approved, #8434 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/2.12.0, Apache-2.0, approved, #8435 nuget/nuget/-/Serilog/3.0.1, Apache-2.0, approved, #10063 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/-/Stubble.Core/1.10.8, MIT AND BSD-2-Clause, approved, #9297 -nuget/nuget/-/SwashBuckle.AspNetCore/6.5.0, MIT AND Apache-2.0, approved, #7159 nuget/nuget/-/Swashbuckle.AspNetCore.Swagger/6.5.0, MIT AND Apache-2.0, approved, #7160 nuget/nuget/-/Swashbuckle.AspNetCore.SwaggerGen/6.5.0, MIT AND Apache-2.0, approved, #7156 nuget/nuget/-/Swashbuckle.AspNetCore.SwaggerUI/6.5.0, MIT AND Apache-2.0, approved, #7158 diff --git a/README.md b/README.md index 880875bced..3bde9bc27d 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,29 @@ This application provides container images for demonstration purposes. * https://hub.docker.com/r/tractusx/portal-provisioning-migrations * https://hub.docker.com/r/tractusx/portal-maintenance-service +## Notice for Nuget Packages + +This application provides nuget packages to share functionalities across different repos. To see how the development and update of nuget packages is working please have a look at the [documentation](/docs/nuget/update-nuget-packages.md). + +### Nuget + +* https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Async/ +* https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Cors/ +* https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider/ +* https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess/ +* https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.DependencyInjection/ +* https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library/ +* https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web/ +* https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions/ +* https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.IO/ +* https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Linq/ +* https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Logging/ +* https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Models/ +* https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Seeding/ +* https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Swagger/ +* https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Token/ +* https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Web/ + ### Base images mcr.microsoft.com/dotnet/aspnet:7.0-alpine: diff --git a/scripts/update-nuget-packages.md b/docs/nuget/update-nuget-packages.md similarity index 92% rename from scripts/update-nuget-packages.md rename to docs/nuget/update-nuget-packages.md index 6f0a9fda7e..110d240778 100644 --- a/scripts/update-nuget-packages.md +++ b/docs/nuget/update-nuget-packages.md @@ -1,6 +1,6 @@ # Update nuget packages -Currently each project of the framework directory is build and provided as an nuget package. +Each project of the framework directory is build and provided as an nuget package. To be able to build and test changes locally we recommend the following setup: @@ -80,4 +80,4 @@ To update the version of a specific package: ./scripts/pack_and_push_packages.sh ``` -NUGET_API_KEY is the key generated on nuget.org. The last command should only be executed within the github action +NUGET_API_KEY is the key generated on nuget.org. The last command should only be executed within the github action [nuget-package-push](/.github/workflows/nuget-package-push.yml) diff --git a/scripts/check_package_versions.sh b/scripts/check_package_versions.sh index cc63ac5e46..f5e14bbd6a 100755 --- a/scripts/check_package_versions.sh +++ b/scripts/check_package_versions.sh @@ -52,4 +52,4 @@ done # return all packages that still need a version update for dir in "${version_update_needed[@]}"; do echo "$dir" -done \ No newline at end of file +done diff --git a/scripts/check_package_versions_local.sh b/scripts/check_package_versions_local.sh index 99036cf492..2514e11924 100755 --- a/scripts/check_package_versions_local.sh +++ b/scripts/check_package_versions_local.sh @@ -48,4 +48,4 @@ done # return all packages that still need a version update for dir in "${version_update_needed[@]}"; do echo "$dir" -done \ No newline at end of file +done diff --git a/scripts/get_current_version.sh b/scripts/get_current_version.sh index a928e1ee62..6178ecd35d 100755 --- a/scripts/get_current_version.sh +++ b/scripts/get_current_version.sh @@ -33,4 +33,4 @@ else version="$version_prefix-framework" fi -echo "Version: $version" \ No newline at end of file +echo "Version: $version" diff --git a/scripts/pack_and_push_packages.sh b/scripts/pack_and_push_packages.sh index 9a197c798f..5416fa52a7 100755 --- a/scripts/pack_and_push_packages.sh +++ b/scripts/pack_and_push_packages.sh @@ -35,7 +35,7 @@ iterate_directories() { if [ -d "$dir" ]; then proj="$(basename "$dir")" echo "Pack project: $proj" - dotnet pack --no-build --no-restore src/framework/$proj/$proj.csproj -c Release -o "$folderPath" + dotnet pack src/framework/$proj/$proj.csproj -c Release -o "$folderPath" fi done } diff --git a/scripts/pack_and_push_packages_local.sh b/scripts/pack_and_push_packages_local.sh index fb159ecc1f..e393484fd9 100755 --- a/scripts/pack_and_push_packages_local.sh +++ b/scripts/pack_and_push_packages_local.sh @@ -27,7 +27,7 @@ iterate_directories() { if [ -d "$dir" ]; then proj="$(basename "$dir")" echo "Pack project: $proj" - dotnet pack --no-build --no-restore src/framework/$proj/$proj.csproj -c Release -o "$folderPath" + dotnet pack src/framework/$proj/$proj.csproj -c Release -o "$folderPath" fi done } diff --git a/src/administration/Administration.Service/Administration.Service.csproj b/src/administration/Administration.Service/Administration.Service.csproj index 9acde6c93e..575446d192 100644 --- a/src/administration/Administration.Service/Administration.Service.csproj +++ b/src/administration/Administration.Service/Administration.Service.csproj @@ -39,11 +39,11 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + diff --git a/src/administration/Administration.Service/BusinessLogic/IdentityProviderSettings.cs b/src/administration/Administration.Service/BusinessLogic/IdentityProviderSettings.cs index f9316dca65..3d58b5113c 100644 --- a/src/administration/Administration.Service/BusinessLogic/IdentityProviderSettings.cs +++ b/src/administration/Administration.Service/BusinessLogic/IdentityProviderSettings.cs @@ -18,8 +18,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Configuration; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Configuration; using System.Text; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; diff --git a/src/administration/Administration.Service/Controllers/CompanyDataController.cs b/src/administration/Administration.Service/Controllers/CompanyDataController.cs index 96e8ab418e..8461ccfc7a 100644 --- a/src/administration/Administration.Service/Controllers/CompanyDataController.cs +++ b/src/administration/Administration.Service/Controllers/CompanyDataController.cs @@ -26,6 +26,7 @@ using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; using System.Net; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/ConnectorsController.cs b/src/administration/Administration.Service/Controllers/ConnectorsController.cs index b88da6d39c..09097792ab 100644 --- a/src/administration/Administration.Service/Controllers/ConnectorsController.cs +++ b/src/administration/Administration.Service/Controllers/ConnectorsController.cs @@ -27,6 +27,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.SdFactory.Library.Models; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/DocumentsController.cs b/src/administration/Administration.Service/Controllers/DocumentsController.cs index 6dc2e89a16..55fe5654bd 100644 --- a/src/administration/Administration.Service/Controllers/DocumentsController.cs +++ b/src/administration/Administration.Service/Controllers/DocumentsController.cs @@ -22,9 +22,9 @@ using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/IdentityProviderController.cs b/src/administration/Administration.Service/Controllers/IdentityProviderController.cs index f4e254c41a..16a1ebeb50 100644 --- a/src/administration/Administration.Service/Controllers/IdentityProviderController.cs +++ b/src/administration/Administration.Service/Controllers/IdentityProviderController.cs @@ -23,9 +23,9 @@ using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Enums; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/InvitationController.cs b/src/administration/Administration.Service/Controllers/InvitationController.cs index e776a39072..93a30dbfd3 100644 --- a/src/administration/Administration.Service/Controllers/InvitationController.cs +++ b/src/administration/Administration.Service/Controllers/InvitationController.cs @@ -23,7 +23,7 @@ using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/NetworkController.cs b/src/administration/Administration.Service/Controllers/NetworkController.cs index 927c5596e9..bc9533acff 100644 --- a/src/administration/Administration.Service/Controllers/NetworkController.cs +++ b/src/administration/Administration.Service/Controllers/NetworkController.cs @@ -22,8 +22,8 @@ using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/RegistrationController.cs b/src/administration/Administration.Service/Controllers/RegistrationController.cs index c207cbc016..47341051f6 100644 --- a/src/administration/Administration.Service/Controllers/RegistrationController.cs +++ b/src/administration/Administration.Service/Controllers/RegistrationController.cs @@ -28,6 +28,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.SdFactory.Library.Models; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/RegistrationStatusController.cs b/src/administration/Administration.Service/Controllers/RegistrationStatusController.cs index 6cee82cb16..aa8d47049e 100644 --- a/src/administration/Administration.Service/Controllers/RegistrationStatusController.cs +++ b/src/administration/Administration.Service/Controllers/RegistrationStatusController.cs @@ -22,8 +22,8 @@ using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/ServiceAccountController.cs b/src/administration/Administration.Service/Controllers/ServiceAccountController.cs index 968ff63355..9d8031a2ac 100644 --- a/src/administration/Administration.Service/Controllers/ServiceAccountController.cs +++ b/src/administration/Administration.Service/Controllers/ServiceAccountController.cs @@ -26,6 +26,7 @@ using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Models; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/SubscriptionConfigurationController.cs b/src/administration/Administration.Service/Controllers/SubscriptionConfigurationController.cs index 5db28f3b02..efa0876b39 100644 --- a/src/administration/Administration.Service/Controllers/SubscriptionConfigurationController.cs +++ b/src/administration/Administration.Service/Controllers/SubscriptionConfigurationController.cs @@ -22,9 +22,9 @@ using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/UserController.cs b/src/administration/Administration.Service/Controllers/UserController.cs index c797271f88..5e50f12514 100644 --- a/src/administration/Administration.Service/Controllers/UserController.cs +++ b/src/administration/Administration.Service/Controllers/UserController.cs @@ -25,6 +25,7 @@ using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Models; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj b/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj index e9bd79854f..9a60c17252 100644 --- a/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj +++ b/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj @@ -35,7 +35,7 @@ - + diff --git a/src/externalsystems/Custodian.Library/Custodian.Library.csproj b/src/externalsystems/Custodian.Library/Custodian.Library.csproj index 2b2816e7f3..5794087a6b 100644 --- a/src/externalsystems/Custodian.Library/Custodian.Library.csproj +++ b/src/externalsystems/Custodian.Library/Custodian.Library.csproj @@ -34,8 +34,8 @@ - - + + diff --git a/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj b/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj index 18e7657742..bc121f91e8 100644 --- a/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj +++ b/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj @@ -29,7 +29,7 @@ - + diff --git a/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProvider.Library.csproj b/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProvider.Library.csproj index 1c715e2808..5a52a3ed2e 100644 --- a/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProvider.Library.csproj +++ b/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProvider.Library.csproj @@ -29,7 +29,7 @@ - + diff --git a/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj b/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj index cf36f6d8bd..8157600598 100644 --- a/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj +++ b/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj @@ -29,7 +29,7 @@ - + diff --git a/src/framework/Framework.Async/Directory.Build.props b/src/framework/Framework.Async/Directory.Build.props index 2cf50be3bf..302100255d 100644 --- a/src/framework/Framework.Async/Directory.Build.props +++ b/src/framework/Framework.Async/Directory.Build.props @@ -21,6 +21,6 @@ 1.0.0 - beta.6 + beta.9 diff --git a/src/framework/Framework.Async/README.md b/src/framework/Framework.Async/README.md index cba7bbf1fb..268f9cc4d3 100644 --- a/src/framework/Framework.Async/README.md +++ b/src/framework/Framework.Async/README.md @@ -10,39 +10,12 @@ This content is produced and maintained by the Eclipse Tractus-X project. dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Async -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Contributing - -We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details. - -## License - -Distributed under the Apache 2.0 License. -See [LICENSE](./LICENSE) for more information. - ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - https://github.com/eclipse-tractusx/portal-backend -## Third-party Content - -This project uses the following image content: - -* Image: Catena-X Logo -* Source URL: https://catena-x.net - -## Cryptography +## License -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. +Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.Authorization/Directory.Build.props b/src/framework/Framework.Authorization/Directory.Build.props deleted file mode 100644 index d601006403..0000000000 --- a/src/framework/Framework.Authorization/Directory.Build.props +++ /dev/null @@ -1,26 +0,0 @@ - - - - - 1.0.0 - beta.7 - - diff --git a/src/framework/Framework.Authorization/README.md b/src/framework/Framework.Authorization/README.md deleted file mode 100644 index 3ebe73e8cb..0000000000 --- a/src/framework/Framework.Authorization/README.md +++ /dev/null @@ -1,48 +0,0 @@ -# Catena-X Portal Backend Framework Authorization - -The Catena-X Portal Backend Framework Authorization library provides some useful Authorization extensions. - -This content is produced and maintained by the Eclipse Tractus-X project. - -* Project home: https://projects.eclipse.org/projects/automotive.tractusx - -## Installation - -dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Authorization - -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Contributing - -We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details. - -## License - -Distributed under the Apache 2.0 License. -See [LICENSE](./LICENSE) for more information. - -## Source Code - -The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - -- https://github.com/eclipse-tractusx/portal-backend - -## Third-party Content - -This project uses the following image content: - -* Image: Catena-X Logo -* Source URL: https://catena-x.net - -## Cryptography - -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. diff --git a/src/framework/Framework.Cors/Directory.Build.props b/src/framework/Framework.Cors/Directory.Build.props index 2cf50be3bf..302100255d 100644 --- a/src/framework/Framework.Cors/Directory.Build.props +++ b/src/framework/Framework.Cors/Directory.Build.props @@ -21,6 +21,6 @@ 1.0.0 - beta.6 + beta.9 diff --git a/src/framework/Framework.Cors/README.md b/src/framework/Framework.Cors/README.md index 5bc9d66aba..1f64d0abcb 100644 --- a/src/framework/Framework.Cors/README.md +++ b/src/framework/Framework.Cors/README.md @@ -10,39 +10,12 @@ This content is produced and maintained by the Eclipse Tractus-X project. dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Cors -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Contributing - -We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details. - -## License - -Distributed under the Apache 2.0 License. -See [LICENSE](./LICENSE) for more information. - ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - https://github.com/eclipse-tractusx/portal-backend -## Third-party Content - -This project uses the following image content: - -* Image: Catena-X Logo -* Source URL: https://catena-x.net - -## Cryptography +## License -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. +Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.DBAccess/Directory.Build.props b/src/framework/Framework.DBAccess/Directory.Build.props index d601006403..7e34c386ad 100644 --- a/src/framework/Framework.DBAccess/Directory.Build.props +++ b/src/framework/Framework.DBAccess/Directory.Build.props @@ -21,6 +21,6 @@ 1.0.0 - beta.7 + beta.10 diff --git a/src/framework/Framework.DBAccess/README.md b/src/framework/Framework.DBAccess/README.md index f288f9a3f3..fca7ba2b75 100644 --- a/src/framework/Framework.DBAccess/README.md +++ b/src/framework/Framework.DBAccess/README.md @@ -10,39 +10,12 @@ This content is produced and maintained by the Eclipse Tractus-X project. dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Contributing - -We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details. - -## License - -Distributed under the Apache 2.0 License. -See [LICENSE](./LICENSE) for more information. - ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - https://github.com/eclipse-tractusx/portal-backend -## Third-party Content - -This project uses the following image content: - -* Image: Catena-X Logo -* Source URL: https://catena-x.net - -## Cryptography +## License -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. +Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.DateTimeProvider/Directory.Build.props b/src/framework/Framework.DateTimeProvider/Directory.Build.props index 2cf50be3bf..302100255d 100644 --- a/src/framework/Framework.DateTimeProvider/Directory.Build.props +++ b/src/framework/Framework.DateTimeProvider/Directory.Build.props @@ -21,6 +21,6 @@ 1.0.0 - beta.6 + beta.9 diff --git a/src/framework/Framework.DateTimeProvider/README.md b/src/framework/Framework.DateTimeProvider/README.md index cb4034e0ca..a3407be4a7 100644 --- a/src/framework/Framework.DateTimeProvider/README.md +++ b/src/framework/Framework.DateTimeProvider/README.md @@ -10,39 +10,12 @@ This content is produced and maintained by the Eclipse Tractus-X project. dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Contributing - -We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details. - -## License - -Distributed under the Apache 2.0 License. -See [LICENSE](./LICENSE) for more information. - ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - https://github.com/eclipse-tractusx/portal-backend -## Third-party Content - -This project uses the following image content: - -* Image: Catena-X Logo -* Source URL: https://catena-x.net - -## Cryptography +## License -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. +Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.DependencyInjection/Directory.Build.props b/src/framework/Framework.DependencyInjection/Directory.Build.props index 2cf50be3bf..302100255d 100644 --- a/src/framework/Framework.DependencyInjection/Directory.Build.props +++ b/src/framework/Framework.DependencyInjection/Directory.Build.props @@ -21,6 +21,6 @@ 1.0.0 - beta.6 + beta.9 diff --git a/src/framework/Framework.DependencyInjection/README.md b/src/framework/Framework.DependencyInjection/README.md index 40c1a641a9..f7e2a69daf 100644 --- a/src/framework/Framework.DependencyInjection/README.md +++ b/src/framework/Framework.DependencyInjection/README.md @@ -10,39 +10,12 @@ This content is produced and maintained by the Eclipse Tractus-X project. dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.DependencyInjection -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Contributing - -We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details. - -## License - -Distributed under the Apache 2.0 License. -See [LICENSE](./LICENSE) for more information. - ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - https://github.com/eclipse-tractusx/portal-backend -## Third-party Content - -This project uses the following image content: - -* Image: Catena-X Logo -* Source URL: https://catena-x.net - -## Cryptography +## License -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. +Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.ErrorHandling.Library/Directory.Build.props b/src/framework/Framework.ErrorHandling.Library/Directory.Build.props index d601006403..7e34c386ad 100644 --- a/src/framework/Framework.ErrorHandling.Library/Directory.Build.props +++ b/src/framework/Framework.ErrorHandling.Library/Directory.Build.props @@ -21,6 +21,6 @@ 1.0.0 - beta.7 + beta.10 diff --git a/src/framework/Framework.ErrorHandling.Library/README.md b/src/framework/Framework.ErrorHandling.Library/README.md index f54ae99263..7b2e9b68af 100644 --- a/src/framework/Framework.ErrorHandling.Library/README.md +++ b/src/framework/Framework.ErrorHandling.Library/README.md @@ -10,39 +10,12 @@ This content is produced and maintained by the Eclipse Tractus-X project. dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Contributing - -We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details. - -## License - -Distributed under the Apache 2.0 License. -See [LICENSE](./LICENSE) for more information. - ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - https://github.com/eclipse-tractusx/portal-backend -## Third-party Content - -This project uses the following image content: - -* Image: Catena-X Logo -* Source URL: https://catena-x.net - -## Cryptography +## License -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. +Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.ErrorHandling.Web/Directory.Build.props b/src/framework/Framework.ErrorHandling.Web/Directory.Build.props index d601006403..7e34c386ad 100644 --- a/src/framework/Framework.ErrorHandling.Web/Directory.Build.props +++ b/src/framework/Framework.ErrorHandling.Web/Directory.Build.props @@ -21,6 +21,6 @@ 1.0.0 - beta.7 + beta.10 diff --git a/src/framework/Framework.ErrorHandling.Web/README.md b/src/framework/Framework.ErrorHandling.Web/README.md index 548e28f57a..05e8dab9e0 100644 --- a/src/framework/Framework.ErrorHandling.Web/README.md +++ b/src/framework/Framework.ErrorHandling.Web/README.md @@ -10,39 +10,12 @@ This content is produced and maintained by the Eclipse Tractus-X project. dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Contributing - -We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details. - -## License - -Distributed under the Apache 2.0 License. -See [LICENSE](./LICENSE) for more information. - ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - https://github.com/eclipse-tractusx/portal-backend -## Third-party Content - -This project uses the following image content: - -* Image: Catena-X Logo -* Source URL: https://catena-x.net - -## Cryptography +## License -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. +Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.HttpClientExtensions/Directory.Build.props b/src/framework/Framework.HttpClientExtensions/Directory.Build.props index d601006403..7e34c386ad 100644 --- a/src/framework/Framework.HttpClientExtensions/Directory.Build.props +++ b/src/framework/Framework.HttpClientExtensions/Directory.Build.props @@ -21,6 +21,6 @@ 1.0.0 - beta.7 + beta.10 diff --git a/src/framework/Framework.HttpClientExtensions/README.md b/src/framework/Framework.HttpClientExtensions/README.md index 871f195fbb..735840e95c 100644 --- a/src/framework/Framework.HttpClientExtensions/README.md +++ b/src/framework/Framework.HttpClientExtensions/README.md @@ -10,39 +10,12 @@ This content is produced and maintained by the Eclipse Tractus-X project. dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Contributing - -We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details. - -## License - -Distributed under the Apache 2.0 License. -See [LICENSE](./LICENSE) for more information. - ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - https://github.com/eclipse-tractusx/portal-backend -## Third-party Content - -This project uses the following image content: - -* Image: Catena-X Logo -* Source URL: https://catena-x.net - -## Cryptography +## License -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. +Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.IO/Directory.Build.props b/src/framework/Framework.IO/Directory.Build.props index d601006403..7e34c386ad 100644 --- a/src/framework/Framework.IO/Directory.Build.props +++ b/src/framework/Framework.IO/Directory.Build.props @@ -21,6 +21,6 @@ 1.0.0 - beta.7 + beta.10 diff --git a/src/framework/Framework.IO/README.md b/src/framework/Framework.IO/README.md index a772ec14fc..f5e04eab8e 100644 --- a/src/framework/Framework.IO/README.md +++ b/src/framework/Framework.IO/README.md @@ -10,39 +10,12 @@ This content is produced and maintained by the Eclipse Tractus-X project. dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.IO -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Contributing - -We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details. - -## License - -Distributed under the Apache 2.0 License. -See [LICENSE](./LICENSE) for more information. - ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - https://github.com/eclipse-tractusx/portal-backend -## Third-party Content - -This project uses the following image content: - -* Image: Catena-X Logo -* Source URL: https://catena-x.net - -## Cryptography +## License -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. +Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.Linq/Directory.Build.props b/src/framework/Framework.Linq/Directory.Build.props index d601006403..7e34c386ad 100644 --- a/src/framework/Framework.Linq/Directory.Build.props +++ b/src/framework/Framework.Linq/Directory.Build.props @@ -21,6 +21,6 @@ 1.0.0 - beta.7 + beta.10 diff --git a/src/framework/Framework.Linq/README.md b/src/framework/Framework.Linq/README.md index ab82592a77..9baac3d067 100644 --- a/src/framework/Framework.Linq/README.md +++ b/src/framework/Framework.Linq/README.md @@ -10,39 +10,12 @@ This content is produced and maintained by the Eclipse Tractus-X project. dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Linq -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Contributing - -We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details. - -## License - -Distributed under the Apache 2.0 License. -See [LICENSE](./LICENSE) for more information. - ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - https://github.com/eclipse-tractusx/portal-backend -## Third-party Content - -This project uses the following image content: - -* Image: Catena-X Logo -* Source URL: https://catena-x.net - -## Cryptography +## License -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. +Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.Logging/Directory.Build.props b/src/framework/Framework.Logging/Directory.Build.props index 2cf50be3bf..302100255d 100644 --- a/src/framework/Framework.Logging/Directory.Build.props +++ b/src/framework/Framework.Logging/Directory.Build.props @@ -21,6 +21,6 @@ 1.0.0 - beta.6 + beta.9 diff --git a/src/framework/Framework.Logging/README.md b/src/framework/Framework.Logging/README.md index 2d4add3dc9..57148e1c8f 100644 --- a/src/framework/Framework.Logging/README.md +++ b/src/framework/Framework.Logging/README.md @@ -10,39 +10,12 @@ This content is produced and maintained by the Eclipse Tractus-X project. dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Logging -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Contributing - -We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details. - -## License - -Distributed under the Apache 2.0 License. -See [LICENSE](./LICENSE) for more information. - ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - https://github.com/eclipse-tractusx/portal-backend -## Third-party Content - -This project uses the following image content: - -* Image: Catena-X Logo -* Source URL: https://catena-x.net - -## Cryptography +## License -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. +Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.Models/Directory.Build.props b/src/framework/Framework.Models/Directory.Build.props index d601006403..7e34c386ad 100644 --- a/src/framework/Framework.Models/Directory.Build.props +++ b/src/framework/Framework.Models/Directory.Build.props @@ -21,6 +21,6 @@ 1.0.0 - beta.7 + beta.10 diff --git a/src/framework/Framework.Models/README.md b/src/framework/Framework.Models/README.md index 41ec1aaf5f..7780f70f85 100644 --- a/src/framework/Framework.Models/README.md +++ b/src/framework/Framework.Models/README.md @@ -10,39 +10,13 @@ This content is produced and maintained by the Eclipse Tractus-X project. dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Models -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Contributing - -We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details. - -## License - -Distributed under the Apache 2.0 License. -See [LICENSE](./LICENSE) for more information. - ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - https://github.com/eclipse-tractusx/portal-backend -## Third-party Content - -This project uses the following image content: -* Image: Catena-X Logo -* Source URL: https://catena-x.net - -## Cryptography +## License -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. +Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.Seeding/Directory.Build.props b/src/framework/Framework.Seeding/Directory.Build.props index d601006403..7e34c386ad 100644 --- a/src/framework/Framework.Seeding/Directory.Build.props +++ b/src/framework/Framework.Seeding/Directory.Build.props @@ -21,6 +21,6 @@ 1.0.0 - beta.7 + beta.10 diff --git a/src/framework/Framework.Seeding/README.md b/src/framework/Framework.Seeding/README.md index b70647dac6..94ebd6136a 100644 --- a/src/framework/Framework.Seeding/README.md +++ b/src/framework/Framework.Seeding/README.md @@ -10,39 +10,12 @@ This content is produced and maintained by the Eclipse Tractus-X project. dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Seeding -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Contributing - -We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details. - -## License - -Distributed under the Apache 2.0 License. -See [LICENSE](./LICENSE) for more information. - ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - https://github.com/eclipse-tractusx/portal-backend -## Third-party Content - -This project uses the following image content: - -* Image: Catena-X Logo -* Source URL: https://catena-x.net - -## Cryptography +## License -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. +Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.Swagger/Directory.Build.props b/src/framework/Framework.Swagger/Directory.Build.props index d601006403..7e34c386ad 100644 --- a/src/framework/Framework.Swagger/Directory.Build.props +++ b/src/framework/Framework.Swagger/Directory.Build.props @@ -21,6 +21,6 @@ 1.0.0 - beta.7 + beta.10 diff --git a/src/framework/Framework.Swagger/README.md b/src/framework/Framework.Swagger/README.md index 6f09ffab93..8402abe999 100644 --- a/src/framework/Framework.Swagger/README.md +++ b/src/framework/Framework.Swagger/README.md @@ -10,39 +10,12 @@ This content is produced and maintained by the Eclipse Tractus-X project. dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Swagger -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Contributing - -We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details. - -## License - -Distributed under the Apache 2.0 License. -See [LICENSE](./LICENSE) for more information. - ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - https://github.com/eclipse-tractusx/portal-backend -## Third-party Content - -This project uses the following image content: - -* Image: Catena-X Logo -* Source URL: https://catena-x.net - -## Cryptography +## License -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. +Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.Token/Directory.Build.props b/src/framework/Framework.Token/Directory.Build.props index d601006403..7e34c386ad 100644 --- a/src/framework/Framework.Token/Directory.Build.props +++ b/src/framework/Framework.Token/Directory.Build.props @@ -21,6 +21,6 @@ 1.0.0 - beta.7 + beta.10 diff --git a/src/framework/Framework.Token/README.md b/src/framework/Framework.Token/README.md index 3ce9b7756a..a109714e17 100644 --- a/src/framework/Framework.Token/README.md +++ b/src/framework/Framework.Token/README.md @@ -10,39 +10,12 @@ This content is produced and maintained by the Eclipse Tractus-X project. dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Token -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Contributing - -We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details. - -## License - -Distributed under the Apache 2.0 License. -See [LICENSE](./LICENSE) for more information. - ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - https://github.com/eclipse-tractusx/portal-backend -## Third-party Content - -This project uses the following image content: - -* Image: Catena-X Logo -* Source URL: https://catena-x.net - -## Cryptography +## License -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. +Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.Web/Directory.Build.props b/src/framework/Framework.Web/Directory.Build.props index 302100255d..46699c39fb 100644 --- a/src/framework/Framework.Web/Directory.Build.props +++ b/src/framework/Framework.Web/Directory.Build.props @@ -21,6 +21,6 @@ 1.0.0 - beta.9 + beta.12 diff --git a/src/framework/Framework.Web/README.md b/src/framework/Framework.Web/README.md index 7652ad8ed7..45f7ba75b6 100644 --- a/src/framework/Framework.Web/README.md +++ b/src/framework/Framework.Web/README.md @@ -10,39 +10,12 @@ This content is produced and maintained by the Eclipse Tractus-X project. dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Web -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Contributing - -We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details. - -## License - -Distributed under the Apache 2.0 License. -See [LICENSE](./LICENSE) for more information. - ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - https://github.com/eclipse-tractusx/portal-backend -## Third-party Content - -This project uses the following image content: - -* Image: Catena-X Logo -* Source URL: https://catena-x.net - -## Cryptography +## License -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. +Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.WebExtensions/Framework.WebExtensions.csproj b/src/framework/Framework.WebExtensions/Framework.WebExtensions.csproj deleted file mode 100644 index 9d80b3d287..0000000000 --- a/src/framework/Framework.WebExtensions/Framework.WebExtensions.csproj +++ /dev/null @@ -1,45 +0,0 @@ - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos - Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos - net7.0 - enable - enable - - - - - - - - - - - - - - - - - - - diff --git a/src/keycloak/Keycloak.Authentication/Keycloak.Authentication.csproj b/src/keycloak/Keycloak.Authentication/Keycloak.Authentication.csproj index 184753ec69..383da8df48 100644 --- a/src/keycloak/Keycloak.Authentication/Keycloak.Authentication.csproj +++ b/src/keycloak/Keycloak.Authentication/Keycloak.Authentication.csproj @@ -39,6 +39,7 @@ + diff --git a/src/keycloak/Keycloak.Authentication/KeycloakClaimsTransformation.cs b/src/keycloak/Keycloak.Authentication/KeycloakClaimsTransformation.cs index 2aec20158d..92f0f2d710 100644 --- a/src/keycloak/Keycloak.Authentication/KeycloakClaimsTransformation.cs +++ b/src/keycloak/Keycloak.Authentication/KeycloakClaimsTransformation.cs @@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Framework.Linq; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; using System.Json; using System.Security.Claims; diff --git a/src/keycloak/Keycloak.ErrorHandling/Keycloak.ErrorHandling.csproj b/src/keycloak/Keycloak.ErrorHandling/Keycloak.ErrorHandling.csproj index 6be1dfa49a..86654ffdcc 100644 --- a/src/keycloak/Keycloak.ErrorHandling/Keycloak.ErrorHandling.csproj +++ b/src/keycloak/Keycloak.ErrorHandling/Keycloak.ErrorHandling.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/keycloak/Keycloak.Factory/Keycloak.Factory.csproj b/src/keycloak/Keycloak.Factory/Keycloak.Factory.csproj index 0c4e4b1fa0..e947d28954 100644 --- a/src/keycloak/Keycloak.Factory/Keycloak.Factory.csproj +++ b/src/keycloak/Keycloak.Factory/Keycloak.Factory.csproj @@ -34,7 +34,7 @@ - + diff --git a/src/keycloak/Keycloak.Seeding/BusinessLogic/ClientsUpdater.cs b/src/keycloak/Keycloak.Seeding/BusinessLogic/ClientsUpdater.cs index 0b76700078..15504f7066 100644 --- a/src/keycloak/Keycloak.Seeding/BusinessLogic/ClientsUpdater.cs +++ b/src/keycloak/Keycloak.Seeding/BusinessLogic/ClientsUpdater.cs @@ -17,7 +17,6 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -using Microsoft.IdentityModel.Tokens; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.Framework.Linq; using Org.Eclipse.TractusX.Portal.Backend.Keycloak.ErrorHandling; diff --git a/src/keycloak/Keycloak.Seeding/Keycloak.Seeding.csproj b/src/keycloak/Keycloak.Seeding/Keycloak.Seeding.csproj index 0bddf850bf..b7736f65ae 100644 --- a/src/keycloak/Keycloak.Seeding/Keycloak.Seeding.csproj +++ b/src/keycloak/Keycloak.Seeding/Keycloak.Seeding.csproj @@ -39,9 +39,9 @@ - - - + + + diff --git a/src/mailing/Mailing.SendMail/Mailing.SendMail.csproj b/src/mailing/Mailing.SendMail/Mailing.SendMail.csproj index f4ff3ffadf..a9c960213b 100644 --- a/src/mailing/Mailing.SendMail/Mailing.SendMail.csproj +++ b/src/mailing/Mailing.SendMail/Mailing.SendMail.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/mailing/Mailing.Template/Mailing.Template.csproj b/src/mailing/Mailing.Template/Mailing.Template.csproj index 3cbc39422e..2fc60b8d07 100644 --- a/src/mailing/Mailing.Template/Mailing.Template.csproj +++ b/src/mailing/Mailing.Template/Mailing.Template.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/maintenance/Maintenance.App/Maintenance.App.csproj b/src/maintenance/Maintenance.App/Maintenance.App.csproj index 65b66acb4c..f73575e562 100644 --- a/src/maintenance/Maintenance.App/Maintenance.App.csproj +++ b/src/maintenance/Maintenance.App/Maintenance.App.csproj @@ -43,7 +43,7 @@ - + diff --git a/src/marketplace/Apps.Service/Controllers/AppChangeController.cs b/src/marketplace/Apps.Service/Controllers/AppChangeController.cs index ff208ae2b8..dde4824be6 100644 --- a/src/marketplace/Apps.Service/Controllers/AppChangeController.cs +++ b/src/marketplace/Apps.Service/Controllers/AppChangeController.cs @@ -23,9 +23,9 @@ using Org.Eclipse.TractusX.Portal.Backend.Apps.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Apps.Service.ViewModels; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Apps.Service.Controllers; diff --git a/src/marketplace/Apps.Service/Controllers/AppReleaseProcessController.cs b/src/marketplace/Apps.Service/Controllers/AppReleaseProcessController.cs index 4ba2962955..07e45e8b18 100644 --- a/src/marketplace/Apps.Service/Controllers/AppReleaseProcessController.cs +++ b/src/marketplace/Apps.Service/Controllers/AppReleaseProcessController.cs @@ -27,6 +27,7 @@ using Org.Eclipse.TractusX.Portal.Backend.Offers.Library.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Apps.Service.Controllers; diff --git a/src/marketplace/Apps.Service/Controllers/AppsController.cs b/src/marketplace/Apps.Service/Controllers/AppsController.cs index 32c2841c6b..c669219e73 100644 --- a/src/marketplace/Apps.Service/Controllers/AppsController.cs +++ b/src/marketplace/Apps.Service/Controllers/AppsController.cs @@ -27,6 +27,7 @@ using Org.Eclipse.TractusX.Portal.Backend.Offers.Library.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; namespace Org.Eclipse.TractusX.Portal.Backend.Apps.Service.Controllers; diff --git a/src/marketplace/Offers.Library.Web/Offers.Library.Web.csproj b/src/marketplace/Offers.Library.Web/Offers.Library.Web.csproj index e0b3999c8e..7995bc30f9 100644 --- a/src/marketplace/Offers.Library.Web/Offers.Library.Web.csproj +++ b/src/marketplace/Offers.Library.Web/Offers.Library.Web.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/marketplace/Offers.Library/Offers.Library.csproj b/src/marketplace/Offers.Library/Offers.Library.csproj index dcede773d2..e8cd124ee3 100644 --- a/src/marketplace/Offers.Library/Offers.Library.csproj +++ b/src/marketplace/Offers.Library/Offers.Library.csproj @@ -39,8 +39,8 @@ - - + + diff --git a/src/marketplace/Services.Service/Controllers/ServiceChangeController.cs b/src/marketplace/Services.Service/Controllers/ServiceChangeController.cs index c1cd6badb2..43983ecddf 100644 --- a/src/marketplace/Services.Service/Controllers/ServiceChangeController.cs +++ b/src/marketplace/Services.Service/Controllers/ServiceChangeController.cs @@ -21,8 +21,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.Services.Service.BusinessLogic; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Services.Service.Controllers; diff --git a/src/marketplace/Services.Service/Controllers/ServiceReleaseController.cs b/src/marketplace/Services.Service/Controllers/ServiceReleaseController.cs index 22b01dadb5..ce332e204b 100644 --- a/src/marketplace/Services.Service/Controllers/ServiceReleaseController.cs +++ b/src/marketplace/Services.Service/Controllers/ServiceReleaseController.cs @@ -27,6 +27,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.Services.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Services.Service.ViewModels; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Services.Service.Controllers; diff --git a/src/marketplace/Services.Service/Controllers/ServicesController.cs b/src/marketplace/Services.Service/Controllers/ServicesController.cs index f70d7394e4..28f9a18bc9 100644 --- a/src/marketplace/Services.Service/Controllers/ServicesController.cs +++ b/src/marketplace/Services.Service/Controllers/ServicesController.cs @@ -26,6 +26,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.Services.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Services.Service.ViewModels; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; namespace Org.Eclipse.TractusX.Portal.Backend.Services.Service.Controllers; diff --git a/src/notifications/Notifications.Service/Controllers/NotificationController.cs b/src/notifications/Notifications.Service/Controllers/NotificationController.cs index 325c883854..65f027a26c 100644 --- a/src/notifications/Notifications.Service/Controllers/NotificationController.cs +++ b/src/notifications/Notifications.Service/Controllers/NotificationController.cs @@ -26,6 +26,7 @@ using Org.Eclipse.TractusX.Portal.Backend.Notifications.Service.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Notifications.Service.Controllers; diff --git a/src/portalbackend/PortalBackend.DBAccess/PortalBackend.DBAccess.csproj b/src/portalbackend/PortalBackend.DBAccess/PortalBackend.DBAccess.csproj index 775c870a35..40071a3480 100644 --- a/src/portalbackend/PortalBackend.DBAccess/PortalBackend.DBAccess.csproj +++ b/src/portalbackend/PortalBackend.DBAccess/PortalBackend.DBAccess.csproj @@ -33,8 +33,8 @@ - - + + diff --git a/src/portalbackend/PortalBackend.Migrations/PortalBackend.Migrations.csproj b/src/portalbackend/PortalBackend.Migrations/PortalBackend.Migrations.csproj index 2d47b661dd..fa13b13473 100644 --- a/src/portalbackend/PortalBackend.Migrations/PortalBackend.Migrations.csproj +++ b/src/portalbackend/PortalBackend.Migrations/PortalBackend.Migrations.csproj @@ -40,8 +40,8 @@ - - + + diff --git a/src/portalbackend/PortalBackend.PortalEntities/PortalBackend.PortalEntities.csproj b/src/portalbackend/PortalBackend.PortalEntities/PortalBackend.PortalEntities.csproj index 3b2c8d93c9..e71f77a53b 100644 --- a/src/portalbackend/PortalBackend.PortalEntities/PortalBackend.PortalEntities.csproj +++ b/src/portalbackend/PortalBackend.PortalEntities/PortalBackend.PortalEntities.csproj @@ -34,10 +34,10 @@ all - - - - + + + + diff --git a/src/processes/NetworkRegistration.Library/NetworkRegistrationHandler.cs b/src/processes/NetworkRegistration.Library/NetworkRegistrationHandler.cs index 284e828e85..7d69f6f3f1 100644 --- a/src/processes/NetworkRegistration.Library/NetworkRegistrationHandler.cs +++ b/src/processes/NetworkRegistration.Library/NetworkRegistrationHandler.cs @@ -18,8 +18,8 @@ ********************************************************************************/ using Microsoft.Extensions.Options; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.Framework.Async; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.Keycloak.ErrorHandling; using Org.Eclipse.TractusX.Portal.Backend.Mailing.SendMail; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess; diff --git a/src/processes/Processes.Worker.Library/IProcessTypeExecutor.cs b/src/processes/Processes.Worker.Library/IProcessTypeExecutor.cs index 9e9c8b1771..33527983da 100644 --- a/src/processes/Processes.Worker.Library/IProcessTypeExecutor.cs +++ b/src/processes/Processes.Worker.Library/IProcessTypeExecutor.cs @@ -18,6 +18,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; namespace Org.Eclipse.TractusX.Portal.Backend.Processes.Worker.Library; diff --git a/src/processes/Processes.Worker.Library/Processes.Worker.Library.csproj b/src/processes/Processes.Worker.Library/Processes.Worker.Library.csproj index ee76ab830c..d6d7d265be 100644 --- a/src/processes/Processes.Worker.Library/Processes.Worker.Library.csproj +++ b/src/processes/Processes.Worker.Library/Processes.Worker.Library.csproj @@ -29,7 +29,7 @@ - + diff --git a/src/processes/Processes.Worker/Processes.Worker.csproj b/src/processes/Processes.Worker/Processes.Worker.csproj index 9328554dee..a1d9fba8a7 100644 --- a/src/processes/Processes.Worker/Processes.Worker.csproj +++ b/src/processes/Processes.Worker/Processes.Worker.csproj @@ -40,7 +40,7 @@ - + diff --git a/src/provisioning/Provisioning.Library/Provisioning.Library.csproj b/src/provisioning/Provisioning.Library/Provisioning.Library.csproj index be131c9bfc..39a54aa5fb 100644 --- a/src/provisioning/Provisioning.Library/Provisioning.Library.csproj +++ b/src/provisioning/Provisioning.Library/Provisioning.Library.csproj @@ -38,9 +38,9 @@ - + - + diff --git a/src/provisioning/Provisioning.Migrations/Provisioning.Migrations.csproj b/src/provisioning/Provisioning.Migrations/Provisioning.Migrations.csproj index eb6e14d1ef..002a601a64 100644 --- a/src/provisioning/Provisioning.Migrations/Provisioning.Migrations.csproj +++ b/src/provisioning/Provisioning.Migrations/Provisioning.Migrations.csproj @@ -45,8 +45,8 @@ - - + + diff --git a/src/registration/Registration.Common/Registration.Common.csproj b/src/registration/Registration.Common/Registration.Common.csproj index 7de6685682..48a4db221c 100644 --- a/src/registration/Registration.Common/Registration.Common.csproj +++ b/src/registration/Registration.Common/Registration.Common.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/src/registration/Registration.Service/Controllers/NetworkController.cs b/src/registration/Registration.Service/Controllers/NetworkController.cs index 832cf81c75..1f10ae80b3 100644 --- a/src/registration/Registration.Service/Controllers/NetworkController.cs +++ b/src/registration/Registration.Service/Controllers/NetworkController.cs @@ -21,9 +21,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.Registration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Registration.Service.Model; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Registration.Service.Controllers; diff --git a/src/registration/Registration.Service/Controllers/RegistrationController.cs b/src/registration/Registration.Service/Controllers/RegistrationController.cs index 67fbe0d83e..6d0ecffe92 100644 --- a/src/registration/Registration.Service/Controllers/RegistrationController.cs +++ b/src/registration/Registration.Service/Controllers/RegistrationController.cs @@ -22,13 +22,13 @@ using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library.Models; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.Keycloak.Authentication; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Models; using Org.Eclipse.TractusX.Portal.Backend.Registration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Registration.Service.Model; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; using System.Net; namespace Org.Eclipse.TractusX.Portal.Backend.Registration.Service.Controllers diff --git a/src/web/Web.Identity/Web.Identity.csproj b/src/web/Web.Identity/Web.Identity.csproj index 38e351eaf7..a09167c3c3 100644 --- a/src/web/Web.Identity/Web.Identity.csproj +++ b/src/web/Web.Identity/Web.Identity.csproj @@ -27,11 +27,12 @@ + - + diff --git a/src/web/Web.Initialization/Web.Initialization.csproj b/src/web/Web.Initialization/Web.Initialization.csproj index 0e02eacf2e..976a99e2d3 100644 --- a/src/web/Web.Initialization/Web.Initialization.csproj +++ b/src/web/Web.Initialization/Web.Initialization.csproj @@ -27,6 +27,7 @@ + @@ -34,7 +35,7 @@ - + diff --git a/src/web/Web.Initialization/WebAppHelper.cs b/src/web/Web.Initialization/WebAppHelper.cs index 3c95554d1b..f70541ff2e 100644 --- a/src/web/Web.Initialization/WebAppHelper.cs +++ b/src/web/Web.Initialization/WebAppHelper.cs @@ -68,6 +68,5 @@ public static void BuildAndRunWebApplication(string[] args, string pat } FlurlErrorHandler.ConfigureErrorHandler(app.Services.GetRequiredService>(), environment.IsDevelopment()); - }, - null); + }); } diff --git a/src/web/Web.PublicInfos/OpenInformationController.cs b/src/web/Web.PublicInfos/OpenInformationController.cs index 0427bcef39..47e2cd6825 100644 --- a/src/web/Web.PublicInfos/OpenInformationController.cs +++ b/src/web/Web.PublicInfos/OpenInformationController.cs @@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; diff --git a/src/web/Web.PublicInfos/Web.PublicInfos.csproj b/src/web/Web.PublicInfos/Web.PublicInfos.csproj index 49a7a10245..afebd5fe37 100644 --- a/src/web/Web.PublicInfos/Web.PublicInfos.csproj +++ b/src/web/Web.PublicInfos/Web.PublicInfos.csproj @@ -34,5 +34,6 @@ + diff --git a/tests/keycloak/Keycloak.Authentication.Tests/KeycloakClaimsTransformationTests.cs b/tests/keycloak/Keycloak.Authentication.Tests/KeycloakClaimsTransformationTests.cs index 4adbdc8faa..196816e5f8 100644 --- a/tests/keycloak/Keycloak.Authentication.Tests/KeycloakClaimsTransformationTests.cs +++ b/tests/keycloak/Keycloak.Authentication.Tests/KeycloakClaimsTransformationTests.cs @@ -19,7 +19,7 @@ using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.Extensions.Options; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; +using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; using System.Security.Claims; namespace Org.Eclipse.TractusX.Portal.Backend.Keycloak.Authentication.Tests; diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/PortalBackend.DBAccess.Tests.csproj b/tests/portalbackend/PortalBackend.DBAccess.Tests/PortalBackend.DBAccess.Tests.csproj index 3cd6f7f97e..1b6266d9a8 100644 --- a/tests/portalbackend/PortalBackend.DBAccess.Tests/PortalBackend.DBAccess.Tests.csproj +++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/PortalBackend.DBAccess.Tests.csproj @@ -34,7 +34,7 @@ - +