fix(app): change appInstanceId to iamClientId for provider endpoint (#…

…158) Refs: CPLP-2983 Reviewed-By: Norbert Truchsess <[email protected]>
eclipse-tractusx · Jul 28, 2023 · c522032 · c522032
1 parent fef1c2c
commit c522032
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/portalbackend/PortalBackend.DBAccess/Models/OfferSubscriptionDetailData.cs b/src/portalbackend/PortalBackend.DBAccess/Models/OfferSubscriptionDetailData.cs
@@ -69,7 +69,7 @@ public record AppProviderSubscriptionDetailData(
     IEnumerable<string> Contact,
     IEnumerable<SubscriptionTechnicalUserData> TechnicalUserData,
     string? TenantUrl,
-    Guid? AppInstanceId
+    string AppInstanceId
 );
 
 /// <summary>

diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/OfferSubscriptionsRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/OfferSubscriptionsRepository.cs
@@ -237,10 +237,10 @@ public OfferSubscription AttachAndModifyOfferSubscription(Guid offerSubscription
                         x.Subscription.Offer!.Name,
                         x.Company!.Name,
                         x.Company.BusinessPartnerNumber,
-                        x.Company.Identities.Where(x => x.IdentityTypeId == IdentityTypeId.COMPANY_USER).Select(i => i.CompanyUser!).Where(cu => cu.Email != null && cu.Identity!.IdentityAssignedRoles.Select(ur => ur.UserRole!).Any(ur => userRoleIds.Contains(ur.Id))).Select(cu => cu.Email!),
+                        x.Company.Identities.Where(i => i.IdentityTypeId == IdentityTypeId.COMPANY_USER).Select(id => id.CompanyUser!).Where(cu => cu.Email != null && cu.Identity!.IdentityAssignedRoles.Select(ur => ur.UserRole!).Any(ur => userRoleIds.Contains(ur.Id))).Select(cu => cu.Email!),
                         x.Subscription.CompanyServiceAccounts.Select(sa => new SubscriptionTechnicalUserData(sa.Id, sa.Name, sa.Identity!.IdentityAssignedRoles.Select(ur => ur.UserRole!).Select(ur => ur.UserRoleText))),
                         x.Subscription.AppSubscriptionDetail!.AppSubscriptionUrl,
-                        x.Subscription.AppSubscriptionDetail!.AppInstanceId)
+                        x.Subscription.AppSubscriptionDetail!.AppInstance!.IamClient!.ClientClientId)
                     : null))
             .SingleOrDefaultAsync();
 

diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/OfferSubscriptionRepositoryTest.cs b/tests/portalbackend/PortalBackend.DBAccess.Tests/OfferSubscriptionRepositoryTest.cs
@@ -272,7 +272,7 @@ public async Task GetAppSubscriptionDetailForProviderAsync_ReturnsExpected()
             x.Contact.SequenceEqual(new[] { "[email protected]" }) &&
             x.OfferSubscriptionStatus == OfferSubscriptionStatusId.ACTIVE &&
             x.TenantUrl == "https://ec-qas.d13fe27.kyma.ondemand.com" &&
-            x.AppInstanceId == new Guid("ab25c218-9ab3-4f1a-b6f4-6394fbc33c5b"));
+            x.AppInstanceId == "https://catenax-int-dismantler-s66pftcc.authentication.eu10.hana.ondemand.com");
     }
 
     [Fact]