Merge branch 'dev' into feature/CPLP-3087-Get-appChange-documents

eclipse-tractusx · Sep 13, 2023 · 6933905 · 6933905
2 parents aff39b8 + 5a83901
commit 6933905
Show file tree

Hide file tree

Showing 28 changed files with 7,862 additions and 87 deletions.
diff --git a/src/administration/Administration.Service/BusinessLogic/IdentityProviderBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/IdentityProviderBusinessLogic.cs
@@ -135,13 +135,7 @@ private async ValueTask<IdentityProviderDetails> CreateOwnCompanyIdentityProvide
         }
 
         var alias = await _provisioningManager.CreateOwnIdpAsync(displayName ?? result.CompanyName, result.CompanyName, protocol).ConfigureAwait(false);
-        var identityProviderId = identityProviderRepository.CreateIdentityProvider(identityProviderCategory, typeId, idp =>
-        {
-            if (typeId == IdentityProviderTypeId.MANAGED)
-            {
-                idp.OwnerId = companyId;
-            }
-        }).Id;
+        var identityProviderId = identityProviderRepository.CreateIdentityProvider(identityProviderCategory, typeId, companyId, null).Id;
         if (typeId == IdentityProviderTypeId.OWN)
         {
             identityProviderRepository.CreateCompanyIdentityProvider(companyId, identityProviderId);
@@ -219,10 +213,10 @@ public async ValueTask<IdentityProviderDetails> SetOwnCompanyIdentityProviderSta
         {
             throw new NotFoundException($"identityProvider {identityProviderId} does not exist");
         }
-        var (isOwnOrOwner, alias, identityProviderCategory, identityProviderTypeId, companyIdAliase) = result;
-        if (!isOwnOrOwner)
+        var (isOwner, alias, identityProviderCategory, identityProviderTypeId, companyIdAliase) = result;
+        if (!isOwner)
         {
-            throw new ConflictException($"identityProvider {identityProviderId} is not associated with company {companyId}");
+            throw new ForbiddenException($"company {companyId} is not the owner of identityProvider {identityProviderId}");
         }
         if (alias == null)
         {
@@ -268,8 +262,8 @@ public async ValueTask<IdentityProviderDetails> UpdateOwnCompanyIdentityProvider
         {
             throw new NotFoundException($"identityProvider {identityProviderId} does not exist");
         }
-        var (isOwnOrOwner, alias, identityProviderCategory, identityProviderTypeId, _) = result;
-        if (!isOwnOrOwner)
+        var (isOwner, alias, identityProviderCategory, identityProviderTypeId, _) = result;
+        if (!isOwner)
         {
             throw new ForbiddenException($"User not allowed to run the change for identity provider {identityProviderId}");
         }
@@ -357,7 +351,7 @@ public async ValueTask DeleteCompanyIdentityProviderAsync(Guid identityProviderI
             }
             await _provisioningManager.DeleteCentralIdentityProviderAsync(alias).ConfigureAwait(false);
         }
-        _portalRepositories.Remove(_portalRepositories.Attach(new IdentityProvider(identityProviderId, default, default, default)));
+        _portalRepositories.Remove(_portalRepositories.Attach(new IdentityProvider(identityProviderId, default, default, default, default)));
 
         await _portalRepositories.SaveAsync().ConfigureAwait(false);
     }
