FIX mutator propagation, added Web config options (#118)

lbotinelly · Jul 13, 2023 · d36cf60 · d36cf60
1 parent eca9643
commit d36cf60
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/Zen.Base/Module/Data.cs b/Zen.Base/Module/Data.cs
@@ -911,7 +911,7 @@ public T Save(Mutator mutator = null)
             else BeforeUpdate();
             BeforeSave();
 
-            var postKey = Info<T>.Settings.Adapter.Upsert(localModel).GetDataKey();
+            var postKey = Info<T>.Settings.Adapter.Upsert(localModel, mutator).GetDataKey();
 
             Info<T>.TryFlushCachedModel(localModel);
 

diff --git a/Zen.Web.App/Zen.Web.App.csproj b/Zen.Web.App/Zen.Web.App.csproj
@@ -26,7 +26,6 @@
     <ProjectReference Include="..\Zen.Media\Zen.Media.csproj" />
     <ProjectReference Include="..\Zen.Storage\Zen.Storage.csproj" />
     <ProjectReference Include="..\Zen.Web.Auth\Zen.Web.Auth.csproj" />
-    <ProjectReference Include="..\Zen.Web.GraphQL\Zen.Web.GraphQL.csproj" />
     <ProjectReference Include="..\Zen.Web\Zen.Web.csproj" />
   </ItemGroup>
 

diff --git a/Zen.Web/Service/Extensions/Use.cs b/Zen.Web/Service/Extensions/Use.cs
@@ -136,10 +136,20 @@ public static void UseZenWeb(this IApplicationBuilder app, Action<IZenWebBuilder
             else
             {
                 app.UseExceptionHandler("/Error");
-                app.UseHsts();
+
+                if (options.Hsts)
+                {
+                    app.UseHsts();
+                    Events.AddLog("HSTS", "enabled");
+                }
             }
 
-            if (!Base.Host.IsContainer) app.UseHttpsRedirection();
+            if (!Base.Host.IsContainer)
+                if (options.HttpsRedirection)
+                {
+                    app.UseHttpsRedirection();
+                    Events.AddLog("HTTPS Redirection", "enabled");
+                }
 
             configuration?.Invoke(builder);
         }

diff --git a/Zen.Web/Service/ZenWebOptions.cs b/Zen.Web/Service/ZenWebOptions.cs
@@ -28,5 +28,7 @@ public PathString DefaultPage
         public string SourcePath { get; set; }
         public bool UseHtml5 { get; set; }
         public bool UseSpa { get; set; } = true;
+        public bool Hsts { get; set; } = true;
+        public bool HttpsRedirection { get; set; } = true;
     }
 }