From 2d4dde22906253b501278a9badfbed59d77c0283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Chalet?= <kevinchalet@gmail.com>
Date: Thu, 22 Dec 2016 15:55:52 +0100
Subject: [PATCH] Introduce new services.AddOpenIddict() overloads to allow
 delegate-based configuration

---
 src/OpenIddict.Core/OpenIddictExtensions.cs | 78 ++++++++++++++++++---
 1 file changed, 69 insertions(+), 9 deletions(-)

diff --git a/src/OpenIddict.Core/OpenIddictExtensions.cs b/src/OpenIddict.Core/OpenIddictExtensions.cs
index 7e127de5..70c9b6e4 100644
--- a/src/OpenIddict.Core/OpenIddictExtensions.cs
+++ b/src/OpenIddict.Core/OpenIddictExtensions.cs
@@ -19,11 +19,10 @@ namespace Microsoft.Extensions.DependencyInjection {
         /// <param name="services">The services collection.</param>
         /// <returns>The <see cref="OpenIddictBuilder"/>.</returns>
         public static OpenIddictBuilder AddOpenIddict([NotNull] this IServiceCollection services) {
-            if (services == null) {
-                throw new ArgumentNullException(nameof(services));
-            }
-
-            return services.AddOpenIddict<OpenIddictApplication, OpenIddictAuthorization, OpenIddictScope, OpenIddictToken>();
+            return services.AddOpenIddict<OpenIddictApplication,
+                                          OpenIddictAuthorization,
+                                          OpenIddictScope,
+                                          OpenIddictToken>();
         }
 
         /// <summary>
@@ -35,10 +34,6 @@ namespace Microsoft.Extensions.DependencyInjection {
         /// <returns>The <see cref="OpenIddictBuilder"/>.</returns>
         public static OpenIddictBuilder AddOpenIddict<TKey>([NotNull] this IServiceCollection services)
             where TKey : IEquatable<TKey> {
-            if (services == null) {
-                throw new ArgumentNullException(nameof(services));
-            }
-
             return services.AddOpenIddict<OpenIddictApplication<TKey>,
                                           OpenIddictAuthorization<TKey>,
                                           OpenIddictScope<TKey>,
@@ -81,5 +76,70 @@ namespace Microsoft.Extensions.DependencyInjection {
 
             return builder;
         }
+
+        /// <summary>
+        /// Registers the default OpenIddict services in the DI container,
+        /// using the default entities and the default entity key type.
+        /// </summary>
+        /// <param name="services">The services collection.</param>
+        /// <param name="configuration">The configuration delegate used to register new services.</param>
+        /// <returns>The <see cref="IServiceCollection"/>.</returns>
+        public static IServiceCollection AddOpenIddict(
+            [NotNull] this IServiceCollection services,
+            [NotNull] Action<OpenIddictBuilder> configuration) {
+            return services.AddOpenIddict<OpenIddictApplication,
+                                          OpenIddictAuthorization,
+                                          OpenIddictScope,
+                                          OpenIddictToken>(configuration);
+        }
+
+        /// <summary>
+        /// Registers the default OpenIddict services in the DI container,
+        /// using the default entities and the specified entity key type.
+        /// </summary>
+        /// <typeparam name="TKey">The type of the entity primary keys.</typeparam>
+        /// <param name="services">The services collection.</param>
+        /// <param name="configuration">The configuration delegate used to register new services.</param>
+        /// <returns>The <see cref="IServiceCollection"/>.</returns>
+        public static IServiceCollection AddOpenIddict<TKey>(
+            [NotNull] this IServiceCollection services,
+            [NotNull] Action<OpenIddictBuilder> configuration)
+            where TKey : IEquatable<TKey> {
+            return services.AddOpenIddict<OpenIddictApplication<TKey>,
+                                          OpenIddictAuthorization<TKey>,
+                                          OpenIddictScope<TKey>,
+                                          OpenIddictToken<TKey>>(configuration);
+        }
+
+        /// <summary>
+        /// Registers the default OpenIddict services in the DI container, using the specified entities.
+        /// </summary>
+        /// <typeparam name="TApplication">The type of the Application entity.</typeparam>
+        /// <typeparam name="TAuthorization">The type of the Authorization entity.</typeparam>
+        /// <typeparam name="TScope">The type of the Scope entity.</typeparam>
+        /// <typeparam name="TToken">The type of the Token entity.</typeparam>
+        /// <param name="services">The services collection.</param>
+        /// <param name="configuration">The configuration delegate used to register new services.</param>
+        /// <returns>The <see cref="IServiceCollection"/>.</returns>
+        public static IServiceCollection AddOpenIddict<TApplication, TAuthorization, TScope, TToken>(
+            [NotNull] this IServiceCollection services,
+            [NotNull] Action<OpenIddictBuilder> configuration)
+            where TApplication : class
+            where TAuthorization : class
+            where TScope : class
+            where TToken : class {
+            if (services == null) {
+                throw new ArgumentNullException(nameof(services));
+            }
+
+            if (configuration == null) {
+                throw new ArgumentNullException(nameof(configuration));
+            }
+
+            // Register the OpenIddict core services and invoke the configuration delegate.
+            configuration(services.AddOpenIddict<TApplication, TAuthorization, TScope, TToken>());
+
+            return services;
+        }
     }
 }
\ No newline at end of file