diff --git a/HwProj.APIGateway/HwProj.APIGateway.API/ApplicationProfile.cs b/HwProj.APIGateway/HwProj.APIGateway.API/ApplicationProfile.cs index 1df12835c..5b4586089 100644 --- a/HwProj.APIGateway/HwProj.APIGateway.API/ApplicationProfile.cs +++ b/HwProj.APIGateway/HwProj.APIGateway.API/ApplicationProfile.cs @@ -1,9 +1,6 @@ using AutoMapper; -using HwProj.Models.AuthService.DTO; using HwProj.Models.AuthService.ViewModels; -using HwProj.Models.CoursesService; using HwProj.Models.CoursesService.DTO; -using HwProj.Models.CoursesService.ViewModels; namespace HwProj.APIGateway.API { diff --git a/HwProj.APIGateway/HwProj.APIGateway.API/Controllers/SolutionsController.cs b/HwProj.APIGateway/HwProj.APIGateway.API/Controllers/SolutionsController.cs index 29aa12871..b278fc38e 100644 --- a/HwProj.APIGateway/HwProj.APIGateway.API/Controllers/SolutionsController.cs +++ b/HwProj.APIGateway/HwProj.APIGateway.API/Controllers/SolutionsController.cs @@ -4,7 +4,6 @@ using System.Net; using System.Threading.Tasks; using HwProj.APIGateway.API.ExceptionFilters; -using HwProj.APIGateway.API.Extensions; using HwProj.APIGateway.API.Models.Solutions; using HwProj.AuthService.Client; using HwProj.CoursesService.Client; diff --git a/HwProj.APIGateway/HwProj.APIGateway.API/Controllers/TasksController.cs b/HwProj.APIGateway/HwProj.APIGateway.API/Controllers/TasksController.cs index 8abfc578a..a8073ddbb 100644 --- a/HwProj.APIGateway/HwProj.APIGateway.API/Controllers/TasksController.cs +++ b/HwProj.APIGateway/HwProj.APIGateway.API/Controllers/TasksController.cs @@ -4,7 +4,6 @@ using HwProj.Models.CoursesService.ViewModels; using HwProj.Models.Result; using HwProj.Models.Roles; -using HwProj.Utils.Authorization; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/HwProj.APIGateway/HwProj.APIGateway.API/Dockerfile b/HwProj.APIGateway/HwProj.APIGateway.API/Dockerfile index be8d9281e..6928d345d 100644 --- a/HwProj.APIGateway/HwProj.APIGateway.API/Dockerfile +++ b/HwProj.APIGateway/HwProj.APIGateway.API/Dockerfile @@ -16,7 +16,6 @@ COPY ["HwProj.SolutionsService/HwProj.SolutionsService.Client/", "HwProj.Solutio COPY ["HwProj.Common/HwProj.Exceptions/", "HwProj.Common/HwProj.Exceptions/"] COPY ["HwProj.ContentService/HwProj.ContentService.Client/", "HwProj.ContentService/HwProj.ContentService.Client/"] COPY ["HwProj.StudentInfo/IStudentsInfo/", "HwProj.StudentInfo/IStudentsInfo/"] -COPY ["HwProj.StudentInfo/StudentsInfo.Tests/", "HwProj.StudentInfo/StudentsInfo.Tests/"] COPY ["HwProj.StudentInfo/StudentsInfo/", "HwProj.StudentInfo/StudentsInfo/"] WORKDIR "/src/HwProj.APIGateway/HwProj.APIGateway.API" diff --git a/HwProj.APIGateway/HwProj.APIGateway.API/Extensions/LinqExtensions.cs b/HwProj.APIGateway/HwProj.APIGateway.API/Extensions/LinqExtensions.cs deleted file mode 100644 index a433f1854..000000000 --- a/HwProj.APIGateway/HwProj.APIGateway.API/Extensions/LinqExtensions.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace HwProj.APIGateway.API.Extensions -{ - public static class LinqExtensions - { - public static IEnumerable DistinctBy(this IEnumerable source, - Func keySelector) - { - var knownKeys = new HashSet(); - foreach (var element in source) - { - if (knownKeys.Add(keySelector(element))) - yield return element; - } - } - } -} diff --git a/HwProj.APIGateway/HwProj.APIGateway.API/HwProj.APIGateway.API.csproj b/HwProj.APIGateway/HwProj.APIGateway.API/HwProj.APIGateway.API.csproj index 7238b2966..8b4e780eb 100644 --- a/HwProj.APIGateway/HwProj.APIGateway.API/HwProj.APIGateway.API.csproj +++ b/HwProj.APIGateway/HwProj.APIGateway.API/HwProj.APIGateway.API.csproj @@ -1,30 +1,27 @@  - netcoreapp2.2 + net8.0 ..\..\docker-compose.dcproj Linux ..\.. - $(CSharpLanguageVersion) $(NullableReferenceTypes) - - - - - - - - - + + + + + + + diff --git a/HwProj.APIGateway/HwProj.APIGateway.API/Startup.cs b/HwProj.APIGateway/HwProj.APIGateway.API/Startup.cs index c0ed38a0f..70be5e82d 100644 --- a/HwProj.APIGateway/HwProj.APIGateway.API/Startup.cs +++ b/HwProj.APIGateway/HwProj.APIGateway.API/Startup.cs @@ -1,19 +1,21 @@ -using System.Text; +using System.Collections.Generic; +using System.Text; +using System.Text.Json.Serialization; using HwProj.AuthService.Client; using HwProj.ContentService.Client; using HwProj.CoursesService.Client; using HwProj.NotificationsService.Client; using HwProj.SolutionsService.Client; -using HwProj.Utils.Configuration; using HwProj.APIGateway.API.Filters; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.IdentityModel.Tokens; using IStudentsInfo; using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.Extensions.Hosting; +using Microsoft.IdentityModel.Tokens; +using Microsoft.OpenApi.Models; using StudentsInfo; namespace HwProj.APIGateway.API @@ -29,8 +31,17 @@ public Startup(IConfiguration configuration) public void ConfigureServices(IServiceCollection services) { + services + .AddCors() + .AddControllers() + .AddJsonOptions(options => + options.JsonSerializerOptions.ReferenceHandler = ReferenceHandler.IgnoreCycles); + + services.AddHttpContextAccessor(); + services.AddAutoMapper(x => x.AddProfile()); services.Configure(options => { options.MultipartBodyLengthLimit = 200 * 1024 * 1024; }); - services.ConfigureHwProjServices("API Gateway"); + ConfigureHwProjServiceSwaggerGen(services); + services.AddSingleton(provider => new StudentsInformationProvider(Configuration["StudentsInfo:Login"], Configuration["StudentsInfo:Password"], @@ -71,9 +82,66 @@ public void ConfigureServices(IServiceCollection services) services.AddScoped(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IHostEnvironment env) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage() + .UseSwagger() + .UseSwaggerUI(c => { c.SwaggerEndpoint("/swagger/v1/swagger.json", "API Gateway"); }); + } + else + { + app.UseHsts(); + } + + app.UseRouting(); + app.UseAuthentication(); + app.UseAuthorization(); + app.UseCors(x => x + .AllowAnyMethod() + .AllowAnyHeader() + .SetIsOriginAllowed(_ => true) + .AllowCredentials()); + + app.UseEndpoints(x => x.MapControllers()); + } + + private static void ConfigureHwProjServiceSwaggerGen(IServiceCollection services) { - app.ConfigureHwProj(env, "API Gateway"); + services.AddSwaggerGen(c => + { + c.SwaggerDoc("v1", new OpenApiInfo { Title = "API Gateway", Version = "v1" }); + c.CustomOperationIds(apiDesc => + { + var controllerName = apiDesc.ActionDescriptor.RouteValues["controller"]; + var actionName = apiDesc.ActionDescriptor.RouteValues["action"]; + return $"{controllerName}{actionName}"; + }); + c.AddSecurityDefinition("Bearer", + new OpenApiSecurityScheme + { + In = ParameterLocation.Header, + Description = "Please enter into field the word 'Bearer' following by space and JWT", + Name = "Authorization", + Type = SecuritySchemeType.ApiKey + }); + c.AddSecurityRequirement( + new OpenApiSecurityRequirement + { + { + new OpenApiSecurityScheme + { + Reference = new OpenApiReference + { + Id = "Bearer", + Type = ReferenceType.SecurityScheme + } + }, + new List() + } + }); + }); } } } diff --git a/HwProj.AuthService/HwProj.AuthService.API/Startup.cs b/HwProj.AuthService/HwProj.AuthService.API/Startup.cs index d7244266f..47cd285cd 100644 --- a/HwProj.AuthService/HwProj.AuthService.API/Startup.cs +++ b/HwProj.AuthService/HwProj.AuthService.API/Startup.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Builder; +using System.Text.Json.Serialization; +using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using HwProj.AuthService.API.Models; @@ -25,7 +26,13 @@ public Startup(IConfiguration configuration) public void ConfigureServices(IServiceCollection services) { - services.ConfigureHwProjServices("AuthService API"); + services + .AddCors() + .AddControllers() + .AddJsonOptions(options => + options.JsonSerializerOptions.ReferenceHandler = ReferenceHandler.IgnoreCycles); + + services.AddAutoMapper(x => x.AddProfile()); services.AddHttpClient(); var connectionString = ConnectionString.GetConnectionString(Configuration); @@ -57,7 +64,20 @@ public void ConfigureServices(IServiceCollection services) public void Configure(IApplicationBuilder app, IHostEnvironment env, IdentityContext context) { - app.ConfigureHwProj(env, "AuthService API", context); + if (env.IsDevelopment()) app.UseDeveloperExceptionPage(); + else app.UseHsts(); + + app.UseRouting(); + app.UseAuthentication(); + app.UseCors(x => x + .AllowAnyMethod() + .AllowAnyHeader() + .SetIsOriginAllowed(_ => true) + .AllowCredentials()); + + app.UseEndpoints(x => x.MapControllers()); + + app.UseDatabase(env, context); using var scope = app.ApplicationServices.CreateScope(); var userManager = scope.ServiceProvider.GetService>(); diff --git a/HwProj.Common/HwProj.Common.Net8/HwProj.Common.Net8.csproj b/HwProj.Common/HwProj.Common.Net8/HwProj.Common.Net8.csproj index bae0d37c5..63ae51c26 100644 --- a/HwProj.Common/HwProj.Common.Net8/HwProj.Common.Net8.csproj +++ b/HwProj.Common/HwProj.Common.Net8/HwProj.Common.Net8.csproj @@ -7,7 +7,8 @@ + - + diff --git a/HwProj.Common/HwProj.Common.Net8/StartupExtensions.cs b/HwProj.Common/HwProj.Common.Net8/StartupExtensions.cs index 380c6aaa9..004a12c0f 100644 --- a/HwProj.Common/HwProj.Common.Net8/StartupExtensions.cs +++ b/HwProj.Common/HwProj.Common.Net8/StartupExtensions.cs @@ -1,93 +1,38 @@ -using System.Reflection; -using System.Text.Json.Serialization; -using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Builder; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Microsoft.OpenApi.Models; namespace HwProj.Common.Net8; public static class StartupExtensions { - public static IServiceCollection ConfigureHwProjServices(this IServiceCollection services, string serviceName) - { - services.AddAutoMapper(x => x.AddMaps(Assembly.GetCallingAssembly())) - .AddCors() - .AddControllers() - .AddJsonOptions(options => - options.JsonSerializerOptions.ReferenceHandler = ReferenceHandler.IgnoreCycles); - - services.ConfigureHwProjServiceSwaggerGen(serviceName); - services.AddHttpContextAccessor(); - - return services; - } - - private static void ConfigureHwProjServiceSwaggerGen(this IServiceCollection services, string serviceName) - { - services.AddSwaggerGen(c => - { - c.SwaggerDoc("v1", new OpenApiInfo { Title = serviceName, Version = "v1" }); - c.CustomOperationIds(apiDesc => - { - var controllerName = apiDesc.ActionDescriptor.RouteValues["controller"]; - var actionName = apiDesc.ActionDescriptor.RouteValues["action"]; - return $"{controllerName}{actionName}"; - }); - }); - } - - public static IApplicationBuilder ConfigureHwProj(this IApplicationBuilder app, IHostEnvironment env, - string serviceName, DbContext? context = null) + public static IApplicationBuilder UseDatabase(this IApplicationBuilder app, IHostEnvironment env, DbContext? context = null) { + if (context == null) return app; if (env.IsDevelopment()) { - app.UseDeveloperExceptionPage() - .UseSwagger() - .UseSwaggerUI(c => { c.SwaggerEndpoint("/swagger/v1/swagger.json", serviceName); }); - } - else - { - app.UseHsts(); + context.Database.EnsureCreated(); + return app; } - app.UseRouting(); - app.UseAuthentication(); - app.UseCors(x => x - .AllowAnyMethod() - .AllowAnyHeader() - .SetIsOriginAllowed(_ => true) - .AllowCredentials()); + var logger = app.ApplicationServices + .GetService()! + .CreateLogger(typeof(StartupExtensions)); - app.UseEndpoints(x => x.MapControllers()); + var tries = 0; + const int maxTries = 100; - if (context != null) + while (!context.Database.CanConnect() && ++tries <= maxTries) { - if (env.IsDevelopment()) - { - context.Database.EnsureCreated(); - return app; - } - - var logger = app.ApplicationServices - .GetService()! - .CreateLogger(typeof(StartupExtensions)); - - var tries = 0; - const int maxTries = 100; - - while (!context.Database.CanConnect() && ++tries <= maxTries) - { - logger.LogWarning($"Can't connect to database. Try {tries}."); - Thread.Sleep(5000); - } - - if (tries > maxTries) throw new Exception("Can't connect to database"); - context.Database.Migrate(); + logger.LogWarning($"Can't connect to database. Try {tries}."); + Thread.Sleep(5000); } + if (tries > maxTries) throw new Exception("Can't connect to database"); + context.Database.Migrate(); + return app; } } diff --git a/hwproj.front/src/api/api.ts b/hwproj.front/src/api/api.ts index 3648d19a8..133648179 100644 --- a/hwproj.front/src/api/api.ts +++ b/hwproj.front/src/api/api.ts @@ -2224,12 +2224,6 @@ export interface StudentCharacteristicsDto { * @interface StudentDataDto */ export interface StudentDataDto { - /** - * - * @type {StudentCharacteristicsDto} - * @memberof StudentDataDto - */ - characteristics?: StudentCharacteristicsDto; /** * * @type {string} @@ -2290,6 +2284,12 @@ export interface StudentDataDto { * @memberof StudentDataDto */ companyName?: string; + /** + * + * @type {StudentCharacteristicsDto} + * @memberof StudentDataDto + */ + characteristics?: StudentCharacteristicsDto; } /** * @@ -2821,7 +2821,7 @@ export const AccountApiFetchParamCreator = function (configuration?: Configurati localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -2886,7 +2886,7 @@ export const AccountApiFetchParamCreator = function (configuration?: Configurati localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -2987,7 +2987,7 @@ export const AccountApiFetchParamCreator = function (configuration?: Configurati localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -3022,7 +3022,7 @@ export const AccountApiFetchParamCreator = function (configuration?: Configurati localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -3087,7 +3087,7 @@ export const AccountApiFetchParamCreator = function (configuration?: Configurati localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -3122,7 +3122,7 @@ export const AccountApiFetchParamCreator = function (configuration?: Configurati localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -3157,7 +3157,7 @@ export const AccountApiFetchParamCreator = function (configuration?: Configurati localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -3727,7 +3727,7 @@ export const CourseGroupsApiFetchParamCreator = function (configuration?: Config localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -4007,7 +4007,7 @@ export const CourseGroupsApiFetchParamCreator = function (configuration?: Config localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -4527,7 +4527,7 @@ export const CoursesApiFetchParamCreator = function (configuration?: Configurati localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -4610,7 +4610,7 @@ export const CoursesApiFetchParamCreator = function (configuration?: Configurati localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -5040,7 +5040,7 @@ export const CoursesApiFetchParamCreator = function (configuration?: Configurati localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -5087,7 +5087,7 @@ export const CoursesApiFetchParamCreator = function (configuration?: Configurati localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -5954,7 +5954,7 @@ export const ExpertsApiFetchParamCreator = function (configuration?: Configurati localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -5989,7 +5989,7 @@ export const ExpertsApiFetchParamCreator = function (configuration?: Configurati localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -6024,7 +6024,7 @@ export const ExpertsApiFetchParamCreator = function (configuration?: Configurati localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -6089,7 +6089,7 @@ export const ExpertsApiFetchParamCreator = function (configuration?: Configurati localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -6525,7 +6525,7 @@ export const FilesApiFetchParamCreator = function (configuration?: Configuration localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -6902,7 +6902,7 @@ export const HomeworksApiFetchParamCreator = function (configuration?: Configura localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -7051,7 +7051,7 @@ export const HomeworksApiFetchParamCreator = function (configuration?: Configura localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -7317,7 +7317,7 @@ export const NotificationsApiFetchParamCreator = function (configuration?: Confi localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -7442,7 +7442,7 @@ export const NotificationsApiFetchParamCreator = function (configuration?: Confi localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -8037,7 +8037,7 @@ export const SolutionsApiFetchParamCreator = function (configuration?: Configura localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -8078,7 +8078,7 @@ export const SolutionsApiFetchParamCreator = function (configuration?: Configura localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -8119,7 +8119,7 @@ export const SolutionsApiFetchParamCreator = function (configuration?: Configura localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -9020,7 +9020,7 @@ export const TasksApiFetchParamCreator = function (configuration?: Configuration localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -9055,7 +9055,7 @@ export const TasksApiFetchParamCreator = function (configuration?: Configuration localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -9096,7 +9096,7 @@ export const TasksApiFetchParamCreator = function (configuration?: Configuration localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943 @@ -9311,7 +9311,7 @@ export const TasksApiFetchParamCreator = function (configuration?: Configuration localVarHeaderParameter["Authorization"] = localVarApiKeyValue; } - localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + localVarHeaderParameter['Content-Type'] = 'application/json'; localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query); // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943