@@ -369,10 +363,10 @@ public async ValueTask DeleteCompanyIdentityProviderAsync(Guid identityProviderI
         {
             throw new NotFoundException($"identityProvider {identityProviderId} does not exist");
         }
-        var (isOwnOrOwner, alias, _, typeId, aliase) = result;
-        if (!isOwnOrOwner)
+        var (isOwner, alias, _, typeId, aliase) = result;
+        if (!isOwner)
         {
-            throw new ConflictException($"identityProvider {identityProviderId} is not associated with company {companyId}");
+            throw new ForbiddenException($"company {companyId} is not the owner of identityProvider {identityProviderId}");
         }
 
         if (typeId == IdentityProviderTypeId.MANAGED)

diff --git a/src/administration/Administration.Service/BusinessLogic/InvitationBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/InvitationBusinessLogic.cs
@@ -83,7 +83,7 @@ private async Task ExecuteInvitationInternalAsync(CompanyInvitationData invitati
         var company = _portalRepositories.GetInstance<ICompanyRepository>().CreateCompany(invitationData.organisationName);
 
         var identityProviderRepository = _portalRepositories.GetInstance<IIdentityProviderRepository>();
-        var identityProvider = identityProviderRepository.CreateIdentityProvider(IdentityProviderCategoryId.KEYCLOAK_OIDC, IdentityProviderTypeId.SHARED, null);
+        var identityProvider = identityProviderRepository.CreateIdentityProvider(IdentityProviderCategoryId.KEYCLOAK_OIDC, IdentityProviderTypeId.SHARED, company.Id, null);
         identityProvider.Companies.Add(company);
         identityProviderRepository.CreateIamIdentityProvider(identityProvider.Id, idpName);
 

diff --git a/src/mailing/Mailing.Template/Enums/EmailTemplateType.cs b/src/mailing/Mailing.Template/Enums/EmailTemplateType.cs
@@ -129,6 +129,18 @@ public enum EmailTemplateType
         /// Email template for credential rejection
         /// </summary>
         [Path("verified_credential_declined.html")]
-        CredentialRejected
+        CredentialRejected,
+
+        /// <summary>
+        /// Email template for app release activation approval
+        /// </summary>
+        [Path("appactivation_offer_release_approval.html")]
+        AppReleaseActivationApproval,
+
+        /// <summary>
+        /// Email template for service release activation approval
+        /// </summary>
+        [Path("serviceactivation_offer_release_approval.html")]
+        ServiceReleaseActivationApproval
     }
 }
diff --git a/src/mailing/Mailing.Template/Mailing.Template.csproj b/src/mailing/Mailing.Template/Mailing.Template.csproj
@@ -99,6 +99,12 @@
 	 <None Update="EmailTemplates\verified_credential_declined.html">
 	   <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	 </None>
+	 <None Update="EmailTemplates\appactivation_offer_release_approval.html">
+	   <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	 </None>
+	 <None Update="EmailTemplates\serviceactivation_offer_release_approval.html">
+	   <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	 </None>
   </ItemGroup>
 
 <ItemGroup>

diff --git a/src/marketplace/Apps.Service/BusinessLogic/AppReleaseBusinessLogic.cs b/src/marketplace/Apps.Service/BusinessLogic/AppReleaseBusinessLogic.cs
@@ -321,7 +321,7 @@ public Task SubmitAppReleaseRequestAsync(Guid appId, Guid userId) =>
 
     /// <inheritdoc/>
     public Task ApproveAppRequestAsync(Guid appId, Guid userId) =>
-        _offerService.ApproveOfferRequestAsync(appId, userId, OfferTypeId.APP, _settings.ApproveAppNotificationTypeIds, _settings.ApproveAppUserRoles, _settings.SubmitAppNotificationTypeIds, _settings.CatenaAdminRoles);
+        _offerService.ApproveOfferRequestAsync(appId, userId, OfferTypeId.APP, _settings.ApproveAppNotificationTypeIds, _settings.ApproveAppUserRoles, _settings.SubmitAppNotificationTypeIds, _settings.CatenaAdminRoles, _settings.BasePortalAddress, _settings.ActivationUserRoles);
 
     private IEnumerable<OfferStatusId> GetOfferStatusIds(OfferStatusIdFilter? offerStatusIdFilter)
     {

diff --git a/src/marketplace/Apps.Service/BusinessLogic/AppsSettings.cs b/src/marketplace/Apps.Service/BusinessLogic/AppsSettings.cs
@@ -184,13 +184,21 @@ public class AppsSettings
     [DistinctValues("x => x.ClientId")]
     public IEnumerable<UserRoleConfig> SubscriptionManagerRoles { get; set; } = null!;
 
+    /// <summary>
+    /// Roles to notify when a new Activation was created
+    /// </summary>
+    [Required]
+    [DistinctValues("x => x.ClientId")]
+    public IEnumerable<UserRoleConfig> ActivationUserRoles { get; init; } = null!;
+
     /// <summary>
     /// Active Document Types
     /// </summary>
     [Required]
     [EnumEnumeration]
     [DistinctValues]
     public IEnumerable<DocumentTypeId> ActiveAppDocumentTypeIds { get; set; } = null!;
+
 }
 
 /// <summary>

diff --git a/src/marketplace/Apps.Service/appsettings.json b/src/marketplace/Apps.Service/appsettings.json
@@ -96,6 +96,13 @@
           "Subject": "Decline of app {offerName}",
           "EmailTemplateType": "AppRequestDecline"
         }
