Merge branch 'release/4.4.1'

Author: Chris Young

src/ArchitectNow.Models/Exceptions/ApiException.cs

@@ -24,6 +24,11 @@ protected ApiException(HttpStatusCode statusCode, string message, Exception inne
         }
 
         public abstract string GetContent();
+
+	    public virtual object GetRawContent()
+	    {
+		    return InternalContent;
+	    }
     }
 
     public class ApiException<TContent>: ApiException, IApiException<TContent>
@@ -56,5 +61,5 @@ public override string GetContent()
 			}
 			return null;
 		}
-	}
+    }
 }

src/ArchitectNow.Mongo/MongoModule.cs

@@ -13,12 +13,12 @@ public class MongoModule: Module
     {
 	    protected override void Load(ContainerBuilder builder)
 	    {
-		    builder.RegisterAssemblyTypes(ThisAssembly).AsImplementedInterfaces().PreserveExistingDefaults();
+		    builder.RegisterAssemblyTypes(ThisAssembly).AsImplementedInterfaces();
 
 		    builder.RegisterType<MongoDataContextService>().As<IDataContextService<MongoDataContext>>()
-			    .InstancePerLifetimeScope().PreserveExistingDefaults();
+			    .InstancePerLifetimeScope();
 
-		    builder.Register(context => context.Resolve<IConfigurationRoot>().CreateOptions<MongoOptions>("mongo")).As<IOptions<MongoOptions>>().SingleInstance().PreserveExistingDefaults();
+		    builder.Register(context => context.Resolve<IConfigurationRoot>().CreateOptions<MongoOptions>("mongo")).As<IOptions<MongoOptions>>().SingleInstance();
 		}
     }
 }

src/ArchitectNow.Services/ServicesModule.cs

@@ -8,8 +8,8 @@ public class ServicesModule : Module
     {
 	    protected override void Load(ContainerBuilder builder)
 	    {
-		    builder.RegisterAssemblyTypes(ThisAssembly).AsImplementedInterfaces().PreserveExistingDefaults();
-		    builder.RegisterType<BaseCacheService<CachingOptions>>().As<ICacheService>().SingleInstance().PreserveExistingDefaults();
+		    builder.RegisterAssemblyTypes(ThisAssembly).AsImplementedInterfaces();
+		    builder.RegisterType<BaseCacheService<CachingOptions>>().As<ICacheService>().SingleInstance();
 	    }
     }
 }

src/ArchitectNow.Web/Services/ExceptionResultBuilder.cs

@@ -54,26 +54,31 @@ public IActionResult Build(Exception exception)
                     message = apiException.GetBaseException().Message;
                 }
             }
-          
-	        var apiError = new ApiError
-	        {
-		        Error = content ?? message
-	        };
 
-	        if (!string.IsNullOrEmpty(stackTrace))
-	        {
-		        apiError.StackTrace = stackTrace;
-	        }
+	        return CreateActionResult(content, message, stackTrace, statusCode, exception);
+        }
 
-            var objectResult = new ObjectResult(apiError)
-            {
-	            StatusCode = statusCode
-            };
-	        var eventId = new EventId(statusCode);
+	    protected virtual IActionResult CreateActionResult(string content, string message, string stackTrace, int statusCode, Exception exception)
+	    {
+		    var apiError = new ApiError
+		    {
+			    Error = content ?? message
+		    };
 
-	        _logger.LogError(eventId, exception, message);
+		    if (!string.IsNullOrEmpty(stackTrace))
+		    {
+			    apiError.StackTrace = stackTrace;
+		    }
 
-            return objectResult;
-        }
+		    var objectResult = new ObjectResult(apiError)
+		    {
+			    StatusCode = statusCode
+		    };
+		    var eventId = new EventId(statusCode);
+
+		    _logger.LogError(eventId, exception, message);
+
+		    return objectResult;
+	    }
     }
 }

src/ArchitectNow.Web/WebModule.cs

@@ -17,13 +17,12 @@ public class WebModule : Module
         protected override void Load(ContainerBuilder builder)
         {
             var assembly = ThisAssembly;
-            builder.RegisterAssemblyTypes(assembly).AsImplementedInterfaces().PreserveExistingDefaults();
+            builder.RegisterAssemblyTypes(assembly).AsImplementedInterfaces();
 
             builder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>().SingleInstance();
-            builder.RegisterType<RaygunJobFilter>().AsSelf().InstancePerLifetimeScope().PreserveExistingDefaults();
+            builder.RegisterType<RaygunJobFilter>().AsSelf().InstancePerLifetimeScope();
 
-            builder.RegisterType<GlobalExceptionFilter>().AsSelf().InstancePerLifetimeScope()
-                .PreserveExistingDefaults();
+            builder.RegisterType<GlobalExceptionFilter>().AsSelf().InstancePerLifetimeScope();
 
             builder.Register(context =>
                 {
@@ -36,8 +35,7 @@ protected override void Load(ContainerBuilder builder)
                     return signingKey;
                 })
                 .AsSelf()
-                .SingleInstance()
-                .PreserveExistingDefaults();
+                .SingleInstance();
 
             builder.Register(context =>
             {
@@ -49,15 +47,15 @@ protected override void Load(ContainerBuilder builder)
                 issuerOptions.SigningCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256Signature);
 
                 return new OptionsWrapper<JwtIssuerOptions>(issuerOptions);
-            }).As<IOptions<JwtIssuerOptions>>().InstancePerLifetimeScope().PreserveExistingDefaults();
+            }).As<IOptions<JwtIssuerOptions>>().InstancePerLifetimeScope();
 
             builder.Register(context =>
             {
                 var configurationRoot = context.Resolve<IConfigurationRoot>();
                 var key = configurationRoot["RaygunSettings:ApiKey"];
                 var raygunClient = new RaygunClient(key);
                 return raygunClient;
-            }).AsSelf().PreserveExistingDefaults();
+            }).AsSelf();
         }
     }
 }