Compare commits

...
5 Commits
Author SHA1 Message Date
Gabriel Amorim cad1e4b3de Merge pull request #144 from dadosfera/fix/delete-connection-permission
FIX: delete connection permission
2022-10-04 15:40:14 -03:00
Gabriel Rosa b311a84bde FIX: delete route reimplemented 2022-10-04 15:22:43 -03:00
Gabriel Rosa 28280dca8d FIX: Delete connections permission 2022-10-04 14:46:52 -03:00
Victor Radael 450c82446e Merge pull request #143 from dadosfera/fix/dadoferademo
FIX: unkown error get user by id
2022-10-03 16:56:55 -03:00
Victor Radael beb27a0f60 FIX: unkown error get user by id 2022-10-03 16:52:42 -03:00
3 changed files with 39 additions and 36 deletions
+10 -11
View File
@@ -125,17 +125,16 @@ export const PERMISSIONS_GROUPS = {
'es-es': 'Crear Source',
},
},
//TODO descomentar quando tiver ok o DELETE de conexões
// DELETE: {
// seqid: 38,
// claim: 'connection:delete',
// usage: PermissionUsages.PUBLIC,
// name: {
// 'pt-br': 'Excluir Fonte',
// 'en-us': 'Remove Source',
// 'es-s': 'Eliminar Source',
// },
// },
DELETE: {
seqid: 38,
claim: 'connection:delete',
usage: PermissionUsages.INTERNAL,
name: {
'pt-br': 'Excluir Fonte',
'en-us': 'Remove Source',
'es-s': 'Eliminar Source',
},
},
UPDATE: {
seqid: 39,
claim: 'connection:update',
+9 -5
View File
@@ -110,7 +110,7 @@ class CatalogService implements OnModuleInit {
}
async getUserRolesIds(userId: string) {
const result = await this.userService.findOneById(userId);
const result = await this.userService.findOneById(userId).catch(() => null);
const roles_ids = result.user.roles.map((role) => role.id);
@@ -139,7 +139,7 @@ class CatalogService implements OnModuleInit {
const condition =
asset.owner && !asset.owner.includes('@') ? true : false;
const result = condition
? await this.userService.findOneById(asset.owner)
? await this.userService.findOneById(asset.owner).catch(() => null)
: null;
const owner = result !== null ? result.user.username : null;
@@ -151,7 +151,7 @@ class CatalogService implements OnModuleInit {
const condition =
asset.owner && !asset.owner.includes('@') ? true : false;
const result = condition
? await this.userService.findOneById(asset.owner)
? await this.userService.findOneById(asset.owner).catch(() => null)
: null;
const owner = result !== null ? result.user.username : null;
@@ -177,7 +177,9 @@ class CatalogService implements OnModuleInit {
const opensearchTable = JSON.parse(data_asset);
const result = opensearchTable.user_id
? await this.userService.findOneById(opensearchTable.owner)
? await this.userService
.findOneById(opensearchTable.owner)
.catch(() => null)
: null;
const owner = result !== null ? result.user.username : null;
@@ -213,7 +215,9 @@ class CatalogService implements OnModuleInit {
);
const opensearchTable = JSON.parse(data_asset);
const result = opensearchTable.user_id
? await this.userService.findOneById(opensearchTable.owner)
? await this.userService
.findOneById(opensearchTable.owner)
.catch(() => null)
: null;
const owner = result !== null ? result.user.username : null;
+20 -20
View File
@@ -105,29 +105,29 @@ export class ConnectionController {
return response;
}
// @Delete('/:id')
// @RequireAllPermissions(connectionPermissions.DELETE)
// async deleteConnection(
// @User() user: RequestUser,
// @Param('id') id: string,
// ): Promise<ConnectionRes> {
// this.logger.info('/connections - Delete Connection');
@Delete('/:id')
@RequireAllPermissions(connectionPermissions.DELETE)
async deleteConnection(
@User() user: RequestUser,
@Param('id') id: string,
): Promise<ConnectionRes> {
this.logger.info('/connections - Delete Connection');
// const { user_id, customer_id, customer_name, username } = user;
// const metadata = PackTheMetadata({
// user_id,
// customer_id,
// customer_name,
// username,
// });
const { user_id, customer_id, customer_name, username } = user;
const metadata = PackTheMetadata({
user_id,
customer_id,
customer_name,
username,
});
// const response: any = await this.clientService.deleteConnection({
// body: { id },
// metadata,
// });
const response: any = await this.clientService.deleteConnection({
body: { id },
metadata,
});
// return response;
// }
return response;
}
@Get()
async getAllConnections(