|
|
@ -5,7 +5,7 @@
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
import { Router, Request, Response, NextFunction } from 'express';
|
|
|
|
import { Router, Request, Response, NextFunction } from 'express';
|
|
|
|
import { findFromToken, setUserPassword, users, createNewUser, verifyCliKey } from '../auth';
|
|
|
|
import { findFromToken, setUserPassword, users, createNewUser, deleteUser, verifyCliKey } from '../auth';
|
|
|
|
import { log } from '../utils';
|
|
|
|
import { log } from '../utils';
|
|
|
|
import { data } from '../data';
|
|
|
|
import { data } from '../data';
|
|
|
|
import { User } from '../types/auth';
|
|
|
|
import { User } from '../types/auth';
|
|
|
@ -15,6 +15,17 @@ import { User } from '../types/auth';
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
const RouterApi = Router();
|
|
|
|
const RouterApi = Router();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* Logs an error and sends a 500 (404 if 'User not found' error)
|
|
|
|
|
|
|
|
* @since v0.14.1
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
const errorHandler = (res: Response, err: Error | any) => {
|
|
|
|
|
|
|
|
log.error(err);
|
|
|
|
|
|
|
|
if (err.message === 'User not found')
|
|
|
|
|
|
|
|
return res.sendStatus(404);
|
|
|
|
|
|
|
|
res.sendStatus(500);
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Token authentication middleware for Admins
|
|
|
|
* Token authentication middleware for Admins
|
|
|
|
* @since v0.14.0
|
|
|
|
* @since v0.14.0
|
|
|
@ -56,7 +67,7 @@ function buildUserRouter() {
|
|
|
|
|
|
|
|
|
|
|
|
setUserPassword(id, newPassword)
|
|
|
|
setUserPassword(id, newPassword)
|
|
|
|
.then(() => res.sendStatus(200))
|
|
|
|
.then(() => res.sendStatus(200))
|
|
|
|
.catch((err) => (log.error(err), res.sendStatus(500)));
|
|
|
|
.catch((err) => errorHandler(res, err));
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
// Create a new user
|
|
|
|
// Create a new user
|
|
|
@ -73,7 +84,7 @@ function buildUserRouter() {
|
|
|
|
|
|
|
|
|
|
|
|
createNewUser(username, password, admin, meta)
|
|
|
|
createNewUser(username, password, admin, meta)
|
|
|
|
.then((user) => res.send(user))
|
|
|
|
.then((user) => res.send(user))
|
|
|
|
.catch((err) => (log.error(err), res.sendStatus(500)));
|
|
|
|
.catch((err) => errorHandler(res, err));
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
// Get a user (must be last as it's a catch-all)
|
|
|
|
// Get a user (must be last as it's a catch-all)
|
|
|
@ -81,6 +92,23 @@ function buildUserRouter() {
|
|
|
|
userRouter.get('/:id', adminAuthMiddleware, (req: Request, res: Response) =>
|
|
|
|
userRouter.get('/:id', adminAuthMiddleware, (req: Request, res: Response) =>
|
|
|
|
userFinder(res, users.find(user => user.unid === req.params.id || user.username === req.params.id)));
|
|
|
|
userFinder(res, users.find(user => user.unid === req.params.id || user.username === req.params.id)));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Delete a user
|
|
|
|
|
|
|
|
// Admin only
|
|
|
|
|
|
|
|
userRouter.delete('/:id', adminAuthMiddleware, (req: Request, res: Response) => {
|
|
|
|
|
|
|
|
const id = req.params.id;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
deleteUser(id)
|
|
|
|
|
|
|
|
.then(() => res.sendStatus(200))
|
|
|
|
|
|
|
|
.catch((err) => errorHandler(res, err));
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Update a user
|
|
|
|
|
|
|
|
// Admin only
|
|
|
|
|
|
|
|
userRouter.put('/:id', adminAuthMiddleware, (req: Request, res: Response) => {
|
|
|
|
|
|
|
|
const id = req.params.id;
|
|
|
|
|
|
|
|
//WIP
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
return userRouter;
|
|
|
|
return userRouter;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|