Merge branch 'issue/58' into auth

src/libs/app.js

@@ -10,12 +10,13 @@ const libs = `${process.cwd()}/libs`;
 
 const log = require(`${libs}/log`)(module);
 
-const config = require(`${libs}/config`);
-const cache = require('apicache').options({ debug: config.get('debug') }).middleware;
+const config = require('./config');
 
 const app = express();
 
-const api = require(`${libs}/routes/api`);
+const api = require('./routes/api');
+
+const passport = require('passport');
 
 const mongoose = require(`${libs}/db/mongoose`);
 
@@ -27,8 +28,6 @@ app.use(cookieParser());
 // Enable Cross-Origin Resource Sharing (CORS)
 app.use(cors());
 app.use(methodOverride());
-// Enable cache for 1 day
-app.use(cache('1 day'));
 // Enable maximum compression
 app.use(compression(9));
 // Middleware tha adds the squel object to req

src/libs/routes/api.js

@@ -2,6 +2,12 @@ const express = require('express');
 
 const api = express();
 
+const libs = `${process.cwd()}/libs`;
+
+const config = require(`${libs}/config`);
+
+const cache = require('apicache').options({ debug: config.get('debug') }).middleware;
+
 const enrollment = require('./enrollment');
 
 const state = require('./state');
@@ -19,11 +25,11 @@ api.get('/', (req, res) => {
 });
 
 // mount API routes
-api.use('/enrollment', enrollment);
-api.use('/state', state);
-api.use('/region', region);
-api.use('/city', city);
-api.use('/school', school);
-api.use('/user', user);
+api.use('/api/v1/enrollment', cache('1 day'), enrollment);
+api.use('/api/v1/state', cache('15 day'), state);
+api.use('/api/v1/region', cache('15 day'), region);
+api.use('/api/v1/city', cache('15 day'), city);
+api.use('/api/v1/school', cache('15 day'), school);
+api.use('/api/v1/user', user);
 
 module.exports = api;