Merge branch 'v1.10.5'

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.10.5 - 2019-05-23
+## Changed
+- Revert api.js
+
 ## 1.10.4 - 2019-05-23
 ## Changed
 - Fix order in enrollment indicator

src/libs/routes/api.js

@@ -40,6 +40,8 @@ const school = require('./school');
 
 const simulation = require('./simulation');
 
+const user = require('./user');
+
 const classroom = require('./classroom');
 
 const teacher = require('./teacher');
@@ -62,8 +64,16 @@ const idhmr = require('./idhmr');
 
 const idhml = require('./idhml');
 
+const oauth2 = require(`${libs}/middlewares/oauth2`);
+
+const verifyToken = require(`${libs}/routes/verifyToken`);
+
+const resetToken = require(`${libs}/routes/resetToken`);
+
 const educationYears = require(`${libs}/routes/educationYears`);
 
+const downloads = require(`${libs}/routes/downloads`);
+
 const infrastructure = require(`${libs}/routes/infrastructure`);
 
 const schoolInfrastructure = require(`${libs}/routes/schoolInfrastructure`);
@@ -107,6 +117,7 @@ api.get('/', (req, res) => {
 });
 
 // mount API routes
+api.use('/user', user);
 api.use('/simulation', simulation);
 api.use('/class', classes);
 api.use('/enrollment', enrollment);
@@ -125,7 +136,11 @@ api.use('/rate_school', rateSchool);
 api.use('/gloss_enrollment_ratio', glossEnrollmentRatio);
 api.use('/liquid_enrollment_ratio', liquidEnrollmentRatio);
 api.use('/idhml', idhml);
+api.use('/auth/token', oauth2.token);
+api.use('/verify', verifyToken);
+api.use('/reset', resetToken);
 api.use('/education_years', educationYears);
+api.use('/downloads', downloads);
 api.use('/infrastructure', infrastructure);
 api.use('/school_infrastructure', schoolInfrastructure);
 api.use('/distribution_factor', distributionFactor);