From 4c2854039d815c8f5b7999c341b6797c852a0e00 Mon Sep 17 00:00:00 2001
From: Renzo Beux <renzobeux@gmail.com>
Date: Sun, 24 Oct 2021 15:51:46 -0300
Subject: [PATCH] audit finished
---
src/Controllers/AuditorController.ts | 3 ++-
src/Models/Auditor.ts | 2 +-
src/Services/Auditor.ts | 8 +++-----
src/Services/UserAPI.ts | 4 ++--
src/routes.ts | 2 +-
5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/Controllers/AuditorController.ts b/src/Controllers/AuditorController.ts
index 4cdab5b..dc51329 100644
--- a/src/Controllers/AuditorController.ts
+++ b/src/Controllers/AuditorController.ts
@@ -9,7 +9,8 @@ const router = Router();
const auditGet = async (req: Request, res: Response) => {
try {
- const audits = await Auditor.getAudit(Number(req.query.cant), Number(req.query.page));
+ const token = req.headers.authorization;
+ const audits = await Auditor.getAudit(Number(req.query.cant), Number(req.query.page), token);
return res.status(200).send(audits);
} catch (error) {
const e = error as Error;
diff --git a/src/Models/Auditor.ts b/src/Models/Auditor.ts
index 2ad8849..8614099 100644
--- a/src/Models/Auditor.ts
+++ b/src/Models/Auditor.ts
@@ -8,7 +8,7 @@ class Auditor extends Model {
action!: string;
- time!: string;
+ createdAt!: string;
}
Auditor.init({
diff --git a/src/Services/Auditor.ts b/src/Services/Auditor.ts
index 3b168bf..402913e 100644
--- a/src/Services/Auditor.ts
+++ b/src/Services/Auditor.ts
@@ -1,5 +1,3 @@
-import { Request, Response } from 'express';
-import AgeGroup from '../DTOs/AgeGroupDTO';
import AuditDTO from '../DTOs/AuditDTO';
import Paginator from '../interfaces/paginator.interface';
import Auditor from '../Models/Auditor';
@@ -28,7 +26,7 @@ const listAudits = async (limit: number, offset: number): Promise<Paginator<Audi
return res;
};
-const getAudit = async (cant: number, page: number) => {
+const getAudit = async (cant: number, page: number, token: any) => {
const offset = cant * (page - 1);
const audits: Paginator<Auditor> = await listAudits(cant, offset);
const ids: number[] = [];
@@ -38,7 +36,7 @@ const getAudit = async (cant: number, page: number) => {
}
});
// eslint-disable-next-line @typescript-eslint/no-explicit-any
- const users = await UserAPI.listUsersById({ userIds: ids }) as any[];
+ const users = await UserAPI.listUsersById({ userIds: ids }, token) as any[];
const usersMap: Map<number, any> = new Map();
users.forEach((user) => {
usersMap.set(user.id, user);
@@ -51,7 +49,7 @@ const getAudit = async (cant: number, page: number) => {
email: user.email,
user_name: user.name,
organization_name: user.organization,
- date: auditor.time,
+ date: auditor.createdAt,
action: auditor.action,
};
userAudits.push(userAudit);
diff --git a/src/Services/UserAPI.ts b/src/Services/UserAPI.ts
index bee3dd4..faa16e9 100644
--- a/src/Services/UserAPI.ts
+++ b/src/Services/UserAPI.ts
@@ -84,9 +84,9 @@ const removeAdminPermission = async (idUser: string, token: string) => {
return res.data;
};
-const listUsersById = async (userIds: any) => {
+const listUsersById = async (userIds: any, token: any) => {
const url = '/usersById';
- const res = await instance.post(url, userIds);
+ const res = await instance.post(url, userIds, { headers: { authorization: token } });
return res.data;
};
diff --git a/src/routes.ts b/src/routes.ts
index eae3e3a..afac091 100644
--- a/src/routes.ts
+++ b/src/routes.ts
@@ -14,7 +14,7 @@ router.get('/', (req: Request, res: Response): void => {
router.use('/users', UserController);
// From this line on a auth verification will be taken
-// router.use(authChecker);
+router.use(authChecker);
router.use('/sheetParser', SheetController);
--
GitLab