Add db url

Author: rerissondaniel

.env.example

@@ -1,4 +1,8 @@
 # Authentication
 
 JWT_SECRET=
-JWT_EXPIRATION_DAYS=7
+JWT_EXPIRATION_DAYS=7
+
+#DATABASE
+DB_URL=
+ALLOWED_ORIGIN=http://localhost:3000

app.js

@@ -1,15 +1,13 @@
 const express = require("express");
 const bodyParser = require("body-parser");
 const cors = require("cors");
-const routes = require('./routes');
+const routes = require("./routes");
 
 const app = express();
 
-var corsOptions = {
-  origin: "http://localhost:8081"
-};
+const config = require("./app/config/enviroment");
 
-app.use(cors(corsOptions));
+app.use(cors({ origin: new RegExp(config.ALLOWED_ORIGIN + ".*") }));
 
 app.use(bodyParser.json());
 
@@ -19,22 +17,18 @@ const db = require("./app/models");
 db.mongoose
   .connect(db.url, {
     useNewUrlParser: true,
-    useUnifiedTopology: true
+    useUnifiedTopology: true,
   })
   .then(() => {
     console.log("Connected to the database!");
   })
-  .catch(err => {
+  .catch((err) => {
     console.log("Cannot connect to the database!", err);
     process.exit();
   });
-
 // Routes
 app.use(routes);
 
-app.get("/", (req, res) => {
-  res.json({ message: "Welcome to Bubbles!" });
-});
 
 // set port, listen for requests
 const PORT = process.env.PORT || 8080;

app/config/db.config.js

@@ -1,3 +1,5 @@
+const config = require('./enviroment');
+
 module.exports = {
-    url: "mongodb://localhost:27017/bubbles_db"
+    url: config.DB_URL
   };

app/config/enviroment.js

@@ -5,21 +5,27 @@ const environment = {
         JWT: {
             secret: process.env.JWT_SECRET,
             expiration_days: process.env.JWT_EXPIRATION_DAYS
-        }
+        },
+        DB_URL: process.env.DB_URL,
+        ALLOWED_ORIGIN: process.env.ALLOWED_ORIGIN
     },
 
     staging: {
         JWT: {
             secret: process.env.JWT_SECRET,
             expiration_days: process.env.JWT_EXPIRATION_DAYS
-        }
+        },
+        DB_URL: process.env.DB_URL,
+        ALLOWED_ORIGIN: process.env.ALLOWED_ORIGIN
     },
 
     production: {
         JWT: {
             secret: process.env.JWT_SECRET,
             expiration_days: process.env.JWT_EXPIRATION_DAYS
-        }
+        },
+        DB_URL: process.env.DB_URL,
+        ALLOWED_ORIGIN: process.env.ALLOWED_ORIGIN
     }
 }
 

app/models/user.model.js

@@ -25,7 +25,7 @@ UserSchema.pre('save', async function save(next) {
 });
 
 UserSchema.methods.validatePassword = async function validatePassword(data) {
-  return await bcrypt.compareSync(data, this.password);
+  return bcrypt.compareSync(data, this.password);
 };
 
 UserSchema.methods.generateAuthToken = function () {

app/services/auth.service.js

@@ -9,9 +9,8 @@ async function login(mail, password) {
         if (!user){
             return null;
         }
-
+        
        const validPassword = await user.validatePassword(password);
-        console.log(validPassword);
         if (!validPassword){
             return null;
         }

routes.js

@@ -6,16 +6,9 @@ const authMiddleware = require('./app/middlewares/auth');
 const auth = require('./app/routes/auth.route');
 const user = require('./app/routes/user.route');
 
-router.get('/', (req, res) => {
-    return res.send('Bubbles API');
-});
-
 router.use('/user', user);
 router.use('/auth', auth);
 // Private routes
 router.use(authMiddleware);
 
-
-
-
 module.exports = router;