diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataProcessor.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataProcessor.cs index 93866272..abbc2a30 100644 --- a/SafeExamBrowser.Configuration/ConfigurationData/DataProcessor.cs +++ b/SafeExamBrowser.Configuration/ConfigurationData/DataProcessor.cs @@ -76,17 +76,12 @@ namespace SafeExamBrowser.Configuration.ConfigurationData private void InitializeProctoringSettings(AppSettings settings) { - settings.Proctoring.Enabled = settings.Proctoring.JitsiMeet.Enabled || settings.Proctoring.Zoom.Enabled; + settings.Proctoring.Enabled = settings.Proctoring.JitsiMeet.Enabled; if (settings.Proctoring.JitsiMeet.Enabled && !settings.Proctoring.JitsiMeet.ReceiveVideo) { settings.Proctoring.WindowVisibility = WindowVisibility.Hidden; } - - if (settings.Proctoring.Zoom.Enabled && !settings.Proctoring.Zoom.ReceiveVideo) - { - settings.Proctoring.WindowVisibility = WindowVisibility.Hidden; - } } private void RemoveLegacyBrowsers(AppSettings settings) diff --git a/SafeExamBrowser.Proctoring/ProctoringControl.cs b/SafeExamBrowser.Proctoring/ProctoringControl.cs index 6e495c72..0591befd 100644 --- a/SafeExamBrowser.Proctoring/ProctoringControl.cs +++ b/SafeExamBrowser.Proctoring/ProctoringControl.cs @@ -94,14 +94,6 @@ namespace SafeExamBrowser.Proctoring credentials.Add(new JProperty("subject", settings.JitsiMeet.ShowMeetingName ? settings.JitsiMeet.Subject : "")); credentials.Add(new JProperty("token", settings.JitsiMeet.Token)); } - else if (settings.Zoom.Enabled) - { - credentials.Add(new JProperty("meetingNumber", settings.Zoom.MeetingNumber)); - credentials.Add(new JProperty("password", settings.Zoom.Password)); - credentials.Add(new JProperty("sdkKey", settings.Zoom.SdkKey)); - credentials.Add(new JProperty("signature", settings.Zoom.Signature)); - credentials.Add(new JProperty("userName", settings.Zoom.UserName)); - } message.Add("credentials", credentials); logger.Debug("Sending credentials to proctoring client."); diff --git a/SafeExamBrowser.Proctoring/ProctoringController.cs b/SafeExamBrowser.Proctoring/ProctoringController.cs index 1c15dfce..1e237a4e 100644 --- a/SafeExamBrowser.Proctoring/ProctoringController.cs +++ b/SafeExamBrowser.Proctoring/ProctoringController.cs @@ -101,12 +101,6 @@ namespace SafeExamBrowser.Proctoring start = !string.IsNullOrWhiteSpace(settings.JitsiMeet.RoomName); start &= !string.IsNullOrWhiteSpace(settings.JitsiMeet.ServerUrl); } - else if (settings.Zoom.Enabled) - { - start = !string.IsNullOrWhiteSpace(settings.Zoom.SdkKey) && !string.IsNullOrWhiteSpace(settings.Zoom.Signature); - start &= !string.IsNullOrWhiteSpace(settings.Zoom.MeetingNumber); - start &= !string.IsNullOrWhiteSpace(settings.Zoom.UserName); - } if (start) { @@ -167,13 +161,6 @@ namespace SafeExamBrowser.Proctoring settings.JitsiMeet.ServerUrl = args.JitsiMeetServerUrl; settings.JitsiMeet.Token = args.JitsiMeetToken; - settings.Zoom.MeetingNumber = args.ZoomMeetingNumber; - settings.Zoom.Password = args.ZoomPassword; - settings.Zoom.SdkKey = args.ZoomSdkKey; - settings.Zoom.Signature = args.ZoomSignature; - settings.Zoom.Subject = args.ZoomSubject; - settings.Zoom.UserName = args.ZoomUserName; - StopProctoring(); StartProctoring(); } @@ -186,10 +173,6 @@ namespace SafeExamBrowser.Proctoring settings.JitsiMeet.ReceiveAudio = receiveAudio; settings.JitsiMeet.ReceiveVideo = receiveVideo; - settings.Zoom.AllowChat = allowChat; - settings.Zoom.ReceiveAudio = receiveAudio; - settings.Zoom.ReceiveVideo = receiveVideo; - if (allowChat || receiveVideo) { settings.WindowVisibility = WindowVisibility.AllowToHide; @@ -225,26 +208,19 @@ namespace SafeExamBrowser.Proctoring }); window = uiFactory.CreateProctoringWindow(control); - window.SetTitle(settings.JitsiMeet.Enabled ? settings.JitsiMeet.Subject : settings.Zoom.Subject); + window.SetTitle(settings.JitsiMeet.Enabled ? settings.JitsiMeet.Subject : ""); window.Show(); if (settings.WindowVisibility == WindowVisibility.AllowToShow || settings.WindowVisibility == WindowVisibility.Hidden) { - if (settings.Zoom.Enabled) - { - window.HideWithDelay(); - } - else - { - window.Hide(); - } + window.Hide(); } IconResource = new XamlIconResource { Uri = new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Desktop;component/Images/ProctoringNotification_Active.xaml") }; Tooltip = text.Get(TextKey.Notification_ProctoringActiveTooltip); NotificationChanged?.Invoke(); - logger.Info($"Started proctoring with {(settings.JitsiMeet.Enabled ? "Jitsi Meet" : "Zoom")}."); + logger.Info($"Started proctoring with {(settings.JitsiMeet.Enabled ? "Jitsi Meet" : "")}."); } catch (Exception e) { @@ -263,10 +239,6 @@ namespace SafeExamBrowser.Proctoring { control.ExecuteScriptAsync("api.executeCommand('hangup'); api.dispose();"); } - else if (settings.Zoom.Enabled) - { - control.ExecuteScriptAsync("ZoomMtg.leaveMeeting({});"); - } Thread.Sleep(2000); @@ -282,36 +254,34 @@ namespace SafeExamBrowser.Proctoring private string LoadContent(ProctoringSettings settings) { - var provider = settings.JitsiMeet.Enabled ? "JitsiMeet" : "Zoom"; - var assembly = Assembly.GetAssembly(typeof(ProctoringController)); - var path = $"{typeof(ProctoringController).Namespace}.{provider}.index.html"; - - using (var stream = assembly.GetManifestResourceStream(path)) - using (var reader = new StreamReader(stream)) + if (settings.JitsiMeet.Enabled) { - var html = reader.ReadToEnd(); + var assembly = Assembly.GetAssembly(typeof(ProctoringController)); + var path = $"{typeof(ProctoringController).Namespace}.JitsiMeet.index.html"; - if (settings.JitsiMeet.Enabled) + using (var stream = assembly.GetManifestResourceStream(path)) + using (var reader = new StreamReader(stream)) { - html = html.Replace("%%_ALLOW_CHAT_%%", settings.JitsiMeet.AllowChat ? "chat" : ""); - html = html.Replace("%%_ALLOW_CLOSED_CAPTIONS_%%", settings.JitsiMeet.AllowClosedCaptions ? "closedcaptions" : ""); - html = html.Replace("%%_ALLOW_RAISE_HAND_%%", settings.JitsiMeet.AllowRaiseHand ? "raisehand" : ""); - html = html.Replace("%%_ALLOW_RECORDING_%%", settings.JitsiMeet.AllowRecording ? "recording" : ""); - html = html.Replace("%%_ALLOW_TILE_VIEW", settings.JitsiMeet.AllowTileView ? "tileview" : ""); - html = html.Replace("'%_AUDIO_MUTED_%'", settings.JitsiMeet.AudioMuted && settings.WindowVisibility != WindowVisibility.Hidden ? "true" : "false"); - html = html.Replace("'%_AUDIO_ONLY_%'", settings.JitsiMeet.AudioOnly ? "true" : "false"); - html = html.Replace("'%_VIDEO_MUTED_%'", settings.JitsiMeet.VideoMuted && settings.WindowVisibility != WindowVisibility.Hidden ? "true" : "false"); - } - else if (settings.Zoom.Enabled) - { - html = html.Replace("'%_ALLOW_CHAT_%'", settings.Zoom.AllowChat ? "true" : "false"); - html = html.Replace("'%_ALLOW_CLOSED_CAPTIONS_%'", settings.Zoom.AllowClosedCaptions ? "true" : "false"); - html = html.Replace("'%_ALLOW_RAISE_HAND_%'", settings.Zoom.AllowRaiseHand ? "true" : "false"); - html = html.Replace("'%_AUDIO_MUTED_%'", settings.Zoom.AudioMuted && settings.WindowVisibility != WindowVisibility.Hidden ? "true" : "false"); - html = html.Replace("'%_VIDEO_MUTED_%'", settings.Zoom.VideoMuted && settings.WindowVisibility != WindowVisibility.Hidden ? "true" : "false"); - } + var html = reader.ReadToEnd(); - return html; + if (settings.JitsiMeet.Enabled) + { + html = html.Replace("%%_ALLOW_CHAT_%%", settings.JitsiMeet.AllowChat ? "chat" : ""); + html = html.Replace("%%_ALLOW_CLOSED_CAPTIONS_%%", settings.JitsiMeet.AllowClosedCaptions ? "closedcaptions" : ""); + html = html.Replace("%%_ALLOW_RAISE_HAND_%%", settings.JitsiMeet.AllowRaiseHand ? "raisehand" : ""); + html = html.Replace("%%_ALLOW_RECORDING_%%", settings.JitsiMeet.AllowRecording ? "recording" : ""); + html = html.Replace("%%_ALLOW_TILE_VIEW", settings.JitsiMeet.AllowTileView ? "tileview" : ""); + html = html.Replace("'%_AUDIO_MUTED_%'", settings.JitsiMeet.AudioMuted && settings.WindowVisibility != WindowVisibility.Hidden ? "true" : "false"); + html = html.Replace("'%_AUDIO_ONLY_%'", settings.JitsiMeet.AudioOnly ? "true" : "false"); + html = html.Replace("'%_VIDEO_MUTED_%'", settings.JitsiMeet.VideoMuted && settings.WindowVisibility != WindowVisibility.Hidden ? "true" : "false"); + } + + return html; + } + } + else + { + return ""; } } diff --git a/SafeExamBrowser.Proctoring/SafeExamBrowser.Proctoring.csproj b/SafeExamBrowser.Proctoring/SafeExamBrowser.Proctoring.csproj index a3d2ed7d..a50134db 100644 --- a/SafeExamBrowser.Proctoring/SafeExamBrowser.Proctoring.csproj +++ b/SafeExamBrowser.Proctoring/SafeExamBrowser.Proctoring.csproj @@ -117,7 +117,6 @@ - diff --git a/SafeExamBrowser.Proctoring/Zoom/index.html b/SafeExamBrowser.Proctoring/Zoom/index.html deleted file mode 100644 index 537ff014..00000000 --- a/SafeExamBrowser.Proctoring/Zoom/index.html +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file