Commit bf5e1a04 authored by Anmol Gupta's avatar Anmol Gupta Committed by manzarul Haque
Browse files

Sc 1388 (#325)

* Issue#SC-1388 ADDED API TO HANDLE THE TENANT REJECTION

* SC-1388 validating auth token for the reject request

* Issue#SC-1388 TOKEN ID VALIDATION WAY CHANGED
Showing with 57 additions and 18 deletions
+57 -18
package controllers.tenantmigration;
import controllers.BaseController;
import controllers.usermanagement.validator.MigrationRejectRequestValidator;
import org.sunbird.common.models.util.ActorOperations;
import org.sunbird.common.models.util.JsonKey;
import org.sunbird.common.request.Request;
......@@ -8,7 +9,9 @@ import org.sunbird.common.request.UserTenantMigrationRequestValidator;
import play.libs.F.Promise;
import play.mvc.Result;
/** @author Amit Kumar This controller will handle all the request related for user migration. */
/** @author Amit Kumar This controller will handle all the request related for user migration.
* @author anmolgupta
* */
public class TenantMigrationController extends BaseController {
/**
......@@ -17,27 +20,29 @@ public class TenantMigrationController extends BaseController {
* @return Result
*/
public Promise<Result> userTenantMigrate() {
return handleRequest(
ActorOperations.USER_TENANT_MIGRATE.getValue(),
request().body().asJson(),
req -> {
Request request = (Request) req;
new UserTenantMigrationRequestValidator().validateUserTenantMigrateRequest(request);
return null;
},
null,
null,
true);
return handleRequest(
ActorOperations.USER_TENANT_MIGRATE.getValue(),
request().body().asJson(),
req -> {
Request request = (Request) req;
new UserTenantMigrationRequestValidator().validateUserTenantMigrateRequest(request);
return null;
},
null,
null,
true);
}
public Promise<Result> tenantReject(String userId) {
String tokenUserId=ctx().flash().get(JsonKey.USER_ID);
return handleRequest(
ActorOperations.REJECT_MIGRATION.getValue(),
null,
null,
request -> {
MigrationRejectRequestValidator.getInstance(tokenUserId,userId).validate();
return null;
},
userId,
JsonKey.USER_ID,
false);
}
JsonKey.USER_ID, false);
}
}
\ No newline at end of file
package controllers.usermanagement.validator;
import org.apache.commons.lang3.StringUtils;
import org.sunbird.common.exception.ProjectCommonException;
import org.sunbird.common.models.util.JsonKey;
import org.sunbird.common.request.BaseRequestValidator;
import org.sunbird.common.responsecode.ResponseCode;
import java.text.MessageFormat;
public class MigrationRejectRequestValidator extends BaseRequestValidator {
private String tokenUserId,userId;
private MigrationRejectRequestValidator(String tokenUserId, String userId) {
this.tokenUserId=tokenUserId;
this.userId=userId;
}
public static MigrationRejectRequestValidator getInstance(String tokenUserId, String authToken) {
return new MigrationRejectRequestValidator(tokenUserId, authToken);
}
public void validate() {
if(!StringUtils.equalsIgnoreCase(tokenUserId,userId)){
throw new ProjectCommonException(ResponseCode.invalidParameterValue.getErrorCode(), MessageFormat.format(ResponseCode.invalidParameterValue.getErrorMessage(), userId, JsonKey.USER_ID), ResponseCode.CLIENT_ERROR.getResponseCode());
}
}
}
\ No newline at end of file
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