1
0
mirror of synced 2025-10-28 18:19:17 +00:00

link between servers & groups, clean, bug fix

This commit is contained in:
Valentin PUCCETTI
2023-09-11 16:28:18 +02:00
parent a034396dbe
commit 221a4b24a0
19 changed files with 298 additions and 76 deletions

View File

@@ -1,5 +1,6 @@
const express = require('express');
const User = require("../model/user.model")
var router = express.Router();
router.use('*', (req, res, next) => {
@@ -20,5 +21,6 @@ router.use('/users/', require('../routes/admin/users.route'));
router.use('/members/', require('../routes/admin/members.route'));
router.use('/groups/', require('../routes/admin/groups.route'));
router.use('/servers/', require('../routes/admin/servers.route'));
router.use('/accesses', require('../routes/admin/accesses.route'))
module.exports = router;

View File

@@ -0,0 +1,30 @@
const express = require('express');
groupService = require("../../services/groups.service");
memberService = require("../../services/members.service");
accessesService = require("../../services/accesses.service");
var router = express.Router();
router.get('/:name/add/:server', (req, res) => {
try {
accessesService.addAccess(req.params.server, req.params.name).then((result) => {
res.redirect('/admin/groups/' + req.params.name)
});
} catch(e) {
console.log(e)
}
})
router.get('/:name/delete/:server', (req, res) => {
try {
accessesService.delAccess(req.params.server, req.params.name).then((result) => {
res.redirect('/admin/groups/' + req.params.name)
});
} catch(e) {
console.log(e)
}
})
module.exports = router;

View File

@@ -1,10 +1,13 @@
const express = require('express');
const User = require("../../model/user.model");
const Group = require("../../model/group.model");
groupService = require("../../services/group.service");
memberService = require("../../services/members.service");
var router = express.Router();
const Server = require("../../model/server.model");
groupService = require("../../services/groups.service");
memberService = require("../../services/members.service");
var router = express.Router();
router.get("/", (req, res) => {
try {
@@ -52,7 +55,16 @@ router.get("/:name", async (req, res) => {
delete users[user]
}
}
res.render('admin/group_edit', { "group": group, "inGroup": result, "outGroup": users })
groupService.groupServerList(req.params.name).then((result2) => {
Server.findAll().then((servers) => {
for (server in servers) {
if (JSON.stringify(result2).includes(servers[server].dataValues.hostname)) {
delete servers[server]
}
}
res.render('admin/group_edit', { "group": group, "inGroup": result, "outGroup": users, "inServer": result2, "outServer": servers});
});
})
});
})
});

View File

@@ -1,9 +1,8 @@
const express = require('express');
const User = require("../../model/user.model");
const Group = require("../../model/group.model");
groupService = require("../../services/group.service");
const Member = require("../../model/member.model");
groupService = require("../../services/groups.service");
memberService = require("../../services/members.service");
var router = express.Router();
router.get('/:name/add/:user', (req, res) => {

View File

@@ -1,9 +1,10 @@
const express = require('express');
const User = require("../../model/user.model");
const Group = require("../../model/group.model");
const Server = require("../../model/server.model");
memberService = require("../../services/members.service");
serverService = require("../../services/server.service");
var router = express.Router();

View File

@@ -1,11 +1,12 @@
const express = require('express');
const User = require("../../model/user.model");
const Group = require("../../model/group.model");
const Key = require("../../model/key.model");
const keyService = require("../../services/keys.service");
groupService = require("../../services/group.service");
keyService = require("../../services/keys.service");
groupService = require("../../services/groups.service");
memberService = require("../../services/members.service");
userService = require("../../services/users.service");
var router = express.Router();

View File

@@ -1,4 +1,5 @@
const express = require('express');
const keyService = require("../services/keys.service");
const Key = require("../model/key.model");