From 79971434fa5448d69b6d8b2b7dda572655d27fb9 Mon Sep 17 00:00:00 2001 From: Nate Barbettini Date: Wed, 29 Jun 2016 14:23:12 -0700 Subject: [PATCH] Add ConfigurationFileRoot --- src/Stormpath.Owin.Abstractions/project.json | 4 ++-- .../StormpathMiddleware.Initialize.cs | 5 +++-- src/Stormpath.Owin.Middleware/StormpathOwinOptions.cs | 2 ++ src/Stormpath.Owin.Middleware/project.json | 7 +++---- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Stormpath.Owin.Abstractions/project.json b/src/Stormpath.Owin.Abstractions/project.json index 6a6e58c..0cc0a37 100644 --- a/src/Stormpath.Owin.Abstractions/project.json +++ b/src/Stormpath.Owin.Abstractions/project.json @@ -8,7 +8,7 @@ "xmlDoc": true }, "dependencies": { - "Stormpath.Configuration.Abstractions": "5.2.0" + "Stormpath.Configuration.Abstractions": "5.3.0" }, "description": "Common components (views, view models) for the Stormpath OWIN middleware library.", "frameworks": { @@ -33,5 +33,5 @@ "tooling": { "defaultNamespace": "Stormpath.Owin.Abstractions" }, - "version": "1.1.0" + "version": "1.2.0" } diff --git a/src/Stormpath.Owin.Middleware/StormpathMiddleware.Initialize.cs b/src/Stormpath.Owin.Middleware/StormpathMiddleware.Initialize.cs index c07097b..31a7c21 100644 --- a/src/Stormpath.Owin.Middleware/StormpathMiddleware.Initialize.cs +++ b/src/Stormpath.Owin.Middleware/StormpathMiddleware.Initialize.cs @@ -49,7 +49,7 @@ public static StormpathMiddleware Create(StormpathOwinOptions options) IFrameworkUserAgentBuilder userAgentBuilder = new DefaultFrameworkUserAgentBuilder(options.LibraryUserAgent); // Initialize and warm up SDK - var clientFactory = InitializeClient(options.Configuration); + var clientFactory = InitializeClient(options.Configuration, options.ConfigurationFileRoot); // Scope a client for our resolution steps below var client = clientFactory.Create(new ScopedClientOptions() @@ -76,7 +76,7 @@ public static StormpathMiddleware Create(StormpathOwinOptions options) return new StormpathMiddleware(options.ViewRenderer, options.Logger, userAgentBuilder, clientFactory, integrationConfiguration); } - private static IScopedClientFactory InitializeClient(object initialConfiguration) + private static IScopedClientFactory InitializeClient(object initialConfiguration, string configurationFileRoot) { // Construct base client var baseClient = Clients.Builder() @@ -87,6 +87,7 @@ private static IScopedClientFactory InitializeClient(object initialConfiguration #endif .SetSerializer(Serializers.Create().JsonNetSerializer()) .SetConfiguration(initialConfiguration) + .SetConfigurationFileRoot(configurationFileRoot) .Build(); // Attempt to connect and prime the cache with ITenant diff --git a/src/Stormpath.Owin.Middleware/StormpathOwinOptions.cs b/src/Stormpath.Owin.Middleware/StormpathOwinOptions.cs index 4022f27..27bef1c 100644 --- a/src/Stormpath.Owin.Middleware/StormpathOwinOptions.cs +++ b/src/Stormpath.Owin.Middleware/StormpathOwinOptions.cs @@ -23,6 +23,8 @@ public sealed class StormpathOwinOptions { public object Configuration { get; set; } + public string ConfigurationFileRoot { get; set; } + public ILogger Logger { get; set; } public string LibraryUserAgent { get; set; } diff --git a/src/Stormpath.Owin.Middleware/project.json b/src/Stormpath.Owin.Middleware/project.json index 8746385..b1c55a4 100644 --- a/src/Stormpath.Owin.Middleware/project.json +++ b/src/Stormpath.Owin.Middleware/project.json @@ -9,12 +9,11 @@ }, "copyright": "(c) 2016 Stormpath, Inc.", "dependencies": { - "Stormpath.Configuration.Abstractions": "5.2.0", "Stormpath.Owin.Abstractions": { "target": "project", - "version": "1.1.0" + "version": "1.2.0" }, - "Stormpath.SDK": "0.91.0" + "Stormpath.SDK": "0.92.0" }, "description": "Stormpath OWIN middleware for .NET.", "frameworks": { @@ -45,5 +44,5 @@ "tooling": { "defaultNamespace": "Stormpath.Owin.Middleware" }, - "version": "1.1.0" + "version": "1.2.0" }