Merge pull request #33 from JasperFx/auth

Updates to support sites that use Authentication
JasperFx · Feb 3, 2017 · baad396 · baad396
2 parents 94135c6 + 8239aff
commit baad396
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 64 deletions.
diff --git a/src/Alba.Testing/Acceptance/specs_against_aspnet_core_app.cs b/src/Alba.Testing/Acceptance/specs_against_aspnet_core_app.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.Formatters;
-using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
 using WebApp;
 using WebApp.Controllers;

diff --git a/src/Alba.Testing/BasicScenarioSupport.cs b/src/Alba.Testing/BasicScenarioSupport.cs
@@ -30,6 +30,7 @@ public class BasicScenarioSupport : ISystemUnderTest
         public BasicScenarioSupport()
         {
             var registry = new Registry();
+            registry.ForSingletonOf<IHttpContextAccessor>().Use<HttpContextAccessor>();
             registry.Populate(new ServiceDescriptor[0]);
 
             Container = new Container(registry);
@@ -40,7 +41,7 @@ public HttpContext CreateContext()
             return new StubHttpContext(Features, Services);
         }
 
-        public IFeatureCollection Features { get; } = null;
+        public IFeatureCollection Features { get; } = new FeatureCollection();
         public IServiceProvider Services => new StructureMapServiceProvider(Container);
         public RequestDelegate Invoker => Invoke;
 

diff --git a/src/Alba.Testing/FormDataExtensionsTests.cs b/src/Alba.Testing/FormDataExtensionsTests.cs
@@ -1,6 +1,4 @@
 using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.IO;
 using Alba.Stubs;
 using Baseline;
 using Shouldly;
@@ -21,7 +19,7 @@ public void round_trip_writing_and_parsing()
                 ["c"] = "really?"
             };
 
-            var context = new StubHttpContext(null, null);
+            var context = StubHttpContext.Empty();
 
             context.WriteFormData(form1);
 

diff --git a/src/Alba/Scenario.cs b/src/Alba/Scenario.cs
@@ -223,7 +223,7 @@ SendExpression IUrlExpression.FormData(Dictionary<string, string> input)
         public SendExpression Text(string text)
         {
             Body.TextIs(text);
-            Context.Request.ContentType = "text/plain";
+            Context.Request.ContentType = MimeType.Text.Value;
 
             return new SendExpression(Context);
         }

diff --git a/src/Alba/Stubs/StubAuthenticationManager.cs b/src/Alba/Stubs/StubAuthenticationManager.cs
@@ -1,48 +1,51 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Authentication;
+using Microsoft.AspNetCore.Http.Authentication.Internal;
 using Microsoft.AspNetCore.Http.Features.Authentication;
 
 namespace Alba
 {
     public class StubAuthenticationManager : AuthenticationManager
     {
+        private readonly DefaultAuthenticationManager _default;
+
         public StubAuthenticationManager(HttpContext context)
         {
             HttpContext = context;
+            _default = new DefaultAuthenticationManager(context);
         }
 
         public override IEnumerable<AuthenticationDescription> GetAuthenticationSchemes()
         {
-            throw new NotImplementedException();
+            return _default.GetAuthenticationSchemes();
         }
 
         public override Task<AuthenticateInfo> GetAuthenticateInfoAsync(string authenticationScheme)
         {
-            throw new NotImplementedException();
+            return _default.GetAuthenticateInfoAsync(authenticationScheme);
         }
 
         public override Task AuthenticateAsync(AuthenticateContext context)
         {
-            throw new NotImplementedException();
+            return _default.AuthenticateAsync(context);
         }
 
         public override Task ChallengeAsync(string authenticationScheme, AuthenticationProperties properties, ChallengeBehavior behavior)
         {
-            throw new NotImplementedException();
+            return _default.ChallengeAsync(authenticationScheme, properties, behavior);
         }
 
         public override Task SignInAsync(string authenticationScheme, ClaimsPrincipal principal, AuthenticationProperties properties)
         {
-            throw new NotImplementedException();
+            return _default.SignInAsync(authenticationScheme, principal, properties);
         }
 
         public override Task SignOutAsync(string authenticationScheme, AuthenticationProperties properties)
         {
-            throw new NotImplementedException();
+            return _default.SignOutAsync(authenticationScheme, properties);
         }
 
         public override HttpContext HttpContext { get; }

diff --git a/src/Alba/SystemUnderTest.cs b/src/Alba/SystemUnderTest.cs
@@ -56,6 +56,7 @@ public static string FindParallelFolder(string folderName)
             {
                 _.AddSingleton<IHostingEnvironment>(environment);
                 _.AddSingleton<IServer>(new TestServer());
+                _.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
             });
 
             builder.UseStartup<T>();

diff --git a/src/Alba/SystemUnderTestExtensions.cs b/src/Alba/SystemUnderTestExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Alba
@@ -13,6 +14,10 @@ public static async Task<IScenarioResult> Scenario(this ISystemUnderTest system,
             using (var scope = system.Services.GetService<IServiceScopeFactory>().CreateScope())
             {
                 var scenario = new Scenario(system, scope);
+
+                var contextAccessor = scope.ServiceProvider.GetService<IHttpContextAccessor>();
+                contextAccessor.HttpContext = scenario.Context;
+
                 configure(scenario);
 
                 scenario.Rewind();