Skip to content

Commit

Permalink
Merge pull request #87 from arati-tekdi/main
Browse files Browse the repository at this point in the history 
Removed checks
  • Loading branch information
@Shubham4026
Shubham4026 authored Feb 25, 2025
2 parents f02b9e5 + cfee051 commit 2291b29
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 48 deletions.
64 changes: 32 additions & 32 deletions src/common/middleware/apiConfig.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ export const apiList = {
{
patch: {
//PRIVILEGE_CHECK: privilegeGroup.content.update,
ROLE_CHECK: rolesGroup.admin_scta_ccta,
//ROLE_CHECK: rolesGroup.admin_scta_ccta,
},
},
'/questionset/v5/hierarchy/update',
Expand Down Expand Up @@ -720,44 +720,44 @@ export const apiList = {
'/action/questionset/v2/create': createRouteObject(
{
post: {
PRIVILEGE_CHECK: privilegeGroup.content.create,
ROLE_CHECK: rolesGroup.admin_scta_ccta,
//PRIVILEGE_CHECK: privilegeGroup.content.create,
//ROLE_CHECK: rolesGroup.admin_scta_ccta,
},
},
'/questionset/v5/create',
),
'/action/questionset/v2/update/:identifier': createRouteObject(
{
patch: {
PRIVILEGE_CHECK: privilegeGroup.content.update,
ROLE_CHECK: rolesGroup.admin_scta_ccta,
//PRIVILEGE_CHECK: privilegeGroup.content.update,
//ROLE_CHECK: rolesGroup.admin_scta_ccta,
},
},
'/questionset/v5/update/:identifier',
),
'/action/questionset/v2/review/:identifier': createRouteObject(
{
post: {
PRIVILEGE_CHECK: privilegeGroup.content.review,
ROLE_CHECK: rolesGroup.admin_scta_ccta,
//PRIVILEGE_CHECK: privilegeGroup.content.review,
///OLE_CHECK: rolesGroup.admin_scta_ccta,
},
},
'/questionset/v5/review/:identifier',
),
'/action/questionset/v2/publish/:identifier': createRouteObject(
{
post: {
PRIVILEGE_CHECK: privilegeGroup.content.publish,
ROLE_CHECK: rolesGroup.admin_scta_ccta,
//PRIVILEGE_CHECK: privilegeGroup.content.publish,
//ROLE_CHECK: rolesGroup.admin_scta_ccta,
},
},
'/questionset/v5/publish/:identifier',
),
'/action/questionset/v2/retire/:identifier': createRouteObject(
{
delete: {
PRIVILEGE_CHECK: privilegeGroup.content.delete,
ROLE_CHECK: rolesGroup.admin_scta_ccta,
//PRIVILEGE_CHECK: privilegeGroup.content.delete,
//ROLE_CHECK: rolesGroup.admin_scta_ccta,
},
},
'/questionset/v5/retire/:identifier',
Expand All @@ -766,17 +766,17 @@ export const apiList = {
'/action/questionset/v2/reject/:identifier': createRouteObject(
{
post: {
PRIVILEGE_CHECK: privilegeGroup.content.delete,
ROLE_CHECK: rolesGroup.admin_scta_ccta,
//PRIVILEGE_CHECK: privilegeGroup.content.delete,
//ROLE_CHECK: rolesGroup.admin_scta_ccta,
},
},
'/questionset/v5/reject/:identifier',
),
'/action/questionset/v2/comment/update/:identifier': createRouteObject(
{
patch: {
PRIVILEGE_CHECK: privilegeGroup.content.update,
ROLE_CHECK: rolesGroup.admin_scta_ccta,
//PRIVILEGE_CHECK: privilegeGroup.content.update,
//ROLE_CHECK: rolesGroup.admin_scta_ccta,
},
},
'/questionset/v5/comment/update/:identifier',
Expand All @@ -797,77 +797,77 @@ export const apiList = {
'/action/asset/v1/create': createRouteObject(
{
post: {
PRIVILEGE_CHECK: privilegeGroup.content.create,
ROLE_CHECK: rolesGroup.admin_scta_ccta,
//PRIVILEGE_CHECK: privilegeGroup.content.create,
//ROLE_CHECK: rolesGroup.admin_scta_ccta,
},
},
'/asset/v4/create',
),
'/action/asset/v1/update/:identifier': createRouteObject(
{
patch: {
PRIVILEGE_CHECK: privilegeGroup.content.update,
ROLE_CHECK: rolesGroup.admin_scta_ccta,
//PRIVILEGE_CHECK: privilegeGroup.content.update,
//ROLE_CHECK: rolesGroup.admin_scta_ccta,
},
},
'/asset/v4/update/:identifier',
),
'/action/asset/v1/copy/:identifier': createRouteObject(
{
post: {
PRIVILEGE_CHECK: privilegeGroup.content.create,
ROLE_CHECK: rolesGroup.admin_scta_ccta,
//PRIVILEGE_CHECK: privilegeGroup.content.create,
//ROLE_CHECK: rolesGroup.admin_scta_ccta,
},
},
'/asset/v4/copy/:identifier',
),
'/action/asset/v1/upload/url/:identifier': createRouteObject(
{
post: {
PRIVILEGE_CHECK: privilegeGroup.content.create,
ROLE_CHECK: rolesGroup.admin_scta_ccta,
//PRIVILEGE_CHECK: privilegeGroup.content.create,
//ROLE_CHECK: rolesGroup.admin_scta_ccta,
},
},
'/asset/v4/upload/url/:identifier',
),
'/action/asset/v1/upload/:identifier': createRouteObject(
{
post: {
PRIVILEGE_CHECK: privilegeGroup.content.create,
ROLE_CHECK: rolesGroup.admin_scta_ccta,
//PRIVILEGE_CHECK: privilegeGroup.content.create,
//ROLE_CHECK: rolesGroup.admin_scta_ccta,
},
},
'/asset/v4/upload/:identifier',
),
'/action/content/v3/upload/url/:identifier': createRouteObject(
{
post: {
PRIVILEGE_CHECK: privilegeGroup.content.create,
ROLE_CHECK: rolesGroup.admin_scta_ccta,
// PRIVILEGE_CHECK: privilegeGroup.content.create,
// ROLE_CHECK: rolesGroup.admin_scta_ccta,
},
},
'/content/v3/upload/url/:identifier',
),
'/action/content/v3/copy/:identifier': createRouteObject(
{
post: {
ROLE_CHECK: rolesGroup.admin_scta_ccta,
//ROLE_CHECK: rolesGroup.admin_scta_ccta,
},
},
'/content/v3/copy/:identifier',
),
'/action/content/v3/import': createRouteObject(
{
post: {
ROLE_CHECK: rolesGroup.admin_scta_ccta,
//ROLE_CHECK: rolesGroup.admin_scta_ccta,
},
},
'/content/v3/import',
),
'/action/content/v3/dialcode/link': createRouteObject(
{
post: {
ROLE_CHECK: rolesGroup.admin_team_leader,
//ROLE_CHECK: rolesGroup.admin_team_leader,
},
},
'/content/v3/dialcode/link',
Expand All @@ -885,8 +885,8 @@ export const apiList = {
'/action/content/v3/upload/:identifier': createRouteObject(
{
post: {
PRIVILEGE_CHECK: privilegeGroup.content.create,
ROLE_CHECK: rolesGroup.admin_scta_ccta,
// PRIVILEGE_CHECK: privilegeGroup.content.create,
// ROLE_CHECK: rolesGroup.admin_scta_ccta,
},
},
'/content/v3/upload/:identifier',
Expand Down
37 changes: 21 additions & 16 deletions src/common/middleware/middleware.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,22 @@ export class MiddlewareServices {
// Iterate for checks defined for API and push to array
apiList[reqUrl][req.method.toLowerCase()].checksNeeded?.forEach(
(CHECK) => {
checksToExecute.push(
new Promise((res, rej) => {
if (
apiList[reqUrl][req.method.toLowerCase()][CHECK] &&
typeof this.urlChecks[CHECK] === 'function'
) {
this.urlChecks[CHECK](
res,
rej,
req,
apiList[reqUrl][req.method.toLowerCase()][CHECK],
reqUrl,
);
}
}),
);
// checksToExecute.push(
// new Promise((res, rej) => {
// if (
// apiList[reqUrl][req.method.toLowerCase()][CHECK] &&
// typeof this.urlChecks[CHECK] === 'function'
// ) {
// this.urlChecks[CHECK](
// res,
// rej,
// req,
// apiList[reqUrl][req.method.toLowerCase()][CHECK],
// reqUrl,
// );
// }
// }),
// );
},
);

Expand Down Expand Up @@ -154,6 +154,11 @@ export class MiddlewareServices {
}
}
console.log('fullUrl', fullUrl);
//console.log('req: ', req);
console.log(
"req.is('multipart/form-data'): ",
req.is('multipart/form-data'),
);
// Handle multipart/form-data
if (req.is('multipart/form-data')) {
const reqObject = await this.processMultipartForm(req, res);
Expand Down

0 comments on commit 2291b29

Please sign in to comment.