Merge pull request #22 from cazac9/master

renemadsen · web-flow · commit 8dde50f3acf3 · 2017-10-31T10:36:03.000+01:00
enable ssl &amp; install location
diff --git a/eFormAPI/Installation/CustomActions/CustomAction.cs b/eFormAPI/Installation/CustomActions/CustomAction.cs
@@ -16,8 +16,6 @@ namespace CustomActions
     public class CustomActions
     {
         public static Session Session;
-        public static string IisSitesDir = @"C:\inetpub\wwwroot\";
-        public static string TempDir = @"C:\inetpub\wwwroot\microtingTemp";
 
         [CustomAction]
         public static ActionResult GetAPIsListCA(Session session)
@@ -75,29 +73,30 @@ public static ActionResult InstallCA(Session session)
 
                 if (session.CustomActionData["INSTMODE"] != "Install")
                     return ActionResult.Success;
-                
+
+                var tmpDir = session.CustomActionData["INSTALLFOLDER"] + "microtingTemp";
+
                 var customerNumber = session.CustomActionData["CUSTOMERNUMBER"];
                 var domain = session.CustomActionData["DOMAINNAME"];
 
                 session.Log("Get latest product version called");
-                GetProductLatestVersion(TempDir);
+                GetProductLatestVersion(tmpDir);
                 IncrementProgressBar(session);
 
-                var uiPorts = Directory.GetDirectories(IisSitesDir).Where(t => t.Contains("_client_")).Select(t => int.Parse(t.Split('_').Last()));
-                var nextUiPort = uiPorts.Any() ? uiPorts.Max() + 1 : 3000;
+                var webApiPort = GetWebApiPort();
+                var nextUiPort = webApiPort-2000;
                 var uiName = $"{customerNumber}_{domain}_client_{nextUiPort}";
-                var uiIisDir = IisSitesDir + uiName;
-                var angularSolutionLocation = $@"{TempDir}\eform-client";
-                session.Log("Build Angullar app tasrk started");
+                var uiIisDir = session.CustomActionData["INSTALLFOLDER"] + uiName;
+                var angularSolutionLocation = $@"{tmpDir}\eform-client";
+                session.Log("Build Angullar app task started");
                 BuildAngularApp(uiIisDir, angularSolutionLocation);
                 IncrementProgressBar(session);
 
-                var webApiLocation = $@"{TempDir}\eFormAPI\eFormAPI";
-                var webApiPort = GetWebApiPort();
+                var webApiLocation = $@"{tmpDir}\eFormAPI\eFormAPI";
                 var webApiName = $"{customerNumber}_{domain}_{webApiPort}";
-                var webApiIisDir = IisSitesDir + webApiName;
+                var webApiIisDir = session.CustomActionData["INSTALLFOLDER"] + webApiName;
                 session.Log("Build WebAPI called");
-               // Debugger.Launch();
+
                 BuildWebApi(webApiLocation, webApiIisDir);
                 IncrementProgressBar(session);
                 session.Log("Host WebAPI called");
@@ -120,11 +119,13 @@ public static ActionResult InstallCA(Session session)
                 SaveInstances(webApiName);
                 IncrementProgressBar(session);
 
-                RunProcess($@"{TempDir}\eFormAPI\Installation\letsencrypt\letsencrypt.exe", $"--plugin manual --manualhost {uiName}  --webroot {IisSitesDir.TrimEnd('\\')}");
+                if (session.CustomActionData["GENERATESSL"]== "1")
+                    RunProcess($@"{tmpDir}\eFormAPI\Installation\letsencrypt\letsencrypt.exe", $"--plugin manual --manualhost {uiName}  --webroot {session.CustomActionData["INSTALLFOLDER"].TrimEnd('\\')}");
+
                 IncrementProgressBar(session);
 
                 session.Log("Clear temp dir called");
-                DeleteDirectory(TempDir);
+                DeleteDirectory(tmpDir);
                 IncrementProgressBar(session);
 
                 return ActionResult.Success;
@@ -165,29 +166,33 @@ public static ActionResult UpdateCA(Session session)
                 if (session.CustomActionData["INSTMODE"] != "Update")
                     return ActionResult.Success;
 
-                var api = session.CustomActionData["DOMAINNAME"].Split('_');
+                var domainName = session.CustomActionData["DOMAINNAME"];
+                var api =  domainName.Split('_');
                 var domain = api[1];
                 var customerNumber = api.First();
                 var apiPort = int.Parse(api.Last());
                 var uiPort = apiPort - 2000;
 
+                var installDir = GetInstallDirrectory(domainName);
+                var tmpDir = Path.Combine(installDir + "microtingTemp");
+
                 // stop sites
                 ControlSites(customerNumber, domain, apiPort, uiPort, false);
                 IncrementProgressBar(session);
 
-                GetProductLatestVersion(TempDir);
+                GetProductLatestVersion(tmpDir);
                 IncrementProgressBar(session);
 
                 // client update
                 var uiName = $"{customerNumber}_{domain}_client_{uiPort}";
-                var uiIisDir = @"C:\inetpub\wwwroot\" + uiName;
+                var uiIisDir = Path.Combine(installDir + uiName);
 
                 RunProcess(@"sc", $"stop eformangular{uiName.Replace(".", "")}.exe");
                 Thread.Sleep(1000);
                 RunProcess(@"C:\Program Files\nodejs\node.exe", "svc.js uninstall", uiIisDir);
                 IncrementProgressBar(session);
 
-                BuildAngularApp(uiIisDir, TempDir + "\\eform-client");
+                BuildAngularApp(uiIisDir, tmpDir + "\\eform-client");
                 IncrementProgressBar(session);
 
                
@@ -196,14 +201,14 @@ public static ActionResult UpdateCA(Session session)
 
                 // api update
                 var webApiName = $"{customerNumber}_{domain}_{apiPort}";
-                var webApiIisDir = @"C:\inetpub\wwwroot\" + webApiName;
-                BuildWebApi(TempDir + "\\eFormAPI\\eFormAPI", webApiIisDir);
+                var webApiIisDir = Path.Combine(installDir + webApiName);
+                BuildWebApi(tmpDir + "\\eFormAPI\\eFormAPI", webApiIisDir);
                 IncrementProgressBar(session);
 
                 ControlSites(customerNumber, domain, apiPort, uiPort, true);
                 IncrementProgressBar(session);
 
-                DeleteDirectory(TempDir);
+                DeleteDirectory(tmpDir);
                 IncrementProgressBar(session);
 
                 return ActionResult.Success;
@@ -227,24 +232,26 @@ public static ActionResult RemoveCA(Session session)
 
                 ResetProgressBar(session, 6);
 
-                var api = session.CustomActionData["DOMAINNAME"].Split('_');
+                var domainName = session.CustomActionData["DOMAINNAME"];
+                var api = domainName.Split('_');
                 var domain = api[1];
                 var customerNumber = api.First();
                 var apiPort = int.Parse(api.Last());
                 var uiPort = apiPort - 2000;
 
+                var installDir = GetInstallDirrectory(domainName);          
+
                 var uiName = $"{customerNumber}_{domain}_client_{uiPort}";
-                var uiIisDir = @"C:\inetpub\wwwroot\" + uiName;
+                var uiIisDir = Path.Combine(installDir + uiName);
                 var webApiName = $"{customerNumber}_{domain}_{apiPort}";
-                var webApiIisDir = @"C:\inetpub\wwwroot\" + webApiName;
-                
+                var webApiIisDir = Path.Combine(installDir + webApiName);
+
                 // stop sites
                 ControlSites(customerNumber, domain, apiPort, uiPort, false);
                 IncrementProgressBar(session);
                 RemoveSites(customerNumber, domain, apiPort, uiPort);
                 IncrementProgressBar(session);
 
-                //Debugger.Launch();
                 RunProcess(@"sc", $"stop eformangular{uiName.Replace(".", "")}.exe");
                 Thread.Sleep(1000);
                 RunProcess(@"C:\Program Files\nodejs\node.exe", "svc.js uninstall", uiIisDir);
@@ -354,6 +361,15 @@ private static void HostWebApi(string webApiName, int port, string iisDir)
             }
         }
 
