summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorChristian Hofmaier2018-08-05 02:02:15 +0200
committerChristian Hofmaier2018-08-05 02:02:15 +0200
commitde1b08baefd08b9b805638a23ea4826a38812f53 (patch)
tree327601263287ae310c8f8d7f28cef3361ce51e65 /server
parentmerge (diff)
downloadbas-de1b08baefd08b9b805638a23ea4826a38812f53.tar.gz
bas-de1b08baefd08b9b805638a23ea4826a38812f53.tar.xz
bas-de1b08baefd08b9b805638a23ea4826a38812f53.zip
code adaption
Diffstat (limited to 'server')
-rw-r--r--server/api/permissions.js7
-rw-r--r--server/api/users.js (renamed from server/api/user.js)18
-rw-r--r--server/router.js12
3 files changed, 11 insertions, 26 deletions
diff --git a/server/api/permissions.js b/server/api/permissions.js
index d55e7d9..3b78c91 100644
--- a/server/api/permissions.js
+++ b/server/api/permissions.js
@@ -2,8 +2,7 @@
var path = require('path');
var db = require(path.join(__appdir, 'lib', 'sequelize'));
-module.exports = {
- // Return ID, Description and Name of a given RoleID
+module.exports.get = {
getRoleById: function(req, res) {
var roleid = req.params.roleid
db.role.findById(roleid, {
@@ -26,8 +25,10 @@ module.exports = {
db.permission.findAll().then(function (permissions) {
res.status(200).send(permissions)
})
- },
+ }
+}
+module.exports.post = {
deleteRoles: function(req, res) {
const roleIds = req.body.id
diff --git a/server/api/user.js b/server/api/users.js
index 9aba1fc..8514bbc 100644
--- a/server/api/user.js
+++ b/server/api/users.js
@@ -4,21 +4,15 @@ var path = require('path')
var db = require(path.join(__appdir, 'lib', 'sequelize'))
var jwt = require('jsonwebtoken')
-module.exports = {
- info: function (req, res) {
+module.exports.get = {
+ getUserInfo: function (req, res) {
// Because veryfyToken was succesfully excecuted the request has the attribute token.
const token = req.token
// Decode the token.
var decoded = jwt.decode(token, {complete: true})
var userid = decoded.payload.user.id
- // db.query('SELECT * FROM users WHERE id=?', [userid], function(err, rows) {
db.user.findOne({ where: { id: userid } }).then(userDb => {
- // if (err) return res.status(500).send({ auth: false, status: 'DATABASE_ERROR', error_message: 'SQL query failed.' });
- // user.id = rows[0].id;
- // user.username = rows[0].username;
- // user.email = rows[0].email;
- // user.name = rows[0].name;
var user = { }
user.id = userDb.id
user.username = userDb.username
@@ -28,15 +22,17 @@ module.exports = {
})
},
- getUserList: function(req, res) {
+ getUserList: function(req, res) {
db.user.findAll({
attributes: ['id', 'username', 'name'],
include: [{model: db.role, as: 'roles', attributes: ['name'] }]
}).then(function (users) {
res.status(200).send(users)
})
- },
+ }
+}
+module.exports.post = {
grantRoles: function(req, res) {
const roleIds = req.body.roleIds
const userIds = req.body.userIds
@@ -60,4 +56,4 @@ module.exports = {
res.status(200).send('success')
})
}
-}
+} \ No newline at end of file
diff --git a/server/router.js b/server/router.js
index 53caca8..f77d09a 100644
--- a/server/router.js
+++ b/server/router.js
@@ -14,18 +14,6 @@ router.post('/changepassword', auth.changePassword)
var ipxe = require(path.join(__dirname, 'api', 'ipxe'))
router.get('/ipxe/loadScript', ipxe.get.loadScript)
-// ############ Legacy Code: TODO(Chris): Rework to api and get/post or delete! ############
-// User API
-var user = require(path.join(__dirname, 'api', 'user'))
-router.get('/user/info', auth.verifyToken, user.info)
-
-// Permissions API
-var permissions = require(path.join(__dirname, 'api', 'permissions'))
-router.get('/getRolesByUserid', permissions.getRolesByUserid)
-router.post('/getRoleById', auth.verifyToken, permissions.getRoleById)
-
-// ############################################################################
-
// Dynamic API routes
function mapApi (method) {
return function (req, res) {