增加功能:swagger网页增加授权中间件
This commit is contained in:
parent
68b5009e97
commit
bbed98b4ae
|
@ -1,83 +1,84 @@
|
||||||
using Bootstrap.DataAccess;
|
using Bootstrap.DataAccess;
|
||||||
using Bootstrap.Security.Filter;
|
using Bootstrap.Security.Filter;
|
||||||
using Bootstrap.Security.Middleware;
|
using Bootstrap.Security.Middleware;
|
||||||
using Longbow.Cache;
|
using Longbow.Cache;
|
||||||
using Longbow.Cache.Middleware;
|
using Longbow.Cache.Middleware;
|
||||||
using Longbow.Configuration;
|
using Longbow.Configuration;
|
||||||
using Longbow.Data;
|
using Longbow.Data;
|
||||||
using Longbow.Logging;
|
using Longbow.Logging;
|
||||||
using Longbow.Web;
|
using Longbow.Web;
|
||||||
using Longbow.Web.SignalR;
|
using Longbow.Web.SignalR;
|
||||||
using Microsoft.AspNetCore.Authentication.Cookies;
|
using Microsoft.AspNetCore.Authentication;
|
||||||
using Microsoft.AspNetCore.Builder;
|
using Microsoft.AspNetCore.Authentication.Cookies;
|
||||||
using Microsoft.AspNetCore.DataProtection;
|
using Microsoft.AspNetCore.Builder;
|
||||||
using Microsoft.AspNetCore.Hosting;
|
using Microsoft.AspNetCore.DataProtection;
|
||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Hosting;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Http;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.Configuration;
|
||||||
using Newtonsoft.Json;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Newtonsoft.Json.Serialization;
|
using Newtonsoft.Json;
|
||||||
|
using Newtonsoft.Json.Serialization;
|
||||||
using Swashbuckle.AspNetCore.Swagger;
|
using Swashbuckle.AspNetCore.Swagger;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
|
||||||
namespace Bootstrap.Admin
|
namespace Bootstrap.Admin
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class Startup
|
public class Startup
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="configuration"></param>
|
/// <param name="configuration"></param>
|
||||||
public Startup(IConfiguration configuration)
|
public Startup(IConfiguration configuration)
|
||||||
{
|
{
|
||||||
Configuration = configuration;
|
Configuration = configuration;
|
||||||
}
|
}
|
||||||
/// <summary>
|
|
||||||
///
|
|
||||||
/// </summary>
|
|
||||||
public IConfiguration Configuration { get; }
|
|
||||||
// This method gets called by the runtime. Use this method to add services to the container.
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="services"></param>
|
public IConfiguration Configuration { get; }
|
||||||
public void ConfigureServices(IServiceCollection services)
|
// This method gets called by the runtime. Use this method to add services to the container.
|
||||||
{
|
/// <summary>
|
||||||
services.Configure<CookiePolicyOptions>(options =>
|
///
|
||||||
{
|
/// </summary>
|
||||||
// This lambda determines whether user consent for non-essential cookies is needed for a given request.
|
/// <param name="services"></param>
|
||||||
options.CheckConsentNeeded = context => true;
|
public void ConfigureServices(IServiceCollection services)
|
||||||
options.MinimumSameSitePolicy = SameSiteMode.None;
|
{
|
||||||
});
|
services.Configure<CookiePolicyOptions>(options =>
|
||||||
services.AddCors();
|
{
|
||||||
services.AddLogging(builder => builder.AddFileLogger().AddDBLogger(ExceptionsHelper.Log));
|
// This lambda determines whether user consent for non-essential cookies is needed for a given request.
|
||||||
services.AddConfigurationManager(Configuration);
|
options.CheckConsentNeeded = context => true;
|
||||||
services.AddCacheManager(Configuration);
|
options.MinimumSameSitePolicy = SameSiteMode.None;
|
||||||
services.AddDbAdapter(() => { CacheManager.Clear(); CacheManager.CorsClear(new List<string>() { "*" }); });
|
});
|
||||||
var dataProtectionBuilder = services.AddDataProtection(op => op.ApplicationDiscriminator = Configuration["ApplicationDiscriminator"])
|
services.AddCors();
|
||||||
.SetApplicationName(Configuration["ApplicationName"])
|
services.AddLogging(builder => builder.AddFileLogger().AddDBLogger(ExceptionsHelper.Log));
|
||||||
.PersistKeysToFileSystem(new DirectoryInfo(Configuration["KeyPath"]));
|
services.AddConfigurationManager(Configuration);
|
||||||
if (Configuration["DisableAutomaticKeyGeneration"] == "True") dataProtectionBuilder.DisableAutomaticKeyGeneration();
|
services.AddCacheManager(Configuration);
|
||||||
services.AddSignalR().AddJsonProtocalDefault();
|
services.AddDbAdapter(() => { CacheManager.Clear(); CacheManager.CorsClear(new List<string>() { "*" }); });
|
||||||
services.AddSignalRExceptionFilterHandler<SignalRHub>(async (client, ex) => await SignalRManager.Send(client, ex));
|
var dataProtectionBuilder = services.AddDataProtection(op => op.ApplicationDiscriminator = Configuration["ApplicationDiscriminator"])
|
||||||
services.AddMvc(options =>
|
.SetApplicationName(Configuration["ApplicationName"])
|
||||||
{
|
.PersistKeysToFileSystem(new DirectoryInfo(Configuration["KeyPath"]));
|
||||||
options.Filters.Add<BootstrapAdminAuthorizeFilter>();
|
if (Configuration["DisableAutomaticKeyGeneration"] == "True") dataProtectionBuilder.DisableAutomaticKeyGeneration();
|
||||||
options.Filters.Add<ExceptionFilter>();
|
services.AddSignalR().AddJsonProtocalDefault();
|
||||||
options.Filters.Add<SignalRExceptionFilter<SignalRHub>>();
|
services.AddSignalRExceptionFilterHandler<SignalRHub>(async (client, ex) => await SignalRManager.Send(client, ex));
|
||||||
}).AddJsonOptions(options =>
|
services.AddMvc(options =>
|
||||||
{
|
{
|
||||||
options.SerializerSettings.ContractResolver = new DefaultContractResolver();
|
options.Filters.Add<BootstrapAdminAuthorizeFilter>();
|
||||||
options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
|
options.Filters.Add<ExceptionFilter>();
|
||||||
JsonConvert.DefaultSettings = () => options.SerializerSettings;
|
options.Filters.Add<SignalRExceptionFilter<SignalRHub>>();
|
||||||
}).SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
|
}).AddJsonOptions(options =>
|
||||||
services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie(options => options.Cookie.Path = "/");
|
{
|
||||||
|
options.SerializerSettings.ContractResolver = new DefaultContractResolver();
|
||||||
|
options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
|
||||||
|
JsonConvert.DefaultSettings = () => options.SerializerSettings;
|
||||||
|
}).SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
|
||||||
|
services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie(options => options.Cookie.Path = "/");
|
||||||
services.AddSwaggerGen(options =>
|
services.AddSwaggerGen(options =>
|
||||||
{
|
{
|
||||||
options.SwaggerDoc("v1", new Info
|
options.SwaggerDoc("v1", new Info
|
||||||
|
@ -90,44 +91,52 @@ namespace Bootstrap.Admin
|
||||||
var xmlPath = Path.Combine(AppContext.BaseDirectory, "Bootstrap.Admin.xml");
|
var xmlPath = Path.Combine(AppContext.BaseDirectory, "Bootstrap.Admin.xml");
|
||||||
options.IncludeXmlComments(xmlPath);
|
options.IncludeXmlComments(xmlPath);
|
||||||
options.OperationFilter<HttpHeaderOperation>(); // 添加httpHeader参数
|
options.OperationFilter<HttpHeaderOperation>(); // 添加httpHeader参数
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
// 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.
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="app"></param>
|
/// <param name="app"></param>
|
||||||
/// <param name="env"></param>
|
/// <param name="env"></param>
|
||||||
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
|
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
|
||||||
{
|
{
|
||||||
if (env.IsDevelopment())
|
if (env.IsDevelopment())
|
||||||
{
|
{
|
||||||
app.UseDeveloperExceptionPage();
|
app.UseDeveloperExceptionPage();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
app.UseExceptionHandler("/Home/Error");
|
app.UseExceptionHandler("/Home/Error");
|
||||||
app.UseHsts();
|
app.UseHsts();
|
||||||
}
|
}
|
||||||
app.UseStatusCodePagesWithReExecute("/Home/Error/{0}");
|
app.UseStatusCodePagesWithReExecute("/Home/Error/{0}");
|
||||||
app.UseCors(builder => builder.WithOrigins(Configuration["AllowOrigins"].Split(',', StringSplitOptions.RemoveEmptyEntries)).AllowAnyHeader().AllowAnyMethod().AllowCredentials());
|
app.UseCors(builder => builder.WithOrigins(Configuration["AllowOrigins"].Split(',', StringSplitOptions.RemoveEmptyEntries)).AllowAnyHeader().AllowAnyMethod().AllowCredentials());
|
||||||
app.UseHttpsRedirection();
|
app.UseHttpsRedirection();
|
||||||
app.UseStaticFiles();
|
app.UseStaticFiles();
|
||||||
app.UseAuthentication();
|
app.UseAuthentication();
|
||||||
app.UseBootstrapAdminAuthorization(userName => RoleHelper.RetrieveRolesByUserName(userName), url => RoleHelper.RetrieveRolesByUrl(url));
|
app.UseBootstrapAdminAuthorization(userName => RoleHelper.RetrieveRolesByUserName(userName), url => RoleHelper.RetrieveRolesByUrl(url));
|
||||||
app.UseCacheManagerCorsHandler();
|
app.UseCacheManagerCorsHandler();
|
||||||
app.UseSignalR(routes => { routes.MapHub<SignalRHub>("/NotiHub"); });
|
app.UseSignalR(routes => { routes.MapHub<SignalRHub>("/NotiHub"); });
|
||||||
app.UseMvc(routes =>
|
app.UseMvc(routes =>
|
||||||
{
|
{
|
||||||
routes.MapRoute(
|
routes.MapRoute(
|
||||||
name: "default",
|
name: "default",
|
||||||
template: "{controller=Home}/{action=Index}/{id?}");
|
template: "{controller=Home}/{action=Index}/{id?}");
|
||||||
});
|
});
|
||||||
|
app.UseWhen(context => context.Request.Path == "/swagger/index.html", builder =>
|
||||||
|
{
|
||||||
|
builder.Use(async (context, next) =>
|
||||||
|
{
|
||||||
|
if (!context.User.Identity.IsAuthenticated) await context.ChallengeAsync();
|
||||||
|
else await next();
|
||||||
|
});
|
||||||
|
});
|
||||||
app.UseSwagger();
|
app.UseSwagger();
|
||||||
app.UseSwaggerUI(c =>
|
app.UseSwaggerUI(c =>
|
||||||
{
|
{
|
||||||
c.SwaggerEndpoint("/swagger/v1/swagger.json", "BootstrapAdmin API V1");
|
c.SwaggerEndpoint("/swagger/v1/swagger.json", "BootstrapAdmin API V1");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue