Skip to content
Snippets Groups Projects
Commit 4cb77e92 authored by Alexander Olofsson's avatar Alexander Olofsson
Browse files

Clean up output, remove lots of debugging

parent b8629662
No related branches found
No related tags found
No related merge requests found
...@@ -23,4 +23,5 @@ app.use('/auth', require('./server/auth')); ...@@ -23,4 +23,5 @@ app.use('/auth', require('./server/auth'));
app.use('/users', ensureLogin('/auth/signin'), require('./server/users')); app.use('/users', ensureLogin('/auth/signin'), require('./server/users'));
app.listen(8080, () => { app.listen(8080, () => {
console.log("Listening on 8080");
}); });
...@@ -34,9 +34,8 @@ CREATE TABLE IF NOT EXISTS audit_events ( ...@@ -34,9 +34,8 @@ CREATE TABLE IF NOT EXISTS audit_events (
(async () => { (async () => {
const client = await pool.connect(); const client = await pool.connect();
try { try {
console.log("Applying database seed.") console.log("Applying database seed...")
const res = await client.query(seed); const res = await client.query(seed);
console.log(res);
} finally { } finally {
client.release(); client.release();
} }
......
...@@ -13,37 +13,13 @@ const axios = require('axios').create({ ...@@ -13,37 +13,13 @@ const axios = require('axios').create({
} }
}); });
router.get('/audit', async (req, res) => {
console.log('GET: /users/audit');
try {
const queryText = 'SELECT * FROM audit_events WHERE user_id = $1';
console.log('> DB Query:');
console.log(queryText);
const dbResponse = await db.query(queryText, [req.user.id]);
console.log('> DB Response:');
console.log(dbResponse);
var rows = dbResponse.rows;
res.send(rows);
} catch(err) {
console.log("> DB Error:");
console.log(err);
return res.status(500).send({ 'message': "Database error occured" });
}
});
router.get('/', async (req, res) => { router.get('/', async (req, res) => {
console.log('GET: /users'); console.log('GET: /users');
try { try {
const queryText = 'SELECT * FROM external_users WHERE owner_id = $1'; const queryText = 'SELECT * FROM external_users WHERE owner_id = $1';
console.log('> DB Query:');
console.log(queryText);
const dbResponse = await db.query(queryText, [req.user.id]); const dbResponse = await db.query(queryText, [req.user.id]);
console.log('> DB Response:'); const rows = dbResponse.rows;
console.log(dbResponse);
var rows = dbResponse.rows;
res.send(rows.map((row) => row.user_id)); res.send(rows.map((row) => row.user_id));
} catch(err) { } catch(err) {
...@@ -56,17 +32,14 @@ router.get('/', async (req, res) => { ...@@ -56,17 +32,14 @@ router.get('/', async (req, res) => {
router.post('/', async (req, res) => { router.post('/', async (req, res) => {
console.log("POST: /users"); console.log("POST: /users");
console.log(req.body); console.log(req.body);
req.body = Object.keys(req.body) req.body = Object.keys(req.body)
.filter( key => ['email','username','name','skype','linkedin','twitter','website_url','organization','bio','location','avatar'].includes(key) ) .filter( key => ['email','username','name','skype','linkedin','twitter','website_url','organization','bio','location','avatar'].includes(key) )
.reduce( (rs, key) => (rs[key] = req.body[key], rs), {} ); .reduce( (rs, key) => (rs[key] = req.body[key], rs), {} );
try { try {
const queryText = 'SELECT * FROM external_users WHERE owner_id = $1'; const queryText = 'SELECT * FROM external_users WHERE owner_id = $1';
console.log('> DB Query:');
console.log(queryText);
const dbResponse = await db.query(queryText, [req.user.id]); const dbResponse = await db.query(queryText, [req.user.id]);
console.log('> DB Response:');
console.log(dbResponse);
if (dbResponse.rowCount >= config.external_limit) { if (dbResponse.rowCount >= config.external_limit) {
return res.status(400).send({ 'message': 'External user limit reached' }); return res.status(400).send({ 'message': 'External user limit reached' });
...@@ -76,26 +49,19 @@ router.post('/', async (req, res) => { ...@@ -76,26 +49,19 @@ router.post('/', async (req, res) => {
console.log(err); console.log(err);
return res.status(500).send({ 'message': "Database error occured" }); return res.status(500).send({ 'message': "Database error occured" });
} }
// TODO: Apply further validation on input // TODO: Apply further validation on input
// XXX Make sure user is allowed to create // XXX Make sure user is allowed to create
try { try {
var dbResponse = null; var dbResponse = null;
console.log('> REST Query:');
console.log('POST api/v4/users');
const response = await axios.post('api/v4/users', Object.assign({}, req.body, { external: true, reset_password: true })) const response = await axios.post('api/v4/users', Object.assign({}, req.body, { external: true, reset_password: true }))
const data = response.data const data = response.data
console.log('> Response:');
console.log(data);
try { try {
const queryText = 'INSERT INTO external_users(owner_id, user_id, username) VALUES($1, $2, $3)'; const queryText = 'INSERT INTO external_users(owner_id, user_id, username) VALUES($1, $2, $3)';
console.log('> DB Query:'); const dbResponse = await db.query(queryText, [req.user.id, data.id, req.body.username]);
console.log(queryText);
dbResponse = await db.query(queryText, [req.user.id, data.id, req.body.username]);
console.log('> DB Response:');
console.log(dbResponse);
} catch(err) { } catch(err) {
console.log('> DB Error:'); console.log('> DB Error:');
console.log(err); console.log(err);
...@@ -105,11 +71,7 @@ router.post('/', async (req, res) => { ...@@ -105,11 +71,7 @@ router.post('/', async (req, res) => {
try { try {
const queryText = 'INSERT INTO audit_events(event, user_id, message) VALUES($1, $2, $3)'; const queryText = 'INSERT INTO audit_events(event, user_id, message) VALUES($1, $2, $3)';
console.log('> DB Query:');
console.log(queryText);
const auditresp = await db.query(queryText, ['user.create', req.user.id, `Created account: ${data.name} <${data.email}>, username: ${data.username}`]); const auditresp = await db.query(queryText, ['user.create', req.user.id, `Created account: ${data.name} <${data.email}>, username: ${data.username}`]);
console.log('> DB Response:');
console.log(auditresp);
} catch(err) { } catch(err) {
console.log('> DB Error:'); console.log('> DB Error:');
console.log(err); console.log(err);
...@@ -127,12 +89,8 @@ router.get('/:userId', async (req, res) => { ...@@ -127,12 +89,8 @@ router.get('/:userId', async (req, res) => {
console.log('GET: /users/' + req.params.userId); console.log('GET: /users/' + req.params.userId);
try { try {
console.log('> REST Query:');
console.log('GET api/v4/users/' + req.params.userId);
const response = await axios.get('api/v4/users/' + req.params.userId) const response = await axios.get('api/v4/users/' + req.params.userId)
const data = response.data const data = response.data
console.log('> Response:');
console.log(data);
res.send(data); res.send(data);
} catch(err) { } catch(err) {
...@@ -142,4 +100,21 @@ router.get('/:userId', async (req, res) => { ...@@ -142,4 +100,21 @@ router.get('/:userId', async (req, res) => {
} }
}); });
router.get('/audit', async (req, res) => {
console.log('GET: /users/audit');
try {
const queryText = 'SELECT * FROM audit_events WHERE user_id = $1';
const dbResponse = await db.query(queryText, [req.user.id]);
const rows = dbResponse.rows;
res.send(rows);
} catch(err) {
console.log("> DB Error:");
console.log(err);
return res.status(500).send({ 'message': "Database error occured" });
}
});
module.exports = router; module.exports = router;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment