diff --git a/my-app/package.json b/my-app/package.json deleted file mode 100644 index 973ccff..0000000 --- a/my-app/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "my-app", - "version": "0.1.0", - "private": true -} diff --git a/server/models/index.js b/server/models/index.js index 04a34bf..73473ae 100644 --- a/server/models/index.js +++ b/server/models/index.js @@ -2,12 +2,12 @@ const fs = require('fs'); const path = require('path'); const Sequelize = require('sequelize'); const basename = path.basename(__filename); -const config = require(__dirname + '/../config/databaseConfig.js'); -const env = config[process.env.NODE_ENV]; +const env = process.env.NODE_ENV || 'development'; +const config = require(__dirname + '/../config/databaseConfig.js')[env]; const db = {}; const sequelize = new Sequelize({ - ...env, + ...config, logging: false, }); diff --git a/server/routes/authRouter.js b/server/routes/authRouter.js index 75383d4..6242232 100644 --- a/server/routes/authRouter.js +++ b/server/routes/authRouter.js @@ -12,8 +12,8 @@ const Logout = require('./auth/Logout'); const RequestReset = require('./auth/RequestReset'); const ResetPassword = require('./auth/ResetPassword'); const GetUserDetails = require('./auth/GetUserDetails'); -const GetKnownOrgs = require('./auth/GetKnownOrgs'); -const GetOwnedORgs = require('./auth/GetOwnedOrgs'); +const GetOwnedOrgs = require('./auth/GetOwnedOrgs'); +const GetMemberOrgs = require('./auth/GetMemberOrgs'); router.post('/register', CreateUser); router.patch('/update', tokenAuth, UpdateUserDetails); @@ -25,6 +25,6 @@ router.patch('/reset-password/:id', ResetPassword); router.get('/:userID', tokenAuth, checkKnownUser, GetUserDetails); router.get('/', tokenAuth, GetOwnedOrgs); -router.get('/orgs', tokenAuth, GetKnownOrgs); +router.get('/orgs', tokenAuth, GetMemberOrgs); module.exports = router;