Merge branch 'master' into master

renemadsen · web-flow · commit ecfa81693444 · 2018-02-13T15:03:51.000+01:00
diff --git a/eFormAPI/Installation/CustomActions/CustomAction.cs b/eFormAPI/Installation/CustomActions/CustomAction.cs
@@ -235,11 +235,12 @@ public static ActionResult InstallCA(Session session)
                 if (session.CustomActionData["GENERATESSL"] == "1")
                 {
                     var siteId = GetSiteId(uiName);
-                    RunProcess(Path.Combine(installFolder, "letsencrypt\\letsencrypt.exe"), $"--plugin iissite --siteid { siteId } --accepttos --usedefaulttaskuser");
+                    var email = session.CustomActionData["EMAIL"];
+                    RunProcess(Path.Combine(installFolder, "letsencrypt\\letsencrypt.exe"), $"--plugin iissite --siteid { siteId } --emailaddress { email } --accepttos --usedefaulttaskuser");
                 }
 
-                CongigureSecurity(clientLocation);
-                CongigureSecurity(webApiLocation);
+                ConfigureSecurity(clientLocation);
+                ConfigureSecurity(webApiLocation);
                 //DeleteDirectory(Path.Combine(installFolder, "letsencrypt"));
                 IncrementProgressBar(session);
 
@@ -348,8 +349,8 @@ public static ActionResult UpdateCA(Session session)
                 ControlSites(customerNumber, domain, apiPort, uiPort, true);
                 IncrementProgressBar(session);
 
-                CongigureSecurity(uiIisDir);
-                CongigureSecurity(webApiLocation);
+                ConfigureSecurity(uiIisDir);
+                ConfigureSecurity(webApiLocation);
 
                 DeleteDirectory(apiTemp);
                 DeleteDirectory(clientTemp);
@@ -510,7 +511,7 @@ private static void RenameFolders(string location, string apiName, string uiName
             DeleteDirectory(Path.Combine(location, "eform-client"));
         }
 
