diff --git a/.github/workflows/pre-checks.yml b/.github/workflows/pre-checks.yml index ec7aae4fcd..4a900d74a4 100644 --- a/.github/workflows/pre-checks.yml +++ b/.github/workflows/pre-checks.yml @@ -72,7 +72,7 @@ jobs: - name: Check Format run: dotnet format src --verify-no-changes --no-restore - name: Test - run: dotnet test src --filter FullyQualifiedName\!~Org.Eclipse.TractusX.Portal.Backend.EndToEnd.Tests --no-restore --verbosity normal + run: dotnet test src --no-build --filter FullyQualifiedName\!~Org.Eclipse.TractusX.Portal.Backend.EndToEnd.Tests --no-restore --verbosity normal checkFramework: name: Check nuget packages diff --git a/docs/api/Org.Eclipse.TractusX.Portal.Backend.Administration.Service.yaml b/docs/api/Org.Eclipse.TractusX.Portal.Backend.Administration.Service.yaml index 82da27e1c3..b4397bc3a8 100644 --- a/docs/api/Org.Eclipse.TractusX.Portal.Backend.Administration.Service.yaml +++ b/docs/api/Org.Eclipse.TractusX.Portal.Backend.Administration.Service.yaml @@ -5025,7 +5025,7 @@ paths: post: tags: - User - summary: Create new users for the companies shared identityprovider by upload of csv-file (Authorization required) + summary: 'Create new users for the companies shared identityprovider by upload of csv-file (Authorization required - Roles: add_user_account)' description: 'Example: POST: api/administration/user/owncompany/usersfile' requestBody: content: @@ -6348,6 +6348,8 @@ components: nullable: true name: type: string + userType: + $ref: '#/components/schemas/CompanyServiceAccountKindId' serviceAccountType: $ref: '#/components/schemas/CompanyServiceAccountTypeId' status: @@ -7767,6 +7769,11 @@ components: roleName: type: string additionalProperties: false + UserRoleType: + enum: + - Internal + - External + type: string UserRoleWithDescription: type: object properties: @@ -7778,6 +7785,8 @@ components: roleDescription: type: string nullable: true + roleType: + $ref: '#/components/schemas/UserRoleType' additionalProperties: false UserRoleWithId: type: object diff --git a/src/provisioning/Provisioning.Library/ProvisioningSettings.cs b/src/provisioning/Provisioning.Library/ProvisioningSettings.cs index 4232891edd..8a3e8139f3 100644 --- a/src/provisioning/Provisioning.Library/ProvisioningSettings.cs +++ b/src/provisioning/Provisioning.Library/ProvisioningSettings.cs @@ -21,6 +21,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Validation; namespace Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library; @@ -43,7 +44,7 @@ public static IServiceCollection ConfigureProvisioningSettings( services.Configure(x => { section.Bind(x); - if (string.IsNullOrWhiteSpace(x.CentralRealm)) + if (!EnvironmentExtensions.SkipValidation() && string.IsNullOrWhiteSpace(x.CentralRealm)) { throw new ConfigurationException($"{nameof(ProvisioningSettings)}: {nameof(x.CentralRealm)} must not be null or empty"); }