Skip to content

feat: ✨ Correção na verificação de permissão de usuario #311

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

Open
Layravbf wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

feat: ✨ Correção na verificação de permissão de usuario #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
728b598
feat: :sparkles: Correção na verificação de permissão de usuario
Layravbf Mar 3, 2023
ec61bb4
feat: :sparkles: Adicionando metodo DELETE e atualizando as permissõe…
Layravbf Mar 3, 2023
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
2 changes: 1 addition & 1 deletion dist/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ app.use(
],
exposedHeaders: ['Authorization'],
origin: '*',
methods: 'GET, POST',
methods: 'GET, POST, DELETE',
preflightContinue: false,
})
);
Expand Down
40 changes: 20 additions & 20 deletions dist/models/RoutesPermission.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,38 +21,38 @@ class RoutesPermission {
];
const adOpsManagerGetRoutes = adOpsTeamUserGetRoutes.slice();
const adOpsManagerPostRoutes = adOpsTeamUserPostRoutes.slice();
const adOpsManagerDeleteRoutes = ['/campaign/.*/delete', '/user/.*/delete'];
adOpsManagerGetRoutes.push('/template/excel', '/users', '/adOpsTeam/users');
adOpsManagerPostRoutes.push(
'/register',
'/user/.*/deactivate',
'/user/.*/reactivate',
'/user/.*/delete',
'/campaign/.*/deactivate',
'/campaign/.*/reactivate',
'/campaign/.*/delete',
'/campaign'
);
if (user.permission === 'user') {
if (this._method === 'POST') {
return adOpsTeamUserPostRoutes.filter((route) => new RegExp(route).test(this._route)).length > 0;
} else if (this._method === 'GET') {
return adOpsTeamUserGetRoutes.filter((route) => new RegExp(route).test(this._route)).length > 0;
} else {
return false;
}
} else if (user.permission === 'adOpsManager') {
if (this._method === 'POST') {
return adOpsManagerPostRoutes.filter((route) => new RegExp(route).test(this._route)).length > 0;
} else if (this._method === 'GET') {
return adOpsManagerGetRoutes.filter((route) => new RegExp(route).test(this._route)).length > 0;
} else {
return false;
}
} else if (user.permission === 'admin' || user.permission === 'owner') {
const permissionRoutes = {
user: {
GET: adOpsTeamUserGetRoutes,
POST: adOpsTeamUserPostRoutes,
},
adOpsManager: {
GET: adOpsManagerGetRoutes,
POST: adOpsManagerPostRoutes,
DELETE: adOpsManagerDeleteRoutes,
},
admin: {},
owner: {},
};
if (user.permission === 'admin' || user.permission === 'owner') {
return true;
} else {
}
const routes = permissionRoutes[user.permission];
if (!routes) {
return false;
}
const allowedRoutes = routes[this._method] || [];
return allowedRoutes.some((route) => new RegExp(route).test(this._route));
}
}
exports.RoutesPermission = RoutesPermission;
3 changes: 2 additions & 1 deletion dist/routes/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ const user = (app) => {
.then((user) => {
if (
(req.permission === 'adOpsManager' && user.adOpsTeam !== req.adOpsTeam) ||
(req.permission === 'admin' && user.permission === 'owner')
(req.permission === 'admin' && user.permission === 'owner') ||
(req.permission === 'admin' && user.permission === 'admin')
)
throw new Error('Usuário sem permissão');
return userDAO.deleteUser(targetUserId);
Expand Down
2 changes: 1 addition & 1 deletion src/ts/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ app.use(
],
exposedHeaders: ['Authorization'],
origin: '*',
methods: 'GET, POST',
methods: 'GET, POST, DELETE',
preflightContinue: false,
})
);
Expand Down
69 changes: 49 additions & 20 deletions src/ts/models/RoutesPermission.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,39 +24,68 @@ export class RoutesPermission {
];
const adOpsManagerGetRoutes = adOpsTeamUserGetRoutes.slice();
const adOpsManagerPostRoutes = adOpsTeamUserPostRoutes.slice();
const adOpsManagerDeleteRoutes = ['/campaign/.*/delete', '/user/.*/delete'];

adOpsManagerGetRoutes.push('/template/excel', '/users', '/adOpsTeam/users');
adOpsManagerPostRoutes.push(
'/register',
'/user/.*/deactivate',
'/user/.*/reactivate',
'/user/.*/delete',
'/campaign/.*/deactivate',
'/campaign/.*/reactivate',
'/campaign/.*/delete',
'/campaign'
);

if (user.permission === 'user') {
if (this._method === 'POST') {
return adOpsTeamUserPostRoutes.filter((route) => new RegExp(route).test(this._route)).length > 0;
} else if (this._method === 'GET') {
return adOpsTeamUserGetRoutes.filter((route) => new RegExp(route).test(this._route)).length > 0;
} else {
return false;
}
} else if (user.permission === 'adOpsManager') {
if (this._method === 'POST') {
return adOpsManagerPostRoutes.filter((route) => new RegExp(route).test(this._route)).length > 0;
} else if (this._method === 'GET') {
return adOpsManagerGetRoutes.filter((route) => new RegExp(route).test(this._route)).length > 0;
} else {
return false;
}
} else if (user.permission === 'admin' || user.permission === 'owner') {
// if (user.permission === 'user') {
// if (this._method === 'POST') {
// return adOpsTeamUserPostRoutes.filter((route) => new RegExp(route).test(this._route)).length > 0;
// } else if (this._method === 'GET') {
// return adOpsTeamUserGetRoutes.filter((route) => new RegExp(route).test(this._route)).length > 0;
// } else {
// return false;
// }
// } else if (user.permission === 'adOpsManager') {
// if (this._method === 'POST') {
// return adOpsManagerPostRoutes.filter((route) => new RegExp(route).test(this._route)).length > 0;
// } else if (this._method === 'GET') {
// return adOpsManagerGetRoutes.filter((route) => new RegExp(route).test(this._route)).length > 0;
// } else if(this._method === 'DELETE'){
// return adOpsManagerDeleteRoutes.filter((route) => new RegExp(route).test(this._route)).length > 0;
// } else {
// return false;
// }
// } else if (user.permission === 'admin' || user.permission === 'owner') {
// return true;
// } else {
// return false;
// }

type RouteMap = Record<string, string[]>;

const permissionRoutes: Record<string, RouteMap> = {
user: {
GET: adOpsTeamUserGetRoutes,
POST: adOpsTeamUserPostRoutes,
},
adOpsManager: {
GET: adOpsManagerGetRoutes,
POST: adOpsManagerPostRoutes,
DELETE: adOpsManagerDeleteRoutes,
},
admin: {},
owner: {},
};

if (user.permission === 'admin' || user.permission === 'owner') {
return true;
} else {
}

const routes = permissionRoutes[user.permission];
if (!routes) {
return false;
}

const allowedRoutes = routes[this._method] || [];
return allowedRoutes.some((route) => new RegExp(route).test(this._route));
}
}
3 changes: 2 additions & 1 deletion src/ts/routes/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ const user = (app: { [key: string]: any }): void => {
.then((user: User) => {
if (
(req.permission === 'adOpsManager' && user.adOpsTeam !== req.adOpsTeam) ||
(req.permission === 'admin' && user.permission === 'owner')
(req.permission === 'admin' && user.permission === 'owner') ||
(req.permission === 'admin' && user.permission === 'admin')
)
throw new Error('Usuário sem permissão');
return userDAO.deleteUser(targetUserId);
Expand Down