Compare commits

..

No commits in common. "9d1bc153d11c65976edba457ab2d7de7e7265b22" and "5d3d318b363444bfe73ba1555515cfbfee845cd7" have entirely different histories.

View File

@ -1,3 +1,4 @@
const express = require('express'); const express = require('express');
const cors = require('cors'); const cors = require('cors');
const app = express(); const app = express();
@ -38,7 +39,6 @@ const guestsRoutes = require('./routes/guests');
const budgetsRoutes = require('./routes/budgets'); const budgetsRoutes = require('./routes/budgets');
const publicRoutes = require('./routes/public'); const publicRoutes = require('./routes/public');
const getBaseUrl = (url) => { const getBaseUrl = (url) => {
if (!url) return ''; if (!url) return '';
return url.endsWith('/api') ? url.slice(0, -4) : url; return url.endsWith('/api') ? url.slice(0, -4) : url;
@ -89,19 +89,17 @@ app.use(cors({origin: true}));
require('./auth/auth'); require('./auth/auth');
const publicRoutes = require('./routes/public');
app.use(bodyParser.json()); app.use(bodyParser.json());
app.use('/api', publicRoutes);
app.use('/api/auth', authRoutes); app.use('/api/auth', authRoutes);
app.use('/api/file', fileRoutes); app.use('/api/file', fileRoutes);
app.use('/api/pexels', pexelsRoutes); app.use('/api/pexels', pexelsRoutes);
app.enable('trust proxy'); app.enable('trust proxy');
app.use('/api', publicRoutes);
app.use('/api/users', passport.authenticate('jwt', {session: false}), usersRoutes); app.use('/api/users', passport.authenticate('jwt', {session: false}), usersRoutes);
app.use('/api/roles', passport.authenticate('jwt', {session: false}), rolesRoutes); app.use('/api/roles', passport.authenticate('jwt', {session: false}), rolesRoutes);