Fix templates and add missing XML documentation

Author: mariozski

generators/app/templates/AuthenticationExtensions.cs

@@ -6,23 +6,57 @@
 
 using System;
 using AspNet.Security.OAuth.<%= name %>;
-using Microsoft.Extensions.Internal;
+using JetBrains.Annotations;
+using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.Builder {
+namespace Microsoft.AspNetCore.Builder {
+    /// <summary>
+    /// Extension methods to add <%= name %> authentication capabilities to an HTTP application pipeline.
+    /// </summary>
     public static class <%= name %>AuthenticationExtensions {
+        /// <summary>
+        /// Adds the <see cref="<%= name %>AuthenticationMiddleware"/> middleware to the specified
+        /// <see cref="IApplicationBuilder"/>, which enables <%= name %> authentication capabilities.
+        /// </summary>
+        /// <param name="app">The <see cref="IApplicationBuilder"/> to add the middleware to.</param>
+        /// <param name="options">A <see cref="<%= name %>AuthenticationOptions"/> that specifies options for the middleware.</param>        
+        /// <returns>A reference to this instance after the operation has completed.</returns>
         public static IApplicationBuilder Use<%= name %>Authentication(
             [NotNull] this IApplicationBuilder app,
             [NotNull] <%= name %>AuthenticationOptions options) {
-            return app.UseMiddleware<<%= name %>AuthenticationMiddleware>(options);
+            if (app == null) {
+                throw new ArgumentNullException(nameof(app));
+            }
+
+            if (options == null) {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            return app.UseMiddleware<<%= name %>AuthenticationMiddleware>(Options.Create(options));
         }
 
+        /// <summary>
+        /// Adds the <see cref="<%= name %>AuthenticationMiddleware"/> middleware to the specified
+        /// <see cref="IApplicationBuilder"/>, which enables <%= name %> authentication capabilities.
+        /// </summary>
+        /// <param name="app">The <see cref="IApplicationBuilder"/> to add the middleware to.</param>
+        /// <param name="configuration">An action delegate to configure the provided <see cref="<%= name %>AuthenticationOptions"/>.</param>
+        /// <returns>A reference to this instance after the operation has completed.</returns>
         public static IApplicationBuilder Use<%= name %>Authentication(
             [NotNull] this IApplicationBuilder app,
             [NotNull] Action<<%= name %>AuthenticationOptions> configuration) {
+            if (app == null) {
+                throw new ArgumentNullException(nameof(app));
+            }
+
+            if (configuration == null) {
+                throw new ArgumentNullException(nameof(configuration));
+            }
+
             var options = new <%= name %>AuthenticationOptions();
             configuration(options);
 
-            return app.UseMiddleware<<%= name %>AuthenticationMiddleware>(options);
+            return app.UseMiddleware<<%= name %>AuthenticationMiddleware>(Options.Create(options));
         }
     }
 }

generators/app/templates/AuthenticationHandler.cs

@@ -38,18 +38,13 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync([NotNull]
             // TODO: Add any optional claims, eg
             //  .AddOptionalClaim("urn:<%= name.toLowerCase() %>:name", <%= name %>AuthenticationHelper.GetName(payload), Options.ClaimsIssuer)
 
-            var context = new OAuthCreatingTicketContext(Context, Options, Backchannel, tokens, payload) {
-                Principal = new ClaimsPrincipal(identity),
-                Properties = properties
-            };
+            var principal = new ClaimsPrincipal(identity);
+            var ticket = new AuthenticationTicket(principal, properties, Options.AuthenticationScheme);
 
+            var context = new OAuthCreatingTicketContext(ticket, Context, Options, Backchannel, tokens, payload);
             await Options.Events.CreatingTicket(context);
 
-            if (context.Principal?.Identity == null) {
-                return null;
-            }
-
-            return new AuthenticationTicket(context.Principal, context.Properties, context.Options.AuthenticationScheme);
+            return context.Ticket;
         }
     }
 }

generators/app/templates/AuthenticationMiddleware.cs

@@ -17,12 +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] UrlEncoder encoder,
-            [NotNull] IOptions<SharedAuthenticationOptions> externalOptions)
-            : base(next, dataProtectionProvider, loggerFactory, encoder, externalOptions, options) {
+            [NotNull] IOptions<SharedAuthenticationOptions> sharedOptions,
+            [NotNull] IOptions<<%= name %>AuthenticationOptions> options)
+            : base(next, dataProtectionProvider, loggerFactory, encoder, sharedOptions, options) {
         }
 
         protected override AuthenticationHandler<<%= name %>AuthenticationOptions> CreateHandler() {

generators/app/templates/AuthenticationOptions.cs

@@ -22,8 +22,6 @@ public class <%= name %>AuthenticationOptions : OAuthOptions {
             AuthorizationEndpoint = <%= name %>AuthenticationDefaults.AuthorizationEndpoint;
             TokenEndpoint = <%= name %>AuthenticationDefaults.TokenEndpoint;
             UserInformationEndpoint = <%= name %>AuthenticationDefaults.UserInformationEndpoint;
-
-            SaveTokensAsClaims = false;
         }
     }
 }

generators/app/templates/project.json

@@ -1,6 +1,6 @@
 {
-    "version": "1.0.0-*",
-    "description": "ASP.NET 5 security middleware enabling <%= name %> authentication.",
+    "version": "1.0.0-beta2-*",
+    "description": "ASP.NET Core security middleware enabling <%= name %> authentication.",
     "authors": [ "<%= authorname %>" ],
 
   "packOptions": {
@@ -33,7 +33,7 @@
   "dependencies": {
     "AspNet.Security.OAuth.Extensions": { "target": "project", "type": "build" },
     "JetBrains.Annotations": { "type": "build", "version": "10.1.4" },
-    "Microsoft.AspNetCore.Authentication.OAuth": "1.0.0-*"
+    "Microsoft.AspNetCore.Authentication.OAuth": "1.0.0"
   },
 
   "frameworks": {

package.json

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