+      },
+      {
+        "Name": "offer-release-activation",
+        "Setting": {
+          "Subject": "Activation of app {offerName}",
+          "EmailTemplateType": "AppReleaseActivationApproval"
+        }
       }
     ],
     "Mail": {

diff --git a/src/marketplace/Offers.Library/Service/IOfferService.cs b/src/marketplace/Offers.Library/Service/IOfferService.cs
@@ -139,7 +139,7 @@ Task CreateOrUpdateOfferSubscriptionAgreementConsentAsync(Guid subscriptionId,
     /// <param name="submitOfferNotificationTypeIds"></param>
     /// <param name="catenaAdminRoles"></param>
     /// <returns></returns>
-    Task ApproveOfferRequestAsync(Guid offerId, Guid userId, OfferTypeId offerTypeId, IEnumerable<NotificationTypeId> approveOfferNotificationTypeIds, IEnumerable<UserRoleConfig> approveOfferRoles, IEnumerable<NotificationTypeId> submitOfferNotificationTypeIds, IEnumerable<UserRoleConfig> catenaAdminRoles);
+    Task ApproveOfferRequestAsync(Guid offerId, Guid userId, OfferTypeId offerTypeId, IEnumerable<NotificationTypeId> approveOfferNotificationTypeIds, IEnumerable<UserRoleConfig> approveOfferRoles, IEnumerable<NotificationTypeId> submitOfferNotificationTypeIds, IEnumerable<UserRoleConfig> catenaAdminRoles, string basePortalAddress, IEnumerable<UserRoleConfig> notificationRecipients);
 
     /// <summary>
     /// Update offer status and create notification for App 

diff --git a/src/marketplace/Offers.Library/Service/OfferService.cs b/src/marketplace/Offers.Library/Service/OfferService.cs
@@ -453,7 +453,7 @@ offerDetails.ProviderCompanyId is not null &&
     }
 
     /// <inheritdoc/>
-    public async Task ApproveOfferRequestAsync(Guid offerId, Guid userId, OfferTypeId offerTypeId, IEnumerable<NotificationTypeId> approveOfferNotificationTypeIds, IEnumerable<UserRoleConfig> approveOfferRoles, IEnumerable<NotificationTypeId> submitOfferNotificationTypeIds, IEnumerable<UserRoleConfig> catenaAdminRoles)
+    public async Task ApproveOfferRequestAsync(Guid offerId, Guid userId, OfferTypeId offerTypeId, IEnumerable<NotificationTypeId> approveOfferNotificationTypeIds, IEnumerable<UserRoleConfig> approveOfferRoles, IEnumerable<NotificationTypeId> submitOfferNotificationTypeIds, IEnumerable<UserRoleConfig> catenaAdminRoles, string basePortalAddress, IEnumerable<UserRoleConfig> notificationRecipients)
     {
         var offerRepository = _portalRepositories.GetInstance<IOfferRepository>();
         var offerDetails = await offerRepository.GetOfferStatusDataByIdAsync(offerId, offerTypeId).ConfigureAwait(false);
@@ -509,6 +509,21 @@ public async Task ApproveOfferRequestAsync(Guid offerId, Guid userId, OfferTypeI
         await _notificationService.SetNotificationsForOfferToDone(catenaAdminRoles, submitOfferNotificationTypeIds, offerId).ConfigureAwait(false);
 
         await _portalRepositories.SaveAsync().ConfigureAwait(false);
+
+        await _roleBaseMailService.RoleBaseSendMail(
+            notificationRecipients,
+            new[]
+            {
+                ("offerName", offerDetails.OfferName),
+                ("portalBaseUrl", basePortalAddress),
+                (offerTypeId == OfferTypeId.APP ? "appId" : "serviceId", offerId.ToString())
+            },
+            ("offerProviderName", "User"),
+            new[]
+            {
+                "offer-release-activation"
+            },
+            offerDetails.ProviderCompanyId.Value).ConfigureAwait(false);
     }
 
     /// <inheritdoc />

diff --git a/src/marketplace/Services.Service/BusinessLogic/ServiceReleaseBusinessLogic.cs b/src/marketplace/Services.Service/BusinessLogic/ServiceReleaseBusinessLogic.cs
@@ -235,7 +235,7 @@ public Task SubmitServiceAsync(Guid serviceId, Guid userId) =>
 
     /// <inheritdoc/>
     public Task ApproveServiceRequestAsync(Guid appId, Guid userId) =>
-        _offerService.ApproveOfferRequestAsync(appId, userId, OfferTypeId.SERVICE, _settings.ApproveServiceNotificationTypeIds, _settings.ApproveServiceUserRoles, _settings.SubmitServiceNotificationTypeIds, _settings.CatenaAdminRoles);
+        _offerService.ApproveOfferRequestAsync(appId, userId, OfferTypeId.SERVICE, _settings.ApproveServiceNotificationTypeIds, _settings.ApproveServiceUserRoles, _settings.SubmitServiceNotificationTypeIds, _settings.CatenaAdminRoles, _settings.BasePortalAddress, _settings.ActivationUserRoles);
 
     /// <inheritdoc />
     public Task DeclineServiceRequestAsync(Guid serviceId, Guid userId, OfferDeclineRequest data) =>

diff --git a/src/marketplace/Services.Service/ServiceSettings.cs b/src/marketplace/Services.Service/ServiceSettings.cs
@@ -147,6 +147,13 @@ public class ServiceSettings
     [DistinctValues("x => x.ClientId")]
     public IEnumerable<UserRoleConfig> SubscriptionManagerRoles { get; init; } = null!;
 
+    /// <summary>
+    /// Roles to notify when a new Activation was created
+    /// </summary>
+    [Required]
+    [DistinctValues("x => x.ClientId")]
+    public IEnumerable<UserRoleConfig> ActivationUserRoles { get; init; } = null!;
+
 }
 
 public static class ServiceSettingsExtension

diff --git a/src/marketplace/Services.Service/appsettings.json b/src/marketplace/Services.Service/appsettings.json
@@ -90,6 +90,13 @@
           "Subject": "Decline of service {offerName}",
           "EmailTemplateType": "ServiceRequestDecline"
         }
