resolução de conflitos

.github/workflows/test.yml

@@ -0,0 +1,37 @@
+name: Node.js CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14, 16]
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Set up Node.js
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - name: Install dependencies
+      run: npm install
+
+    - name: Run tests
+      env:
+        Admin_email: ${{ secrets.Admin_email }}
+        Admin_celular: ${{ secrets.Admin_celular }}
+        Admin_senha: ${{ secrets.Admin_senha }}
+        User_email: ${{ secrets.User_email }}
+        User_celular: ${{ secrets.User_celular }}
+        User_senha: ${{ secrets.User_senha }}
+      run: npm test

.gitignore

@@ -1,21 +1,20 @@
-# Dependências instaladas
-/node_modules
-
-# Arquivos de log
-npm-debug.log
-yarn-debug.log
-yarn-error.log
-package-lock.json
-
-# Arquivos de ambiente
-.env
-
-# Arquivos de build
-/build
-/coverage
-
-# Arquivos de configuração de IDEs
-.idea
-.vscode
-.env
+# Dependências instaladas
+/node_modules
+
+# Arquivos de log
+npm-debug.log
+yarn-debug.log
+yarn-error.log
+package-lock.json
+
+# Arquivos de ambiente
+.env
+
+# Arquivos de build
+/build
+/coverage
+
+# Arquivos de configuração de IDEs
+.idea
+.vscode
 .vs/

src/Controllers/membershipController.js

@@ -1,10 +1,9 @@
 const { sendEmail } = require("../Utils/email");
 const Membership = require("../Models/membershipSchema");
-const generator = require("generate-password");
 const bcrypt = require("bcryptjs");
 const Token = require("../Models/tokenSchema");
 const { generateRecoveryPasswordToken } = require("../Utils/token");
-const salt = bcrypt.genSaltSync();
+const saltRounds = 13;
 const Role = require("../Models/roleSchema");
 
 const createMembershipForm = async (req, res) => {
@@ -35,7 +34,7 @@
 
         const sindRole = await Role.findOne({ name: "sindicalizado" });
         if (!sindRole) {
             console.error(
                 'Role "sindicalizado" não encontrada. Crie a role antes de adicionar o usuário administrador.'
             );
             return;
@@ -45,12 +44,7 @@
 
         const membership = new Membership(formData);
 
-        const temp_pass = generator.generate({
-            length: 8,
-            numbers: true,
-        });
-
-        membership.password = bcrypt.hashSync(temp_pass, salt);
+        membership.password = await bcrypt.hash(formData.senha, saltRounds);
 
         await membership.save();
         return res.status(201).send(membership);
@@ -63,7 +57,7 @@
     try {
         const sindRole = await Role.findOne({ name: "sindicalizado" });
         if (!sindRole) {
             console.error('Role "sindicalizado" não encontrada.');
             // prettier-ignore
             return res
             .status(404).send({ error: 'Role "sindicalizado" não encontrada.' });
@@ -78,7 +72,7 @@
         const membership = await Membership.find(query);
         return res.status(200).send(membership);
     } catch (error) {
         console.error("Erro no getMembershipForm:", error);
         return res.status(400).send({ error: error.message });
     }
 };

src/Controllers/userController.js

@@ -77,7 +77,11 @@ const login = async (req, res) => {
 
     try {
         if (typeof email == "string") {
-            const user = await User.findOne({ email: email, status: true });
+            const user = await User.findOne({
+                email: email,
+                //"Gamebiarra" Não deve ficar aqui no final
+                status: true,
+            });
 
             if (!user) {
                 return res

src/Utils/initDatabase.js

@@ -1,10 +1,28 @@
+/*Para inicializar o Database você precisa criar um arquivo .env na raiz do projeto com os seguintes dados:
+######################################################################################
+    Admin_email=
+    Admin_celular=
+    Admin_senha=
+    User_email=
+    User_celular=
+    User_senha=
+######################################################################################
+Altere os dados de forma que melhor desejar para iniciar o banco de dados com um usuário comum e um usuario Administrador.
+*/
+
 // ./utils/initRoles.js
 const mongoose = require("mongoose");
 const Role = require("../Models/roleSchema"); // Ajuste o caminho conforme necessário
 const User = require("../Models/userSchema");
 const bcrypt = require("bcryptjs");
+const saltRounds = 13;
 
-const salt = bcrypt.genSaltSync();
+const senhaAdmin = process.env.Admin_senha;
+const emailAdmin = process.env.Admin_email;
+const celularAdmin = process.env.Admin_celular;
+const senhaUser = process.env.User_senha;
+const emailUser = process.env.User_email;
+const celularUser = process.env.User_celular;
 
 const initializeRoles = async () => {
     const roles = [
@@ -53,7 +71,6 @@ const initializeRoles = async () => {
     ];
 
     try {
-        // Verificar se a conexão está aberta antes de executar
         if (mongoose.connection.readyState === 1) {
             for (const roleData of roles) {
                 const existingRole = await Role.findOne({
@@ -75,7 +92,6 @@ const initializeRoles = async () => {
     }
 
     try {
-        // Verificar se a conexão está aberta antes de executar
         if (mongoose.connection.readyState === 1) {
             // Busca o user 'administrador'
             const adminRole = await Role.findOne({ name: "administrador" });
@@ -93,18 +109,19 @@ const initializeRoles = async () => {
                 return;
             }
 
-            // Verifica se o usuário administrador já existe
             const existingAdmin = await User.findOne({
-                email: "admin@admin.com",
+                email: emailAdmin,
             });
             if (!existingAdmin) {
-                const hashedPassword = await bcrypt.hash("senha", salt); // Altere a senha padrão conforme necessário
+                const hashedPassword = await bcrypt.hash(
+                    senhaAdmin,
+                    saltRounds
+                );
 
-                // Cria o usuário administrador
                 const adminUser = new User({
                     name: "Admin",
-                    email: "admin@admin.com",
-                    phone: "1234567890",
+                    email: emailAdmin,
+                    phone: celularAdmin,
                     status: true,
                     password: hashedPassword,
                     role: adminRole._id,
@@ -118,16 +135,15 @@ const initializeRoles = async () => {
             }
 
             const ExistingSindicalizado = await User.findOne({
-                email: "user@user.com",
+                email: emailUser,
             });
             if (!ExistingSindicalizado) {
-                const hashedPassword = await bcrypt.hash("senha", salt); // Altere a senha padrão conforme necessário
+                const hashedPassword = await bcrypt.hash(senhaUser, saltRounds);
 
-                // Cria o usuário administrador
                 const sindUser = new User({
                     name: "User",
-                    email: "user@user.com",
-                    phone: "61981818181",
+                    email: emailUser,
+                    phone: celularUser,
                     status: true,
                     password: hashedPassword,
                     role: userRole,