Added WithAuthenticatedUser to the HttpRequestBuilder

Author: ivaylokenov

samples/MusicStore/MusicStore.Test/Controllers/ShoppingCartControllerTest.cs

@@ -1,13 +1,13 @@
 namespace MusicStore.Test.Controllers
 {
     using System.Linq;
-    using System.Threading.Tasks;
+    using System.Threading;
     using Models;
     using MusicStore.Controllers;
     using MyTested.AspNetCore.Mvc;
     using ViewModels;
     using Xunit;
-    using System.Threading;
+
     public class ShoppingCartControllerTest
     {
         [Fact]

samples/MusicStore/MusicStore.Test/Routes/CheckoutRouteTest.cs

@@ -13,7 +13,9 @@ public void GetAddressAndPaymentShouldBeRoutedCorrectly()
         {
             MyMvc
                 .Routes()
-                .ShouldMap("/Checkout/AddressAndPayment")
+                .ShouldMap(request => request
+                    .WithLocation("/Checkout/AddressAndPayment")
+                    .WithAuthenticatedUser())
                 .To<CheckoutController>(c => c.AddressAndPayment());
         }
 
@@ -47,6 +49,7 @@ public void PostAddressAndPaymentShouldBeRoutedCorrectly()
                         Phone = phone,
                         Email = email,
                     })
+                    .WithAuthenticatedUser()
                     .WithAntiForgeryToken())
                 .To<CheckoutController>(c => c.AddressAndPayment(
                     With.Any<MusicStoreContext>(),
@@ -72,7 +75,9 @@ public void GetCompleteShouldBeRoutedCorrectly()
         {
             MyMvc
                 .Routes()
-                .ShouldMap("/Checkout/Complete/1")
+                .ShouldMap(request => request
+                    .WithLocation("/Checkout/Complete/1")
+                    .WithAuthenticatedUser())
                 .To<CheckoutController>(c => c.Complete(With.Any<MusicStoreContext>(), 1));
         }
     }

samples/MusicStore/MusicStore.Test/TestStartup.cs

@@ -2,10 +2,6 @@
 {
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.Identity;
-    using Microsoft.EntityFrameworkCore;
-    using Microsoft.EntityFrameworkCore.Infrastructure;
-    using Microsoft.EntityFrameworkCore.Infrastructure.Internal;
-    using Microsoft.EntityFrameworkCore.Storage.Internal;
     using Microsoft.Extensions.DependencyInjection;
     using Mocks;
     using Models;

src/MyTested.AspNetCore.Mvc.Core/Builders/Contracts/Http/IHttpRequestBuilder.cs

@@ -7,7 +7,7 @@
     using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Primitives;
     using Uris;
-
+    using Authentication;
     /// <summary>
     /// Used for building <see cref="HttpRequest"/>.
     /// </summary>
@@ -456,5 +456,18 @@ public interface IHttpRequestBuilder
         /// <param name="uriBuilder">Builder for the URI.</param>
         /// <returns>The same <see cref="IAndHttpRequestBuilder"/>.</returns>
         IAndHttpRequestBuilder WithLocation(Action<IUriTestBuilder> uriBuilder);
+
+        /// <summary>
+        /// Sets default authenticated <see cref="HttpContext.User"/> to the built request with "TestId" identifier and "TestUser" username.
+        /// </summary>
+        /// <returns>The same <see cref="IAndHttpRequestBuilder"/>.</returns>
+        IAndHttpRequestBuilder WithAuthenticatedUser();
+
+        /// <summary>
+        /// Sets custom authenticated <see cref="HttpContext.User"/> to the built request using the provided user builder.
+        /// </summary>
+        /// <param name="userBuilder">Action setting the <see cref="HttpContext.User"/> by using <see cref="IClaimsPrincipalBuilder"/>.</param>
+        /// <returns>The same <see cref="IAndHttpRequestBuilder"/>.</returns>
+        IAndHttpRequestBuilder WithAuthenticatedUser(Action<IClaimsPrincipalBuilder> userBuilder);
     }
 }

src/MyTested.AspNetCore.Mvc.Core/Builders/Http/HttpRequestBuilder.cs

@@ -5,6 +5,8 @@
     using System.IO;
     using System.Linq;
     using System.Text;
+    using Authentication;
+    using Contracts.Authentication;
     using Contracts.Http;
     using Contracts.Uris;
     using Exceptions;
@@ -425,6 +427,22 @@ public IAndHttpRequestBuilder WithLocation(Action<IUriTestBuilder> uriBuilder)
             return this.WithLocation(uri);
         }
 
+        /// <inheritdoc />
+        public IAndHttpRequestBuilder WithAuthenticatedUser()
+        {
+            this.HttpContext.User = ClaimsPrincipalBuilder.DefaultAuthenticated;
+            return this;
+        }
+
+        /// <inheritdoc />
+        public IAndHttpRequestBuilder WithAuthenticatedUser(Action<IClaimsPrincipalBuilder> userBuilder)
+        {
+            var newUserBuilder = new ClaimsPrincipalBuilder();
+            userBuilder(newUserBuilder);
+            this.HttpContext.User = newUserBuilder.GetClaimsPrincipal();
+            return this;
+        }
+
         /// <inheritdoc />
         public IHttpRequestBuilder AndAlso() => this;
 

