Skip to content
GitLab
Unverified Commit e13bf48e authored by Mahesh Kumar Gangula's avatar Mahesh Kumar Gangula Committed by GitHub
Browse files

Merge pull request #396 from PradyumnaNagendra/enrol-api-SB-27532 

SB-27632 fix: Fixed managed user enrol API issue
parents 363e0e9a db1f0ab4
master bootcamp dependabot/maven/course-mw/course-actors-common/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/course-mw/course-actors-common/org.postgresql-postgresql-42.4.1 dependabot/maven/course-mw/enrolment-actor/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/course-mw/sunbird-util/sunbird-cassandra-utils/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/course-mw/sunbird-util/sunbird-notification/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/course-mw/sunbird-util/sunbird-platform-core/actor-core/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/course-mw/sunbird-util/sunbird-platform-core/actor-util/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/course-mw/sunbird-util/sunbird-platform-core/auth-verifier/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/course-mw/sunbird-util/sunbird-platform-core/common-util/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/course-mw/sunbird-util/sunbird-platform-core/common-util/org.apache.kafka-kafka-clients-0.10.2.2 dependabot/maven/service/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 helmchart release-4.4.0 release-4.5.0 release-4.6.0 release-4.8.0 release-4.9.0 release-5.0.0 release-5.0.1 release-5.0.2 release-5.1.0 release-5.2.0 release-5.2.1 release-5.3.0 release-5.3.1 release-5.4.0 release-5.3.1_RC1 release-5.3.0_RC1 release-5.2.0_RC2 release-5.2.0_RC1 release-5.1.0_RC2 release-5.1.0_RC1 release-5.0.1_RC3 release-5.0.1_RC2 release-5.0.1_RC1 release-5.0.0_RC6 release-5.0.0_RC5 release-5.0.0_RC4 release-5.0.0_RC3 release-5.0.0_RC2 release-5.0.0_RC1 release-4.9.0_RC4 release-4.9.0_RC3 release-4.9.0_RC2 release-4.9.0_RC1 release-4.8.0_RC2 release-4.8.0_RC1 release-4.6.0_RC10 release-4.6.0_RC9 release-4.6.0_RC8 release-4.6.0_RC7 release-4.6.0_RC6 release-4.6.0_RC5 release-4.6.0_RC4 release-4.6.0_RC3 release-4.6.0_RC2 release-4.6.0_RC1 release-4.5.0_RC4 release-4.5.0_RC3 release-4.5.0_RC2 release-4.5.0_RC1 release-4.4.0_RC3 release-4.4.0_RC2
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 13 deletions
+17 -13
service/app/controllers/LearnerController.java
+ 3
− 2
View file @ e13bf48e
......@@ -46,8 +46,9 @@ public class LearnerController extends BaseController {
JsonNode requestJson = httpRequest.body().asJson();
Request request =
createAndInitRequest("getConsumption", requestJson, httpRequest);
validator.validateRequestedBy((String) request.getRequest().get(JsonKey.REQUESTED_BY));
request.getRequest().put(JsonKey.USER_ID, request.getRequest().get(JsonKey.REQUESTED_BY));
String userId = (String) request.getContext().getOrDefault(JsonKey.REQUESTED_FOR, request.getContext().get(JsonKey.REQUESTED_BY));
validator.validateRequestedBy(userId);
request.getRequest().put(JsonKey.USER_ID, userId);
validator.validateGetContentState(request);
request = transformUserId(request);
return actorResponseHandler(
......
service/app/controllers/courseenrollment/CourseEnrollmentController.java
+ 14
− 11
View file @ e13bf48e
......@@ -40,10 +40,10 @@ public class CourseEnrollmentController extends BaseController {
fields.addAll(Arrays.asList(JsonKey.NAME, JsonKey.DESCRIPTION, JsonKey.LEAF_NODE_COUNT, JsonKey.APP_ICON));
queryParams.put("fields", fields.toArray(new String[0]));
}
validator.validateRequestedBy((String) request.getRequest().get(JsonKey.REQUESTED_BY));
request.getContext().put(JsonKey.USER_ID, request.getRequest().get(JsonKey.REQUESTED_BY));
request.getRequest().put(JsonKey.USER_ID, request.getRequest().get(JsonKey.REQUESTED_BY));
String userId = (String) request.getContext().getOrDefault(JsonKey.REQUESTED_FOR, request.getContext().get(JsonKey.REQUESTED_BY));
validator.validateRequestedBy(userId);
request.getContext().put(JsonKey.USER_ID, userId);
request.getRequest().put(JsonKey.USER_ID, userId);
request
.getContext()
......@@ -104,8 +104,9 @@ public class CourseEnrollmentController extends BaseController {
Map<String, String[]> queryParams = new HashMap<>(httpRequest.queryString());
String courseId = req.getRequest().containsKey(JsonKey.COURSE_ID) ? JsonKey.COURSE_ID : JsonKey.COLLECTION_ID;
req.getRequest().put(JsonKey.COURSE_ID, req.getRequest().get(courseId));
validator.validateRequestedBy((String) req.getRequest().get(JsonKey.REQUESTED_BY));
req.getRequest().put(JsonKey.USER_ID, req.getRequest().get(JsonKey.REQUESTED_BY));
String userId = (String) req.getContext().getOrDefault(JsonKey.REQUESTED_FOR, req.getContext().get(JsonKey.REQUESTED_BY));
validator.validateRequestedBy(userId);
req.getRequest().put(JsonKey.USER_ID, userId);
validator.validateEnrollCourse(req);
return null;
},
......@@ -122,8 +123,9 @@ public class CourseEnrollmentController extends BaseController {
Map<String, String[]> queryParams = new HashMap<>(httpRequest.queryString());
String courseId = req.getRequest().containsKey(JsonKey.COURSE_ID) ? JsonKey.COURSE_ID : JsonKey.COLLECTION_ID;
req.getRequest().put(JsonKey.COURSE_ID, req.getRequest().get(courseId));
validator.validateRequestedBy((String) req.getRequest().get(JsonKey.REQUESTED_BY));
req.getRequest().put(JsonKey.USER_ID, req.getRequest().get(JsonKey.REQUESTED_BY));
String userId = (String) req.getContext().getOrDefault(JsonKey.REQUESTED_FOR, req.getContext().get(JsonKey.REQUESTED_BY));
validator.validateRequestedBy(userId);
req.getRequest().put(JsonKey.USER_ID, userId);
validator.validateUnenrollCourse(req);
return null;
},
......@@ -149,9 +151,10 @@ public class CourseEnrollmentController extends BaseController {
request
.getContext()
.put(JsonKey.BATCH_DETAILS, httpRequest.queryString().get(JsonKey.BATCH_DETAILS));
validator.validateRequestedBy((String) request.getRequest().get(JsonKey.REQUESTED_BY));
request.getContext().put(JsonKey.USER_ID, request.getRequest().get(JsonKey.REQUESTED_BY));
request.getRequest().put(JsonKey.USER_ID, request.getRequest().get(JsonKey.REQUESTED_BY));
String userId = (String) request.getContext().getOrDefault(JsonKey.REQUESTED_FOR, request.getContext().get(JsonKey.REQUESTED_BY));
validator.validateRequestedBy(userId);
request.getContext().put(JsonKey.USER_ID, userId);
request.getRequest().put(JsonKey.USER_ID, userId);
return null;
},
getAllRequestHeaders((httpRequest)),
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment