diff --git a/index.js b/index.js index 1c37f08..9cfdc36 100644 --- a/index.js +++ b/index.js @@ -11,7 +11,7 @@ const app = express(); app.use(bodyParser.urlencoded({extended: true})); app.use( cors({ - origin: ["http://192.168.1.27:3001"], + origin: ["http://192.168.1.15:3000"], methods: ["GET", "POST"], credentials: true }) @@ -26,19 +26,26 @@ app.use((req, res, next) => { app.use(express.urlencoded({extended: true})); app.use(express.json()); app.use(session({ - secret: 'key', + name: "barbaros-sid", + secret: 'key', resave: false, - saveUninitialized: false, + saveUninitialized: true, cookie: { maxAge: 1000 * 60 * 60 * 24 * 7 }, store: new SequelizeStore({ - db: Database + db: Database }) -})); + }) +); //MODULES const moduleLogin = require("./modules/logins/index"); +const moduleBlog = require("./modules/blogs/app"); +const moduleUser = require("./modules/users/app"); + app.use(moduleLogin); +app.use(moduleBlog); +app.use(moduleUser); // DATABASES const DatabaseDump = require("./database/dump"); diff --git a/modules/blogs/app.js b/modules/blogs/app.js new file mode 100644 index 0000000..8e52113 --- /dev/null +++ b/modules/blogs/app.js @@ -0,0 +1,12 @@ +const express = require("express"); +const app = express(); + +app.get("/get/blogs", async function(req, res){ + res.json([{ + id: 1, + title: "Başlık", + text: "İçerik" + }]); +}); + +module.exports = app; \ No newline at end of file diff --git a/modules/logins/middlewares/auth.js b/modules/logins/middlewares/auth.js index 0c0763c..fe4a71a 100644 --- a/modules/logins/middlewares/auth.js +++ b/modules/logins/middlewares/auth.js @@ -1,3 +1,8 @@ module.exports = (req, res, next) => { - console.log(req.session); + if(req.session.isAuth === true){ + next(); + }else{ + res.json({Status: "Failed"}); + // next(); + } }; \ No newline at end of file diff --git a/modules/logins/routes/home.js b/modules/logins/routes/home.js index fa791c4..fae3f47 100644 --- a/modules/logins/routes/home.js +++ b/modules/logins/routes/home.js @@ -6,6 +6,7 @@ const router = express.Router(); router.post('/login/control', (req, res) => { + console.log(req.headers, req.sessionID); if(req.session.isAuth === true){ res.json({Status: "Success"}); }else{ @@ -25,10 +26,12 @@ router.post('/login', async (req, res) => { if(result){ req.session.isAuth = true; res.json({Status: "Success", Token: req.sessionID}); + }else{ + res.json({Status: "Failed"}); }; }) -router.get('/logout', async (req, res) => { +router.get('/logout', auth, async (req, res) => { req.session.destroy(); res.clearCookie('connect.sid'); res.redirect(data.serverOptions.frontEnd.url + "/login"); diff --git a/modules/users/app.js b/modules/users/app.js index 565a16a..b813837 100644 --- a/modules/users/app.js +++ b/modules/users/app.js @@ -1,6 +1,10 @@ const express = require("express"); const app = express(); +//MODULES +const routeUsers = require("./routes/home"); +//USES +app.use(routeUsers); module.exports = app; \ No newline at end of file diff --git a/modules/users/routes/home.js b/modules/users/routes/home.js index 223f561..b35903f 100644 --- a/modules/users/routes/home.js +++ b/modules/users/routes/home.js @@ -2,8 +2,16 @@ const express = require("express"); const auth = require("../../logins/middlewares/auth"); const router = express(); -router.get("/profile", auth, (req, res) => { - res.json({name: "Batuhan", surname: "Coşkun"}); +router.get("/get/peoples", auth, (req, res) => { + res.json([{ + id: 1, name: "Batuhan", surname: "Coşkun" + },{ + id: 2, name: "Anders", surname: "İsaksson" + },{ + id: 3, name: "Noah", surname: "İsaksson" + },{ + id: 4, name: "Julia", surname: "İsaksson" + }]); }); module.exports = router; \ No newline at end of file