Merge branch 'master' into feature/api-explorer

This commit is contained in:
Niggl1999 2020-06-04 16:55:52 +02:00
commit e36ddb137b
2 changed files with 74 additions and 74 deletions

View File

@ -10,11 +10,11 @@ namespace ScrumTaskboard.Controllers
{ {
[Route("[controller]")] [Route("[controller]")]
[ApiController] [ApiController]
public class CategoryController : ControllerBase public class CategoriesController : ControllerBase
{ {
private readonly TaskContext _context; private readonly TaskContext _context;
public CategoryController(TaskContext context) public CategoriesController(TaskContext context)
{ {
_context = context; _context = context;
} }

View File

@ -1,43 +1,43 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.HttpsPolicy; using Microsoft.AspNetCore.HttpsPolicy;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace ScrumTaskboard namespace ScrumTaskboard
{ {
public class Startup public class Startup
{ {
public Startup(IConfiguration configuration) public Startup(IConfiguration configuration)
{ {
Configuration = configuration; Configuration = configuration;
} }
public IConfiguration Configuration { get; } public IConfiguration Configuration { get; }
// This method gets called by the runtime. Use this method to add services to the container. // This method gets called by the runtime. Use this method to add services to the container.
public void ConfigureServices(IServiceCollection services) public void ConfigureServices(IServiceCollection services)
{ {
services.AddCors(o => o.AddPolicy("AllowAll", builder => services.AddCors(o => o.AddPolicy("AllowAll", builder =>
{ {
builder.AllowAnyOrigin() builder.AllowAnyOrigin()
.AllowAnyMethod() .AllowAnyMethod()
.AllowAnyHeader(); .AllowAnyHeader();
})); }));
services.AddScoped(serviceProvider => new TaskContext( services.AddScoped(serviceProvider => new TaskContext(
new DbContextOptionsBuilder<TaskContext>() new DbContextOptionsBuilder<TaskContext>()
.UseNpgsql("Host=nig.gl; Port=8543; Username=scrum; Database=taskboard; Password=c6gXud7YvBWp2sgxSgy4wRN") .UseNpgsql("Host=nig.gl; Port=8543; Username=scrum; Database=taskboard; Password=c6gXud7YvBWp2sgxSgy4wRN")
.Options)); .Options));
services.AddControllers(); services.AddControllers();
services.AddOpenApiDocument( services.AddOpenApiDocument(
config => config =>
{ {
config.PostProcess = document => config.PostProcess = document =>
@ -47,36 +47,36 @@ namespace ScrumTaskboard
document.Info.Description = "A RESTful API for the Scrum Taskboard Backend"; document.Info.Description = "A RESTful API for the Scrum Taskboard Backend";
document.Info.TermsOfService = "None"; document.Info.TermsOfService = "None";
}; };
}); });
} }
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IWebHostEnvironment env) public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{ {
using (var serviceScope = app.ApplicationServices.GetService<IServiceScopeFactory>().CreateScope()) using (var serviceScope = app.ApplicationServices.GetService<IServiceScopeFactory>().CreateScope())
{ {
var context = serviceScope.ServiceProvider.GetRequiredService<TaskContext>(); var context = serviceScope.ServiceProvider.GetRequiredService<TaskContext>();
context.Database.EnsureCreated(); context.Database.EnsureCreated();
} }
if (env.IsDevelopment()) if (env.IsDevelopment())
{ {
app.UseDeveloperExceptionPage(); app.UseDeveloperExceptionPage();
} }
//app.UseHttpsRedirection(); //app.UseHttpsRedirection();
app.UseCors("AllowAll"); app.UseCors("AllowAll");
app.UseRouting(); app.UseRouting();
app.UseAuthorization(); app.UseAuthorization();
app.UseEndpoints(endpoints => app.UseEndpoints(endpoints =>
{ {
endpoints.MapControllers(); endpoints.MapControllers();
}); });
app.UseOpenApi(); app.UseOpenApi();
app.UseSwaggerUi3(); app.UseSwaggerUi3();
} }
} }
} }