c4patino/know-it-all
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed database not getting config settings

Browse source
This commit is contained in:
Ceferino Patino 2022-03-12 19:09:56 -06:00
commit 64154d1bf5
3 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
my-app/package.json
View file

@ -1,5 +0,0 @@
{
"name": "my-app",
"version": "0.1.0",
"private": true
}

6
server/models/index.js
View file

@ -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,
});

6
server/routes/authRouter.js
View file

@ -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;