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

SEBWIN-556: Now sending OS and SEB version information to SEB Server as early as possible.

Browse source
This commit is contained in:
Damian Büchel 2022-05-18 09:17:08 +02:00
parent bfe4a32098
commit dce2477a4b
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.editorconfig
View file

@ -63,10 +63,11 @@ csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
csharp_style_prefer_not_pattern = true:suggestion csharp_style_prefer_not_pattern = true:suggestion
csharp_style_prefer_extended_property_pattern = true:suggestion csharp_style_prefer_extended_property_pattern = true:suggestion
csharp_style_var_for_built_in_types = false:silent csharp_style_var_for_built_in_types = true:suggestion
csharp_style_var_when_type_is_apparent = false:silent csharp_style_var_when_type_is_apparent = true:suggestion
csharp_style_var_elsewhere = false:silent csharp_style_var_elsewhere = true:suggestion
csharp_space_after_cast = true csharp_space_after_cast = true
csharp_space_around_binary_operators = before_and_after
[*.xml] [*.xml]
indent_style = space indent_style = space

8
SafeExamBrowser.Server/ServerProxy.cs
View file

@ -146,7 +146,9 @@ namespace SafeExamBrowser.Server
public ServerResponse<IEnumerable<Exam>> GetAvailableExams(string examId = default) public ServerResponse<IEnumerable<Exam>> GetAvailableExams(string examId = default)
{ {
var authorization = ("Authorization", $"Bearer {oauth2Token}"); var authorization = ("Authorization", $"Bearer {oauth2Token}");
var content = $"institutionId={settings.Institution}{(examId == default ? "" : $"&examId={examId}")}"; var clientInfo = $"client_id={userInfo.GetUserName()}&seb_machine_name={systemInfo.Name}";
var versionInfo = $"seb_os_name={systemInfo.OperatingSystemInfo}&seb_version={appConfig.ProgramInformationalVersion}";
var content = $"institutionId={settings.Institution}&{clientInfo}&{versionInfo}{(examId == default ? "" : $"&examId={examId}")}";
var contentType = "application/x-www-form-urlencoded"; var contentType = "application/x-www-form-urlencoded";
var exams = default(IList<Exam>); var exams = default(IList<Exam>);
@ -307,9 +309,7 @@ namespace SafeExamBrowser.Server
public ServerResponse SendSessionIdentifier(string identifier) public ServerResponse SendSessionIdentifier(string identifier)
{ {
var authorization = ("Authorization", $"Bearer {oauth2Token}"); var authorization = ("Authorization", $"Bearer {oauth2Token}");
var clientInfo = $"client_id={userInfo.GetUserName()}&seb_machine_name={systemInfo.Name}"; var content = $"examId={examId}&seb_user_session_id={identifier}";
var versionInfo = $"seb_os_name={systemInfo.OperatingSystemInfo}&seb_version={appConfig.ProgramInformationalVersion}";
var content = $"examId={examId}&{clientInfo}&{versionInfo}&seb_user_session_id={identifier}";
var contentType = "application/x-www-form-urlencoded"; var contentType = "application/x-www-form-urlencoded";
var token = ("SEBConnectionToken", connectionToken); var token = ("SEBConnectionToken", connectionToken);