Skip to content

Commit 3133be7

Browse files
committed
SEBSERV-652 fixed by apply proper form URL encoding to Moodle POST body
1 parent 77d61df commit 3133be7

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java

-10
Original file line numberDiff line numberDiff line change
@@ -629,16 +629,6 @@ public static String toColorFractionString(final int fraction) {
629629
}
630630

631631
public static String toAppFormUrlEncodedBody(final MultiValueMap<String, String> attributes) {
632-
return toAppFormUrlEncodedBodyForSPService(attributes);
633-
// TODO do it all the same with toAppFormUrlEncodedBody
634-
// if (attributes == null) {
635-
// return StringUtils.EMPTY;
636-
// }
637-
//
638-
// return reduceFormUrlAttributes(attributes);
639-
}
640-
641-
public static String toAppFormUrlEncodedBodyForSPService(final MultiValueMap<String, String> attributes) {
642632
if (attributes == null) {
643633
return StringUtils.EMPTY;
644634
}

src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ScreenProctoringAPIBinding.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
package ch.ethz.seb.sebserver.webservice.servicelayer.session.impl.proctoring;
1010

11-
import static ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ScreenProctoringGroopRecordDynamicSqlSupport.sebGroupId;
1211
import static ch.ethz.seb.sebserver.webservice.servicelayer.session.impl.proctoring.SPS_API.*;
1312

1413
import java.util.*;
@@ -914,7 +913,7 @@ Tuple<String> createSEBSession(
914913
params.add(SESSION.ATTR_CLIENT_MACHINE_NAME, clientConnection.getClientMachineName());
915914
params.add(SESSION.ATTR_CLIENT_OS_NAME, clientConnection.getClientOsName());
916915
params.add(SESSION.ATTR_CLIENT_VERSION, clientConnection.getClientVersion());
917-
final String paramsFormEncoded = Utils.toAppFormUrlEncodedBodyForSPService(params);
916+
final String paramsFormEncoded = Utils.toAppFormUrlEncodedBody(params);
918917

919918
final ResponseEntity<String> exchange = apiTemplate.exchange(uri, paramsFormEncoded);
920919
if (exchange.getStatusCode() != HttpStatus.OK) {
@@ -1193,7 +1192,7 @@ private ScreenProctoringGroup createGroupOnSPS(
11931192
params.add(GROUP.ATTR_NAME, name);
11941193
params.add(GROUP.ATTR_DESCRIPTION, "Created by SEB Server");
11951194
params.add(GROUP.ATTR_EXAM_ID, spsExamUUID);
1196-
final String paramsFormEncoded = Utils.toAppFormUrlEncodedBodyForSPService(params);
1195+
final String paramsFormEncoded = Utils.toAppFormUrlEncodedBody(params);
11971196

11981197
final ResponseEntity<String> exchange = apiTemplate.exchange(uri, paramsFormEncoded);
11991198
if (exchange.getStatusCode() != HttpStatus.OK) {
@@ -1236,7 +1235,7 @@ private void createExam(
12361235
uuid,
12371236
/*settings.deletionTime */ null,
12381237
supporterIds);
1239-
final String paramsFormEncoded = Utils.toAppFormUrlEncodedBodyForSPService(params);
1238+
final String paramsFormEncoded = Utils.toAppFormUrlEncodedBody(params);
12401239

12411240
final ResponseEntity<String> exchange = apiTemplate.exchange(uri, paramsFormEncoded);
12421241
if (exchange.getStatusCode() != HttpStatus.OK) {
@@ -1358,7 +1357,7 @@ private void createSEBAccess(
13581357
final MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
13591358
params.add(SEB_ACCESS.ATTR_NAME, name);
13601359
params.add(SEB_ACCESS.ATTR_DESCRIPTION, description);
1361-
final String paramsFormEncoded = Utils.toAppFormUrlEncodedBodyForSPService(params);
1360+
final String paramsFormEncoded = Utils.toAppFormUrlEncodedBody(params);
13621361

13631362
final ResponseEntity<String> exchange = apiTemplate.exchange(uri, paramsFormEncoded);
13641363
if (exchange.getStatusCode() != HttpStatus.OK) {

0 commit comments

Comments
 (0)