Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Task #215826 Task #215928 Addition of AclGuard permissions to the modules #938

Open
wants to merge 17 commits into
base: feat-acl
Choose a base branch
from
Open

Task #215826 Task #215928 Addition of AclGuard permissions to the modules #938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b58abd1
added permission and acl to kit-material
Mar 20, 2024
5e025f9
added aclguard and permissions to references controller
Mar 20, 2024
42e06df
added permission to pcrscore controller
Mar 20, 2024
4274726
completed session controller for aclguard
Mar 21, 2024
04d79c9
completed upload-file module
Mar 21, 2024
e23d5b3
completed edit-request module
Mar 21, 2024
0621d15
moved all of the pr into one
Apr 5, 2024
24d8f0a
trying as pr is not reflecting
Apr 5, 2024
36b9756
applied aclguard to user controller
Apr 7, 2024
771a618
refactored aclhelper
Apr 7, 2024
d738f6a
corrected the entities and permissions
Apr 11, 2024
324187b
list pis of beneficiaries completed
Apr 11, 2024
b7f64df
list apis for camps completed
Apr 11, 2024
b7da84b
refactored list functions for aclguard
Apr 21, 2024
0275caf
added the ownership function required entities
Apr 24, 2024
ebc3760
completed aclguard
Apr 25, 2024
c6187b9
resolved coflicts on the local branch
Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 51 additions & 8 deletions src/src/beneficiaries/beneficiaries.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ export class BeneficiariesController {

@Post('/admin/list/duplicates-by-aadhaar')
@UseGuards(AuthGuard)
@UseGuards(AclGuard)
@AclGuardData('beneficiary', ['read', 'read.own'])
async getBeneficiariesDuplicatesByAadhaar(
@Req() request: any,
@Body() body: Record<string, any>,
@Query() query: any,
@Res() response: Record<string, any>,
Expand Down Expand Up @@ -100,6 +103,8 @@ export class BeneficiariesController {

@Post('admin/list/deactivate-duplicates')
@UseGuards(AuthGuard)
@UseGuards(AclGuard)
@AclGuardData('beneficiary', ['read.own'])
async deactivateDuplicateBeneficiaries(
@Body() body: Record<string, any>,
@Req() req: any,
Expand Down Expand Up @@ -154,7 +159,7 @@ export class BeneficiariesController {
@Post('/admin/list')
@UseGuards(AuthGuard)
@UseGuards(AclGuard)
@AclGuardData('beneficiary', ['read', 'read.own'])
@AclGuardData('beneficiary', ['read.own', 'read'])
findAllBeneficiariesForIp(
@Body() request: Record<string, any>,
@Req() req: any,
Expand All @@ -165,6 +170,8 @@ export class BeneficiariesController {

@Post('/:id/is_enrollment_exists')
@UseGuards(AuthGuard)
@UseGuards(AclGuard)
@AclGuardData('beneficiary', ['read.own'])
async isEnrollmentNumberExists(
@Param('id') id: string,
@Body() body: Record<string, any>,
Expand All @@ -180,7 +187,7 @@ export class BeneficiariesController {
@Get('/getStatuswiseCount')
@UseGuards(AuthGuard)
@UseGuards(AclGuard)
@AclGuardData('beneficiary', ['read', 'read.own'])
@AclGuardData('beneficiary', ['read.own', 'read'])
async getStatuswiseCount(
@Body() body: any,
@Req() request: any,
Expand All @@ -195,6 +202,8 @@ export class BeneficiariesController {

@Get('admin/list/duplicates-count-by-aadhaar')
@UseGuards(AuthGuard)
@UseGuards(AclGuard)
@AclGuardData('beneficiary', ['read.own'])
async getAllDuplicateCountsByAadhaar(
@Req() request: any,
@Query() query: any,
Expand Down Expand Up @@ -305,7 +314,7 @@ export class BeneficiariesController {
@UsePipes(ValidationPipe)
@UseGuards(AuthGuard)
@UseGuards(AclGuard)
@AclGuardData('beneficiary', ['edit.status', 'edit.status.own'])
@AclGuardData('beneficiary', ['edit.status.own'])
async statusUpdate(
@Body() body: StatusUpdateDTO,
@Res() response: any,
Expand Down Expand Up @@ -341,12 +350,25 @@ export class BeneficiariesController {
@UsePipes(ValidationPipe)
@UseGuards(AuthGuard)
@UseGuards(AclGuard)
@AclGuardData('beneficiary', ['edit.status', 'edit.status.own'])
@AclGuardData('beneficiary', ['edit.status.own'])
async statusUpdateByIp(
@Body() body: StatusUpdateDTO,
@Res() response: any,
@Req() request: any,
) {
if (
!(await this.aclHelper.doIHaveAccess(
request,
'beneficiary',
parseInt(body?.user_id, 10),
))
) {
return response.status(403).json({
success: false,
message: 'FORBIDDEN',
data: {},
});
}
const result = await this.beneficiariesService.statusUpdateByIp(
body,
request,
Expand All @@ -361,7 +383,7 @@ export class BeneficiariesController {
@Post('/admin/export-csv')
@UseGuards(AuthGuard)
@UseGuards(AclGuard)
@AclGuardData('beneficiary', ['export.csv', 'export.csv.own'])
@AclGuardData('beneficiary', ['read.own'])
async exportCsv(
@Req() request: any,
@Body() body: any,
Expand All @@ -373,7 +395,7 @@ export class BeneficiariesController {
@Post('/admin/export-subjects-csv')
@UseGuards(AuthGuard)
@UseGuards(AclGuard)
@AclGuardData('beneficiary', ['export.csv', 'export.csv.own'])
@AclGuardData('beneficiary', ['read.own'])
async exportSubjectsCsv(
@Req() request: any,
@Body() body: any,
Expand All @@ -389,7 +411,7 @@ export class BeneficiariesController {
@Post('admin/verify-enrollment')
@UseGuards(AuthGuard)
@UseGuards(AclGuard)
@AclGuardData('beneficiary', ['edit.enrollement', 'edit.enrollement.own'])
@AclGuardData('beneficiary', ['edit.enrollement.own'])
async verifyEnrollment(
@Body() body: any,
@Res() response: any,
Expand Down Expand Up @@ -438,12 +460,29 @@ export class BeneficiariesController {
@Post('admin/reassign')
@UseGuards(AuthGuard)
@UseGuards(AclGuard)
@AclGuardData('beneficiary', ['reassign', 'reassign.own'])
@AclGuardData('beneficiary', ['reassign.facilitator.own'])
async reassignBeneficiary(
@Req() request: any,
@Body() body: any,
@Res() response: any,
) {
const benId = body?.beneficiaryIds;
for (let id of benId) {
if (
!(await this.aclHelper.doIHaveAccess(
request,
'beneficiary',
parseInt(id, 10),
))
) {
return response.status(403).json({
success: false,
message: 'FORBIDDEN',
data: {},
});
}
}

// @TODO - validate access for all beneficiaryIds (if not checked below)

const result = {
Expand Down Expand Up @@ -546,6 +585,8 @@ export class BeneficiariesController {

@Patch('update-Beneficiaries-aadhar/:id')
@UseGuards(AuthGuard)
@UseGuards(AclGuard)
@AclGuardData('beneficiary', ['aadhar.update.own'])
updateBeneficiariesAadhar(
@Param('id') id: string,
@Body() body: Record<string, any>,
Expand All @@ -562,6 +603,8 @@ export class BeneficiariesController {

@Post('/beneficiaries-for-camp')
@UseGuards(AuthGuard)
@UseGuards(AclGuard)
@AclGuardData('beneficiary', ['read.own'])
notRegisteredBeneficiaries(
@Req() request: any,
@Body() body: any,
Expand Down
Loading