zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-475: Implemented missing configuration options for Zoom proctoring.

Browse source
This commit is contained in:
Damian Büchel 2021-06-25 09:55:02 +02:00
parent 2775abe172
commit f0b71ec10c
7 changed files with 146 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
SafeExamBrowser.Configuration/ConfigurationData/DataMapping/ProctoringDataMapper.cs
View file

@ -20,8 +20,8 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
case Keys.Proctoring.JitsiMeet.AllowChat:
MapJitsiMeetAllowChat(settings, value);
break;
case Keys.Proctoring.JitsiMeet.AllowCloseCaptions:
MapJitsiMeetAllowCloseCaptions(settings, value);
case Keys.Proctoring.JitsiMeet.AllowClosedCaptions:
MapJitsiMeetAllowClosedCaptions(settings, value);
break;
case Keys.Proctoring.JitsiMeet.AllowRaiseHand:
MapJitsiMeetAllowRaiseHands(settings, value);
@ -77,18 +77,36 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
case Keys.Proctoring.WindowVisibility:
MapWindowVisibility(settings, value);
break;
case Keys.Proctoring.Zoom.AllowChat:
MapZoomAllowChat(settings, value);
break;
case Keys.Proctoring.Zoom.AllowClosedCaptions:
MapZoomAllowClosedCaptions(settings, value);
break;
case Keys.Proctoring.Zoom.AllowRaiseHand:
MapZoomAllowRaiseHands(settings, value);
break;
case Keys.Proctoring.Zoom.ApiKey:
MapZoomApiKey(settings, value);
break;
case Keys.Proctoring.Zoom.ApiSecret:
MapZoomApiSecret(settings, value);
break;
case Keys.Proctoring.Zoom.AudioMuted:
MapZoomAudioMuted(settings, value);
break;
case Keys.Proctoring.Zoom.Enabled:
MapZoomEnabled(settings, value);
break;
case Keys.Proctoring.Zoom.MeetingNumber:
MapZoomMeetingNumber(settings, value);
break;
case Keys.Proctoring.Zoom.SendAudio:
MapZoomSendAudio(settings, value);
break;
case Keys.Proctoring.Zoom.SendVideo:
MapZoomSendVideo(settings, value);
break;
case Keys.Proctoring.Zoom.Signature:
MapZoomSignature(settings, value);
break;
@ -98,6 +116,9 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
case Keys.Proctoring.Zoom.UserName:
MapZoomUserName(settings, value);
break;
case Keys.Proctoring.Zoom.VideoMuted:
MapZoomVideoMuted(settings, value);
break;
}
}
@ -109,11 +130,11 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
}
}
private void MapJitsiMeetAllowCloseCaptions(AppSettings settings, object value)
private void MapJitsiMeetAllowClosedCaptions(AppSettings settings, object value)
{
if (value is bool allow)
{
settings.Proctoring.JitsiMeet.AllowCloseCaptions = allow;
settings.Proctoring.JitsiMeet.AllowClosedCaptions = allow;
}
}
@ -280,6 +301,30 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
}
}
private void MapZoomAllowChat(AppSettings settings, object value)
{
if (value is bool allow)
{
settings.Proctoring.Zoom.AllowChat = allow;
}
}
private void MapZoomAllowClosedCaptions(AppSettings settings, object value)
{
if (value is bool allow)
{
settings.Proctoring.Zoom.AllowClosedCaptions = allow;
}
}
private void MapZoomAllowRaiseHands(AppSettings settings, object value)
{
if (value is bool allow)
{
settings.Proctoring.Zoom.AllowRaiseHand = allow;
}
}
private void MapZoomApiKey(AppSettings settings, object value)
{
if (value is string key)
@ -296,6 +341,14 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
}
}
private void MapZoomAudioMuted(AppSettings settings, object value)
{
if (value is bool muted)
{
settings.Proctoring.Zoom.AudioMuted = muted;
}
}
private void MapZoomEnabled(AppSettings settings, object value)
{
if (value is bool enabled)
@ -312,6 +365,22 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
}
}
private void MapZoomSendAudio(AppSettings settings, object value)
{
if (value is bool send)
{
settings.Proctoring.Zoom.SendAudio = send;
}
}
private void MapZoomSendVideo(AppSettings settings, object value)
{
if (value is bool send)
{
settings.Proctoring.Zoom.SendVideo = send;
}
}
private void MapZoomSignature(AppSettings settings, object value)
{
if (value is string signature)
@ -335,5 +404,13 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
settings.Proctoring.Zoom.UserName = name;
}
}
private void MapZoomVideoMuted(AppSettings settings, object value)
{
if (value is bool muted)
{
settings.Proctoring.Zoom.VideoMuted = muted;
}
}
}
}

