gitea_admin/maestro
1
0
Fork 0
mirror of https://github.com/dadosfera/maestro.git synced 2026-11-02 07:39:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: changed get roles to search roles

Browse Source
This commit is contained in:
Gabriel Rosa
2022-07-15 14:39:30 -03:00
parent 1de4eedd38
commit 071c524a2e
7 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+7 -7
View File
@@ -36,7 +36,7 @@
"passport-hubspot-oauth2": "^1.0.3",
"passport-mailchimp": "^1.1.0",
"protospack": "2.5.1",
"protospack-v2": "3.5.0",
"protospack-v2": "3.5.1",
"reflect-metadata": "^0.1.13",
"rimraf": "^3.0.2",
"rxjs": "^7.5.5",
@@ -9015,9 +9015,9 @@
}
},
"node_modules/protospack-v2": {
"version": "3.5.0",
"resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.5.0.tgz",
"integrity": "sha512-fmTPfg9IdlCLYu+zoosyQBRMN/L6ov6LDIsbdE6L6xtpBuIIHEzg/ALyKwsaFi9nZIhPAKFbd28EI6xb66xrzA==",
"version": "3.5.1",
"resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.5.1.tgz",
"integrity": "sha512-qSD5D9p1f/FtPMovfwHG3nbnvpD8c2V01ifK2QB2V2SMPc/Qxe+IYiv3zhXu/KUQZGI82nYznXyMnmiJ9Jo9aw==",
"dependencies": {
"@grpc/grpc-js": "^1.6.7",
"rxjs": "^7.5.5",
@@ -17245,9 +17245,9 @@
}
},
"protospack-v2": {
"version": "3.5.0",
"resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.5.0.tgz",
"integrity": "sha512-fmTPfg9IdlCLYu+zoosyQBRMN/L6ov6LDIsbdE6L6xtpBuIIHEzg/ALyKwsaFi9nZIhPAKFbd28EI6xb66xrzA==",
"version": "3.5.1",
"resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/protospack-v2/-/protospack-v2-3.5.1.tgz",
"integrity": "sha512-qSD5D9p1f/FtPMovfwHG3nbnvpD8c2V01ifK2QB2V2SMPc/Qxe+IYiv3zhXu/KUQZGI82nYznXyMnmiJ9Jo9aw==",
"requires": {
"@grpc/grpc-js": "^1.6.7",
"rxjs": "^7.5.5",
package.json
+1 -1
View File
@@ -51,7 +51,7 @@
"passport-hubspot-oauth2": "^1.0.3",
"passport-mailchimp": "^1.1.0",
"protospack": "2.5.1",
"protospack-v2": "3.5.0",
"protospack-v2": "3.5.1",
"reflect-metadata": "^0.1.13",
"rimraf": "^3.0.2",
"rxjs": "^7.5.5",
src/authentication/permissions.enum.ts
+1 -1
View File
@@ -51,7 +51,7 @@ export const PERMISSIONS = {
CREATE: {
seqid: 18,
claim: 'POST /auth',
usage: PermissionUsages.PUBLIC,
usage: PermissionUsages.INTERNAL,
name: {
'pt-br': '',
'en-us': '',
src/modules/permissions/permissions.service.ts
+5 -5
View File
@@ -89,11 +89,11 @@ export class PermissionsService
permissionUsage ? usage === permissionUsage : true,
)
.map(({ seqid, name }) => ({ id: seqid, name: name[language] }));
groups.push({
title,
permissions,
});
if (permissions?.length)
groups.push({
title,
permissions,
});
}
return groups;
}
src/modules/roles/dto/entities.ts
+1 -1
View File
@@ -31,7 +31,7 @@ export enum TrueOrFalseEnum {
}
export class GetRolesByCustomerReq {
@ApiPropertyOptional()
permissionIds: string[];
permissionId: string[];
@ApiPropertyOptional({ enum: TrueOrFalseEnum })
getUsers: TrueOrFalseEnum;
}
src/modules/roles/roles.controller.ts
+3 -6
View File
@@ -69,17 +69,14 @@ export class RolesController {
@Get()
@ApiOkResponse({ type: GetRolesByCustomerRes })
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
async getRolesByCustomer(
async searchRoles(
@User() user: RequestUser,
@Query() filters: GetRolesByCustomerReq,
@Headers('dadosfera-lang') language,
) {
this.logger.info('getRolesByCustomer', { user });
this.logger.info('searchRoles', { user });
this.rolesService.setLanguage(language);
return await this.rolesService.getRolesByCustomer(
filters,
user.customer_id,
);
return await this.rolesService.roleSearch(filters, user.customer_id);
}
@Post()
src/modules/roles/roles.service.ts
+3 -3
View File
@@ -48,8 +48,8 @@ export class RolesService {
const [roleTreated] = this.getRolesPermissionsName([role.role]);
return { role: roleTreated };
}
async getRolesByCustomer(filters: GetRolesByCustomerReq, customerId: string) {
let { permissionIds } = filters;
async roleSearch(filters: GetRolesByCustomerReq, customerId: string) {
let { permissionId: permissionIds } = filters;
if (permissionIds && !Array.isArray(permissionIds))
permissionIds = [permissionIds];
const { getUsers } = filters;
@@ -62,7 +62,7 @@ export class RolesService {
return seqId;
}) || [];
const roles = await lastValueFrom(
this.rolesClientService.RoleFindAllByCustomerId({
this.rolesClientService.RoleSearch({
customerId,
getUsers: isGetUsers,
permissionIds: [],