xfarrow/blink
0
0
Fork 0
mirror of https://github.com/xfarrow/blink synced 2025-06-27 09:03:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Show organization

Browse Source
This commit is contained in:
xfarrow
2024-02-29 12:20:08 +01:00
parent 69bc104b68
commit dacf750633
4 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/apis/nodejs/src/app.js
View File

@ -24,7 +24,7 @@ const personRoutes = require('./routes/person_routes.js');
const organizationRoutes = require('./routes/organization_routes.js');
const organizationAdminRoutes = require('./routes/organization_admin_routes.js');
const organizationPostRoutes = require('./routes/organization_post_routes.js');
const jwt_utils = require('./utils/middleware_utils.js');
const jwtUtils = require('./utils/middleware_utils.js');
/*
===== END IMPORTING MODULES
@ -54,17 +54,17 @@ app.use(rateLimit({
const publicRoutes = express.Router();
publicRoutes.post('/register', personRoutes.registerPerson);
publicRoutes.post('/login', personRoutes.login);
publicRoutes.get('/person/:id/details', personRoutes.getPerson);
publicRoutes.get('/organization/:id', organizationRoutes.getOrganization);
const protectedRoutes = express.Router();
protectedRoutes.use(jwt_utils.verifyToken);
protectedRoutes.use(jwtUtils.verifyToken);
protectedRoutes.get('/person/myself', personRoutes.getMyself);
protectedRoutes.get('/person/:id', personRoutes.getPerson);
protectedRoutes.put('/person/:id', personRoutes.updatePerson);
protectedRoutes.delete('/person/delete', personRoutes.deletePerson);
protectedRoutes.post('/organization/admin', organizationAdminRoutes.addOrganizationAdmin);
protectedRoutes.delete('/organization/removeadmin', organizationAdminRoutes.removeOrganizationAdmin);
protectedRoutes.post('/organization', organizationRoutes.createOrganization);
protectedRoutes.get('/organization/:id', organizationRoutes.getOrganization);
protectedRoutes.put('/organization/:id', organizationRoutes.updateOrganization);
protectedRoutes.delete('/organization/:id', organizationRoutes.deleteOrganization);
protectedRoutes.post('/organization/post', organizationPostRoutes.createOrganizationPost);

9
backend/apis/nodejs/src/routes/person_routes.js
View File

@ -108,12 +108,9 @@ async function login (req, res) {
async function getPerson (req, res) {
try {
const person = await personModel.getPersonById(req.params.id);
if (person) {
// I am retrieving either myself or an enabled user
if (person.id == req.jwt.person_id || person.enabled) {
delete person.password; // remove password field for security reasons
return res.status(200).send(person);
}
if (person && person.enabled) {
delete person.password; // remove password field for security reasons
return res.status(200).send(person);
}
return res.status(404).json({ error: 'Not found' });
} catch (error) {