+        private static string GetInstallDirrectory(string siteName)
+        {
+            using (var serverManager = new ServerManager())
+            {
+                var sitePath = serverManager.Sites[siteName].Applications["/"].VirtualDirectories["/"].PhysicalPath;
+                 return new DirectoryInfo(sitePath).Parent.FullName + "\\";
+            }
+        }
+
         private static void RunAngularAsWinService(int webApiPort, int uiWinServicePort, string iisDir, string uiName)
         {
             var serverJs = File.ReadAllText(iisDir + @"\server.js");
diff --git a/eFormAPI/Installation/MainInstaller/DomainNameDlg.wxs b/eFormAPI/Installation/MainInstaller/DomainNameDlg.wxs
@@ -3,12 +3,14 @@
     <Fragment>
         <UI>
             <Dialog Id="DomainNameDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
-                <Control Id="NameLabel" Type="Text" X="45" Y="73" Width="100" Height="15" TabSkip="no" Text="&amp;Domain Name:"/>
+                <Control Id="NameLabel" Type="Text" X="45" Y="73" Width="100" Height="15" TabSkip="no" Text="&amp;Domain Name:" />
                 <Control Id="NameEdit" Type="Edit" X="45" Y="85" Width="220" Height="15" Property="DOMAINNAME" Text="{80}" />
                 <Control Type="Text" Id="CustomerNumberText" Width="100" Height="15" X="45" Y="118" Text="&amp;Customer number:" />
-                <Control Type="Edit" Id="CustomerNumber" Width="220" Height="15" X="45" Y="132"  Property="CUSTOMERNUMBER" Text="{80}" />
+                <Control Type="Edit" Id="CustomerNumber" Width="220" Height="15" X="45" Y="132" Property="CUSTOMERNUMBER" Text="{80}" />
               
-                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&amp;Back"/>
+                <Control Type="CheckBox" Id="certgen" Property="GENERATESSL" Width="215" Height="17" X="45" Y="165" CheckBoxValue="1" Text="Generate SSL certificate" />
+              
+                <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>
                 </Control>
diff --git a/eFormAPI/Installation/MainInstaller/MaintenanceTypeModifiedDlg.wxs b/eFormAPI/Installation/MainInstaller/MaintenanceTypeModifiedDlg.wxs
@@ -12,6 +12,7 @@
           <Publish Property="INSTMODE" Value="Install" >1</Publish>
           <Publish Property="DOMAINNAME" Value="{}" >1</Publish>
           <Publish Property="CUSTOMERNUMBER" Value="{}" >1</Publish>
+          <Publish Property="GENERATESSL" Value="{}" >1</Publish>
         </Control>
         <Control Id="Update" Type="PushButton" X="98" Y="139" Width="139" Height="33" Text="&amp;Update" >
           <Condition Action="disable">NOUI</Condition>
diff --git a/eFormAPI/Installation/MainInstaller/Product.wxs b/eFormAPI/Installation/MainInstaller/Product.wxs
@@ -20,17 +20,22 @@
   <Fragment>
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="$(var.ProductName)"/>   
+        <Directory Id="INSTALLFOLDER" Name="$(var.ProductName)" />   
       </Directory> 
     </Directory>
-    
+
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
+
     <Property Id="MSIUSEREALADMINDETECTION" Value="1" />
     <Property Id="MSIINSTALLPERUSER" Value="{}" />
+    
 
     <SetProperty Id="ARPNOMODIFY" Value="1" After="InstallValidate" Sequence="execute"/>
     <Property Id="INSTMODE" Value="{}" Secure="yes" />
     <Property Id="DOMAINNAME" Value="{}" Secure="yes"/>
     <Property Id="CUSTOMERNUMBER" Value="{}" Secure="yes"/>
+    <Property Id="GENERATESSL" Value="{}" Secure="yes"/>
+    <Property Id="INSTALLFOLDER" Value="C:\inetpub\wwwroot" Secure="yes"/>
 
     <InstallExecuteSequence>
       <Custom Action="SetProductName" After="InstallInitialize"/>
@@ -51,7 +56,7 @@
     <CustomAction Id="RemoveService" BinaryKey="BinaryCA" DllEntry="RemoveCA" Execute="deferred" Impersonate="no" />
     <Binary Id="BinaryCA" SourceFile="BuildedCustomActions\CustomActions.CA.dll"/> 
 
-    <CustomAction Id="SetInstalValues" Property="Install" Value="INSTMODE=[INSTMODE];DOMAINNAME=[DOMAINNAME];CUSTOMERNUMBER=[CUSTOMERNUMBER]" />
+    <CustomAction Id="SetInstalValues" Property="Install" Value="INSTMODE=[INSTMODE];DOMAINNAME=[DOMAINNAME];CUSTOMERNUMBER=[CUSTOMERNUMBER];GENERATESSL=[GENERATESSL];INSTALLFOLDER=[INSTALLFOLDER]" />
     <CustomAction Id="SetRemoveValues" Property="RemoveService" Value="INSTMODE=[INSTMODE];DOMAINNAME=[DOMAINNAME]" />
     <CustomAction Id="SetUpdateServiceValues" Property="UpdateService" Value="INSTMODE=[INSTMODE];DOMAINNAME=[DOMAINNAME]" />
    
diff --git a/eFormAPI/Installation/MainInstaller/WixUI_InstallDirModified.wxs b/eFormAPI/Installation/MainInstaller/WixUI_InstallDirModified.wxs
@@ -33,15 +33,26 @@
       <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="DomainNameDlg"></Publish>
 
       <Publish Dialog="DomainNameDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
-      <Publish Dialog="DomainNameDlg" Control="Next" Event="NewDialog" Value="VerifyReadyModifiedDlg">1</Publish>
+      <Publish Dialog="DomainNameDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">1</Publish>
 
-      <Publish Dialog="VerifyReadyModifiedDlg" Control="Back" Event="NewDialog" Value="DomainNameDlg" Order="1">WixUI_InstallMode = "Install"</Publish>
+      <Publish Dialog="VerifyReadyModifiedDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1">WixUI_InstallMode = "Install"</Publish>
       <Publish Dialog="VerifyReadyModifiedDlg" Control="Back" Event="NewDialog" Value="DomainNameSelectDlg" Order="1">WixUI_InstallMode = "Update" OR WixUI_InstallMode = "Remove"</Publish>
 
       <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeModifiedDlg">1</Publish>
 
       <Publish Dialog="DomainNameSelectDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeModifiedDlg">1</Publish>
       <Publish Dialog="DomainNameSelectDlg" Control="Next" Event="NewDialog" Value="VerifyReadyModifiedDlg">1</Publish>
+
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="DomainNameDlg">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyModifiedDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
+      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
+
+      <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
+      <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
     </UI>
   </Fragment>
 </Wix>