-        public static void CongigureSecurity(string folder)
+        public static void ConfigureSecurity(string folder)
         {
             using (var powershell = PowerShell.Create())
             {
diff --git a/eFormAPI/Installation/MainInstaller/DomainNameDlg.wxs b/eFormAPI/Installation/MainInstaller/DomainNameDlg.wxs
@@ -9,10 +9,19 @@
                 <Control Type="Edit" Id="CustomerNumber" Width="220" Height="15" X="45" Y="132" Property="CUSTOMERNUMBER" Text="{80}" />
               
                 <Control Type="CheckBox" Id="certgen" Property="GENERATESSL" Width="215" Height="17" X="45" Y="165" CheckBoxValue="1" Text="Generate SSL certificate" />
+
+                <Control Id="EmailText" Type="Text" X="45" Y="182" Width="220" Height="15" Text ="&amp;Email address:">
+                  <Condition Action="show" >GENERATESSL</Condition> 
+                  <Condition Action="hide"><![CDATA[GENERATESSL <> "1"]]></Condition>
+                </Control>
+              <Control Id="EmailBox" Type="Edit" X="45" Y="196" Width="220" Height="15" Property="EMAIL" Text="{80}">
+                <Condition Action="show" >GENERATESSL</Condition>
+                <Condition Action="hide"><![CDATA[GENERATESSL <> "1"]]></Condition>
+              </Control>
               
                 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&amp;Back" />
                 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&amp;Next">
-                    <Publish Event="SpawnDialog" Value="EmptyFieldDlg">NOT DOMAINNAME OR NOT CUSTOMERNUMBER</Publish>
+                    <Publish Event="SpawnDialog" Value="EmptyFieldDlg">(NOT DOMAINNAME OR NOT CUSTOMERNUMBER) OR (GENERATESSL AND NOT EMAIL)</Publish>
                 </Control>
                 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
                     <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
diff --git a/eFormAPI/Installation/MainInstaller/MaintenanceTypeModifiedDlg.wxs b/eFormAPI/Installation/MainInstaller/MaintenanceTypeModifiedDlg.wxs
@@ -13,6 +13,7 @@
           <Publish Property="DOMAINNAME" Value="{}" >1</Publish>
           <Publish Property="CUSTOMERNUMBER" Value="{}" >1</Publish>
           <Publish Property="GENERATESSL" Value="{}" >1</Publish>
+          <Publish Property="EMAIL" Value="{}" >1</Publish> 
           <Publish Property="CONFIGURATIONEXISTS" Value="{}" >1</Publish>
         </Control>
         <Control Id="Update" Type="PushButton" X="98" Y="139" Width="139" Height="33" Text="&amp;Update" >
diff --git a/eFormAPI/Installation/MainInstaller/Product.wxs b/eFormAPI/Installation/MainInstaller/Product.wxs
@@ -38,6 +38,7 @@
     <Property Id="DOMAINNAME" Value="{}" Secure="yes" />
     <Property Id="CUSTOMERNUMBER" Value="{}" Secure="yes" />
     <Property Id="GENERATESSL" Value="{}" Secure="yes" />
+    <Property Id="EMAIL" Value="{}" Secure="yes" />
     <Property Id="INSTALLFOLDER" Value="C:\inetpub\wwwroot" Secure="yes" />
     <Property Id="KEEPFOLDERS" Value="eform-api\output" Secure="yes"/>
     <Property Id="KEEPSETTINGS" Value="1" Secure="yes"/>
@@ -70,7 +71,7 @@
     
     <Binary Id="BinaryCA" SourceFile="BuildedCustomActions\CustomActions.CA.dll" />
 
-    <CustomAction Id="SetInstalValues" Property="Install" Value="INSTMODE=[INSTMODE];DOMAINNAME=[DOMAINNAME];CUSTOMERNUMBER=[CUSTOMERNUMBER];GENERATESSL=[GENERATESSL];INSTALLFOLDER=[INSTALLFOLDER];USEEXISTINGCONFIGURATION=[USEEXISTINGCONFIGURATION];CONFIGURATIONEXISTS=[CONFIGURATIONEXISTS];KEEPFOLDERS=[KEEPFOLDERS];KEEPFILES=[KEEPFILES]"/>
+    <CustomAction Id="SetInstalValues" Property="Install" Value="INSTMODE=[INSTMODE];DOMAINNAME=[DOMAINNAME];CUSTOMERNUMBER=[CUSTOMERNUMBER];GENERATESSL=[GENERATESSL];INSTALLFOLDER=[INSTALLFOLDER];USEEXISTINGCONFIGURATION=[USEEXISTINGCONFIGURATION];CONFIGURATIONEXISTS=[CONFIGURATIONEXISTS];KEEPFOLDERS=[KEEPFOLDERS];KEEPFILES=[KEEPFILES];EMAIL=[EMAIL]"/>
     <CustomAction Id="SetRemoveValues" Property="RemoveService" Value="INSTMODE=[INSTMODE];DOMAINNAME=[DOMAINNAME];KEEPFOLDERS=[KEEPFOLDERS];KEEPSETTINGS=[KEEPSETTINGS];KEEPFILES=[KEEPFILES]" />
     <CustomAction Id="SetUpdateServiceValues" Property="UpdateService" Value="INSTMODE=[INSTMODE];DOMAINNAME=[DOMAINNAME];INSTALLFOLDER=[INSTALLFOLDER]" />
 
diff --git a/eFormAPI/eFormAPI.Common/packages.config b/eFormAPI/eFormAPI.Common/packages.config
@@ -7,7 +7,7 @@
   <package id="EntityFramework" version="6.1.3" targetFramework="net46" />
   <package id="EPPlus" version="4.1.1" targetFramework="net46" />
   <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net46" />
-  <package id="Microting.eForm" version="2.1.87" targetFramework="net46" />
+  <package id="Microting.eForm" version="2.1.90" targetFramework="net46" />
   <package id="MySql.Data" version="6.9.11" targetFramework="net46" />
   <package id="MySql.Data.Entity" version="6.9.11" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />
diff --git a/eFormAPI/eFormAPI/Controllers/CasesController.cs b/eFormAPI/eFormAPI/Controllers/CasesController.cs
@@ -21,7 +21,7 @@ public OperationDataResult<List<Case>> Index(int id)
             try
             {
                 var core = _coreHelper.GetCore();
-                var model = core.CaseReadAll(id, null, null);
+                var model = core.CaseReadAll(id, null, null, Constants.WorkflowStates.NotRemoved, "", true, Constants.CaseSortParameters.CreatedAt);
                 return new OperationDataResult<List<Case>>(true, model);
             }
             catch (Exception)
diff --git a/eFormAPI/eFormAPI/Controllers/TemplateFilesController.cs b/eFormAPI/eFormAPI/Controllers/TemplateFilesController.cs
@@ -258,6 +258,7 @@ public HttpResponseMessage UploadEformZip()
                             }
 
                             ZipFile.ExtractToDirectory(filePath, extractPath);
+                            File.Delete(filePath);
                             return Request.CreateResponse(HttpStatusCode.OK);
                         }
                     }
