Switch to automatically ensure request services

HaoK · HaoK · commit 78f472fd2055 · 2014-10-16T11:14:07.000-07:00
diff --git a/samples/CookieSample/Startup.cs b/samples/CookieSample/Startup.cs
@@ -9,7 +9,6 @@ public class Startup
     {
         public void Configure(IApplicationBuilder app)
         {
-            app.UseServices(services => { });
             app.UseCookieAuthentication(options =>
             {
             });
diff --git a/samples/CookieSessionSample/Startup.cs b/samples/CookieSessionSample/Startup.cs
@@ -10,7 +10,6 @@ public class Startup
     {
         public void Configure(IApplicationBuilder app)
         {
-            app.UseRequestServices();
             app.UseCookieAuthentication(options => 
             {
                 options.SessionStore = new MemoryCacheSessionStore();
diff --git a/src/Microsoft.AspNet.Security.Cookies/CookieAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.Cookies/CookieAuthenticationMiddleware.cs
@@ -18,11 +18,12 @@ public class CookieAuthenticationMiddleware : AuthenticationMiddleware<CookieAut
         private readonly ILogger _logger;
 
         public CookieAuthenticationMiddleware(RequestDelegate next, 
+            IServiceProvider services,
             IDataProtectionProvider dataProtectionProvider, 
             ILoggerFactory loggerFactory, 
             IOptions<CookieAuthenticationOptions> options,
             ConfigureOptions<CookieAuthenticationOptions> configureOptions)
-            : base(next, options, configureOptions)
+            : base(next, services, options, configureOptions)
         {
             if (Options.Notifications == null)
             {
diff --git a/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationMiddleware.cs
@@ -26,12 +26,13 @@ public class FacebookAuthenticationMiddleware : OAuthAuthenticationMiddleware<Fa
         /// <param name="options">Configuration options for the middleware.</param>
         public FacebookAuthenticationMiddleware(
             RequestDelegate next,
+            IServiceProvider services,
             IDataProtectionProvider dataProtectionProvider,
             ILoggerFactory loggerFactory,
             IOptions<ExternalAuthenticationOptions> externalOptions,
             IOptions<FacebookAuthenticationOptions> options,
             ConfigureOptions<FacebookAuthenticationOptions> configureOptions = null)
-            : base(next, dataProtectionProvider, loggerFactory, externalOptions, options, configureOptions)
+            : base(next, services, dataProtectionProvider, loggerFactory, externalOptions, options, configureOptions)
         {
             if (string.IsNullOrWhiteSpace(Options.AppId))
             {
diff --git a/src/Microsoft.AspNet.Security.Google/GoogleAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.Google/GoogleAuthenticationMiddleware.cs
@@ -25,17 +25,19 @@ public class GoogleAuthenticationMiddleware : OAuthAuthenticationMiddleware<Goog
         /// Initializes a new <see cref="GoogleAuthenticationMiddleware"/>.
         /// </summary>
         /// <param name="next">The next middleware in the HTTP pipeline to invoke.</param>
+        /// <param name="services"></param>
         /// <param name="dataProtectionProvider"></param>
         /// <param name="loggerFactory"></param>
         /// <param name="options">Configuration options for the middleware.</param>
         public GoogleAuthenticationMiddleware(
             RequestDelegate next,
+            IServiceProvider services,
             IDataProtectionProvider dataProtectionProvider,
             ILoggerFactory loggerFactory,
             IOptions<ExternalAuthenticationOptions> externalOptions,
             IOptions<GoogleAuthenticationOptions> options,
             ConfigureOptions<GoogleAuthenticationOptions> configureOptions = null)
-            : base(next, dataProtectionProvider, loggerFactory, externalOptions, options, configureOptions)
+            : base(next, services, dataProtectionProvider, loggerFactory, externalOptions, options, configureOptions)
         {
             if (Options.Notifications == null)
             {
diff --git a/src/Microsoft.AspNet.Security.MicrosoftAccount/MicrosoftAccountAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.MicrosoftAccount/MicrosoftAccountAuthenticationMiddleware.cs
@@ -21,17 +21,19 @@ public class MicrosoftAccountAuthenticationMiddleware : OAuthAuthenticationMiddl
         /// Initializes a new <see cref="MicrosoftAccountAuthenticationMiddleware"/>.
         /// </summary>
         /// <param name="next">The next middleware in the HTTP pipeline to invoke.</param>
+        /// <param name="services"></param>
         /// <param name="dataProtectionProvider"></param>
         /// <param name="loggerFactory"></param>
         /// <param name="options">Configuration options for the middleware.</param>
         public MicrosoftAccountAuthenticationMiddleware(
             RequestDelegate next,
+            IServiceProvider services,
             IDataProtectionProvider dataProtectionProvider,
             ILoggerFactory loggerFactory,
             IOptions<ExternalAuthenticationOptions> externalOptions,
             IOptions<MicrosoftAccountAuthenticationOptions> options,
             ConfigureOptions<MicrosoftAccountAuthenticationOptions> configureOptions = null)
-            : base(next, dataProtectionProvider, loggerFactory, externalOptions, options, configureOptions)
+            : base(next, services, dataProtectionProvider, loggerFactory, externalOptions, options, configureOptions)
         {
             if (Options.Notifications == null)
             {
diff --git a/src/Microsoft.AspNet.Security.OAuth/OAuthAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.OAuth/OAuthAuthenticationMiddleware.cs
@@ -26,17 +26,19 @@ public class OAuthAuthenticationMiddleware<TOptions, TNotifications> : Authentic
         /// Initializes a new <see cref="OAuthAuthenticationMiddleware"/>.
         /// </summary>
         /// <param name="next">The next middleware in the HTTP pipeline to invoke.</param>
+        /// <param name="services"></param>
         /// <param name="dataProtectionProvider"></param>
         /// <param name="loggerFactory"></param>
         /// <param name="options">Configuration options for the middleware.</param>
         public OAuthAuthenticationMiddleware(
             RequestDelegate next,
+            IServiceProvider services,
             IDataProtectionProvider dataProtectionProvider,
             ILoggerFactory loggerFactory,
             IOptions<ExternalAuthenticationOptions> externalOptions,
             IOptions<TOptions> options,
             ConfigureOptions<TOptions> configureOptions = null)
-            : base(next, options, configureOptions)
+            : base(next, services, options, configureOptions)
         {
             // todo: review error handling
             if (string.IsNullOrWhiteSpace(Options.AuthenticationType))
diff --git a/src/Microsoft.AspNet.Security.OAuth/OAuthBearerAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.OAuth/OAuthBearerAuthenticationMiddleware.cs
@@ -7,6 +7,7 @@
 using Microsoft.AspNet.Security.Infrastructure;
 using Microsoft.Framework.Logging;
 using Microsoft.Framework.OptionsModel;
+using System;
 
 namespace Microsoft.AspNet.Security.OAuth
 {
@@ -28,11 +29,12 @@ public class OAuthBearerAuthenticationMiddleware : AuthenticationMiddleware<OAut
         /// </summary>
         public OAuthBearerAuthenticationMiddleware(
             RequestDelegate next,
+            IServiceProvider services,
             IDataProtectionProvider dataProtectionProvider,
             ILoggerFactory loggerFactory,
             IOptions<OAuthBearerAuthenticationOptions> options,
             ConfigureOptions<OAuthBearerAuthenticationOptions> configureOptions)
-            : base(next, options, configureOptions)
+            : base(next, services, options, configureOptions)
         {
             _logger = loggerFactory.Create<OAuthBearerAuthenticationMiddleware>();
 
diff --git a/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationMiddleware.cs
@@ -29,17 +29,19 @@ public class TwitterAuthenticationMiddleware : AuthenticationMiddleware<TwitterA
         /// Initializes a <see cref="TwitterAuthenticationMiddleware"/>
         /// </summary>
         /// <param name="next">The next middleware in the HTTP pipeline to invoke</param>
+        /// <param name="services"></param>
         /// <param name="dataProtectionProvider"></param>
         /// <param name="loggerFactory"></param>
         /// <param name="options">Configuration options for the middleware</param>
         public TwitterAuthenticationMiddleware(
             RequestDelegate next,
+            IServiceProvider services,
             IDataProtectionProvider dataProtectionProvider,
             ILoggerFactory loggerFactory,
             IOptions<ExternalAuthenticationOptions> externalOptions,
             IOptions<TwitterAuthenticationOptions> options,
             ConfigureOptions<TwitterAuthenticationOptions> configureOptions = null)
-            : base(next, options, configureOptions)
+            : base(next, services, options, configureOptions)
         {
             if (string.IsNullOrWhiteSpace(Options.ConsumerSecret))
             {
diff --git a/src/Microsoft.AspNet.Security/Infrastructure/AuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security/Infrastructure/AuthenticationMiddleware.cs
@@ -6,15 +6,17 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.RequestContainer;
 using Microsoft.Framework.OptionsModel;
 
 namespace Microsoft.AspNet.Security.Infrastructure
 {
     public abstract class AuthenticationMiddleware<TOptions> where TOptions : AuthenticationOptions, new()
     {
         private readonly RequestDelegate _next;
+        private readonly IServiceProvider _services;
 
-        protected AuthenticationMiddleware([NotNull] RequestDelegate next, [NotNull] IOptions<TOptions> options, ConfigureOptions<TOptions> configureOptions)
+        protected AuthenticationMiddleware([NotNull] RequestDelegate next, [NotNull] IServiceProvider services, [NotNull] IOptions<TOptions> options, ConfigureOptions<TOptions> configureOptions)
         {
             if (configureOptions != null)
             {
@@ -26,6 +28,7 @@ protected AuthenticationMiddleware([NotNull] RequestDelegate next, [NotNull] IOp
                 Options = options.Options;
             }
             _next = next;
+            _services = services;
         }
 
         public string AuthenticationType { get; set; }
@@ -34,15 +37,18 @@ protected AuthenticationMiddleware([NotNull] RequestDelegate next, [NotNull] IOp
 
         public async Task Invoke(HttpContext context)
         {
-            AuthenticationHandler<TOptions> handler = CreateHandler();
-            await handler.Initialize(Options, context);
-            if (!await handler.InvokeAsync())
+            using (RequestServicesContainer.EnsureRequestServices(context, _services))
             {
-                await _next(context);
+                AuthenticationHandler<TOptions> handler = CreateHandler();
+                await handler.Initialize(Options, context);
+                if (!await handler.InvokeAsync())
+                {
+                    await _next(context);
+                }
+                await handler.TeardownAsync();
             }
-            await handler.TeardownAsync();
         }
 
         protected abstract AuthenticationHandler<TOptions> CreateHandler();
     }
-}
+}
diff --git a/src/Microsoft.AspNet.Security/project.json b/src/Microsoft.AspNet.Security/project.json
@@ -1,6 +1,7 @@
 {
     "version": "1.0.0-*",
     "dependencies": {
+        "Microsoft.AspNet.RequestContainer": "1.0.0-*",
         "Microsoft.AspNet.HttpFeature": { "version": "1.0.0-*", "type": "build" },
         "Microsoft.AspNet.PipelineCore": "1.0.0-*",
         "Microsoft.AspNet.Security.DataProtection": "1.0.0-*",
diff --git a/test/Microsoft.AspNet.Security.Test/Cookies/CookieMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/Cookies/CookieMiddlewareTests.cs
@@ -369,7 +369,6 @@ private static TestServer CreateServer(Action<CookieAuthenticationOptions> confi
         {
             return TestServer.Create(app =>
             {
-                app.UseServices(services => { });
                 app.UseCookieAuthentication(configureOptions);
                 app.Use(async (context, next) =>
                 {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ public class Startup`
`9`	`9`	`{`
`10`	`10`	`public void Configure(IApplicationBuilder app)`
`11`	`11`	`{`
`12`		`- app.UseServices(services => { });`
`13`	`12`	`app.UseCookieAuthentication(options =>`
`14`	`13`	`{`
`15`	`14`	`});`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ public class Startup`
`10`	`10`	`{`
`11`	`11`	`public void Configure(IApplicationBuilder app)`
`12`	`12`	`{`
`13`		`- app.UseRequestServices();`
`14`	`13`	`app.UseCookieAuthentication(options =>`
`15`	`14`	`{`
`16`	`15`	`options.SessionStore = new MemoryCacheSessionStore();`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,12 @@ public class CookieAuthenticationMiddleware : AuthenticationMiddleware<CookieAut`
`18`	`18`	`private readonly ILogger _logger;`
`19`	`19`
`20`	`20`	`public CookieAuthenticationMiddleware(RequestDelegate next,`
	`21`	`+ IServiceProvider services,`
`21`	`22`	`IDataProtectionProvider dataProtectionProvider,`
`22`	`23`	`ILoggerFactory loggerFactory,`
`23`	`24`	`IOptions<CookieAuthenticationOptions> options,`
`24`	`25`	`ConfigureOptions<CookieAuthenticationOptions> configureOptions)`
`25`		`- : base(next, options, configureOptions)`
	`26`	`+ : base(next, services, options, configureOptions)`
`26`	`27`	`{`
`27`	`28`	`if (Options.Notifications == null)`
`28`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,17 @@`
`6`	`6`	`using System.Threading.Tasks;`
`7`	`7`	`using Microsoft.AspNet.Builder;`
`8`	`8`	`using Microsoft.AspNet.Http;`
	`9`	`+using Microsoft.AspNet.RequestContainer;`
`9`	`10`	`using Microsoft.Framework.OptionsModel;`
`10`	`11`
`11`	`12`	`namespace Microsoft.AspNet.Security.Infrastructure`
`12`	`13`	`{`
`13`	`14`	`public abstract class AuthenticationMiddleware<TOptions> where TOptions : AuthenticationOptions, new()`
`14`	`15`	`{`
`15`	`16`	`private readonly RequestDelegate _next;`
	`17`	`+ private readonly IServiceProvider _services;`
`16`	`18`
`17`		`- protected AuthenticationMiddleware([NotNull] RequestDelegate next, [NotNull] IOptions<TOptions> options, ConfigureOptions<TOptions> configureOptions)`
	`19`	`+ protected AuthenticationMiddleware([NotNull] RequestDelegate next, [NotNull] IServiceProvider services, [NotNull] IOptions<TOptions> options, ConfigureOptions<TOptions> configureOptions)`
`18`	`20`	`{`
`19`	`21`	`if (configureOptions != null)`
`20`	`22`	`{`
`@@ -26,6 +28,7 @@ protected AuthenticationMiddleware([NotNull] RequestDelegate next, [NotNull] IOp`
`26`	`28`	`Options = options.Options;`
`27`	`29`	`}`
`28`	`30`	`_next = next;`
	`31`	`+ _services = services;`
`29`	`32`	`}`
`30`	`33`
`31`	`34`	`public string AuthenticationType { get; set; }`
`@@ -34,15 +37,18 @@ protected AuthenticationMiddleware([NotNull] RequestDelegate next, [NotNull] IOp`
`34`	`37`
`35`	`38`	`public async Task Invoke(HttpContext context)`
`36`	`39`	`{`
`37`		`- AuthenticationHandler<TOptions> handler = CreateHandler();`
`38`		`- await handler.Initialize(Options, context);`
`39`		`- if (!await handler.InvokeAsync())`
	`40`	`+ using (RequestServicesContainer.EnsureRequestServices(context, _services))`
`40`	`41`	`{`
`41`		`- await _next(context);`
	`42`	`+ AuthenticationHandler<TOptions> handler = CreateHandler();`
	`43`	`+ await handler.Initialize(Options, context);`
	`44`	`+ if (!await handler.InvokeAsync())`
	`45`	`+ {`
	`46`	`+ await _next(context);`
	`47`	`+ }`
	`48`	`+ await handler.TeardownAsync();`
`42`	`49`	`}`
`43`		`- await handler.TeardownAsync();`
`44`	`50`	`}`
`45`	`51`
`46`	`52`	`protected abstract AuthenticationHandler<TOptions> CreateHandler();`
`47`	`53`	`}`
`48`		`-}`
	`54`	`+}`