8
SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs
View file

@ -218,7 +218,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
settings.Proctoring.Enabled = false;
settings.Proctoring.JitsiMeet.AllowChat = false;
settings.Proctoring.JitsiMeet.AllowCloseCaptions = false;
settings.Proctoring.JitsiMeet.AllowClosedCaptions = false;
settings.Proctoring.JitsiMeet.AllowRaiseHand = false;
settings.Proctoring.JitsiMeet.AllowRecording = false;
settings.Proctoring.JitsiMeet.AllowTileView = false;
@ -234,9 +234,15 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
settings.Proctoring.ShowTaskbarNotification = true;
settings.Proctoring.WindowVisibility = WindowVisibility.Hidden;
settings.Proctoring.Zoom.AllowChat = false;
settings.Proctoring.Zoom.AllowClosedCaptions = false;
settings.Proctoring.Zoom.AllowRaiseHand = false;
settings.Proctoring.Zoom.AudioMuted = true;
settings.Proctoring.Zoom.Enabled = false;
settings.Proctoring.Zoom.ReceiveAudio = false;
settings.Proctoring.Zoom.ReceiveVideo = false;
settings.Proctoring.Zoom.SendAudio = true;
settings.Proctoring.Zoom.SendVideo = true;
settings.Proctoring.Zoom.VideoMuted = false;
settings.Security.AllowApplicationLogAccess = false;
settings.Security.AllowTermination = true;

9
SafeExamBrowser.Configuration/ConfigurationData/Keys.cs
View file

@ -229,7 +229,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
internal static class JitsiMeet
{
internal const string AllowChat = "jitsiMeetFeatureFlagChat";
internal const string AllowCloseCaptions = "jitsiMeetFeatureFlagCloseCaptions";
internal const string AllowClosedCaptions = "jitsiMeetFeatureFlagCloseCaptions";
internal const string AllowRaiseHand = "jitsiMeetFeatureFlagRaiseHand";
internal const string AllowRecording = "jitsiMeetFeatureFlagRecording";
internal const string AllowTileView = "jitsiMeetFeatureFlagTileView";
@ -250,13 +250,20 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
internal static class Zoom
{
internal const string AllowChat = "zoomFeatureFlagChat";
internal const string AllowClosedCaptions = "zoomFeatureFlagCloseCaptions";
internal const string AllowRaiseHand = "zoomFeatureFlagRaiseHand";
internal const string ApiKey = "zoomApiKey";
internal const string ApiSecret = "zoomApiSecret";
internal const string AudioMuted = "zoomAudioMuted";
internal const string Enabled = "zoomEnable";
internal const string MeetingNumber = "zoomRoom";
internal const string SendAudio = "zoomSendAudio";
internal const string SendVideo = "zoomSendVideo";
internal const string Signature = "zoomToken";
internal const string Subject = "zoomSubject";
internal const string UserName = "zoomUserInfoDisplayName";
internal const string VideoMuted = "zoomVideoMuted";
}
}

6
SafeExamBrowser.Proctoring/ProctoringController.cs
View file

@ -240,7 +240,7 @@ namespace SafeExamBrowser.Proctoring
if (settings.JitsiMeet.Enabled)
{
html = html.Replace("%%_ALLOW_CHAT_%%", settings.JitsiMeet.AllowChat ? "chat" : "");
html = html.Replace("%%_ALLOW_CLOSED_CAPTIONS_%%", settings.JitsiMeet.AllowCloseCaptions ? "closedcaptions" : "");
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" : "");
@ -255,12 +255,16 @@ namespace SafeExamBrowser.Proctoring
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("%%_API_KEY_%%", settings.Zoom.ApiKey);
html = html.Replace("%%_API_SECRET_%%", settings.Zoom.ApiSecret);
html = html.Replace("'%_AUDIO_MUTED_%'", settings.Zoom.AudioMuted && settings.WindowVisibility != WindowVisibility.Hidden ? "true" : "false");
html = html.Replace("%%_MEETING_NUMBER_%%", settings.Zoom.MeetingNumber);
html = html.Replace("%%_PASSWORD_%%", settings.Zoom.Password);
html = html.Replace("%%_SIGNATURE_%%", settings.Zoom.Signature);
html = html.Replace("%%_USER_NAME_%%", settings.Zoom.UserName);
html = html.Replace("'%_VIDEO_MUTED_%'", settings.Zoom.VideoMuted && settings.WindowVisibility != WindowVisibility.Hidden ? "true" : "false");
}
return html;

