From 8358d0efaf3d8c0269d43862f48bf49e778a0880 Mon Sep 17 00:00:00 2001
From: Tugberk Ugurlu <tugberk@outlook.com>
Date: Wed, 25 Nov 2015 01:29:50 +0000
Subject: [PATCH] preserving the existing appbuilder properties and conventions
 inside the middleware

---
 ...ntityServerBearerTokenValidationAppBuilderExtensions.cs | 2 +-
 .../IdentityServerBearerTokenValidationMiddleware.cs       | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/source/AccessTokenValidation/IdentityServerBearerTokenValidationAppBuilderExtensions.cs b/source/AccessTokenValidation/IdentityServerBearerTokenValidationAppBuilderExtensions.cs
index 2a65668..78df0c0 100644
--- a/source/AccessTokenValidation/IdentityServerBearerTokenValidationAppBuilderExtensions.cs
+++ b/source/AccessTokenValidation/IdentityServerBearerTokenValidationAppBuilderExtensions.cs
@@ -64,7 +64,7 @@ public static IAppBuilder UseIdentityServerBearerTokenAuthentication(this IAppBu
                 middlewareOptions.TokenProvider = options.TokenProvider;
             }
 
-            app.Use<IdentityServerBearerTokenValidationMiddleware>(middlewareOptions, loggerFactory);
+            app.Use<IdentityServerBearerTokenValidationMiddleware>(app, middlewareOptions, loggerFactory);
 
             if (options.RequiredScopes.Any())
             {
diff --git a/source/AccessTokenValidation/IdentityServerBearerTokenValidationMiddleware.cs b/source/AccessTokenValidation/IdentityServerBearerTokenValidationMiddleware.cs
index 92357ed..f272e1c 100644
--- a/source/AccessTokenValidation/IdentityServerBearerTokenValidationMiddleware.cs
+++ b/source/AccessTokenValidation/IdentityServerBearerTokenValidationMiddleware.cs
@@ -42,9 +42,10 @@ public class IdentityServerBearerTokenValidationMiddleware
         /// Initializes a new instance of the <see cref="IdentityServerBearerTokenValidationMiddleware" /> class.
         /// </summary>
         /// <param name="next">The next middleware.</param>
+        /// <param name="app">The app builder.</param>
         /// <param name="options">The options.</param>
         /// <param name="loggerFactory">The logger factory.</param>
-        public IdentityServerBearerTokenValidationMiddleware(AppFunc next, IdentityServerOAuthBearerAuthenticationOptions options, ILoggerFactory loggerFactory)
+        public IdentityServerBearerTokenValidationMiddleware(AppFunc next, IAppBuilder app, IdentityServerOAuthBearerAuthenticationOptions options, ILoggerFactory loggerFactory)
         {
             _next = next;
             _options = options;
@@ -52,7 +53,7 @@ public IdentityServerBearerTokenValidationMiddleware(AppFunc next, IdentityServe
 
             if (options.LocalValidationOptions != null)
             {
-                var localBuilder = new AppBuilder();
+                var localBuilder = app.New();
                 localBuilder.UseOAuthBearerAuthentication(options.LocalValidationOptions);
                 localBuilder.Run(ctx => next(ctx.Environment));
                 _localValidationFunc = localBuilder.Build();
@@ -60,7 +61,7 @@ public IdentityServerBearerTokenValidationMiddleware(AppFunc next, IdentityServe
 
             if (options.EndpointValidationOptions != null)
             {
-                var endpointBuilder = new AppBuilder();
+                var endpointBuilder = app.New();
                 endpointBuilder.Properties["host.AppName"] = "foobar";
 
                 endpointBuilder.UseOAuthBearerAuthentication(options.EndpointValidationOptions);