src/MyTested.AspNetCore.Mvc.Core/IControllerBuilder.cs

@@ -148,7 +148,7 @@ IAndControllerBuilder<TController> WithServiceFor<TService>(TService service)
         IAndControllerBuilder<TController> WithAuthenticatedUser();
 
         /// <summary>
-        /// Sets custom authenticated <see cref="HttpContext.User"/> using the provided user builder.
+        /// Sets custom authenticated <see cref="HttpContext.User"/> to the built controller using the provided user builder.
         /// </summary>
         /// <param name="userBuilder">Action setting the <see cref="HttpContext.User"/> by using <see cref="IClaimsPrincipalBuilder"/>.</param>
         /// <returns>The same <see cref="IControllerBuilder{TController}"/>.</returns>

src/MyTested.AspNetCore.Mvc.Core/Internal/Routes/InternalRouteResolver.cs

@@ -80,7 +80,7 @@ public static ResolvedRouteContext Resolve(IServiceProvider services, IRouter ro
 
             if (modelBindingActionInvoker.BoundActionArguments == null)
             {
-                return new ResolvedRouteContext("action could not be invoked because of the declared filters");
+                return new ResolvedRouteContext("action could not be invoked because of the declared filters. You must set the request properties so that they will pass through the pipeline");
             }
 
             return new ResolvedRouteContext(

…rnal/Http/MockedAuthenticationHandler.cs …nal/Routes/RouteAuthenticationHandler.cssrc/MyTested.AspNetCore.Mvc.Core/Internal/Http/MockedAuthenticationHandler.cs renamed to src/MyTested.AspNetCore.Mvc.Core/Internal/Routes/RouteAuthenticationHandler.cs src/MyTested.AspNetCore.Mvc.Core/Internal/Http/MockedAuthenticationHandler.cs renamed to src/MyTested.AspNetCore.Mvc.Core/Internal/Routes/RouteAuthenticationHandler.cs

@@ -1,12 +1,12 @@
-namespace MyTested.AspNetCore.Mvc.Internal.Http
+namespace MyTested.AspNetCore.Mvc.Internal.Routes
 {
     using System.Collections.Generic;
     using System.Threading.Tasks;
     using Builders.Authentication;
     using Microsoft.AspNetCore.Http.Features.Authentication;
     using Microsoft.AspNetCore.Mvc.Internal;
 
-    public class MockedAuthenticationHandler : IAuthenticationHandler
+    public class RouteAuthenticationHandler : IAuthenticationHandler
     {
         public Task AuthenticateAsync(AuthenticateContext context)
         {

src/MyTested.AspNetCore.Mvc.Core/Internal/TestContexts/RouteTestContext.cs

@@ -1,10 +1,9 @@
 namespace MyTested.AspNetCore.Mvc.Internal.TestContexts
 {
     using System;
-    using Builders.Authentication;
-    using Http;
     using Microsoft.AspNetCore.Routing;
     using Microsoft.AspNetCore.Http.Features.Authentication;
+    using Routes;
 
     public class RouteTestContext : HttpTestContext
     {
@@ -40,11 +39,9 @@ private void SetAuthentication()
                 this.HttpContext.Features.Get<IHttpAuthenticationFeature>()
                 ?? new HttpAuthenticationFeature();
 
-            httpAuthenticationFeature.Handler = new MockedAuthenticationHandler();
+            httpAuthenticationFeature.Handler = new RouteAuthenticationHandler();
 
             this.HttpContext.Features.Set(httpAuthenticationFeature);
-
-            this.HttpContext.User = ClaimsPrincipalBuilder.DefaultAuthenticated;
         }
     }
 }

src/MyTested.AspNetCore.Mvc.ViewFeatures/HttpRequestBuilderViewFeaturesExtensions.cs

@@ -4,18 +4,27 @@
     using Builders.Http;
     using Microsoft.AspNetCore.Antiforgery;
     using Microsoft.AspNetCore.Antiforgery.Internal;
+    using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.Options;
 
+    /// <summary>
+    /// Contains <see cref="IAntiforgery"/> extension methods for <see cref="IHttpRequestBuilder"/>.
+    /// </summary>
     public static class HttpRequestBuilderViewFeaturesExtensions
     {
+        /// <summary>
+        /// Adds anti-forgery token to the <see cref="Microsoft.AspNetCore.Http.HttpRequest"/>.
+        /// </summary>
+        /// <param name="httpRequestBuilder">Instance of <see cref="IHttpRequestBuilder"/> type.</param>
+        /// <returns>The same <see cref="IHttpRequestBuilder"/>.</returns>
         public static IAndHttpRequestBuilder WithAntiForgeryToken(this IHttpRequestBuilder httpRequestBuilder)
         {
             var actualHttpRequestBuilder = (HttpRequestBuilder)httpRequestBuilder;
 
             var httpContext = actualHttpRequestBuilder.HttpContext;
 
-            var antiForgery = From.Services<IAntiforgery>();
-            var antiForgeryOptions = From.Services<IOptions<AntiforgeryOptions>>().Value;
+            var antiForgery = httpContext.RequestServices.GetRequiredService<IAntiforgery>();
+            var antiForgeryOptions = httpContext.RequestServices.GetRequiredService<IOptions<AntiforgeryOptions>>().Value;
 
             var tokens = antiForgery.GetTokens(httpContext);