+      },
+      {
+        "Name": "offer-release-activation",
+        "Setting": {
+          "Subject": "Activation of service {offerName}",
+          "EmailTemplateType": "ServiceReleaseActivationApproval"
+        }
       }
     ],
     "Mail": {

diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/IIdentityProviderRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/IIdentityProviderRepository.cs
@@ -28,13 +28,13 @@ namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositorie
 /// </summary>
 public interface IIdentityProviderRepository
 {
-    IdentityProvider CreateIdentityProvider(IdentityProviderCategoryId identityProviderCategory, IdentityProviderTypeId identityProviderTypeId, Action<IdentityProvider>? setOptionalFields);
+    IdentityProvider CreateIdentityProvider(IdentityProviderCategoryId identityProviderCategory, IdentityProviderTypeId identityProviderTypeId, Guid owner, Action<IdentityProvider>? setOptionalFields);
     IamIdentityProvider CreateIamIdentityProvider(Guid identityProviderId, string idpAlias);
     CompanyIdentityProvider CreateCompanyIdentityProvider(Guid companyId, Guid identityProviderId);
     Task<string?> GetSharedIdentityProviderIamAliasDataUntrackedAsync(Guid companyId);
     Task<IdpUser?> GetIdpCategoryIdByUserIdAsync(Guid companyUserId, Guid userCompanyId);
     Task<(string? Alias, IdentityProviderCategoryId IamIdentityProviderCategory, bool IsOwnOrOwnerCompany, IdentityProviderTypeId TypeId)> GetOwnCompanyIdentityProviderAliasUntrackedAsync(Guid identityProviderId, Guid companyId);
-    Task<(bool IsOwnOrOwner, string? Alias, IdentityProviderCategoryId IdentityProviderCategory, IdentityProviderTypeId IdentityProviderTypeId, IEnumerable<(Guid CompanyId, IEnumerable<string> Aliase)>? CompanyIdAliase)> GetOwnCompanyIdentityProviderUpdateDataUntrackedAsync(Guid identityProviderId, Guid companyId, bool queryAliase);
+    Task<(bool IsOwner, string? Alias, IdentityProviderCategoryId IdentityProviderCategory, IdentityProviderTypeId IdentityProviderTypeId, IEnumerable<(Guid CompanyId, IEnumerable<string> Aliase)>? CompanyIdAliase)> GetOwnCompanyIdentityProviderUpdateDataUntrackedAsync(Guid identityProviderId, Guid companyId, bool queryAliase);
     IAsyncEnumerable<(Guid IdentityProviderId, IdentityProviderCategoryId CategoryId, string Alias, IdentityProviderTypeId TypeId)> GetCompanyIdentityProviderCategoryDataUntracked(Guid companyId);
     IAsyncEnumerable<(Guid IdentityProviderId, string Alias)> GetOwnCompanyIdentityProviderAliasDataUntracked(Guid companyId, IEnumerable<Guid> identityProviderIds);
     Task<(string? UserEntityId, string? Alias, bool IsSameCompany)> GetIamUserIsOwnCompanyIdentityProviderAliasAsync(Guid companyUserId, Guid identityProviderId, Guid companyId);

diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/IdentityProviderRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/IdentityProviderRepository.cs
@@ -41,12 +41,13 @@ public IdentityProviderRepository(PortalDbContext portalDbContext)
     }
 
     /// <inheritdoc/>
-    public IdentityProvider CreateIdentityProvider(IdentityProviderCategoryId identityProviderCategory, IdentityProviderTypeId identityProviderTypeId, Action<IdentityProvider>? setOptionalFields)
+    public IdentityProvider CreateIdentityProvider(IdentityProviderCategoryId identityProviderCategory, IdentityProviderTypeId identityProviderTypeId, Guid owner, Action<IdentityProvider>? setOptionalFields)
     {
         var idp = new IdentityProvider(
             Guid.NewGuid(),
             identityProviderCategory,
             identityProviderTypeId,
+            owner,
             DateTimeOffset.UtcNow);
         setOptionalFields?.Invoke(idp);
         return _context.IdentityProviders
@@ -100,12 +101,12 @@ public IamIdentityProvider CreateIamIdentityProvider(Guid identityProviderId, st
                     identityProvider.IdentityProviderTypeId))
             .SingleOrDefaultAsync();
 
-    public Task<(bool IsOwnOrOwner, string? Alias, IdentityProviderCategoryId IdentityProviderCategory, IdentityProviderTypeId IdentityProviderTypeId, IEnumerable<(Guid CompanyId, IEnumerable<string> Aliase)>? CompanyIdAliase)> GetOwnCompanyIdentityProviderUpdateDataUntrackedAsync(Guid identityProviderId, Guid companyId, bool queryAliase) =>
+    public Task<(bool IsOwner, string? Alias, IdentityProviderCategoryId IdentityProviderCategory, IdentityProviderTypeId IdentityProviderTypeId, IEnumerable<(Guid CompanyId, IEnumerable<string> Aliase)>? CompanyIdAliase)> GetOwnCompanyIdentityProviderUpdateDataUntrackedAsync(Guid identityProviderId, Guid companyId, bool queryAliase) =>
         _context.IdentityProviders
             .Where(identityProvider => identityProvider.Id == identityProviderId)
             .Select(identityProvider =>
                 new ValueTuple<bool, string?, IdentityProviderCategoryId, IdentityProviderTypeId, IEnumerable<(Guid, IEnumerable<string>)>?>(
-                    identityProvider.Owner == null && identityProvider.Companies.Any(c => c.Id == companyId) && identityProvider.Companies.Count == 1 || identityProvider.OwnerId == companyId,
+                    identityProvider.OwnerId == companyId,
                     identityProvider.IamIdentityProvider!.IamIdpAlias,
                     identityProvider.IdentityProviderCategoryId,
                     identityProvider.IdentityProviderTypeId,
@@ -118,7 +119,7 @@ public IamIdentityProvider CreateIamIdentityProvider(Guid identityProviderId, st
     public IAsyncEnumerable<(Guid IdentityProviderId, IdentityProviderCategoryId CategoryId, string Alias, IdentityProviderTypeId TypeId)> GetCompanyIdentityProviderCategoryDataUntracked(Guid companyId) =>
         _context.IdentityProviders
             .AsNoTracking()
-            .Where(identityProvider => identityProvider.OwnerId == companyId || identityProvider.Companies.Any(company => company.Id == companyId) && identityProvider.OwnerId == null)
+            .Where(identityProvider => identityProvider.OwnerId == companyId || identityProvider.Companies.Any(company => company.Id == companyId))
             .Select(identityProvider => new ValueTuple<Guid, IdentityProviderCategoryId, string, IdentityProviderTypeId>(
                 identityProvider.Id,
                 identityProvider.IdentityProviderCategoryId,