tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-04-22 06:42:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

all administration tests passing again...yey

Browse Source
This commit is contained in:
Tom Gardham-Pallister 2017-10-30 07:59:34 +00:00
parent 3f6f665f93
commit b23bbf56b9
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Ocelot/DependencyInjection/ServiceCollectionExtensions.cs
View File

@ -158,7 +158,9 @@ namespace Ocelot.DependencyInjection
services.TryAddSingleton<IIdentityServerConfiguration>(identityServerConfiguration); services.TryAddSingleton<IIdentityServerConfiguration>(identityServerConfiguration);
services.TryAddSingleton<IHashMatcher, HashMatcher>(); services.TryAddSingleton<IHashMatcher, HashMatcher>();
var identityServerBuilder = services var identityServerBuilder = services
.AddIdentityServer() .AddIdentityServer(o => {
o.IssuerUri = "Ocelot";
})
.AddInMemoryApiResources(Resources(identityServerConfiguration)) .AddInMemoryApiResources(Resources(identityServerConfiguration))
.AddInMemoryClients(Client(identityServerConfiguration)) .AddInMemoryClients(Client(identityServerConfiguration))
.AddResourceOwnerValidator<OcelotResourceOwnerPasswordValidator>(); .AddResourceOwnerValidator<OcelotResourceOwnerPasswordValidator>();

3
test/Ocelot.ManualTest/Program.cs
View File

@ -9,17 +9,14 @@ namespace Ocelot.ManualTest
public static void Main(string[] args) public static void Main(string[] args)
{ {
IWebHostBuilder builder = new WebHostBuilder(); IWebHostBuilder builder = new WebHostBuilder();
builder.ConfigureServices(s => { builder.ConfigureServices(s => {
s.AddSingleton(builder); s.AddSingleton(builder);
}); });
builder.UseKestrel() builder.UseKestrel()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseStartup<Startup>(); .UseStartup<Startup>();
var host = builder.Build(); var host = builder.Build();
host.Run(); host.Run();
} }
} }