diff --git a/eFormAPI/eFormAPI/Handlers/GenerateJasperFilesHandler.cs b/eFormAPI/eFormAPI/Handlers/GenerateJasperFilesHandler.cs
@@ -0,0 +1,24 @@
+﻿using eFormAPI.Web.Messages;
+using System.Threading.Tasks;
+using Rebus.Handlers;
+
+namespace eFormAPI.Web.Handlers
+{
+    public class GenerateJasperFilesHandler : IHandleMessages<GenerateJasperFiles>
+    {
+        //private readonly SqlController sqlController;
+
+        public GenerateJasperFilesHandler()
+        {
+            //this.sqlController = sqlController;
+        }
+
+#pragma warning disable 1998
+        public async Task Handle(GenerateJasperFiles message)
+        {
+            //sqlController.NotificationCreate(message.NotificationId, message.MicrotringUUID, Constants.Notifications.UnitActivate);
+
+            // Potentially send new message onto local queue
+        }
+    }
+}
diff --git a/eFormAPI/eFormAPI/Infrastructure/Helpers/EFormCoreHelper.cs b/eFormAPI/eFormAPI/Infrastructure/Helpers/EFormCoreHelper.cs
@@ -5,13 +5,17 @@
 using System.Web.WebPages;
 using eFormCore;
 using NLog;
