diff --git a/docs/api/administration-service.yaml b/docs/api/administration-service.yaml index b4397bc3a8..f13ccdf7ba 100644 --- a/docs/api/administration-service.yaml +++ b/docs/api/administration-service.yaml @@ -2908,7 +2908,7 @@ paths: post: tags: - Network - summary: 'Registers a partner company (Authorization required - Roles: create_partner_registration)' + summary: 'Registers a partner company (Authorization required - Roles: configure_partner_registration)' requestBody: description: Data for the registration content: @@ -3077,6 +3077,56 @@ paths: description: Internal Server Error '401': description: The User is unauthorized + /api/administration/registration/Network/companies: + get: + tags: + - Network + summary: 'Get OSP Company Application Detail by Company Name or Status (Authorization required - Roles: configure_partner_registration)' + description: "Example: GET: api/administration/registration/network/companies?companyName=Car&page=0&size=4&companyApplicationStatus=Closed \n\r\nExample: GET: api/administration/registration/network/companies?page=0&size=4" + parameters: + - name: page + in: query + description: page index start from 0 + schema: + type: integer + format: int32 + - name: size + in: query + description: size to get number of records + schema: + type: integer + format: int32 + - name: companyApplicationStatusFilter + in: query + description: Search by company applicationstatus + schema: + $ref: '#/components/schemas/CompanyApplicationStatusFilter' + - name: companyName + in: query + description: search by company name + schema: + type: string + - name: externalId + in: query + description: search by external Id + schema: + type: string + - name: dateCreatedOrderFilter + in: query + description: sort result by dateCreated ascending or descending + schema: + $ref: '#/components/schemas/DateCreatedOrderFilter' + responses: + '200': + description: Result as a OSP Company Application Details + content: + application/json: + schema: + $ref: '#/components/schemas/CompanyDetailsOspOnboardingResponse' + '500': + description: Internal Server Error + '401': + description: The User is unauthorized /api/info: get: tags: @@ -4047,56 +4097,6 @@ paths: description: Internal Server Error '401': description: The User is unauthorized - /api/administration/registration/network/companies: - get: - tags: - - Registration - summary: 'Get OSP Company Application Detail by Company Name or Status (Authorization required - Roles: view_submitted_applications)' - description: "Example: GET: api/administration/registration/network/companies?companyName=Car&page=0&size=4&companyApplicationStatus=Closed \n\r\nExample: GET: api/administration/registration/network/companies?page=0&size=4" - parameters: - - name: page - in: query - description: page index start from 0 - schema: - type: integer - format: int32 - - name: size - in: query - description: size to get number of records - schema: - type: integer - format: int32 - - name: companyApplicationStatusFilter - in: query - description: Search by company applicationstatus - schema: - $ref: '#/components/schemas/CompanyApplicationStatusFilter' - - name: companyName - in: query - description: search by company name - schema: - type: string - - name: externalId - in: query - description: search by external Id - schema: - type: string - - name: dateCreatedOrderFilter - in: query - description: sort result by dateCreated ascending or descending - schema: - $ref: '#/components/schemas/DateCreatedOrderFilter' - responses: - '200': - description: Result as a OSP Company Application Details - content: - application/json: - schema: - $ref: '#/components/schemas/CompanyDetailsOspOnboardingResponse' - '500': - description: Internal Server Error - '401': - description: The User is unauthorized /api/administration/RegistrationStatus/callback: get: tags: diff --git a/src/externalsystems/Bpdm.Library/DependencyInjection/BpnAccessCollectionExtension.cs b/src/externalsystems/Bpdm.Library/DependencyInjection/BpnAccessCollectionExtension.cs index ea2fad8872..f91e5599f5 100644 --- a/src/externalsystems/Bpdm.Library/DependencyInjection/BpnAccessCollectionExtension.cs +++ b/src/externalsystems/Bpdm.Library/DependencyInjection/BpnAccessCollectionExtension.cs @@ -36,7 +36,7 @@ public static IServiceCollection AddBpnAccess(this IServiceCollection services, var sp = services.BuildServiceProvider(); var settings = sp.GetRequiredService>(); - var baseAddress = settings.Value.BaseUrl; + var baseAddress = settings.Value.BaseAddress; services.AddTransient>(); services.AddHttpClient(nameof(BpnAccess), c => { diff --git a/src/externalsystems/Bpdm.Library/Models/BpdmAccessSettings.cs b/src/externalsystems/Bpdm.Library/Models/BpdmAccessSettings.cs index cb1e3b1e4e..bc0d47daf5 100644 --- a/src/externalsystems/Bpdm.Library/Models/BpdmAccessSettings.cs +++ b/src/externalsystems/Bpdm.Library/Models/BpdmAccessSettings.cs @@ -24,5 +24,5 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library.Models; public class BpdmAccessSettings { [Required(AllowEmptyStrings = false)] - public string BaseUrl { get; set; } = null!; + public string BaseAddress { get; set; } = null!; } diff --git a/src/processes/OfferSubscription.Executor/DependencyInjection/OfferSubscriptionsProcessSettings.cs b/src/processes/OfferSubscription.Executor/DependencyInjection/OfferSubscriptionsProcessSettings.cs index 817752d4bd..1d5bb21c10 100644 --- a/src/processes/OfferSubscription.Executor/DependencyInjection/OfferSubscriptionsProcessSettings.cs +++ b/src/processes/OfferSubscription.Executor/DependencyInjection/OfferSubscriptionsProcessSettings.cs @@ -44,8 +44,4 @@ public class OfferSubscriptionsProcessSettings /// [Required(AllowEmptyStrings = false)] public string BasePortalAddress { get; init; } = null!; - - [Required] - [DistinctValues("x => x.ClientId")] - public IEnumerable DimUserRoles { get; set; } = null!; }