23
SafeExamBrowser.Proctoring/Zoom/index.html
View file

@ -34,33 +34,38 @@
var audioContainer = document.getElementsByClassName('join-audio-container')[0];
var leave = document.getElementsByClassName('footer__leave-btn-container')[0];
var more = document.getElementsByClassName('more-button')[0];
var raiseHandContainer = document.getElementsByClassName('participants-section-container__participants-footer')[0];
var videoButton = document.getElementsByClassName('send-video-container__btn')[0];
var videoContainer = document.getElementsByClassName('send-video-container')[0];
if (audioButton && audioJoin < 100) {
if (audioButton && !'%_AUDIO_MUTED_%' && audioJoin < 100) {
audioButton.click();
audioJoin++;
}
if (audioContainer) {
audioContainer.style.visibility = "hidden";
if (audioContainer && !'%_AUDIO_MUTED_%') {
audioContainer.style.visibility = 'hidden';
}
if (leave) {
leave.style.visibility = "hidden";
leave.style.visibility = 'hidden';
}
if (more) {
more.style.visibility = "hidden";
more.style.visibility = 'hidden';
}
if (videoButton && videoJoin < 100) {
if (raiseHandContainer && !'%_ALLOW_RAISE_HAND_%') {
raiseHandContainer.style.visibility = 'hidden';
}
if (videoButton && !'%_VIDEO_MUTED_%' && videoJoin < 100) {
videoButton.click();
videoJoin++;
}
if (videoContainer) {
videoContainer.style.visibility = "hidden";
if (videoContainer && !'%_VIDEO_MUTED_%') {
videoContainer.style.visibility = 'hidden';
}
requestAnimationFrame(initializeUserInterface);
@ -100,7 +105,7 @@
isSupportAV: true,
isSupportBreakout: false,
isSupportChat: '%_ALLOW_CHAT_%',
isSupportCC: false,
isSupportCC: '%_ALLOW_CLOSED_CAPTIONS_%',
isSupportPolling: false,
isSupportQA: false,
isSupportNonverbal: false,

2
SafeExamBrowser.Settings/Proctoring/JitsiMeetSettings.cs
View file

@ -24,7 +24,7 @@ namespace SafeExamBrowser.Settings.Proctoring
/// <summary>
/// Determines whether the user can use close captions.
/// </summary>
public bool AllowCloseCaptions { get; set; }
public bool AllowClosedCaptions { get; set; }
/// <summary>
/// Determines whether the user can use the raise hand feature.

30
SafeExamBrowser.Settings/Proctoring/ZoomSettings.cs
View file

@ -21,6 +21,16 @@ namespace SafeExamBrowser.Settings.Proctoring
/// </summary>
public bool AllowChat { get; set; }
/// <summary>
/// Determines whether the user can use closed captions.
/// </summary>
public bool AllowClosedCaptions { get; set; }
/// <summary>
/// Determines whether the user can use the raise hand feature.
/// </summary>
public bool AllowRaiseHand { get; set; }
/// <summary>
/// The API key to be used for authentication.
/// </summary>
@ -31,6 +41,11 @@ namespace SafeExamBrowser.Settings.Proctoring
/// </summary>
public string ApiSecret { get; set; }
/// <summary>
/// Determines whether the audio starts muted.
/// </summary>
public bool AudioMuted { get; set; }
/// <summary>
/// Determines whether proctoring with Zoom is enabled.
/// </summary>
@ -56,6 +71,16 @@ namespace SafeExamBrowser.Settings.Proctoring
/// </summary>
public bool ReceiveVideo { get; set; }
/// <summary>
/// Determines whether the audio stream of the user will be sent to the server.
/// </summary>
public bool SendAudio { get; set; }
/// <summary>
/// Determines whether the video stream of the user will be sent to the server.
/// </summary>
public bool SendVideo { get; set; }
/// <summary>
/// The signature to be used for authentication.
/// </summary>
@ -70,5 +95,10 @@ namespace SafeExamBrowser.Settings.Proctoring
/// The user name to be used for the meeting.
/// </summary>
public string UserName { get; set; }
/// <summary>
/// Determines whether the video starts muted.
/// </summary>
public bool VideoMuted { get; set; }
}
}