handle OPTIONS and properly save autostart api setting

ffrank06 · Jun 26, 2018 · bc1ba36 · bc1ba36
1 parent d7a9007
commit bc1ba36
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/EDEngineer.Server/Server.fs b/EDEngineer.Server/Server.fs
@@ -300,7 +300,7 @@ let start (token,
           (request(fun request ->
             let timestampString = match request.queryParam "last" with
                                   | Choice1Of2 s     -> Some(s)
-                                  | Choice2Of2 other -> None
+                                  | Choice2Of2 _ -> None
 
             cmdr {
               let! state = stateRoute commander
@@ -314,7 +314,12 @@ let start (token,
                                            | _                     -> false)
               return (operations, l) |> FormatPicker(f) |> OK >=> MimeType(f)
             })))
-
+
+        OPTIONS >=>
+            fun context ->
+                context |> (
+                    OK "CORS approved" )
+
         NOT_FOUND "Route not found" ] >=> setHeader "Access-Control-Allow-Origin" "*" >=> cors corsConfig
 
   startWebServer { 

diff --git a/EDEngineer/EDEngineer.csproj b/EDEngineer/EDEngineer.csproj
@@ -32,8 +32,8 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>9</ApplicationRevision>
-    <ApplicationVersion>1.1.2.9</ApplicationVersion>
+    <ApplicationRevision>10</ApplicationRevision>
+    <ApplicationVersion>1.1.2.10</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/EDEngineer/Utils/System/ServerBridge.cs b/EDEngineer/Utils/System/ServerBridge.cs
@@ -94,7 +94,10 @@ public void Stop()
 
         public void Dispose()
         {
-            Stop();
+            if (cts?.IsCancellationRequested == false)
+            {
+                cts.Cancel();
+            }
         }
 
         private bool TryGetPort(out ushort port)