From 4eb061d76e82bfd3584be66672ad4a9a9d0287e2 Mon Sep 17 00:00:00 2001 From: Edvaldo Szymonek Date: Mon, 16 Feb 2026 23:30:01 -0300 Subject: [PATCH] =?UTF-8?q?converte=20tipo=20de=20usu=C3=A1rio=20para=20nu?= =?UTF-8?q?mero=20antes=20de=20comparar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/cspell.yml | 3 ++- .env.example | 9 +++++++++ docker-compose.yml | 24 +++++++++++------------- src/middlewares/tokens-middleware.js | 2 +- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/.config/cspell.yml b/.config/cspell.yml index 334d6676..f7fae0c8 100644 --- a/.config/cspell.yml +++ b/.config/cspell.yml @@ -1,6 +1,7 @@ language: en,pt-BR words: - - mysql + - postgresql + - herbario - distro - caprover - certbot diff --git a/.env.example b/.env.example index 513c62f4..e2b72d10 100644 --- a/.env.example +++ b/.env.example @@ -24,3 +24,12 @@ SMTP_PASS="sua-senha-de-app-de-16-digitos" SMTP_FROM="Sistema HCF " PAINEL_BASE_URL=http://localhost:5173 + +PG_DATABASE=herbario_dev +PG_HOST=127.0.0.1 +PG_PORT=5432 +PG_USERNAME=postgres +PG_PASSWORD=masterkey + +PG_MIGRATION_USERNAME=postgres +PG_MIGRATION_PASSWORD=masterkey diff --git a/docker-compose.yml b/docker-compose.yml index d0f5b302..1beb67df 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,18 +1,16 @@ services: - mysql: - image: mysql:8.0 - container_name: hcf_mysql + postgres: + image: postgres:18 + container_name: herbario_postgresql environment: - MYSQL_DATABASE: $MYSQL_DATABASE - MYSQL_ROOT_PASSWORD: $MYSQL_PASSWORD + POSTGRES_DB: $PG_DATABASE + POSTGRES_USER: $PG_USERNAME + POSTGRES_PASSWORD: $PG_PASSWORD volumes: - - ./mysql/data:/var/lib/mysql + - ./postgresql:/var/lib/postgresql ports: - - ${MYSQL_PORT}:3306 - command: - - --default-time-zone=+00:00 - - --character-set-server=utf8mb4 - - --sql-mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION + - ${PG_PORT:-5432}:5432 + shm_size: 128mb api: build: @@ -20,14 +18,14 @@ services: dockerfile: Dockerfile platform: linux/amd64 image: hcf-api:local - container_name: hcf_api + container_name: herbario_api env_file: .env ports: - $PORT:$PORT nginx: image: nginx:1.17-alpine - container_name: hcf_nginx + container_name: berbario_nginx volumes: - ./nginx/nginx.conf:/etc/nginx/nginx.conf - ./nginx/conf.d:/etc/nginx/conf.d diff --git a/src/middlewares/tokens-middleware.js b/src/middlewares/tokens-middleware.js index bc75a3bb..d05760af 100644 --- a/src/middlewares/tokens-middleware.js +++ b/src/middlewares/tokens-middleware.js @@ -22,7 +22,7 @@ export default (tipoUsuarioPermitido = []) => const usuario = decodificaTokenUsuario(token); - const estaPermitido = !Array.isArray(tipoUsuarioPermitido) || tipoUsuarioPermitido.length < 1 || tipoUsuarioPermitido.includes(usuario.tipo_usuario_id); + const estaPermitido = !Array.isArray(tipoUsuarioPermitido) || tipoUsuarioPermitido.length < 1 || tipoUsuarioPermitido.includes(Number(usuario.tipo_usuario_id)); if (!estaPermitido) { throw new ForbiddenException(102);