Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(startup errors): adjust settings #1057

Merged
merged 1 commit into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 51 additions & 51 deletions docs/api/administration-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static IServiceCollection AddBpnAccess(this IServiceCollection services,

var sp = services.BuildServiceProvider();
var settings = sp.GetRequiredService<IOptions<BpdmAccessSettings>>();
var baseAddress = settings.Value.BaseUrl;
var baseAddress = settings.Value.BaseAddress;
services.AddTransient<LoggingHandler<BpnAccess>>();
services.AddHttpClient(nameof(BpnAccess), c =>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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!;
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,4 @@ public class OfferSubscriptionsProcessSettings
/// </summary>
[Required(AllowEmptyStrings = false)]
public string BasePortalAddress { get; init; } = null!;

[Required]
[DistinctValues("x => x.ClientId")]
public IEnumerable<UserRoleConfig> DimUserRoles { get; set; } = null!;
}
Loading