Skip to content

Commit 0c41218

Browse files
ramon-tomas-cramon-tomas-c
committed
Include aspnetcore.all metapackage
1 parent 789d7e4 commit 0c41218

3 files changed

Lines changed: 29 additions & 40 deletions

File tree

‎src/Services/Ordering/Ordering.API/Ordering.API.csproj‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,32 +36,13 @@
3636
<PackageReference Include="FluentValidation.MVC6" Version="6.4.0" />
3737
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="3.0.0" />
3838
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.1.0" />
39-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
40-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.0" />
41-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
42-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
43-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.0" />
44-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.0" />
45-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
46-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.0" />
47-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.0.0" />
48-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
49-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
50-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" />
51-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
52-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
53-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.0" />
54-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.0" />
55-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.0" />
56-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="2.0.0-preview1-final" />
57-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0" />
39+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
5840
<PackageReference Include="MediatR" Version="3.0.1" />
5941
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
6042
<PackageReference Include="System.Reflection" Version="4.3.0" />
61-
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="1.2.1" />
6243
<PackageReference Include="Dapper" Version="1.50.2" />
63-
<PackageReference Include="System.ValueTuple" Version="4.4.0-preview1-25305-02" />
64-
<PackageReference Include="Polly" Version="5.2.0" />
44+
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
45+
<PackageReference Include="Polly" Version="5.3.1" />
6546
</ItemGroup>
6647

6748
<ItemGroup>

‎src/Services/Ordering/Ordering.API/Program.cs‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
1-
using Microsoft.AspNetCore.Builder;
1+
using Microsoft.AspNetCore;
22
using Microsoft.AspNetCore.Hosting;
3-
using System.IO;
43

54
namespace Microsoft.eShopOnContainers.Services.Ordering.API
65
{
76
public class Program
87
{
98
public static void Main(string[] args)
109
{
11-
var host = new WebHostBuilder()
12-
.UseKestrel()
13-
.UseHealthChecks("/hc")
14-
.UseContentRoot(Directory.GetCurrentDirectory())
15-
.UseIISIntegration()
10+
BuildWebHost(args).Run();
11+
}
12+
13+
public static IWebHost BuildWebHost(string[] args) =>
14+
WebHost.CreateDefaultBuilder(args)
1615
.UseStartup<Startup>()
1716
.Build();
18-
19-
host.Run();
20-
}
2117
}
2218
}

‎src/Services/Ordering/Ordering.API/Startup.cs‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using Infrastructure.AutofacModules;
1212
using Infrastructure.Filters;
1313
using Infrastructure.Services;
14+
using Microsoft.AspNetCore.Authentication.JwtBearer;
1415
using Microsoft.AspNetCore.Builder;
1516
using Microsoft.AspNetCore.Hosting;
1617
using Microsoft.Azure.ServiceBus;
@@ -170,7 +171,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
170171
}
171172

172173
RegisterEventBus(services);
173-
174+
ConfigureAuthService(services);
174175
services.AddOptions();
175176

176177
//configure autofac
@@ -225,22 +226,33 @@ private void ConfigureEventBus(IApplicationBuilder app)
225226
eventBus.Subscribe<OrderPaymentSuccededIntegrationEvent, IIntegrationEventHandler<OrderPaymentSuccededIntegrationEvent>>();
226227
}
227228

228-
protected virtual void ConfigureAuth(IApplicationBuilder app)
229+
private void ConfigureAuthService(IServiceCollection services)
229230
{
230231
var identityUrl = Configuration.GetValue<string>("IdentityUrl");
231-
app.UseIdentityServerAuthentication(new IdentityServerAuthenticationOptions
232+
233+
services.AddAuthentication(options =>
234+
{
235+
options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
236+
options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
237+
238+
}).AddJwtBearer(options =>
232239
{
233-
Authority = identityUrl.ToString(),
234-
ApiName = "orders",
235-
RequireHttpsMetadata = false
240+
options.Authority = identityUrl;
241+
options.RequireHttpsMetadata = false;
242+
options.Audience = "orders";
236243
});
237244
}
238245

246+
protected virtual void ConfigureAuth(IApplicationBuilder app)
247+
{
248+
app.UseAuthentication();
249+
}
250+
239251
private void RegisterEventBus(IServiceCollection services)
240252
{
241253
if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
242254
{
243-
services.AddSingleton<BuildingBlocks.EventBus.Abstractions.IEventBus, EventBusServiceBus>(sp =>
255+
services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
244256
{
245257
var serviceBusPersisterConnection = sp.GetRequiredService<IServiceBusPersisterConnection>();
246258
var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>();
@@ -254,7 +266,7 @@ private void RegisterEventBus(IServiceCollection services)
254266
}
255267
else
256268
{
257-
services.AddSingleton<BuildingBlocks.EventBus.Abstractions.IEventBus, EventBusRabbitMQ>();
269+
services.AddSingleton<IEventBus, EventBusRabbitMQ>();
258270
}
259271

260272
services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>();

0 commit comments

Comments
 (0)