React to API changes in aspnet/Security

aspnet/Security@081577e

Author: kevinchalet

generators/app/templates/AuthenticationExtensions.cs

@@ -6,27 +6,23 @@
 
 using System;
 using AspNet.Security.OAuth.<%= name %>;
-using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
-using Microsoft.Framework.OptionsModel;
 
 namespace Microsoft.AspNet.Builder {
     public static class <%= name %>AuthenticationExtensions {
-        public static IServiceCollection Configure<%= name %>Authentication(
-            [NotNull] this IServiceCollection services,
-            [NotNull] Action<<%= name %>AuthenticationOptions> configuration) {
-            return services.Configure(configuration);
-        }
-
-        public static IApplicationBuilder Use<%= name %>Authentication([NotNull] this IApplicationBuilder app) {
-            return app.UseMiddleware<<%= name %>AuthenticationMiddleware>();
+        public static IApplicationBuilder Use<%= name %>Authentication(
+            [NotNull] this IApplicationBuilder app,
+            [NotNull] <%= name %>AuthenticationOptions options) {
+            return app.UseMiddleware<<%= name %>AuthenticationMiddleware>(options);
         }
 
         public static IApplicationBuilder Use<%= name %>Authentication(
             [NotNull] this IApplicationBuilder app,
             [NotNull] Action<<%= name %>AuthenticationOptions> configuration) {
-            return app.UseMiddleware<<%= name %>AuthenticationMiddleware>(
-                new ConfigureOptions<<%= name %>AuthenticationOptions>(configuration));
+            var options = new <%= name %>AuthenticationOptions();
+            configuration(options);
+
+            return app.UseMiddleware<<%= name %>AuthenticationMiddleware>(options);
         }
     }
 }

generators/app/templates/AuthenticationMiddleware.cs

@@ -17,14 +17,12 @@ namespace AspNet.Security.OAuth.<%= name %> {
     public class <%= name %>AuthenticationMiddleware : OAuthMiddleware<<%= name %>AuthenticationOptions> {
         public <%= name %>AuthenticationMiddleware(
             [NotNull] RequestDelegate next,
+            [NotNull] <%= name %>AuthenticationOptions options,
             [NotNull] IDataProtectionProvider dataProtectionProvider,
             [NotNull] ILoggerFactory loggerFactory,
             [NotNull] IUrlEncoder encoder,
-            [NotNull] IOptions<SharedAuthenticationOptions> externalOptions,
-            [NotNull] IOptions<<%= name %>AuthenticationOptions> options,
-            ConfigureOptions<<%= name %>AuthenticationOptions> configureOptions = null)
-            : base(next, dataProtectionProvider, loggerFactory,
-                   encoder, externalOptions, options, configureOptions) {
+            [NotNull] IOptions<SharedAuthenticationOptions> externalOptions)
+            : base(next, dataProtectionProvider, loggerFactory, encoder, externalOptions, options) {
         }
 
         protected override AuthenticationHandler<<%= name %>AuthenticationOptions> CreateHandler() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-aspnet-oauth",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Yeoman generator for OAuth Providers for ASP.NET 5",
   "license": "MIT",
   "main": "app/index.js",