verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

requested changes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details

This commit is contained in:
Pau 2023-01-18 07:41:10 +01:00
parent 3b69d76525
commit cc806cc08f
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
back/models/notificationSubscription.js
View File

@ -7,9 +7,7 @@ module.exports = Self => {
const user = await ctx.instance.userFk; const user = await ctx.instance.userFk;
const modifiedUser = await getUserToModify(null, user, models); const modifiedUser = await getUserToModify(null, user, models);
if (userId == modifiedUser.id || userId == modifiedUser.bossFk) if (userId != modifiedUser.id && userId != modifiedUser.bossFk)
return;
else
throw new UserError('You dont have permission to modify this user'); throw new UserError('You dont have permission to modify this user');
}); });
@ -42,14 +40,13 @@ module.exports = Self => {
const user = ctx.req.accessToken.userId; const user = ctx.req.accessToken.userId;
const modifiedUser = await getUserToModify(notificationId, null, models); const modifiedUser = await getUserToModify(notificationId, null, models);
if (user == modifiedUser.id || modifiedUser.bossFk == user) { if (user != modifiedUser.id && user != modifiedUser.bossFk)
await models.NotificationSubscription.destroyById(notificationId);
return;
} else
throw new UserError('You dont have permission to modify this user'); throw new UserError('You dont have permission to modify this user');
await models.NotificationSubscription.destroyById(notificationId);
}; };
async function getUserToModify(notificationId = null, userFk = null, models) { async function getUserToModify(notificationId, userFk, models) {
if (notificationId != null) { if (notificationId != null) {
const subscription = await models.NotificationSubscription.findById(notificationId); const subscription = await models.NotificationSubscription.findById(notificationId);
const user = await subscription.userFk; const user = await subscription.userFk;

5
db/dump/structure.sql
View File

@ -19726,10 +19726,11 @@ DROP TABLE IF EXISTS `notificationSubscription`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */; /*!40101 SET character_set_client = utf8 */;
CREATE TABLE `notificationSubscription` ( CREATE TABLE `notificationSubscription` (
`Id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`notificationFk` int(11) NOT NULL, `notificationFk` int(11) NOT NULL,
`userFk` int(10) unsigned NOT NULL, `userFk` int(10) unsigned NOT NULL,
PRIMARY KEY (`Id`), PRIMARY KEY (`id`),
KEY `notificationSubscription_ibfk_1` (`notificationFk`),
KEY `notificationSubscription_ibfk_2` (`userFk`), KEY `notificationSubscription_ibfk_2` (`userFk`),
CONSTRAINT `notificationSubscription_ibfk_1` FOREIGN KEY (`notificationFk`) REFERENCES `notification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `notificationSubscription_ibfk_1` FOREIGN KEY (`notificationFk`) REFERENCES `notification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `notificationSubscription_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE CONSTRAINT `notificationSubscription_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE