From c722edc01303eed129038ddd20fd9f6ca197ea28 Mon Sep 17 00:00:00 2001 From: OxSaitama Date: Wed, 6 Sep 2023 17:12:00 +0200 Subject: [PATCH] refacto rules & folders --- package.json | 2 +- src/app/api/notary/OfficeFoldersController.ts | 1 - src/app/middlewares/RulesHandler.ts | 5 +++++ src/services/common/FilesService/FilesService.ts | 1 - 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index fd95302f..45621fda 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "cron": "^2.3.1", "express": "^4.18.2", "jsonwebtoken": "^9.0.0", - "le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.69", + "le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.71", "module-alias": "^2.2.2", "multer": "^1.4.5-lts.1", "next": "^13.1.5", diff --git a/src/app/api/notary/OfficeFoldersController.ts b/src/app/api/notary/OfficeFoldersController.ts index af46d774..85b80173 100644 --- a/src/app/api/notary/OfficeFoldersController.ts +++ b/src/app/api/notary/OfficeFoldersController.ts @@ -175,7 +175,6 @@ export default class OfficeFoldersController extends ApiController { this.httpInternalError(response, error); return; } - this.httpSuccess(response, await this.officeFoldersService.getByUid("uid")); } /** diff --git a/src/app/middlewares/RulesHandler.ts b/src/app/middlewares/RulesHandler.ts index cd35dcfe..ff677652 100644 --- a/src/app/middlewares/RulesHandler.ts +++ b/src/app/middlewares/RulesHandler.ts @@ -6,6 +6,11 @@ export default async function ruleHandler(req: Request, response: Response, next const rules = req.body.user.rules; const service = req.path && req.path.split("/")[4]; + if (!rules) { + response.status(HttpCodes.UNAUTHORIZED).send("Unauthorized without rules"); + return; + } + if (!rules.includes(req.method + " " + service)) { response.status(HttpCodes.UNAUTHORIZED).send("Unauthorized with those rules"); return; diff --git a/src/services/common/FilesService/FilesService.ts b/src/services/common/FilesService/FilesService.ts index 2ec4e6b5..4023b5db 100644 --- a/src/services/common/FilesService/FilesService.ts +++ b/src/services/common/FilesService/FilesService.ts @@ -8,7 +8,6 @@ import { BackendVariables } from "@Common/config/variables/Variables"; import { Readable } from "stream"; import { v4 } from "uuid"; import { Files, Prisma } from "@prisma/client"; -import fetch from "node-fetch"; @Service() export default class FilesService extends BaseService {