Merge pull request eclipse-tractusx#885 from eclipse-tractusx/release…

…/v2.1.0-RC2

build(2.1.0-rc2): merge main into main

CHANGELOG.md

@@ -2,6 +2,32 @@
 
 New features, fixed bugs, known defects and other noteworthy changes to each release of the Catena-X Portal Backend.
 
+## 2.1.0-RC2
+
+### Change
+
+* **Offer Autosetup**
+  * enhanced subscription/provider endpoint with external service data [#867](https://github.com/eclipse-tractusx/portal-backend/pull/867)
+
+### Technical Support
+
+* bumped efcore to 8.0.7 [#857](https://github.com/eclipse-tractusx/portal-backend/pull/857)
+* upgraded  implicit dependencies on System.Text.Json [#875](https://github.com/eclipse-tractusx/portal-backend/pull/875)
+* bumped MimeKit from 4.3.0 to 4.7.1 [#833](https://github.com/eclipse-tractusx/portal-backend/pull/833)
+
+### Bugfixes
+
+* **Offer Autosetup**
+  * removed leading '/' from the activate subscription endpoint [#861](https://github.com/eclipse-tractusx/portal-backend/pull/861)
+  * suppressed activation of external service accounts on activation of offer subscription [#864](https://github.com/eclipse-tractusx/portal-backend/pull/864)
+  * skipped optional autosetup provider callback if it is not configured [#865](https://github.com/eclipse-tractusx/portal-backend/pull/865)
+  * added default clientPrefix to appsettings.json [#870](https://github.com/eclipse-tractusx/portal-backend/pull/870)
+* **Decentral Identity Management (DIM) Integration**
+  * fixed callback logic for dim requests in case of multiple company applications with same bpn (some declined, one in status submitted) [#863](https://github.com/eclipse-tractusx/portal-backend/pull/863)
+* **Registration Process (Administration Service)**
+  * set process step to skipped if ClearinghouseConnectDisabed is true [#874](https://github.com/eclipse-tractusx/portal-backend/pull/874)
+* fixed typos [#883](https://github.com/eclipse-tractusx/portal-backend/pull/883)
+
 ## 2.1.0-RC1
 
 ### Change

src/Directory.Build.props

@@ -20,6 +20,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>2.1.0</VersionPrefix>
-    <VersionSuffix>RC1</VersionSuffix>
+    <VersionSuffix>RC2</VersionSuffix>
   </PropertyGroup>
 </Project>

src/portalbackend/PortalBackend.Migrations/Seeder/Data/company_role_descriptions.json

@@ -7,7 +7,7 @@
   {
     "company_role_id": 1,
     "language_short_name": "en",
-    "description": "The participant role is covering the data provider, data consumer or app user scenario. As participant you are an active member of the network with enabled services to particiapte as contributer and user."
+    "description": "The participant role is covering the data provider, data consumer or app user scenario. As participant you are an active member of the network with enabled services to participate as contributor and user."
   },
   {
     "company_role_id": 2,

tests/portalbackend/PortalBackend.DBAccess.Tests/CompanyRepositoryTests.cs

@@ -553,7 +553,7 @@ public async Task GetCompanyRoleAndConsentAgreementDetailsAsync_ReturnsExpected(
     {
         var (sut, _) = await CreateSut();
         var companyId = new Guid("3390c2d7-75c1-4169-aa27-6ce00e1f3cdd");
-        var activeDescription = "The participant role is covering the data provider, data consumer or app user scenario. As participant you are an active member of the network with enabled services to particiapte as contributer and user.";
+        var activeDescription = "The participant role is covering the data provider, data consumer or app user scenario. As participant you are an active member of the network with enabled services to participate as contributor and user.";
         var serviceDscription = "The Service Provider is able to offer 3rd party services, such as dataspace service offerings to Catena-X Members. Catena-X members can subscribe for those services.";
         var appDescription = "The App Provider is a company which is providing application software via the CX marketplace. As app provider you can participate and use the developer hub, release and offer applications to the network and manage your applications.";
         var onboardingServiceProviderDescription = "The Onboarding service provider is a Catena-X certified role which enables the company to act as onboarding provider inside the network.";