Robert Raboud
7 years ago
64 changed files with 546 additions and 1126 deletions
Unified View
Diff Options
-
+163 -1eShopOnContainers.sln
-
+3 -2src/BuildingBlocks/Infrastructure/ActionResults/InternalServerErrorObjectResult.cs
-
+1 -1src/BuildingBlocks/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
-
+13 -19src/BuildingBlocks/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
-
+2 -2src/BuildingBlocks/Infrastructure/Filters/JsonErrorResponse.cs
-
+1 -1src/BuildingBlocks/Infrastructure/Filters/ValidateModelStateFilter.cs
-
+25 -0src/BuildingBlocks/Infrastructure/Infrastructure.csproj
-
+3 -4src/BuildingBlocks/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
-
+1 -1src/BuildingBlocks/Linq/Microsoft.Extensions.Linq/LinqSelectExtensions.cs
-
+7 -0src/BuildingBlocks/Linq/Microsoft.Extensions.Linq/Microsoft.Extensions.Linq.csproj
-
+18 -0src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs
-
+18 -0src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs
-
+6 -0src/Services/Basket/Basket.API/Basket.API.csproj
-
+0 -56src/Services/Basket/Basket.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
-
+4 -2src/Services/Basket/Basket.API/Startup.cs
-
+9 -0src/Services/Catalog/Catalog.API/Catalog.API.csproj
-
+1 -1src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
-
+0 -50src/Services/Catalog/Catalog.API/Extensions/LinqSelectExtensions.cs
-
+0 -14src/Services/Catalog/Catalog.API/Infrastructure/ActionResults/InternalServerErrorObjectResult.cs
-
+17 -17src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
-
+0 -63src/Services/Catalog/Catalog.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
-
+33 -32src/Services/Catalog/Catalog.API/Startup.cs
-
+0 -24src/Services/Catalog/Catalog.API/ViewModel/PaginatedItemsViewModel.cs
-
+9 -0src/Services/Common/Common.API/Common.API.csproj
-
+25 -0src/Services/Common/Common.API/PaginatedItemsViewModel.cs
-
+1 -1src/Services/Identity/Identity.API/Data/ApplicationDbContextSeed.cs
-
+0 -50src/Services/Identity/Identity.API/Extensions/LinqSelectExtensions.cs
-
+1 -4src/Services/Identity/Identity.API/Identity.API.csproj
-
+0 -14src/Services/Location/Locations.API/Infrastructure/ActionResults/InternalServerErrorObjectResult.cs
-
+0 -31src/Services/Location/Locations.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
-
+0 -67src/Services/Location/Locations.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
-
+0 -79src/Services/Location/Locations.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
-
+4 -0src/Services/Location/Locations.API/Locations.API.csproj
-
+4 -3src/Services/Location/Locations.API/Startup.cs
-
+16 -18src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
-
+0 -14src/Services/Marketing/Marketing.API/Infrastructure/ActionResult/InternalServerErrorObjectResult.cs
-
+0 -32src/Services/Marketing/Marketing.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
-
+0 -67src/Services/Marketing/Marketing.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
-
+0 -78src/Services/Marketing/Marketing.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
-
+3 -0src/Services/Marketing/Marketing.API/Marketing.API.csproj
-
+37 -36src/Services/Marketing/Marketing.API/Startup.cs
-
+0 -23src/Services/Marketing/Marketing.API/ViewModel/PaginatedItemsViewModel.cs
-
+0 -14src/Services/Ordering/Ordering.API/Infrastructure/ActionResults/InternalServerErrorObjectResult.cs
-
+0 -32src/Services/Ordering/Ordering.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
-
+0 -79src/Services/Ordering/Ordering.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
-
+20 -19src/Services/Ordering/Ordering.API/Infrastructure/OrderingContextSeed.cs
-
+6 -0src/Services/Ordering/Ordering.API/Ordering.API.csproj
-
+40 -39src/Services/Ordering/Ordering.API/Startup.cs
-
+6 -0src/Web/WebMVC/ByPassAuthMiddleware.cs
-
+3 -2src/Web/WebMVC/Controllers/CampaignsController.cs
-
+2 -1src/Web/WebMVC/Controllers/CatalogController.cs
-
+0 -80src/Web/WebMVC/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
-
+4 -3src/Web/WebMVC/Services/CampaignService.cs
-
+3 -2src/Web/WebMVC/Services/CatalogService.cs
-
+3 -2src/Web/WebMVC/Services/ICampaignService.cs
-
+2 -1src/Web/WebMVC/Services/ICatalogService.cs
-
+0 -1src/Web/WebMVC/Startup.cs
-
+0 -12src/Web/WebMVC/ViewModels/Campaign.cs
-
+1 -1src/Web/WebMVC/ViewModels/Pagination/PaginationInfo.cs
-
+5 -0src/Web/WebMVC/WebMVC.csproj
-
+1 -0src/Web/WebSPA/WebSPA.csproj
-
+1 -1test/Services/FunctionalTests/Services/IntegrationEventsScenarios.cs
-
+0 -1test/Services/FunctionalTests/Services/Marketing/MarketingScenarios.cs
-
+24 -29test/Services/UnitTest/Catalog/Application/CatalogControllerTest.cs
+ 163
- 1
eShopOnContainers.sln
View File
src/Services/Basket/Basket.API/Infrastructure/ActionResults/InternalServerErrorObjectResult.cs → src/BuildingBlocks/Infrastructure/ActionResults/InternalServerErrorObjectResult.cs
View File
src/Services/Basket/Basket.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs → src/BuildingBlocks/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
View File
src/Services/Ordering/Ordering.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs → src/BuildingBlocks/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
View File
src/Services/Basket/Basket.API/Infrastructure/Filters/JsonErrorResponse.cs → src/BuildingBlocks/Infrastructure/Filters/JsonErrorResponse.cs
View File
| @ -1,6 +1,6 @@ | |||||
| namespace Basket.API.Infrastructure.Filters | |||||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.Infrastructure.Filters | |||||
| { | { | ||||
| public class JsonErrorResponse | |||||
| public class JsonErrorResponse | |||||
| { | { | ||||
| public string[] Messages { get; set; } | public string[] Messages { get; set; } | ||||
src/Services/Basket/Basket.API/Infrastructure/Filters/ValidateModelStateFilter.cs → src/BuildingBlocks/Infrastructure/Filters/ValidateModelStateFilter.cs
View File
+ 25
- 0
src/BuildingBlocks/Infrastructure/Infrastructure.csproj
View File
| @ -0,0 +1,25 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk"> | |||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.0</TargetFramework> | |||||
| <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.Infrastructure</RootNamespace> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.2" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions"> | |||||
| <HintPath>C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.aspnetcore.hosting.abstractions\2.0.1\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.Abstractions.dll</HintPath> | |||||
| </Reference> | |||||
| <Reference Include="Microsoft.AspNetCore.Mvc.Abstractions"> | |||||
| <HintPath>C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.aspnetcore.mvc.abstractions\2.0.2\lib\netstandard2.0\Microsoft.AspNetCore.Mvc.Abstractions.dll</HintPath> | |||||
| </Reference> | |||||
| <Reference Include="Microsoft.Extensions.Logging.Abstractions"> | |||||
| <HintPath>C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.extensions.logging.abstractions\2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath> | |||||
| </Reference> | |||||
| </ItemGroup> | |||||
| </Project> | |||||
src/Services/Basket/Basket.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs → src/BuildingBlocks/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
View File
src/Services/Ordering/Ordering.API/Extensions/LinqSelectExtensions.cs → src/BuildingBlocks/Linq/Microsoft.Extensions.Linq/LinqSelectExtensions.cs
View File
+ 7
- 0
src/BuildingBlocks/Linq/Microsoft.Extensions.Linq/Microsoft.Extensions.Linq.csproj
View File
| @ -0,0 +1,7 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk"> | |||||
| <PropertyGroup> | |||||
| <TargetFramework>netstandard2.0</TargetFramework> | |||||
| </PropertyGroup> | |||||
| </Project> | |||||
+ 18
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs
View File
+ 18
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs
View File
+ 6
- 0
src/Services/Basket/Basket.API/Basket.API.csproj
View File
+ 0
- 56
src/Services/Basket/Basket.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
View File
| @ -1,56 +0,0 @@ | |||||
| using Basket.API.Infrastructure.ActionResults; | |||||
| using Basket.API.Infrastructure.Exceptions; | |||||
| using Microsoft.AspNetCore.Hosting; | |||||
| using Microsoft.AspNetCore.Mvc; | |||||
| using Microsoft.AspNetCore.Mvc.Filters; | |||||
| using Microsoft.Extensions.Logging; | |||||
| using System.Net; | |||||
| namespace Basket.API.Infrastructure.Filters | |||||
| { | |||||
| public partial class HttpGlobalExceptionFilter : IExceptionFilter | |||||
| { | |||||
| private readonly IHostingEnvironment env; | |||||
| private readonly ILogger<HttpGlobalExceptionFilter> logger; | |||||
| public HttpGlobalExceptionFilter(IHostingEnvironment env, ILogger<HttpGlobalExceptionFilter> logger) | |||||
| { | |||||
| this.env = env; | |||||
| this.logger = logger; | |||||
| } | |||||
| public void OnException(ExceptionContext context) | |||||
| { | |||||
| logger.LogError(new EventId(context.Exception.HResult), | |||||
| context.Exception, | |||||
| context.Exception.Message); | |||||
| if (context.Exception.GetType() == typeof(BasketDomainException)) | |||||
| { | |||||
| var json = new JsonErrorResponse | |||||
| { | |||||
| Messages = new[] { context.Exception.Message } | |||||
| }; | |||||
| context.Result = new BadRequestObjectResult(json); | |||||
| context.HttpContext.Response.StatusCode = (int)HttpStatusCode.BadRequest; | |||||
| } | |||||
| else | |||||
| { | |||||
| var json = new JsonErrorResponse | |||||
| { | |||||
| Messages = new[] { "An error occurred. Try it again." } | |||||
| }; | |||||
| if (env.IsDevelopment()) | |||||
| { | |||||
| json.DeveloperMessage = context.Exception; | |||||
| } | |||||
| context.Result = new InternalServerErrorObjectResult(json); | |||||
| context.HttpContext.Response.StatusCode = (int)HttpStatusCode.InternalServerError; | |||||
| } | |||||
| context.ExceptionHandled = true; | |||||
| } | |||||
| } | |||||
| } | |||||
+ 4
- 2
src/Services/Basket/Basket.API/Startup.cs
View File
+ 9
- 0
src/Services/Catalog/Catalog.API/Catalog.API.csproj
View File
+ 1
- 1
src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
View File
+ 0
- 50
src/Services/Catalog/Catalog.API/Extensions/LinqSelectExtensions.cs
View File
| @ -1,50 +0,0 @@ | |||||
| using System; | |||||
| using System.Collections.Generic; | |||||
| using System.Linq; | |||||
| namespace Catalog.API.Extensions | |||||
| { | |||||
| public static class LinqSelectExtensions | |||||
| { | |||||
| public static IEnumerable<SelectTryResult<TSource, TResult>> SelectTry<TSource, TResult>(this IEnumerable<TSource> enumerable, Func<TSource, TResult> selector) | |||||
| { | |||||
| foreach (TSource element in enumerable) | |||||
| { | |||||
| SelectTryResult<TSource, TResult> returnedValue; | |||||
| try | |||||
| { | |||||
| returnedValue = new SelectTryResult<TSource, TResult>(element, selector(element), null); | |||||
| } | |||||
| catch (Exception ex) | |||||
| { | |||||
| returnedValue = new SelectTryResult<TSource, TResult>(element, default(TResult), ex); | |||||
| } | |||||
| yield return returnedValue; | |||||
| } | |||||
| } | |||||
| public static IEnumerable<TResult> OnCaughtException<TSource, TResult>(this IEnumerable<SelectTryResult<TSource, TResult>> enumerable, Func<Exception, TResult> exceptionHandler) | |||||
| { | |||||
| return enumerable.Select(x => x.CaughtException == null ? x.Result : exceptionHandler(x.CaughtException)); | |||||
| } | |||||
| public static IEnumerable<TResult> OnCaughtException<TSource, TResult>(this IEnumerable<SelectTryResult<TSource, TResult>> enumerable, Func<TSource, Exception, TResult> exceptionHandler) | |||||
| { | |||||
| return enumerable.Select(x => x.CaughtException == null ? x.Result : exceptionHandler(x.Source, x.CaughtException)); | |||||
| } | |||||
| public class SelectTryResult<TSource, TResult> | |||||
| { | |||||
| internal SelectTryResult(TSource source, TResult result, Exception exception) | |||||
| { | |||||
| Source = source; | |||||
| Result = result; | |||||
| CaughtException = exception; | |||||
| } | |||||
| public TSource Source { get; private set; } | |||||
| public TResult Result { get; private set; } | |||||
| public Exception CaughtException { get; private set; } | |||||
| } | |||||
| } | |||||
| } | |||||
+ 0
- 14
src/Services/Catalog/Catalog.API/Infrastructure/ActionResults/InternalServerErrorObjectResult.cs
View File
| @ -1,14 +0,0 @@ | |||||
| using Microsoft.AspNetCore.Http; | |||||
| using Microsoft.AspNetCore.Mvc; | |||||
| namespace Catalog.API.Infrastructure.ActionResults | |||||
| { | |||||
| public class InternalServerErrorObjectResult : ObjectResult | |||||
| { | |||||
| public InternalServerErrorObjectResult(object error) | |||||
| : base(error) | |||||
| { | |||||
| StatusCode = StatusCodes.Status500InternalServerError; | |||||
| } | |||||
| } | |||||
| } | |||||
+ 17
- 17
src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
View File
+ 0
- 63
src/Services/Catalog/Catalog.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
View File
| @ -1,63 +0,0 @@ | |||||
| using Catalog.API.Infrastructure.ActionResults; | |||||
| using Catalog.API.Infrastructure.Exceptions; | |||||
| using Microsoft.AspNetCore.Hosting; | |||||
| using Microsoft.AspNetCore.Mvc; | |||||
| using Microsoft.AspNetCore.Mvc.Filters; | |||||
| using Microsoft.Extensions.Logging; | |||||
| using System.Net; | |||||
| namespace Catalog.API.Infrastructure.Filters | |||||
| { | |||||
| public class HttpGlobalExceptionFilter : IExceptionFilter | |||||
| { | |||||
| private readonly IHostingEnvironment env; | |||||
| private readonly ILogger<HttpGlobalExceptionFilter> logger; | |||||
| public HttpGlobalExceptionFilter(IHostingEnvironment env, ILogger<HttpGlobalExceptionFilter> logger) | |||||
| { | |||||
| this.env = env; | |||||
| this.logger = logger; | |||||
| } | |||||
| public void OnException(ExceptionContext context) | |||||
| { | |||||
| logger.LogError(new EventId(context.Exception.HResult), | |||||
| context.Exception, | |||||
| context.Exception.Message); | |||||
| if (context.Exception.GetType() == typeof(CatalogDomainException)) | |||||
| { | |||||
| var json = new JsonErrorResponse | |||||
| { | |||||
| Messages = new[] { context.Exception.Message } | |||||
| }; | |||||
| context.Result = new BadRequestObjectResult(json); | |||||
| context.HttpContext.Response.StatusCode = (int)HttpStatusCode.BadRequest; | |||||
| } | |||||
| else | |||||
| { | |||||
| var json = new JsonErrorResponse | |||||
| { | |||||
| Messages = new[] { "An error ocurr.Try it again." } | |||||
| }; | |||||
| if (env.IsDevelopment()) | |||||
| { | |||||
| json.DeveloperMeesage = context.Exception; | |||||
| } | |||||
| context.Result = new InternalServerErrorObjectResult(json); | |||||
| context.HttpContext.Response.StatusCode = (int)HttpStatusCode.InternalServerError; | |||||
| } | |||||
| context.ExceptionHandled = true; | |||||
| } | |||||
| private class JsonErrorResponse | |||||
| { | |||||
| public string[] Messages { get; set; } | |||||
| public object DeveloperMeesage { get; set; } | |||||
| } | |||||
| } | |||||
| } | |||||
+ 33
- 32
src/Services/Catalog/Catalog.API/Startup.cs
View File
+ 0
- 24
src/Services/Catalog/Catalog.API/ViewModel/PaginatedItemsViewModel.cs
View File
| @ -1,24 +0,0 @@ | |||||
| namespace Microsoft.eShopOnContainers.Services.Catalog.API.ViewModel | |||||
| { | |||||
| using System.Collections.Generic; | |||||
| public class PaginatedItemsViewModel<TEntity> where TEntity : class | |||||
| { | |||||
| public int PageIndex { get; private set; } | |||||
| public int PageSize { get; private set; } | |||||
| public long Count { get; private set; } | |||||
| public IEnumerable<TEntity> Data { get; private set; } | |||||
| public PaginatedItemsViewModel(int pageIndex, int pageSize, long count, IEnumerable<TEntity> data) | |||||
| { | |||||
| this.PageIndex = pageIndex; | |||||
| this.PageSize = pageSize; | |||||
| this.Count = count; | |||||
| this.Data = data; | |||||
| } | |||||
| } | |||||
| } | |||||
+ 9
- 0
src/Services/Common/Common.API/Common.API.csproj
View File
| @ -0,0 +1,9 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk"> | |||||
| <PropertyGroup> | |||||
| <TargetFramework>netstandard2.0</TargetFramework> | |||||
| <AssemblyName>Common.API</AssemblyName> | |||||
| <RootNamespace>Microsoft.eShopOnContainers.Services.Common.API</RootNamespace> | |||||
| </PropertyGroup> | |||||
| </Project> | |||||
+ 25
- 0
src/Services/Common/Common.API/PaginatedItemsViewModel.cs
View File
| @ -0,0 +1,25 @@ | |||||
| using System; | |||||
| using System.Collections.Generic; | |||||
| using System.Text; | |||||
| namespace Microsoft.eShopOnContainers.Services.Common.API | |||||
| { | |||||
| public class PaginatedItemsViewModel<TEntity> where TEntity : class | |||||
| { | |||||
| public int PageIndex { get; private set; } | |||||
| public int PageSize { get; private set; } | |||||
| public long Count { get; private set; } | |||||
| public IEnumerable<TEntity> Data { get; private set; } | |||||
| public PaginatedItemsViewModel(int pageIndex, int pageSize, long count, IEnumerable<TEntity> data) | |||||
| { | |||||
| this.PageIndex = pageIndex; | |||||
| this.PageSize = pageSize; | |||||
| this.Count = count; | |||||
| this.Data = data; | |||||
| } | |||||
| } | |||||
| } | |||||
+ 1
- 1
src/Services/Identity/Identity.API/Data/ApplicationDbContextSeed.cs
View File
+ 0
- 50
src/Services/Identity/Identity.API/Extensions/LinqSelectExtensions.cs
View File
| @ -1,50 +0,0 @@ | |||||
| using System; | |||||
| using System.Collections.Generic; | |||||
| using System.Linq; | |||||
| namespace Microsoft.eShopOnContainers.Services.Identity.API.Extensions | |||||
| { | |||||
| public static class LinqSelectExtensions | |||||
| { | |||||
| public static IEnumerable<SelectTryResult<TSource, TResult>> SelectTry<TSource, TResult>(this IEnumerable<TSource> enumerable, Func<TSource, TResult> selector) | |||||
| { | |||||
| foreach (TSource element in enumerable) | |||||
| { | |||||
| SelectTryResult<TSource, TResult> returnedValue; | |||||
| try | |||||
| { | |||||
| returnedValue = new SelectTryResult<TSource, TResult>(element, selector(element), null); | |||||
| } | |||||
| catch (Exception ex) | |||||
| { | |||||
| returnedValue = new SelectTryResult<TSource, TResult>(element, default(TResult), ex); | |||||
| } | |||||
| yield return returnedValue; | |||||
| } | |||||
| } | |||||
| public static IEnumerable<TResult> OnCaughtException<TSource, TResult>(this IEnumerable<SelectTryResult<TSource, TResult>> enumerable, Func<Exception, TResult> exceptionHandler) | |||||
| { | |||||
| return enumerable.Select(x => x.CaughtException == null ? x.Result : exceptionHandler(x.CaughtException)); | |||||
| } | |||||
| public static IEnumerable<TResult> OnCaughtException<TSource, TResult>(this IEnumerable<SelectTryResult<TSource, TResult>> enumerable, Func<TSource, Exception, TResult> exceptionHandler) | |||||
| { | |||||
| return enumerable.Select(x => x.CaughtException == null ? x.Result : exceptionHandler(x.Source, x.CaughtException)); | |||||
| } | |||||
| public class SelectTryResult<TSource, TResult> | |||||
| { | |||||
| internal SelectTryResult(TSource source, TResult result, Exception exception) | |||||
| { | |||||
| Source = source; | |||||
| Result = result; | |||||
| CaughtException = exception; | |||||
| } | |||||
| public TSource Source { get; private set; } | |||||
| public TResult Result { get; private set; } | |||||
| public Exception CaughtException { get; private set; } | |||||
| } | |||||
| } | |||||
| } | |||||
+ 1
- 4
src/Services/Identity/Identity.API/Identity.API.csproj
View File
+ 0
- 14
src/Services/Location/Locations.API/Infrastructure/ActionResults/InternalServerErrorObjectResult.cs
View File
| @ -1,14 +0,0 @@ | |||||
| using Microsoft.AspNetCore.Http; | |||||
| using Microsoft.AspNetCore.Mvc; | |||||
| namespace Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.ActionResults | |||||
| { | |||||
| public class InternalServerErrorObjectResult : ObjectResult | |||||
| { | |||||
| public InternalServerErrorObjectResult(object error) | |||||
| : base(error) | |||||
| { | |||||
| StatusCode = StatusCodes.Status500InternalServerError; | |||||
| } | |||||
| } | |||||
| } | |||||
+ 0
- 31
src/Services/Location/Locations.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
View File
| @ -1,31 +0,0 @@ | |||||
| | |||||
| using Microsoft.AspNetCore.Authorization; | |||||
| using Swashbuckle.AspNetCore.Swagger; | |||||
| using Swashbuckle.AspNetCore.SwaggerGen; | |||||
| using System.Collections.Generic; | |||||
| using System.Linq; | |||||
| namespace Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Filters | |||||
| { | |||||
| internal class AuthorizeCheckOperationFilter : IOperationFilter | |||||
| { | |||||
| public void Apply(Operation operation, OperationFilterContext context) | |||||
| { | |||||
| // Check for authorize attribute | |||||
| var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() || | |||||
| context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any(); | |||||
| if (hasAuthorize) | |||||
| { | |||||
| operation.Responses.Add("401", new Response { Description = "Unauthorized" }); | |||||
| operation.Responses.Add("403", new Response { Description = "Forbidden" }); | |||||
| operation.Security = new List<IDictionary<string, IEnumerable<string>>>(); | |||||
| operation.Security.Add(new Dictionary<string, IEnumerable<string>> | |||||
| { | |||||
| { "oauth2", new [] { "locationsapi" } } | |||||
| }); | |||||
| } | |||||
| } | |||||
| } | |||||
| } | |||||
+ 0
- 67
src/Services/Location/Locations.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
View File
| @ -1,67 +0,0 @@ | |||||
| namespace Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Filters | |||||
| { | |||||
| using AspNetCore.Mvc; | |||||
| using Microsoft.AspNetCore.Hosting; | |||||
| using Microsoft.AspNetCore.Mvc.Filters; | |||||
| using Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.ActionResults; | |||||
| using Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Exceptions; | |||||
| using Microsoft.Extensions.Logging; | |||||
| using System.Net; | |||||
| public class HttpGlobalExceptionFilter : IExceptionFilter | |||||
| { | |||||
| private readonly IHostingEnvironment env; | |||||
| private readonly ILogger<HttpGlobalExceptionFilter> logger; | |||||
| public HttpGlobalExceptionFilter(IHostingEnvironment env, ILogger<HttpGlobalExceptionFilter> logger) | |||||
| { | |||||
| this.env = env; | |||||
| this.logger = logger; | |||||
| } | |||||
| public void OnException(ExceptionContext context) | |||||
| { | |||||
| logger.LogError(new EventId(context.Exception.HResult), | |||||
| context.Exception, | |||||
| context.Exception.Message); | |||||
| if (context.Exception.GetType() == typeof(LocationDomainException)) | |||||
| { | |||||
| var json = new JsonErrorResponse | |||||
| { | |||||
| Messages = new[] { context.Exception.Message } | |||||
| }; | |||||
| // Result asigned to a result object but in destiny the response is empty. This is a known bug of .net core 1.1 | |||||
| //It will be fixed in .net core 1.1.2. See https://github.com/aspnet/Mvc/issues/5594 for more information | |||||
| context.Result = new BadRequestObjectResult(json); | |||||
| context.HttpContext.Response.StatusCode = (int)HttpStatusCode.BadRequest; | |||||
| } | |||||
| else | |||||
| { | |||||
| var json = new JsonErrorResponse | |||||
| { | |||||
| Messages = new[] { "An error occur.Try it again." } | |||||
| }; | |||||
| if (env.IsDevelopment()) | |||||
| { | |||||
| json.DeveloperMessage = context.Exception; | |||||
| } | |||||
| // Result asigned to a result object but in destiny the response is empty. This is a known bug of .net core 1.1 | |||||
| // It will be fixed in .net core 1.1.2. See https://github.com/aspnet/Mvc/issues/5594 for more information | |||||
| context.Result = new InternalServerErrorObjectResult(json); | |||||
| context.HttpContext.Response.StatusCode = (int)HttpStatusCode.InternalServerError; | |||||
| } | |||||
| context.ExceptionHandled = true; | |||||
| } | |||||
| private class JsonErrorResponse | |||||
| { | |||||
| public string[] Messages { get; set; } | |||||
| public object DeveloperMessage { get; set; } | |||||
| } | |||||
| } | |||||
| } | |||||
+ 0
- 79
src/Services/Location/Locations.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
View File
| @ -1,79 +0,0 @@ | |||||
| using Microsoft.AspNetCore.Http; | |||||
| using Microsoft.Extensions.Primitives; | |||||
| using System; | |||||
| using System.Collections.Generic; | |||||
| using System.Linq; | |||||
| using System.Security.Claims; | |||||
| using System.Threading.Tasks; | |||||
| namespace Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Middlewares | |||||
| { | |||||
| class ByPassAuthMiddleware | |||||
| { | |||||
| private readonly RequestDelegate _next; | |||||
| private string _currentUserId; | |||||
| public ByPassAuthMiddleware(RequestDelegate next) | |||||
| { | |||||
| _next = next; | |||||
| _currentUserId = null; | |||||
| } | |||||
| public async Task Invoke(HttpContext context) | |||||
| { | |||||
| var path = context.Request.Path; | |||||
| if (path == "/noauth") | |||||
| { | |||||
| var userid = context.Request.Query["userid"]; | |||||
| if (!string.IsNullOrEmpty(userid)) | |||||
| { | |||||
| _currentUserId = userid; | |||||
| } | |||||
| context.Response.StatusCode = 200; | |||||
| context.Response.ContentType = "text/string"; | |||||
| await context.Response.WriteAsync($"User set to {_currentUserId}"); | |||||
| } | |||||
| else if (path == "/noauth/reset") | |||||
| { | |||||
| _currentUserId = null; | |||||
| context.Response.StatusCode = 200; | |||||
| context.Response.ContentType = "text/string"; | |||||
| await context.Response.WriteAsync($"User set to none. Token required for protected endpoints."); | |||||
| } | |||||
| else | |||||
| { | |||||
| var currentUserId = _currentUserId; | |||||
| var authHeader = context.Request.Headers["Authorization"]; | |||||
| if (authHeader != StringValues.Empty) | |||||
| { | |||||
| var header = authHeader.FirstOrDefault(); | |||||
| if (!string.IsNullOrEmpty(header) && header.StartsWith("Email ") && header.Length > "Email ".Length) | |||||
| { | |||||
| currentUserId = header.Substring("Email ".Length); | |||||
| } | |||||
| } | |||||
| if (!string.IsNullOrEmpty(currentUserId)) | |||||
| { | |||||
| var user = new ClaimsIdentity(new[] { | |||||
| new Claim("emails", currentUserId), | |||||
| new Claim("name", "Test user"), | |||||
| new Claim("nonce", Guid.NewGuid().ToString()), | |||||
| new Claim("ttp://schemas.microsoft.com/identity/claims/identityprovider", "ByPassAuthMiddleware"), | |||||
| new Claim("nonce", Guid.NewGuid().ToString()), | |||||
| new Claim("sub", "1234"), | |||||
| new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname","User"), | |||||
| new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname","Microsoft")} | |||||
| , "ByPassAuth"); | |||||
| context.User = new ClaimsPrincipal(user); | |||||
| } | |||||
| await _next.Invoke(context); | |||||
| } | |||||
| } | |||||
| } | |||||
| } | |||||
+ 4
- 0
src/Services/Location/Locations.API/Locations.API.csproj
View File
+ 4
- 3
src/Services/Location/Locations.API/Startup.cs
View File
+ 16
- 18
src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
View File
+ 0
- 14
src/Services/Marketing/Marketing.API/Infrastructure/ActionResult/InternalServerErrorObjectResult.cs
View File
| @ -1,14 +0,0 @@ | |||||
| namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.ActionResults | |||||
| { | |||||
| using AspNetCore.Http; | |||||
| using Microsoft.AspNetCore.Mvc; | |||||
| public class InternalServerErrorObjectResult : ObjectResult | |||||
| { | |||||
| public InternalServerErrorObjectResult(object error) | |||||
| : base(error) | |||||
| { | |||||
| StatusCode = StatusCodes.Status500InternalServerError; | |||||
| } | |||||
| } | |||||
| } | |||||
+ 0
- 32
src/Services/Marketing/Marketing.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
View File
| @ -1,32 +0,0 @@ | |||||
| using Microsoft.AspNetCore.Authorization; | |||||
| using Swashbuckle.AspNetCore.Swagger; | |||||
| using Swashbuckle.AspNetCore.SwaggerGen; | |||||
| using System.Collections.Generic; | |||||
| using System.Linq; | |||||
| namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Filters | |||||
| { | |||||
| public class AuthorizeCheckOperationFilter : IOperationFilter | |||||
| { | |||||
| public void Apply(Operation operation, OperationFilterContext context) | |||||
| { | |||||
| // Check for authorize attribute | |||||
| var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() || | |||||
| context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any(); | |||||
| if (hasAuthorize) | |||||
| { | |||||
| operation.Responses.Add("401", new Response { Description = "Unauthorized" }); | |||||
| operation.Responses.Add("403", new Response { Description = "Forbidden" }); | |||||
| operation.Security = new List<IDictionary<string, IEnumerable<string>>> | |||||
| { | |||||
| new Dictionary<string, IEnumerable<string>> | |||||
| { | |||||
| { "oauth2", new [] { "marketingapi" } } | |||||
| } | |||||
| }; | |||||
| } | |||||
| } | |||||
| } | |||||
| } | |||||
+ 0
- 67
src/Services/Marketing/Marketing.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
View File
| @ -1,67 +0,0 @@ | |||||
| namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Filters | |||||
| { | |||||
| using AspNetCore.Mvc; | |||||
| using global::Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Exceptions; | |||||
| using Microsoft.AspNetCore.Hosting; | |||||
| using Microsoft.AspNetCore.Mvc.Filters; | |||||
| using Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.ActionResults; | |||||
| using Microsoft.Extensions.Logging; | |||||
| using System.Net; | |||||
| public class HttpGlobalExceptionFilter : IExceptionFilter | |||||
| { | |||||
| private readonly IHostingEnvironment env; | |||||
| private readonly ILogger<HttpGlobalExceptionFilter> logger; | |||||
| public HttpGlobalExceptionFilter(IHostingEnvironment env, ILogger<HttpGlobalExceptionFilter> logger) | |||||
| { | |||||
| this.env = env; | |||||
| this.logger = logger; | |||||
| } | |||||
| public void OnException(ExceptionContext context) | |||||
| { | |||||
| logger.LogError(new EventId(context.Exception.HResult), | |||||
| context.Exception, | |||||
| context.Exception.Message); | |||||
| if (context.Exception.GetType() == typeof(MarketingDomainException)) | |||||
| { | |||||
| var json = new JsonErrorResponse | |||||
| { | |||||
| Messages = new[] { context.Exception.Message } | |||||
| }; | |||||
| // Result asigned to a result object but in destiny the response is empty. This is a known bug of .net core 1.1 | |||||
| //It will be fixed in .net core 1.1.2. See https://github.com/aspnet/Mvc/issues/5594 for more information | |||||
| context.Result = new BadRequestObjectResult(json); | |||||
| context.HttpContext.Response.StatusCode = (int)HttpStatusCode.BadRequest; | |||||
| } | |||||
| else | |||||
| { | |||||
| var json = new JsonErrorResponse | |||||
| { | |||||
| Messages = new[] { "An error occur.Try it again." } | |||||
| }; | |||||
| if (env.IsDevelopment()) | |||||
| { | |||||
| json.DeveloperMessage = context.Exception; | |||||
| } | |||||
| // Result asigned to a result object but in destiny the response is empty. This is a known bug of .net core 1.1 | |||||
| // It will be fixed in .net core 1.1.2. See https://github.com/aspnet/Mvc/issues/5594 for more information | |||||
| context.Result = new InternalServerErrorObjectResult(json); | |||||
| context.HttpContext.Response.StatusCode = (int)HttpStatusCode.InternalServerError; | |||||
| } | |||||
| context.ExceptionHandled = true; | |||||
| } | |||||
| private class JsonErrorResponse | |||||
| { | |||||
| public string[] Messages { get; set; } | |||||
| public object DeveloperMessage { get; set; } | |||||
| } | |||||
| } | |||||
| } | |||||
+ 0
- 78
src/Services/Marketing/Marketing.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
View File
| @ -1,78 +0,0 @@ | |||||
| using Microsoft.AspNetCore.Http; | |||||
| using Microsoft.Extensions.Primitives; | |||||
| using System; | |||||
| using System.Linq; | |||||
| using System.Security.Claims; | |||||
| using System.Threading.Tasks; | |||||
| namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Middlewares | |||||
| { | |||||
| class ByPassAuthMiddleware | |||||
| { | |||||
| private readonly RequestDelegate _next; | |||||
| private string _currentUserId; | |||||
| public ByPassAuthMiddleware(RequestDelegate next) | |||||
| { | |||||
| _next = next; | |||||
| _currentUserId = null; | |||||
| } | |||||
| public async Task Invoke(HttpContext context) | |||||
| { | |||||
| var path = context.Request.Path; | |||||
| if (path == "/noauth") | |||||
| { | |||||
| var userid = context.Request.Query["userid"]; | |||||
| if (!string.IsNullOrEmpty(userid)) | |||||
| { | |||||
| _currentUserId = userid; | |||||
| } | |||||
| context.Response.StatusCode = 200; | |||||
| context.Response.ContentType = "text/string"; | |||||
| await context.Response.WriteAsync($"User set to {_currentUserId}"); | |||||
| } | |||||
| else if (path == "/noauth/reset") | |||||
| { | |||||
| _currentUserId = null; | |||||
| context.Response.StatusCode = 200; | |||||
| context.Response.ContentType = "text/string"; | |||||
| await context.Response.WriteAsync($"User set to none. Token required for protected endpoints."); | |||||
| } | |||||
| else | |||||
| { | |||||
| var currentUserId = _currentUserId; | |||||
| var authHeader = context.Request.Headers["Authorization"]; | |||||
| if (authHeader != StringValues.Empty) | |||||
| { | |||||
| var header = authHeader.FirstOrDefault(); | |||||
| if (!string.IsNullOrEmpty(header) && header.StartsWith("Email ") && header.Length > "Email ".Length) | |||||
| { | |||||
| currentUserId = header.Substring("Email ".Length); | |||||
| } | |||||
| } | |||||
| if (!string.IsNullOrEmpty(currentUserId)) | |||||
| { | |||||
| var user = new ClaimsIdentity(new[] { | |||||
| new Claim("emails", currentUserId), | |||||
| new Claim("name", "Test user"), | |||||
| new Claim("nonce", Guid.NewGuid().ToString()), | |||||
| new Claim("ttp://schemas.microsoft.com/identity/claims/identityprovider", "ByPassAuthMiddleware"), | |||||
| new Claim("nonce", Guid.NewGuid().ToString()), | |||||
| new Claim("sub", "1234"), | |||||
| new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname","User"), | |||||
| new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname","Microsoft")} | |||||
| , "ByPassAuth"); | |||||
| context.User = new ClaimsPrincipal(user); | |||||
| } | |||||
| await _next.Invoke(context); | |||||
| } | |||||
| } | |||||
| } | |||||
| } | |||||
+ 3
- 0
src/Services/Marketing/Marketing.API/Marketing.API.csproj
View File
+ 37
- 36
src/Services/Marketing/Marketing.API/Startup.cs
View File
+ 0
- 23
src/Services/Marketing/Marketing.API/ViewModel/PaginatedItemsViewModel.cs
View File
| @ -1,23 +0,0 @@ | |||||
| namespace Microsoft.eShopOnContainers.Services.Marketing.API.ViewModel | |||||
| { | |||||
| using System.Collections.Generic; | |||||
| public class PaginatedItemsViewModel<TEntity> where TEntity : class | |||||
| { | |||||
| public int PageIndex { get; private set; } | |||||
| public int PageSize { get; private set; } | |||||
| public long Count { get; private set; } | |||||
| public IEnumerable<TEntity> Data { get; private set; } | |||||
| public PaginatedItemsViewModel(int pageIndex, int pageSize, long count, IEnumerable<TEntity> data) | |||||
| { | |||||
| this.PageIndex = pageIndex; | |||||
| this.PageSize = pageSize; | |||||
| this.Count = count; | |||||
| this.Data = data; | |||||
| } | |||||
| } | |||||
| } | |||||
+ 0
- 14
src/Services/Ordering/Ordering.API/Infrastructure/ActionResults/InternalServerErrorObjectResult.cs
View File
| @ -1,14 +0,0 @@ | |||||
| namespace Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure.ActionResults | |||||
| { | |||||
| using AspNetCore.Http; | |||||
| using Microsoft.AspNetCore.Mvc; | |||||
| public class InternalServerErrorObjectResult : ObjectResult | |||||
| { | |||||
| public InternalServerErrorObjectResult(object error) | |||||
| : base(error) | |||||
| { | |||||
| StatusCode = StatusCodes.Status500InternalServerError; | |||||
| } | |||||
| } | |||||
| } | |||||
+ 0
- 32
src/Services/Ordering/Ordering.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
View File
| @ -1,32 +0,0 @@ | |||||
| using Microsoft.AspNetCore.Authorization; | |||||
| using Swashbuckle.AspNetCore.Swagger; | |||||
| using Swashbuckle.AspNetCore.SwaggerGen; | |||||
| using System; | |||||
| using System.Collections.Generic; | |||||
| using System.Linq; | |||||
| using System.Threading.Tasks; | |||||
| namespace Ordering.API.Infrastructure.Filters | |||||
| { | |||||
| public class AuthorizeCheckOperationFilter : IOperationFilter | |||||
| { | |||||
| public void Apply(Operation operation, OperationFilterContext context) | |||||
| { | |||||
| // Check for authorize attribute | |||||
| var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() || | |||||
| context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any(); | |||||
| if (hasAuthorize) | |||||
| { | |||||
| operation.Responses.Add("401", new Response { Description = "Unauthorized" }); | |||||
| operation.Responses.Add("403", new Response { Description = "Forbidden" }); | |||||
| operation.Security = new List<IDictionary<string, IEnumerable<string>>>(); | |||||
| operation.Security.Add(new Dictionary<string, IEnumerable<string>> | |||||
| { | |||||
| { "oauth2", new [] { "orderingapi" } } | |||||
| }); | |||||
| } | |||||
| } | |||||
| } | |||||
| } | |||||
+ 0
- 79
src/Services/Ordering/Ordering.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
View File
| @ -1,79 +0,0 @@ | |||||
| using Microsoft.AspNetCore.Http; | |||||
| using Microsoft.Extensions.Primitives; | |||||
| using System; | |||||
| using System.Collections.Generic; | |||||
| using System.Linq; | |||||
| using System.Security.Claims; | |||||
| using System.Threading.Tasks; | |||||
| namespace Ordering.API.Infrastructure.Middlewares | |||||
| { | |||||
| class ByPassAuthMiddleware | |||||
| { | |||||
| private readonly RequestDelegate _next; | |||||
| private string _currentUserId; | |||||
| public ByPassAuthMiddleware(RequestDelegate next) | |||||
| { | |||||
| _next = next; | |||||
| _currentUserId = null; | |||||
| } | |||||
| public async Task Invoke(HttpContext context) | |||||
| { | |||||
| var path = context.Request.Path; | |||||
| if (path == "/noauth") | |||||
| { | |||||
| var userid = context.Request.Query["userid"]; | |||||
| if (!string.IsNullOrEmpty(userid)) | |||||
| { | |||||
| _currentUserId = userid; | |||||
| } | |||||
| context.Response.StatusCode = 200; | |||||
| context.Response.ContentType = "text/string"; | |||||
| await context.Response.WriteAsync($"User set to {_currentUserId}"); | |||||
| } | |||||
| else if (path == "/noauth/reset") | |||||
| { | |||||
| _currentUserId = null; | |||||
| context.Response.StatusCode = 200; | |||||
| context.Response.ContentType = "text/string"; | |||||
| await context.Response.WriteAsync($"User set to none. Token required for protected endpoints."); | |||||
| } | |||||
| else | |||||
| { | |||||
| var currentUserId = _currentUserId; | |||||
| var authHeader = context.Request.Headers["Authorization"]; | |||||
| if (authHeader != StringValues.Empty) | |||||
| { | |||||
| var header = authHeader.FirstOrDefault(); | |||||
| if (!string.IsNullOrEmpty(header) && header.StartsWith("Email ") && header.Length > "Email ".Length) | |||||
| { | |||||
| currentUserId = header.Substring("Email ".Length); | |||||
| } | |||||
| } | |||||
| if (!string.IsNullOrEmpty(currentUserId)) | |||||
| { | |||||
| var user = new ClaimsIdentity(new[] { | |||||
| new Claim("emails", currentUserId), | |||||
| new Claim("name", "Test user"), | |||||
| new Claim("nonce", Guid.NewGuid().ToString()), | |||||
| new Claim("ttp://schemas.microsoft.com/identity/claims/identityprovider", "ByPassAuthMiddleware"), | |||||
| new Claim("nonce", Guid.NewGuid().ToString()), | |||||
| new Claim("sub", "1234"), | |||||
| new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname","User"), | |||||
| new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname","Microsoft")} | |||||
| , "ByPassAuth"); | |||||
| context.User = new ClaimsPrincipal(user); | |||||
| } | |||||
| await _next.Invoke(context); | |||||
| } | |||||
| } | |||||
| } | |||||
| } | |||||
+ 20
- 19
src/Services/Ordering/Ordering.API/Infrastructure/OrderingContextSeed.cs
View File
+ 6
- 0
src/Services/Ordering/Ordering.API/Ordering.API.csproj
View File
+ 40
- 39
src/Services/Ordering/Ordering.API/Startup.cs
View File
+ 6
- 0
src/Web/WebMVC/ByPassAuthMiddleware.cs
View File
| @ -0,0 +1,6 @@ | |||||
| namespace Microsoft.eShopOnContainers.WebMVC | |||||
| { | |||||
| internal class ByPassAuthMiddleware | |||||
| { | |||||
| } | |||||
| } | |||||
+ 3
- 2
src/Web/WebMVC/Controllers/CampaignsController.cs
View File
+ 2
- 1
src/Web/WebMVC/Controllers/CatalogController.cs
View File
+ 0
- 80
src/Web/WebMVC/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
View File
| @ -1,80 +0,0 @@ | |||||
| using Microsoft.AspNetCore.Http; | |||||
| using Microsoft.Extensions.Primitives; | |||||
| using System; | |||||
| using System.Collections.Generic; | |||||
| using System.Linq; | |||||
| using System.Security.Claims; | |||||
| using System.Threading.Tasks; | |||||
| namespace WebMVC.Infrastructure.Middlewares | |||||
| { | |||||
| class ByPassAuthMiddleware | |||||
| { | |||||
| private readonly RequestDelegate _next; | |||||
| private string _currentUserId; | |||||
| public ByPassAuthMiddleware(RequestDelegate next) | |||||
| { | |||||
| _next = next; | |||||
| _currentUserId = null; | |||||
| } | |||||
| public async Task Invoke(HttpContext context) | |||||
| { | |||||
| var path = context.Request.Path; | |||||
| if (path == "/noauth") | |||||
| { | |||||
| var userid = context.Request.Query["userid"]; | |||||
| if (!string.IsNullOrEmpty(userid)) | |||||
| { | |||||
| _currentUserId = userid; | |||||
| } | |||||
| context.Response.StatusCode = 200; | |||||
| context.Response.ContentType = "text/string"; | |||||
| await context.Response.WriteAsync($"User set to {_currentUserId}"); | |||||
| } | |||||
| else if (path == "/noauth/reset") | |||||
| { | |||||
| _currentUserId = null; | |||||
| context.Response.StatusCode = 200; | |||||
| context.Response.ContentType = "text/string"; | |||||
| await context.Response.WriteAsync($"User set to none. Token required for protected endpoints."); | |||||
| } | |||||
| else | |||||
| { | |||||
| var currentUserId = _currentUserId; | |||||
| var authHeader = context.Request.Headers["Authorization"]; | |||||
| if (authHeader != StringValues.Empty) | |||||
| { | |||||
| var header = authHeader.FirstOrDefault(); | |||||
| if (!string.IsNullOrEmpty(header) && header.StartsWith("Email ") && header.Length > "Email ".Length) | |||||
| { | |||||
| currentUserId = header.Substring("Email ".Length); | |||||
| } | |||||
| } | |||||
| if (!string.IsNullOrEmpty(currentUserId)) | |||||
| { | |||||
| var user = new ClaimsIdentity(new[] { | |||||
| new Claim("emails", currentUserId), | |||||
| new Claim("name", "Test user"), | |||||
| new Claim("nonce", Guid.NewGuid().ToString()), | |||||
| new Claim("ttp://schemas.microsoft.com/identity/claims/identityprovider", "ByPassAuthMiddleware"), | |||||
| new Claim("nonce", Guid.NewGuid().ToString()), | |||||
| new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname","User"), | |||||
| new Claim("sub", "1234"), | |||||
| new Claim("card_expiration", "12/20"), | |||||
| new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname","Microsoft")} | |||||
| , "ByPassAuth"); | |||||
| context.User = new ClaimsPrincipal(user); | |||||
| } | |||||
| await _next.Invoke(context); | |||||
| } | |||||
| } | |||||
| } | |||||
| } | |||||
+ 4
- 3
src/Web/WebMVC/Services/CampaignService.cs
View File
+ 3
- 2
src/Web/WebMVC/Services/CatalogService.cs
View File
+ 3
- 2
src/Web/WebMVC/Services/ICampaignService.cs
View File
| @ -1,12 +1,13 @@ | |||||
| namespace Microsoft.eShopOnContainers.WebMVC.Services | namespace Microsoft.eShopOnContainers.WebMVC.Services | ||||
| { | { | ||||
| using System.Collections.Generic; | |||||
| using Microsoft.eShopOnContainers.Services.Common.API; | |||||
| using System.Collections.Generic; | |||||
| using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
| using ViewModels; | using ViewModels; | ||||
| public interface ICampaignService | public interface ICampaignService | ||||
| { | { | ||||
| Task<Campaign> GetCampaigns(int pageSize, int pageIndex); | |||||
| Task<PaginatedItemsViewModel<CampaignItem>> GetCampaigns(int pageSize, int pageIndex); | |||||
| Task<CampaignItem> GetCampaignById(int id); | Task<CampaignItem> GetCampaignById(int id); | ||||
| } | } | ||||
+ 2
- 1
src/Web/WebMVC/Services/ICatalogService.cs
View File
+ 0
- 1
src/Web/WebMVC/Startup.cs
View File
+ 0
- 12
src/Web/WebMVC/ViewModels/Campaign.cs
View File
| @ -1,12 +0,0 @@ | |||||
| namespace Microsoft.eShopOnContainers.WebMVC.ViewModels | |||||
| { | |||||
| using System.Collections.Generic; | |||||
| public class Campaign | |||||
| { | |||||
| public int PageIndex { get; set; } | |||||
| public int PageSize { get; set; } | |||||
| public int Count { get; set; } | |||||
| public List<CampaignItem> Data { get; set; } | |||||
| } | |||||
| } | |||||