xfarrow/blink
0
0
Fork 0
mirror of https://github.com/xfarrow/blink synced 2025-04-03 15:11:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
xfarrow 2024-02-29 15:10:57 +01:00
parent e0f01bbbd9
commit 298e78ab1b
5 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/apis/BlinkApiUsageExample.json
View File

File diff suppressed because one or more lines are too long

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

@ -60,7 +60,7 @@ publicRoutes.get('/organization/:id', organizationRoutes.getOrganization);
const protectedRoutes = express.Router(); const protectedRoutes = express.Router();
protectedRoutes.use(jwtUtils.verifyToken); protectedRoutes.use(jwtUtils.verifyToken);
protectedRoutes.get('/person/myself', personRoutes.getMyself); protectedRoutes.get('/person/myself', personRoutes.getMyself);
protectedRoutes.put('/person/:id', personRoutes.updatePerson); protectedRoutes.put('/person/', personRoutes.updatePerson);
protectedRoutes.delete('/person/delete', personRoutes.deletePerson); protectedRoutes.delete('/person/delete', personRoutes.deletePerson);
protectedRoutes.post('/organization/admin', organizationAdminRoutes.addOrganizationAdmin); protectedRoutes.post('/organization/admin', organizationAdminRoutes.addOrganizationAdmin);
protectedRoutes.delete('/organization/removeadmin', organizationAdminRoutes.removeOrganizationAdmin); protectedRoutes.delete('/organization/removeadmin', organizationAdminRoutes.removeOrganizationAdmin);

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

@ -145,17 +145,14 @@ async function getMyself (req, res) {
* PUT request * PUT request
* *
* Updates a Person's details. If some details are * Updates a Person's details. If some details are
* not present, they shall be ignored. * not present, they shall be ignored. An user can
* only update themselves
* *
* Required field(s): none. Both old_password and * Required field(s): none. Both old_password and
* new_password if updating the password. * new_password if updating the password.
* *
*/ */
async function updatePerson (req, res) { async function updatePerson (req, res) {
if (req.jwt.person_id != req.params.id) {
return res.status(403).json({ error: 'Forbidden' });
}
const updatePerson = {}; const updatePerson = {};
if (req.body.display_name) { if (req.body.display_name) {
@ -179,7 +176,13 @@ async function updatePerson (req, res) {
} }
// If we are tying to change password, the old password must be provided // If we are tying to change password, the old password must be provided
if (req.body.old_password && req.body.new_password) { if (req.body.old_password || req.body.new_password) {
if(!req.body.old_password){
return res.status(401).json({ error: 'The old password must be specified' });
}
if(!req.body.new_password){
return res.status(401).json({ error: 'The new password must be specified' });
}
const user = await personModel.getPersonById(req.jwt.person_id); const user = await personModel.getPersonById(req.jwt.person_id);
const passwordMatches = await bcrypt.compare(req.body.old_password, user.password); const passwordMatches = await bcrypt.compare(req.body.old_password, user.password);
if (passwordMatches) { if (passwordMatches) {
@ -194,7 +197,7 @@ async function updatePerson (req, res) {
} }
try { try {
await personModel.updatePerson(updatePerson, req.params.id); await personModel.updatePerson(updatePerson, req.jwt.person_id);
return res.status(200).json({ success: 'true' }); return res.status(200).json({ success: 'true' });
} catch (error) { } catch (error) {
console.error(`Error in function ${updatePerson.name}: ${error}`); console.error(`Error in function ${updatePerson.name}: ${error}`);

13
frontend/vanilla/css/profile.css
View File

@ -12,6 +12,7 @@ body {
padding: 20px; padding: 20px;
border-radius: 5px; border-radius: 5px;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
position: relative;
} }
header { header {
@ -60,3 +61,15 @@ footer {
margin-bottom: 10px; margin-bottom: 10px;
} }
.edit-badge {
position: absolute;
top: 20px;
right: 20px;
background-color: #008CFF;
color: #fff;
padding: 5px 10px;
border-radius: 5px;
font-weight: bold;
cursor: pointer;
}

10
frontend/vanilla/html/userprofile.html
View File

@ -8,6 +8,7 @@
</head> </head>
<body style="display: none;"> <body style="display: none;">
<div class="container"> <div class="container">
<div class="edit-badge" style="display: none;" id="editBadge" onclick="editProfile()">Edit</div>
<header> <header>
<img src="../content/profile-picture-example.jpg" alt="Profile Picture" class="profile-picture"> <img src="../content/profile-picture-example.jpg" alt="Profile Picture" class="profile-picture">
<h1 id="displayName">Name Surname</h1> <h1 id="displayName">Name Surname</h1>
@ -56,6 +57,7 @@
// Retrieving the logged in user's profile // Retrieving the logged in user's profile
if(!idToDisplay || idToDisplay === 'myself'){ if(!idToDisplay || idToDisplay === 'myself'){
document.getElementById('editBadge').style.display = 'block'; // show edit button
const token = getCookie('token'); const token = getCookie('token');
// Check whether the token exists // Check whether the token exists
if(!token){ if(!token){
@ -79,19 +81,23 @@
const data = await response.json(); const data = await response.json();
if(response.ok){ if(response.ok){
populateFields(data.display_name, data.email); populateFields(data.display_name, data.email);
document.body.style.display = "block"; // Show page document.body.style.display = 'block'; // Show page
} }
else{ else{
alert(data.error); alert(data.error);
} }
} }
function populateFields(displayName, email){ function populateFields (displayName, email) {
document.getElementById('displayName').textContent = displayName; document.getElementById('displayName').textContent = displayName;
document.title = `${displayName} - Blink` document.title = `${displayName} - Blink`
document.getElementById('email').textContent = email; document.getElementById('email').textContent = email;
} }
function editProfile () {
alert('Editing');
}
</script> </script>
</body> </body>