From 2f03b301d0c71524691871b9d03cdb5b9ad3e436 Mon Sep 17 00:00:00 2001 From: Piotr Russ Date: Sun, 22 Nov 2020 22:39:04 +0100 Subject: move environmental variables to dotenv --- app.js | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'app.js') diff --git a/app.js b/app.js index 40fc07d..4391b7f 100755 --- a/app.js +++ b/app.js @@ -1,8 +1,10 @@ const path = require("path"); const express = require("express"); -// const cors = require('cors'); const cookieParser = require('cookie-parser'); +// const cors = require('cors'); +require('dotenv-safe').config(); require('./server/db/mongoose'); +const setCookie = require('./server/helpers/setCookie'); const userRoutes = require('./server/routes/user'); const auth = require('./server/middleware/auth'); const redirectIfLoggedIn = require('./server/middleware/redirectIfLoggedIn'); @@ -11,22 +13,23 @@ const app = express(); const port = process.env.PORT || 3000; app.use(express.json()); -// app.use(cors()); app.use(cookieParser()); +// app.use(cors()); app.use('/api/user/', userRoutes); -app.use('/admin/', auth, express.static(path.join(__dirname, 'client/admin'), { - setHeaders: function (res, path, stat) { - if (res.req.newToken){ - res.set('Set-Cookie', "token=" + res.req.newToken + ";httpOnly;MaxAge=604800000;Path=/"); - } - } -})); +app.use('/admin/', auth, express.static( + path.join(__dirname, 'client/admin'), + { setHeaders: setCookie } +)); -app.use('/login/', redirectIfLoggedIn, express.static(path.join(__dirname, 'client/login'))); +app.use('/login/', redirectIfLoggedIn, express.static( + path.join(__dirname, 'client/login') +)); -app.use('/', express.static(path.join(__dirname, 'client/public'))); +app.use('/', express.static( + path.join(__dirname, 'client/public') +)); app.get('*', (req, res) => res.redirect('/')); -- cgit v1.2.3