From 54802d8343dcb710ced4d009995a8cc796915039 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 24 Jun 2018 13:03:39 +0300
Subject: Added password encryption. Core version 1.0.0.1 Machine Studio
 version 1.0.0.4

Added forced update to machine studio versions db.
Removed pubxml files from gitignore.
Implemented a publish profile for machine studio update service.

Worked on twine.local IIS & FTP !! :(
Implemented virtual host names for publish and download (MS versions) FTP sites.
---
 .../Update/UpdateServiceHelper.cs                  |  4 ++--
 .../Update/UploadVersionRequest.cs                 |  3 +++
 .../Tango.MachineStudio.Publisher/MainWindow.xaml  |  2 ++
 .../Tango.MachineStudio.Publisher/MainWindowVM.cs  |  9 +++++++++
 .../MachineStudioUpdateService.svc.cs              | 19 ++++++++++++++-----
 .../Publish To Twine Local Via FTP.pubxml          | 21 +++++++++++++++++++++
 .../Tango.MachineStudio.UpdateService.csproj       |  2 +-
 .../Web.Debug.config                               |  5 +++++
 .../Web.Release.config                             |  5 +++++
 .../Tango.MachineStudio.UpdateService/Web.config   | 22 +++++++++++++++++++---
 10 files changed, 81 insertions(+), 11 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Properties/PublishProfiles/Publish To Twine Local Via FTP.pubxml

(limited to 'Software/Visual_Studio/MachineStudio')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UpdateServiceHelper.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UpdateServiceHelper.cs
index 2194ec5cf..067e4470d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UpdateServiceHelper.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UpdateServiceHelper.cs
@@ -13,8 +13,8 @@ namespace Tango.MachineStudio.Common.Update
         public static ChannelFactory<IMachineStudioUpdateService> GetUpdateServiceChannel()
         {
             BasicHttpBinding binding = new BasicHttpBinding(BasicHttpSecurityMode.None);
-            binding.ReceiveTimeout = TimeSpan.FromSeconds(20);
-            binding.SendTimeout = TimeSpan.FromSeconds(20);
+            binding.ReceiveTimeout = TimeSpan.FromSeconds(60);
+            binding.SendTimeout = TimeSpan.FromSeconds(60);
             binding.MaxBufferPoolSize = 6553600;
             binding.MaxBufferSize = 6553600;
             binding.MaxReceivedMessageSize = 6553600;
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadVersionRequest.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadVersionRequest.cs
index 71ce04f1f..18f29eda2 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadVersionRequest.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadVersionRequest.cs
@@ -21,5 +21,8 @@ namespace Tango.MachineStudio.Common.Update
 
         [DataMember]
         public String Comments { get; set; }
+
+        [DataMember]
+        public bool ForcedUpdate { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
index abbfa0aa6..404faf4ab 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
@@ -48,6 +48,8 @@
 
                         <TextBlock FontSize="16" Margin="0 20 0 0">Comments</TextBlock>
                         <TextBox Height="70" Margin="0 5 0 0" Width="500" AcceptsReturn="True" TextWrapping="Wrap" Text="{Binding Comments,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+
+                        <CheckBox Margin="0 10 0 0" IsChecked="{Binding ForcedUpdate}">Forced Update</CheckBox>
                     </StackPanel>
 
                     <Grid DockPanel.Dock="Bottom">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
index 622d3b0d0..11222e806 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
@@ -50,6 +50,14 @@ namespace Tango.MachineStudio.Publisher
             set { _comments = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _forcesUpdate;
+
+        public bool ForcedUpdate
+        {
+            get { return _forcesUpdate; }
+            set { _forcesUpdate = value; RaisePropertyChangedAuto(); }
+        }
+
         private String _currentVersion;
 
         public String CurrentVersion
@@ -135,6 +143,7 @@ namespace Tango.MachineStudio.Publisher
                         Password = Password,
                         Version = CurrentVersion.ToString(),
                         Comments = Comments,
+                        ForcedUpdate = ForcedUpdate,
                     });
 
                     tempFile = Path.Combine(Path.GetTempPath(), response.FileName);
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
index 9b03cda30..4438ad188 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
@@ -30,6 +30,8 @@ namespace Tango.MachineStudio.UpdateService
 
             public String Comments { get; set; }
 
+            public bool ForcedUpdate { get; set; }
+
             public String FilePath { get; set; }
         }
 
@@ -48,7 +50,7 @@ namespace Tango.MachineStudio.UpdateService
             {
                 CheckForUpdatesResponse response = new CheckForUpdatesResponse();
 
-                using (ObservablesContext db = ObservablesContext.CreateDefaultForWeb())
+                using (ObservablesContext db = ObservablesContext.CreateDefault(GetServerAddress()))
                 {
                     db.Configuration.LazyLoadingEnabled = false;
 
@@ -98,7 +100,7 @@ namespace Tango.MachineStudio.UpdateService
             {
                 UploadVersionResponse response = new UploadVersionResponse();
 
-                using (ObservablesContext db = ObservablesContext.CreateDefaultForWeb())
+                using (ObservablesContext db = ObservablesContext.CreateDefault(GetServerAddress()))
                 {
                     db.Configuration.LazyLoadingEnabled = false;
 
@@ -134,6 +136,7 @@ namespace Tango.MachineStudio.UpdateService
                             {
                                 UserGuid = user.Guid,
                                 Comments = request.Comments,
+                                ForcedUpdate = request.ForcedUpdate,
                                 Token = response.Token,
                                 Version = request.Version,
                                 FilePath = response.FilePath,
@@ -169,7 +172,7 @@ namespace Tango.MachineStudio.UpdateService
                 {
                     _pendingUploads.RemoveAll(x => x.Token == upload.Token);
 
-                    using (ObservablesContext db = ObservablesContext.CreateDefaultForWeb())
+                    using (ObservablesContext db = ObservablesContext.CreateDefault(GetServerAddress()))
                     {
                         db.Configuration.LazyLoadingEnabled = false;
 
@@ -178,7 +181,8 @@ namespace Tango.MachineStudio.UpdateService
                             Comments = upload.Comments,
                             FtpFilePath = upload.FilePath,
                             UserGuid = upload.UserGuid,
-                            Version = upload.Version
+                            Version = upload.Version,
+                            ForceUpdate = upload.ForcedUpdate,
                         });
 
                         db.SaveChanges();
@@ -200,7 +204,7 @@ namespace Tango.MachineStudio.UpdateService
         {
             try
             {
-                using (ObservablesContext db = ObservablesContext.CreateDefaultForWeb())
+                using (ObservablesContext db = ObservablesContext.CreateDefault(GetServerAddress()))
                 {
                     return db.MachineStudioVersions.FirstOrDefault().Version;
                 }
@@ -210,5 +214,10 @@ namespace Tango.MachineStudio.UpdateService
                 throw new FaultException(ex.ToString());
             }
         }
+
+        private String GetServerAddress()
+        {
+            return ConfigurationManager.AppSettings["ServerAddress"].ToString();
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Properties/PublishProfiles/Publish To Twine Local Via FTP.pubxml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Properties/PublishProfiles/Publish To Twine Local Via FTP.pubxml
new file mode 100644
index 000000000..64a875aa4
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Properties/PublishProfiles/Publish To Twine Local Via FTP.pubxml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>FTP</WebPublishMethod>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <publishUrl>twine01</publishUrl>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <FtpPassiveMode>True</FtpPassiveMode>
+    <FtpSitePath />
+    <UserName>MachineStudioUpdateService|Roy</UserName>
+    <_SavePWD>True</_SavePWD>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj
index 08d40b49a..8dc2d264e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj
@@ -81,7 +81,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="packages.config" />
-    <None Include="Properties\PublishProfiles\Twine Local Via FTP.pubxml" />
+    <None Include="Properties\PublishProfiles\Publish To Twine Local Via FTP.pubxml" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.Debug.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.Debug.config
index fae9cfefa..0b30d99e4 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.Debug.config
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.Debug.config
@@ -14,6 +14,11 @@
         xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
     </connectionStrings>
   -->
+
+  <appSettings>
+    <add key="ServerAddress" value="localhost\SQLEXPRESS" />
+  </appSettings>
+  
   <system.web>
     <!--
       In the example below, the "Replace" transform will replace the entire 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.Release.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.Release.config
index d2da57796..1c52b9ab5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.Release.config
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.Release.config
@@ -14,6 +14,11 @@
         xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
     </connectionStrings>
   -->
+
+  <appSettings>
+    <add key="ServerAddress" value="localhost\SQLTWINE" />
+  </appSettings>
+  
   <system.web>
     <!--<compilation xdt:Transform="RemoveAttributes(debug)" />-->
     <!--
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.config
index 276756b0e..6fd5e637f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.config
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
     <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
@@ -6,15 +6,31 @@
   </configSections>
   <appSettings>
     <add key="aspnet:UseTaskFriendlySynchronizationContext" value="true" />
+    <add key="ServerAddress" value="localhost\SQLTWINE" />
     <add key="FtpHost" value="Twine01" />
-    <add key="UserName" value="FTPWriter" />
+    <add key="UserName" value="MachineStudio|FTPWriter" />
     <add key="Password" value="Aa123456" />
   </appSettings>
   <system.web>
-    <compilation debug="true" targetFramework="4.6" />
+    <compilation debug="true" targetFramework="4.6">
+      <assemblies>
+        <remove assembly="Tango.Video" />
+      </assemblies>
+    </compilation>
     <httpRuntime targetFramework="4.6" />
   </system.web>
   <system.serviceModel>
+    <bindings>
+      <basicHttpBinding>
+        <binding name="LongTimeoutHttpBinding" receiveTimeout="00:01:00" />
+      </basicHttpBinding>
+    </bindings>
+    <services>
+      <service name="Tango.MachineStudio.UpdateService.MachineStudioUpdateService">
+        <endpoint address="" binding="basicHttpBinding" bindingConfiguration="LongTimeoutHttpBinding"
+          name="" contract="Tango.MachineStudio.Common.Update.IMachineStudioUpdateService" />
+      </service>
+    </services>
     <behaviors>
       <serviceBehaviors>
         <behavior>
-- 
cgit v1.3.1