+using Castle.Windsor;
+using eFormAPI.Web.Installers;
 
 namespace eFormAPI.Web.Infrastructure.Helpers
 {
     public class EFormCoreHelper
     {
         private Core _core;
         private readonly Logger Logger = LogManager.GetCurrentClassLogger();
+        IWindsorContainer container;
+
 
         #region ExceptionHandling
 
@@ -75,7 +79,9 @@ public Core GetCore()
             try
             {
                 running = _core.StartSqlOnly(connectionStr);
-            } catch (Exception ex) {
+            }
+            catch (Exception ex)
+            {
                 AdminTools adminTools = new AdminTools(connectionStr);
                 adminTools.MigrateDb();
                 adminTools.DbSettingsReloadRemote();
@@ -84,6 +90,11 @@ public Core GetCore()
 
             if (running)
             {
+                container = new WindsorContainer();
+                container.Install(
+                        new RebusHandlerInstaller()
+                        , new RebusInstaller(System.Configuration.ConfigurationManager.ConnectionStrings["eFormMainConnection"].ConnectionString)
+                    );
                 return _core;
             }
             Logger.Error("Core is not running");
diff --git a/eFormAPI/eFormAPI/Installers/RebusHandlerInstaller.cs b/eFormAPI/eFormAPI/Installers/RebusHandlerInstaller.cs
@@ -0,0 +1,18 @@
+﻿using Castle.MicroKernel.Registration;
+using Castle.MicroKernel.SubSystems.Configuration;
+using Castle.Windsor;
+using Rebus.Handlers;
+
+namespace eFormAPI.Web.Installers
+{
+    public class RebusHandlerInstaller : IWindsorInstaller
+    {
+        public void Install(IWindsorContainer container, IConfigurationStore store)
+        {
+            container.Register(Classes.FromThisAssembly()
+                .BasedOn(typeof(IHandleMessages<>))
+                .WithServiceBase()
+                .LifestyleTransient());
+        }
+    }
+}
diff --git a/eFormAPI/eFormAPI/Installers/RebusInstaller.cs b/eFormAPI/eFormAPI/Installers/RebusInstaller.cs
@@ -0,0 +1,32 @@
+﻿using Castle.MicroKernel.Registration;
+using Castle.MicroKernel.SubSystems.Configuration;
+using Castle.Windsor;
+using Rebus.Config;
+using System;
+
+namespace eFormAPI.Web.Installers
+{
+    public class RebusInstaller : IWindsorInstaller
+    {
+        private readonly string connectionString;
+
+        public RebusInstaller(string connectionString)
+        {
+            if (string.IsNullOrEmpty(connectionString)) throw new ArgumentNullException(nameof(connectionString));
+            this.connectionString = connectionString;
+        }
+
+        public void Install(IWindsorContainer container, IConfigurationStore store)
+        {
+            Configure.With(new CastleWindsorContainerAdapter(container))
+                .Logging(l => l.ColoredConsole())
+                .Transport(t => t.UseSqlServer(connectionStringOrConnectionStringName: connectionString, tableName: "Rebus", inputQueueName: "angular-input"))
+                .Options(o =>
+                {
+                    o.SetMaxParallelism(1);
+                    o.SetNumberOfWorkers(1);
+                })
+                .Start();
+        }
+    }
+}
diff --git a/eFormAPI/eFormAPI/Messages/GenerateJasperFiles.cs b/eFormAPI/eFormAPI/Messages/GenerateJasperFiles.cs
@@ -0,0 +1,14 @@
+﻿using System;
+
+namespace eFormAPI.Web.Messages
+{
+    public class GenerateJasperFiles
+    {
+        public int TemplateId { get; protected set; }
+
+        public GenerateJasperFiles(int templateId)
+        {
+            this.TemplateId = templateId;
+        }
+    }
+}
diff --git a/eFormAPI/eFormAPI/eFormAPI.Web.csproj b/eFormAPI/eFormAPI/eFormAPI.Web.csproj
@@ -262,6 +262,7 @@
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
+    <Compile Include="Handlers\GenerateJasperFilesHandler.cs" />
     <Compile Include="Infrastructure\Consts\EformRoles.cs" />
     <Compile Include="Infrastructure\Data\Entities\EformRole.cs" />
     <Compile Include="Infrastructure\Data\Entities\EformUserClaim.cs" />
@@ -280,6 +281,9 @@
     <Compile Include="Infrastructure\Identity\EformUserManager.cs" />
     <Compile Include="Infrastructure\Security\ApplicationOAuthProvider.cs" />
     <Compile Include="Infrastructure\Security\ChallengeResult.cs" />
+    <Compile Include="Installers\RebusHandlerInstaller.cs" />
+    <Compile Include="Installers\RebusInstaller.cs" />
+    <Compile Include="Messages\GenerateJasperFiles.cs" />
     <Compile Include="Migrations\201707190837078_InitialCreate.cs" />
     <Compile Include="Migrations\201707190837078_InitialCreate.Designer.cs">
       <DependentUpon>201707190837078_InitialCreate.cs</DependentUpon>
@@ -339,6 +343,7 @@
   <ItemGroup>
     <Analyzer Include="..\packages\AWSSDK.SQS.3.3.3\analyzers\dotnet\cs\AWSSDK.SQS.CodeAnalysis.dll" />
   </ItemGroup>
+  <ItemGroup />
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

Original file line number	Diff line number	Diff line change
`@@ -235,11 +235,12 @@ public static ActionResult InstallCA(Session session)`
`235`	`235`	`if (session.CustomActionData["GENERATESSL"] == "1")`
`236`	`236`	`{`
`237`	`237`	`var siteId = GetSiteId(uiName);`
`238`		`- RunProcess(Path.Combine(installFolder, "letsencrypt\\letsencrypt.exe"), $"--plugin iissite --siteid { siteId } --accepttos --usedefaulttaskuser");`
	`238`	`+ var email = session.CustomActionData["EMAIL"];`
	`239`	`+ RunProcess(Path.Combine(installFolder, "letsencrypt\\letsencrypt.exe"), $"--plugin iissite --siteid { siteId } --emailaddress { email } --accepttos --usedefaulttaskuser");`
`239`	`240`	`}`
`240`	`241`
`241`		`- CongigureSecurity(clientLocation);`
`242`		`- CongigureSecurity(webApiLocation);`
	`242`	`+ ConfigureSecurity(clientLocation);`
	`243`	`+ ConfigureSecurity(webApiLocation);`
`243`	`244`	`//DeleteDirectory(Path.Combine(installFolder, "letsencrypt"));`
`244`	`245`	`IncrementProgressBar(session);`
`245`	`246`
`@@ -348,8 +349,8 @@ public static ActionResult UpdateCA(Session session)`
`348`	`349`	`ControlSites(customerNumber, domain, apiPort, uiPort, true);`
`349`	`350`	`IncrementProgressBar(session);`
`350`	`351`
`351`		`- CongigureSecurity(uiIisDir);`
`352`		`- CongigureSecurity(webApiLocation);`
	`352`	`+ ConfigureSecurity(uiIisDir);`
	`353`	`+ ConfigureSecurity(webApiLocation);`
`353`	`354`
`354`	`355`	`DeleteDirectory(apiTemp);`
`355`	`356`	`DeleteDirectory(clientTemp);`
`@@ -510,7 +511,7 @@ private static void RenameFolders(string location, string apiName, string uiName`
`510`	`511`	`DeleteDirectory(Path.Combine(location, "eform-client"));`
`511`	`512`	`}`
`512`	`513`
`513`		`- public static void CongigureSecurity(string folder)`
	`514`	`+ public static void ConfigureSecurity(string folder)`
`514`	`515`	`{`
`515`	`516`	`using (var powershell = PowerShell.Create())`
`516`	`517`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public OperationDataResult<List<Case>> Index(int id)`
`21`	`21`	`try`
`22`	`22`	`{`
`23`	`23`	`var core = _coreHelper.GetCore();`
`24`		`- var model = core.CaseReadAll(id, null, null);`
	`24`	`+ var model = core.CaseReadAll(id, null, null, Constants.WorkflowStates.NotRemoved, "", true, Constants.CaseSortParameters.CreatedAt);`
`25`	`25`	`return new OperationDataResult<List<Case>>(true, model);`
`26`	`26`	`}`
`27`	`27`	`catch (Exception)`
Original file line number	Diff line number	Diff line change
`@@ -258,6 +258,7 @@ public HttpResponseMessage UploadEformZip()`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`ZipFile.ExtractToDirectory(filePath, extractPath);`
	`261`	`+ File.Delete(filePath);`
`261`	`262`	`return Request.CreateResponse(HttpStatusCode.OK);`
`262`	`263`	`}`
`263`	`264`	`}`