PreWireMockMiddlewareInit / PostWireMockMiddlewareInit

WireMock.Net Solution.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.13
+VisualStudioVersion = 15.0.27004.2002
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EF242EDF-7133-4277-9A0C-18744DE08707}"
 EndProject
@@ -21,11 +21,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net", "src\WireMoc
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Tests", "test\WireMock.Net.Tests\WireMock.Net.Tests.csproj", "{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.NETCoreApp", "examples\WireMock.Net.Console.NETCoreApp\WireMock.Net.Console.NETCoreApp.csproj", "{FE281639-B014-4C8A-96FA-141164A74713}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NETCoreApp", "examples\WireMock.Net.Console.NETCoreApp\WireMock.Net.Console.NETCoreApp.csproj", "{FE281639-B014-4C8A-96FA-141164A74713}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.Record.NETCoreApp", "examples\WireMock.Net.Console.Record.NETCoreApp\WireMock.Net.Console.Record.NETCoreApp.csproj", "{1995E414-F197-4AB4-90C2-68D806B5AF59}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Client", "examples\WireMock.Net.Client\WireMock.Net.Client.csproj", "{058D4B6C-C03E-49D0-91DB-A535B058FA0D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Client", "examples\WireMock.Net.Client\WireMock.Net.Client.csproj", "{058D4B6C-C03E-49D0-91DB-A535B058FA0D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.StandAlone", "src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj", "{B6269AAC-170A-43D5-8B9A-579DED3D9A95}"
 EndProject
@@ -36,6 +36,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net
 		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {B6269AAC-170A-43D5-8B9A-579DED3D9A95}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.ConsoleApplication", "examples\WireMock.Net.ConsoleApplication\WireMock.Net.ConsoleApplication.csproj", "{668F689E-57B4-422E-8846-C0FF643CA268}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -74,6 +76,10 @@ Global
 		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|Any CPU.Build.0 = Release|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -87,5 +93,9 @@ Global
 		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {EF242EDF-7133-4277-9A0C-18744DE08707}
 		{10E16614-61CA-48D8-8BDD-664C13913DED} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{668F689E-57B4-422E-8846-C0FF643CA999} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{668F689E-57B4-422E-8846-C0FF643CA268} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {BF428BCC-C837-433B-87D2-15C7014B73E9}
 	EndGlobalSection
 EndGlobal

examples/WireMock.Net.ConsoleApplication/MainApp.cs

@@ -20,7 +20,9 @@ namespace WireMock.Net.ConsoleApplication
             {
                 Urls = new[] { url1, url2, url3 },
                 StartAdminInterface = true,
-                ReadStaticMappings = false
+                ReadStaticMappings = false,
+                PreWireMockMiddlewareInit = app => { System.Console.WriteLine($"PreWireMockMiddlewareInit : {app.GetType()}"); },
+                PostWireMockMiddlewareInit = app => { System.Console.WriteLine($"PostWireMockMiddlewareInit : {app.GetType()}"); }
             });
             System.Console.WriteLine("FluentMockServer listening at {0}", string.Join(" and ", server.Urls));
 

examples/WireMock.Net.ConsoleApplication/WireMock.Net.ConsoleApplication.csproj

@@ -47,9 +47,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="WireMock.Net">
-      <HintPath>..\..\src\WireMock.Net\bin\$(Configuration)\net45\WireMock.Net.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainApp.cs" />
@@ -67,6 +64,16 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">
+      <Project>{b6269aac-170a-43d5-8b9a-579ded3d9a95}</Project>
+      <Name>WireMock.Net.StandAlone</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
+      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
+      <Name>WireMock.Net</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/WireMock.Net/Owin/AspNetCoreSelfHost.cs

@@ -46,7 +46,9 @@ namespace WireMock.Owin
             _host = new WebHostBuilder()
                 .Configure(appBuilder =>
                 {
+                    _options.PreWireMockMiddlewareInit?.Invoke(appBuilder);
                     appBuilder.UseMiddleware<WireMockMiddleware>(_options);
+                    _options.PostWireMockMiddlewareInit?.Invoke(appBuilder);
                 })
                 .UseKestrel()
                 .UseUrls(_uriPrefixes)

src/WireMock.Net/Owin/OwinSelfHost.cs

@@ -57,11 +57,13 @@ namespace WireMock.Owin
 
         private void StartServers()
         {
-            System.Console.WriteLine("WireMock.Net server using .net 4.5.x or .net 4.6.x");
+            Console.WriteLine("WireMock.Net server using .net 4.5.x or .net 4.6.x");
 
             Action<IAppBuilder> startup = app =>
             {
+                _options.PreWireMockMiddlewareInit?.Invoke(app);
                 app.Use<WireMockMiddleware>(_options);
+                _options.PostWireMockMiddlewareInit?.Invoke(app);
             };
 
             var servers = new List<IDisposable>();

src/WireMock.Net/Owin/WireMockMiddleware.cs

@@ -50,7 +50,7 @@ namespace WireMock.Owin
             RequestMatchResult requestMatchResult = null;
             try
             {
-                foreach (var mapping in _options.Mappings.Where(m => m.Scenario != null))
+                foreach (var mapping in _options.Mappings.Where(m => m?.Scenario != null))
                 {
                     // Set start
                     if (!_options.Scenarios.ContainsKey(mapping.Scenario) && mapping.IsStartState)

src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs

@@ -4,6 +4,11 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using WireMock.Logging;
 using WireMock.Matchers;
+#if !NETSTANDARD
+using Owin;
+#else
+using Microsoft.AspNetCore.Builder;
+#endif
 
 namespace WireMock.Owin
 {
@@ -24,5 +29,15 @@ namespace WireMock.Owin
         public int? MaxRequestLogCount { get; set; }
 
         public IDictionary<string, object> Scenarios { get; } = new ConcurrentDictionary<string, object>();
+
+#if !NETSTANDARD
+        public Action<IAppBuilder> PreWireMockMiddlewareInit { get; set; }
+
+        public Action<IAppBuilder> PostWireMockMiddlewareInit { get; set; }
+#else
+        public Action<IApplicationBuilder> PreWireMockMiddlewareInit { get; set; }
+
+        public Action<IApplicationBuilder> PostWireMockMiddlewareInit { get; set; }
+#endif
     }
 }

src/WireMock.Net/ResponseBuilders/BodyDestinationFormat.cs

@@ -1,5 +1,8 @@
 namespace WireMock.ResponseBuilders
 {
+    /// <summary>
+    /// Defines the BodyDestinationFormat
+    /// </summary>
     public static class BodyDestinationFormat
     {
         /// <summary>

src/WireMock.Net/Server/FluentMockServer.cs

@@ -162,6 +162,9 @@ namespace WireMock.Server
                 Urls = new[] { (settings.UseSSL == true ? "https" : "http") + "://localhost:" + port + "/" };
             }
 
+            _options.PreWireMockMiddlewareInit = settings.PreWireMockMiddlewareInit;
+            _options.PostWireMockMiddlewareInit = settings.PostWireMockMiddlewareInit;
+
 #if NETSTANDARD
             _httpServer = new AspNetCoreSelfHost(_options, Urls);
 #else

src/WireMock.Net/Settings/FluentMockServerSettings.cs

@@ -1,4 +1,7 @@
-namespace WireMock.Settings
+using System;
+using JetBrains.Annotations;
+
+namespace WireMock.Settings
 {
     /// <summary>
     /// FluentMockServerSettings
@@ -8,76 +11,87 @@
         /// <summary>
         /// Gets or sets the port.
         /// </summary>
-        /// <value>
+        [PublicAPI]
-        /// The port.
-        /// </value>
         public int? Port { get; set; }
 
         /// <summary>
         /// Gets or sets the use SSL.
         /// </summary>
-        /// <value>
-        /// The use SSL.
-        /// </value>
         // ReSharper disable once InconsistentNaming
+        [PublicAPI]
         public bool? UseSSL { get; set; }
 
         /// <summary>
-        /// Gets or sets the start admin interface.
+        /// Gets or sets wether to start admin interface.
         /// </summary>
-        /// <value>
+        [PublicAPI]
-        /// The start admin interface.
-        /// </value>
         public bool? StartAdminInterface { get; set; }
 
         /// <summary>
         /// Gets or sets if the static mappings should be read at startup.
         /// </summary>
-        /// <value>true/false</value>
+        [PublicAPI]
         public bool? ReadStaticMappings { get; set; }
 
         /// <summary>
         /// Gets or sets if the server should record and save requests and responses.
         /// </summary>
         /// <value>true/false</value>
+        [PublicAPI]
         public ProxyAndRecordSettings ProxyAndRecordSettings { get; set; }
 
         /// <summary>
         /// Gets or sets the urls.
         /// </summary>
-        /// <value>
+        [PublicAPI]
-        /// The urls.
-        /// </value>
         public string[] Urls { get; set; }
 
         /// <summary>
         /// StartTimeout
         /// </summary>
+        [PublicAPI]
         public int StartTimeout { get; set; } = 10000;
 
         /// <summary>
         /// Allow Partial Mapping (default set to false).
         /// </summary>
+        [PublicAPI]
         public bool? AllowPartialMapping { get; set; }
 
         /// <summary>
         /// The username needed for __admin access.
         /// </summary>
+        [PublicAPI]
         public string AdminUsername { get; set; }
 
         /// <summary>
         /// The password needed for __admin access.
         /// </summary>
+        [PublicAPI]
         public string AdminPassword { get; set; }
 
         /// <summary>
         /// The RequestLog expiration in hours (optional).
         /// </summary>
+        [PublicAPI]
         public int? RequestLogExpirationDuration { get; set; }
 
         /// <summary>
         /// The MaxRequestLog count (optional).
         /// </summary>
+        [PublicAPI]
         public int? MaxRequestLogCount { get; set; }
+
+        /// <summary>
+        /// Action which is called (with the IAppBuilder or IApplicationBuilder) before the internal WireMockMiddleware is initialized. [Optional]
+        /// </summary>
+        [PublicAPI]
+        public Action<object> PreWireMockMiddlewareInit { get; set; }
+
+        /// <summary>
+        /// Action which is called (with the IAppBuilder or IApplicationBuilder) after the internal WireMockMiddleware is initialized. [Optional]
+        /// </summary>
+        [PublicAPI]
+        public Action<object> PostWireMockMiddlewareInit { get; set; }
     }
 }