Throw an exception when no valid sign-in scheme can be found and introduce OpenIdAuthenticationOptions.DataProtectionProvider

Author: kevinchalet

src/AspNet.Security.OpenId/OpenIdAuthenticationMiddleware.cs

@@ -27,19 +27,30 @@ public OpenIdAuthenticationMiddleware(
             [NotNull] IDataProtectionProvider dataProtectionProvider,
             [NotNull] ILoggerFactory loggerFactory,
             [NotNull] UrlEncoder encoder,
-            [NotNull] IOptions<SharedAuthenticationOptions> externalOptions)
+            [NotNull] IOptions<SharedAuthenticationOptions> sharedOptions)
             : base(next, options, loggerFactory, encoder)
         {
             if (string.IsNullOrEmpty(Options.SignInScheme))
             {
-                Options.SignInScheme = externalOptions.Value.SignInScheme;
+                Options.SignInScheme = sharedOptions.Value.SignInScheme;
+            }
+
+            if (string.IsNullOrEmpty(Options.SignInScheme))
+            {
+                throw new ArgumentException("The sign-in scheme cannot be null or empty.", nameof(options));
+            }
+
+            if (Options.DataProtectionProvider == null)
+            {
+                Options.DataProtectionProvider = dataProtectionProvider;
             }
 
             if (Options.StateDataFormat == null)
             {
-                Options.StateDataFormat = new PropertiesDataFormat(
-                    dataProtectionProvider.CreateProtector(
-                        GetType().FullName, Options.AuthenticationScheme, "v1"));
+                var protector = Options.DataProtectionProvider.CreateProtector(
+                    GetType().FullName, Options.AuthenticationScheme, "v1");
+
+                Options.StateDataFormat = new PropertiesDataFormat(protector);
             }
 
             if (Options.HtmlParser == null)

src/AspNet.Security.OpenId/OpenIdAuthenticationOptions.cs

@@ -10,6 +10,7 @@
 using AngleSharp.Parser.Html;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Authentication;
 using Microsoft.IdentityModel.Protocols;
@@ -26,12 +27,6 @@ public OpenIdAuthenticationOptions()
             Events = new OpenIdAuthenticationEvents();
         }
 
-        /// <summary>
-        /// Gets or sets the data format used to serialize the
-        /// authentication properties used for the "state" parameter.
-        /// </summary>
-        public ISecureDataFormat<AuthenticationProperties> StateDataFormat { get; set; }
-
         /// <summary>
         /// Gets or sets the absolute URL of the OpenID 2.0 authentication server.
         /// Note: this property is ignored when <see cref="Configuration"/>
@@ -97,6 +92,20 @@ public OpenIdAuthenticationOptions()
             set { base.Events = value; }
         }
 
+        /// <summary>
+        /// Gets or sets the data format used to serialize the
+        /// authentication properties used for the "state" parameter.
+        /// </summary>
+        public ISecureDataFormat<AuthenticationProperties> StateDataFormat { get; set; }
+
+        /// <summary>
+        /// Gets or sets the data protection provider used to create the default
+        /// data protectors used by the OpenID 2.0 authentication middleware.
+        /// When this property is set to <c>null</c>, the data protection provider
+        /// is directly retrieved from the dependency injection container.
+        /// </summary>
+        public IDataProtectionProvider DataProtectionProvider { get; set; }
+
         /// <summary>
         /// Gets or sets the HTTP client used to communicate with the OpenID provider.
         /// </summary>