Skip to content
Snippets Groups Projects
Commit 1261fa9a authored by Marcel Nellesen's avatar Marcel Nellesen
Browse files

Merge branch 'Sprint/2021-03' into 'master' 

Sprint/2021 03

See merge request !56
parents 5c69c06a 39b65ecd
Branches
Tags
1 merge request!56Sprint/2021 03
Hide whitespace changes
Inline Side-by-side
Showing
with 53 additions and 102 deletions
.config/dotnet-tools.json deleted 100644 → 0
+ 0
− 18
View file @ 5c69c06a
{
"version": 1,
"isRoot": true,
"tools": {
"gitversion.tool": {
"version": "5.6.4",
"commands": [
"dotnet-gitversion"
]
},
"dotnet-version-cli": {
"version": "2.1.1",
"commands": [
"dotnet-version"
]
}
}
}
\ No newline at end of file
.gitignore
+ 2
− 2
View file @ 1261fa9a
......@@ -269,5 +269,5 @@ tools/*
!tools/packages.config
dist/
#linq2db
**/LinqToDB.Templates/**
# Dotnet Tool Manifest
.config/*
src/ApiCommons.Tests/ApiCommons.Tests.csproj
+ 5
− 14
View file @ 1261fa9a
......@@ -3,23 +3,14 @@
<OutputType>Library</OutputType>
<RootNamespace>ApiCommons.Tests</RootNamespace>
<AssemblyName>ApiCommons.Tests</AssemblyName>
<TargetFrameworks>net5.0;net461</TargetFrameworks>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Consul" Version="1.6.1.1" />
<PackageReference Include="Coscine.Configuration" Version="*-*" />
<PackageReference Include="Coscine.Database" Version="*-*" />
<PackageReference Include="Coscine.Logging" Version="*-*" />
<PackageReference Include="EntityFramework" Version="6.4.4" />
<PackageReference Include="linq2db" Version="3.2.3" />
<PackageReference Include="LinqKit" Version="1.1.22" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NLog" Version="4.7.7" />
<PackageReference Include="NLog.Config" Version="4.7.7" />
<PackageReference Include="NLog.Schema" Version="4.7.7" />
<ProjectReference Include="..\apicommons\ApiCommons.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="NUnit" Version="3.13.0" />
<PackageReference Include="NUnit" Version="3.13.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
</ItemGroup>
</Project>
\ No newline at end of file
src/ApiCommons.Tests/Properties/AssemblyInfo.cs deleted 100644 → 0
+ 0
− 9
View file @ 5c69c06a
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by Cake.
// </auto-generated>
//------------------------------------------------------------------------------
using System.Reflection;
[assembly: AssemblyDescription("ApiCommons.Tests is a part of the CoScInE group.")]
[assembly: AssemblyCopyright("2021 IT Center, RWTH Aachen University")]
\ No newline at end of file
src/ApiCommons/AbstractDefaultStartup.cs
+ 20
− 11
View file @ 1261fa9a
using Coscine.ApiCommons.Middleware;
using Coscine.Configuration;
using Coscine.Database.Settings;
using LinqToDB.Data;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Server.Kestrel.Core;
using Microsoft.Extensions.DependencyInjection;
namespace Coscine.ApiCommons
......@@ -39,28 +38,32 @@ namespace Coscine.ApiCommons
{
ConfigureServicesExtension(services);
services.AddMvc();
services.Configure<KestrelServerOptions>(options =>
{
options.AllowSynchronousIO = true;
});
services.AddControllersWithViews().AddNewtonsoftJson();
ConfigureServicesExtensionLate(services);
}
public virtual void ConfigureExtension(IApplicationBuilder app, IHostingEnvironment env)
public virtual void ConfigureExtension(IApplicationBuilder app, IWebHostEnvironment env)
{
}
// Add Middlewares which need the User to be existent
public virtual void ConfigureExtensionMiddleware(IApplicationBuilder app, IHostingEnvironment env)
public virtual void ConfigureExtensionMiddleware(IApplicationBuilder app, IWebHostEnvironment env)
{
}
public virtual void ConfigureExtensionLate(IApplicationBuilder app, IHostingEnvironment env)
public virtual void ConfigureExtensionLate(IApplicationBuilder app, IWebHostEnvironment env)
{
}
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{
ConfigureExtension(app, env);
......@@ -68,7 +71,7 @@ namespace Coscine.ApiCommons
app.UseMiddleware<LoggingMiddleware>();
app.UseCors(builder => builder
.AllowAnyOrigin()
.SetIsOriginAllowed(_ => true)
.AllowAnyMethod()
.AllowAnyHeader()
.AllowCredentials());
......@@ -78,7 +81,15 @@ namespace Coscine.ApiCommons
ConfigureExtensionMiddleware(app, env);
app.UsePathBase(_basePath);
app.UseMvc();
app.UseRouting();
app.UseAuthorization();
app.UseEndpoints(endpoints =>
{
endpoints.MapControllers();
});
app.UseStatusCodePages(async context =>
{
......@@ -89,8 +100,6 @@ namespace Coscine.ApiCommons
context.HttpContext.Response.StatusCode);
});
DataConnection.DefaultSettings = new CoscineSettings(_configuration);
ConfigureExtensionLate(app, env);
}
}
......
src/ApiCommons/AbstractStartup.cs
+ 8
− 3
View file @ 1261fa9a
......@@ -3,6 +3,7 @@ using Coscine.JwtHandler;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Server.Kestrel.Core;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.IdentityModel.Tokens;
using NSwag;
......@@ -29,7 +30,11 @@ namespace Coscine.ApiCommons
{
ConfigureServicesExtension(services);
services.AddMvc();
services.Configure<KestrelServerOptions>(options =>
{
options.AllowSynchronousIO = true;
});
services.AddControllersWithViews().AddNewtonsoftJson();
var key = _jWTHandler.GetSecurityKey();
services.AddAuthentication(x =>
......@@ -79,14 +84,14 @@ namespace Coscine.ApiCommons
});
}
public override void ConfigureExtensionMiddleware(IApplicationBuilder app, IHostingEnvironment env)
public override void ConfigureExtensionMiddleware(IApplicationBuilder app, IWebHostEnvironment env)
{
base.ConfigureExtensionMiddleware(app, env);
app.UseMiddleware<TOSMiddleware>();
}
public override void ConfigureExtensionLate(IApplicationBuilder app, IHostingEnvironment env)
public override void ConfigureExtensionLate(IApplicationBuilder app, IWebHostEnvironment env)
{
base.ConfigureExtensionLate(app, env);
......
src/ApiCommons/ApiCommons.csproj
+ 18
− 21
View file @ 1261fa9a
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Coscine.ApiCommons</RootNamespace>
<AssemblyName>Coscine.ApiCommons</AssemblyName>
<TargetFrameworks>net5.0;net461</TargetFrameworks>
<Version>1.12.0</Version></PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<Version>1.12.0</Version>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
<Authors>RWTH Aachen University</Authors>
<Company>IT Center, RWTH Aachen University</Company>
<Copyright>2021 IT Center, RWTH Aachen University</Copyright>
<Description>ApiCommons is a part of the Coscine group.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://git.rwth-aachen.de/coscine/backend/libraries/ApiCommons</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<None Include="key.snk" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Coscine.Database" Version="*-*" />
<PackageReference Include="Coscine.Configuration" Version="*-*" />
<PackageReference Include="Coscine.JwtHandler" Version="*-*" />
<PackageReference Include="Coscine.Logging" Version="*-*" />
<PackageReference Include="Coscine.Database" Version="2.*-*" />
<PackageReference Include="Coscine.JwtHandler" Version="2.*-*" />
<PackageReference Include="Coscine.Logging" Version="2.*-*" />
<PackageReference Include="linq2db" Version="3.2.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.3" />
<PackageReference Include="NLog" Version="4.7.7" />
<PackageReference Include="NLog.Config" Version="4.7.7" />
<PackageReference Include="NLog.Schema" Version="4.7.7" />
<PackageReference Include="NLog.Web.AspNetCore" Version="4.10.0" />
<PackageReference Include="NSwag.AspNetCore" Version="13.10.1" />
<PackageReference Include="System.Collections" Version="4.3.0" />
<PackageReference Include="NSwag.AspNetCore" Version="13.10.2" />
</ItemGroup>
</Project>
src/ApiCommons/ApiCommons.nuspec deleted 100644 → 0
+ 0
− 15
View file @ 5c69c06a
<?xml version="1.0"?>
<package >
<metadata>
<id>$id$</id>
<version>$version$</version>
<title>$title$</title>
<authors>rwth-aachen</authors>
<owners>rwth-aachen</owners>
<license type="expression">MIT</license>
<projectUrl>https://git.rwth-aachen.de/coscine/cs/apicommons</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>$description$</description>
<copyright>$copyright$</copyright>
</metadata>
</package>
\ No newline at end of file
src/ApiCommons/Properties/AssemblyInfo.cs deleted 100644 → 0
+ 0
− 9
View file @ 5c69c06a
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by Cake.
// </auto-generated>
//------------------------------------------------------------------------------
using System.Reflection;
[assembly: AssemblyDescription("ApiCommons is a part of the CoScInE group.")]
[assembly: AssemblyCopyright("2021 IT Center, RWTH Aachen University")]
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment