Update ServerConfig page for IceServers.

immense · May 3, 2020 · 95055e0 · 95055e0
1 parent 088c180
commit 95055e0
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml b/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml
@@ -193,6 +193,7 @@
                     <br />
                     <span asp-validation-for="AppSettingsInput.UseHsts" class="text-danger"></span>
                 </div>
+
                 <div class="form-group">
                     <label asp-for="AppSettingsInput.UseWebRtc"></label>
                     <br />
@@ -201,6 +202,11 @@
                     <span asp-validation-for="AppSettingsInput.UseWebRtc" class="text-danger"></span>
                 </div>
 
+                <div class="form-group">
+                    <label asp-for="AppSettingsInput.IceServers"></label>
+                    <br />
+                    <span class="text-muted">Must be edited in appsettings.json.</span>
+                </div>
 
                 <h4>Connection Strings</h4>
 

diff --git a/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml.cs b/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml.cs
@@ -127,7 +127,7 @@ private async Task SaveAppSettings()
             }
 
             var settingsJson = JsonSerializer.Deserialize<IDictionary<string, object>>(await System.IO.File.ReadAllTextAsync(savePath));
-
+            AppSettingsInput.IceServers = Configuration.GetSection("ApplicationOptions:IceServers").Get<IceServerModel[]>();
             settingsJson["ApplicationOptions"] = AppSettingsInput;
             settingsJson["ConnectionStrings"] = ConnectionStrings;
 
@@ -154,6 +154,9 @@ public class AppSettingsModel
             [Display(Name = "Enable Windows Event Log")]
             public bool EnableWindowsEventLog { get; set; }
 
+            [Display(Name = "Ice Servers")]
+            public IceServerModel[] IceServers { get; set; }
+
             [Display(Name = "Known Proxies")]
             public string[] KnownProxies { get; set; }
 

diff --git a/Server/appsettings.json b/Server/appsettings.json
@@ -16,8 +16,16 @@
     "DefaultPrompt": "~>",
     "EnableWindowsEventLog": false,
     "IceServers": [
-      { "Url": "stun: stun.l.google.com:19302" },
-      { "Url": "stun: stun4.l.google.com:19302" }
+      {
+        "Url": "stun: stun.l.google.com:19302",
+        "TurnPassword": null,
+        "TurnUsername": null
+      },
+      {
+        "Url": "stun: stun4.l.google.com:19302",
+        "TurnPassword": null,
+        "TurnUsername": null
+      }
     ],
     "KnownProxies": [],
     "MaxConcurrentUpdates": 10,

diff --git a/Server/wwwroot/scripts/RemoteControl/UI.js b/Server/wwwroot/scripts/RemoteControl/UI.js
diff --git a/Server/wwwroot/scripts/RemoteControl/UI.js.map b/Server/wwwroot/scripts/RemoteControl/UI.js.map
diff --git a/Server/wwwroot/scripts/RemoteControl/UI.ts b/Server/wwwroot/scripts/RemoteControl/UI.ts
@@ -497,7 +497,6 @@ export function UpdateCursor(imageBytes: Uint8Array, hotSpotX: number, hotSpotY:
         var base64 = ConvertUInt8ArrayToBase64(imageBytes);
         ScreenViewer.style.cursor = `url('data:image/png;base64,${base64}') ${hotSpotX} ${hotSpotY}, default`;
     }
-    console.log("Cursor updated: " + ScreenViewer.style.cursor);
 }
 
 export function UpdateDisplays(selectedDisplay: string, displayNames: string[]) {