Split the unit tests classes into separate handler/middleware tests classes

Author: kevinchalet

src/Owin.Security.OAuth.Introspection/OAuthIntrospectionExtensions.cs

@@ -54,7 +54,7 @@ public static IAppBuilder UseOAuthIntrospection(
                 throw new ArgumentNullException(nameof(options));
             }
 
-            return app.Use<OAuthIntrospectionMiddleware>(app, options);
+            return app.Use<OAuthIntrospectionMiddleware>(app.Properties, options);
         }
     }
 }

src/Owin.Security.OAuth.Introspection/OAuthIntrospectionMiddleware.cs

@@ -5,6 +5,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Net.Http;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.DataProtection;
@@ -20,7 +21,7 @@ namespace Owin.Security.OAuth.Introspection {
     public class OAuthIntrospectionMiddleware : AuthenticationMiddleware<OAuthIntrospectionOptions> {
         public OAuthIntrospectionMiddleware(
             [NotNull] OwinMiddleware next,
-            [NotNull] IAppBuilder app,
+            [NotNull] IDictionary<string, object> properties,
             [NotNull] OAuthIntrospectionOptions options)
             : base(next, options) {
             if (string.IsNullOrEmpty(options.Authority) &&
@@ -38,14 +39,13 @@ public OAuthIntrospectionMiddleware(
             }
 
             if (options.DataProtectionProvider == null) {
-                // Try to use the application name provided by
-                // the OWIN host as the application discriminator.
-                var discriminator = new AppProperties(app.Properties).AppName;
-
-                // When an application discriminator cannot be resolved from
-                // the OWIN host properties, generate a temporary identifier.
+                // Use the application name provided by the OWIN host as the Data Protection discriminator.
+                // If the application name cannot be resolved, throw an invalid operation exception.
+                var discriminator = new AppProperties(properties).AppName;
                 if (string.IsNullOrEmpty(discriminator)) {
-                    discriminator = Guid.NewGuid().ToString();
+                    throw new InvalidOperationException("The application name cannot be resolved from the OWIN application builder. " +
+                                                        "Consider manually setting the 'DataProtectionProvider' property in the " +
+                                                        "options using 'DataProtectionProvider.Create([unique application name])'.");
                 }
 
                 options.DataProtectionProvider = DataProtectionProvider.Create(discriminator);

src/Owin.Security.OAuth.Validation/OAuthValidationExtensions.cs

@@ -67,7 +67,7 @@ public static IAppBuilder UseOAuthValidation(
                 throw new ArgumentNullException(nameof(options));
             }
 
-            return app.Use<OAuthValidationMiddleware>(app, options);
+            return app.Use<OAuthValidationMiddleware>(app.Properties, options);
         }
     }
 }

src/Owin.Security.OAuth.Validation/OAuthValidationMiddleware.cs

@@ -5,6 +5,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.Logging;
@@ -17,22 +18,21 @@ namespace Owin.Security.OAuth.Validation {
     public class OAuthValidationMiddleware : AuthenticationMiddleware<OAuthValidationOptions> {
         public OAuthValidationMiddleware(
             [NotNull] OwinMiddleware next,
-            [NotNull] IAppBuilder app,
+            [NotNull] IDictionary<string, object> properties,
             [NotNull] OAuthValidationOptions options)
             : base(next, options) {
             if (Options.Events == null) {
                 Options.Events = new OAuthValidationEvents();
             }
 
             if (options.DataProtectionProvider == null) {
-                // Try to use the application name provided by
-                // the OWIN host as the application discriminator.
-                var discriminator = new AppProperties(app.Properties).AppName;
-
-                // When an application discriminator cannot be resolved from
-                // the OWIN host properties, generate a temporary identifier.
+                // Use the application name provided by the OWIN host as the Data Protection discriminator.
+                // If the application name cannot be resolved, throw an invalid operation exception.
+                var discriminator = new AppProperties(properties).AppName;
                 if (string.IsNullOrEmpty(discriminator)) {
-                    discriminator = Guid.NewGuid().ToString();
+                    throw new InvalidOperationException("The application name cannot be resolved from the OWIN application builder. " +
+                                                        "Consider manually setting the 'DataProtectionProvider' property in the " +
+                                                        "options using 'DataProtectionProvider.Create([unique application name])'.");
                 }
 
                 options.DataProtectionProvider = DataProtectionProvider.Create(discriminator);