summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hofmaier2018-08-05 02:26:47 +0200
committerChristian Hofmaier2018-08-05 02:26:47 +0200
commit67518cfa6364b166eeac0ced4e2270b6ce06bf0d (patch)
treed011fea7e8417e6f1b445ef915f6b4343ec0a275
parentfdsa (diff)
downloadbas-67518cfa6364b166eeac0ced4e2270b6ce06bf0d.tar.gz
bas-67518cfa6364b166eeac0ced4e2270b6ce06bf0d.tar.xz
bas-67518cfa6364b166eeac0ced4e2270b6ce06bf0d.zip
fixed eslint
-rw-r--r--server/api/permissions.js30
-rw-r--r--server/api/users.js12
-rw-r--r--server/app.js4
-rw-r--r--server/lib/permissions/index.js4
-rw-r--r--server/migrations/20180726033400-create-user_x_role.js6
-rw-r--r--server/migrations/20180726173100-create-role_x_permission.js6
-rw-r--r--server/migrations/20180804234000-create-role_x_group.js6
-rw-r--r--server/models/role.js4
-rw-r--r--server/models/user.js2
9 files changed, 37 insertions, 37 deletions
diff --git a/server/api/permissions.js b/server/api/permissions.js
index 3b78c91..5f89be1 100644
--- a/server/api/permissions.js
+++ b/server/api/permissions.js
@@ -1,9 +1,9 @@
/* global __appdir */
-var path = require('path');
-var db = require(path.join(__appdir, 'lib', 'sequelize'));
+var path = require('path')
+var db = require(path.join(__appdir, 'lib', 'sequelize'))
module.exports.get = {
- getRoleById: function(req, res) {
+ getRoleById: function (req, res) {
var roleid = req.params.roleid
db.role.findById(roleid, {
attributes: ['id', 'name', 'descr']
@@ -13,31 +13,31 @@ module.exports.get = {
})
},
- getRoleList: function(req, res) {
+ getRoleList: function (req, res) {
db.role.findAll({
- attributes: ['id', 'name', 'descr']
- }).then(function (roles) {
- res.status(200).send(roles)
- })
+ attributes: ['id', 'name', 'descr']
+ }).then(function (roles) {
+ res.status(200).send(roles)
+ })
},
- getPermissionList: function(req, res) {
+ getPermissionList: function (req, res) {
db.permission.findAll().then(function (permissions) {
- res.status(200).send(permissions)
- })
+ res.status(200).send(permissions)
+ })
}
}
module.exports.post = {
- deleteRoles: function(req, res) {
+ deleteRoles: function (req, res) {
const roleIds = req.body.id
- db.role.destroy({ where: { id: roleIds } }).then(function() {
+ db.role.destroy({ where: { id: roleIds } }).then(function () {
res.status(200).send('success')
})
},
- saveRole: function(req, res) {
+ saveRole: function (req, res) {
}
-} \ No newline at end of file
+}
diff --git a/server/api/users.js b/server/api/users.js
index 8514bbc..38acbc2 100644
--- a/server/api/users.js
+++ b/server/api/users.js
@@ -5,7 +5,7 @@ var db = require(path.join(__appdir, 'lib', 'sequelize'))
var jwt = require('jsonwebtoken')
module.exports.get = {
- getUserInfo: function (req, res) {
+ getUserInfo: function (req, res) {
// Because veryfyToken was succesfully excecuted the request has the attribute token.
const token = req.token
// Decode the token.
@@ -22,10 +22,10 @@ module.exports.get = {
})
},
- getUserList: function(req, res) {
+ getUserList: function (req, res) {
db.user.findAll({
attributes: ['id', 'username', 'name'],
- include: [{model: db.role, as: 'roles', attributes: ['name'] }]
+ include: [{ model: db.role, as: 'roles', attributes: ['name'] }]
}).then(function (users) {
res.status(200).send(users)
})
@@ -33,7 +33,7 @@ module.exports.get = {
}
module.exports.post = {
- grantRoles: function(req, res) {
+ grantRoles: function (req, res) {
const roleIds = req.body.roleIds
const userIds = req.body.userIds
@@ -45,7 +45,7 @@ module.exports.post = {
})
},
- revokeRoles: function(req, res) {
+ revokeRoles: function (req, res) {
const roleIds = req.body.roleIds
const userIds = req.body.userIds
@@ -56,4 +56,4 @@ module.exports.post = {
res.status(200).send('success')
})
}
-} \ No newline at end of file
+}
diff --git a/server/app.js b/server/app.js
index cc5cd21..4f5e6dd 100644
--- a/server/app.js
+++ b/server/app.js
@@ -10,8 +10,8 @@ var app = express()
global.__appdir = __dirname
-var tftp = require('./lib/tftp')
-var permissionsDB = require ('./lib/permissions')
+require('./lib/tftp')
+require('./lib/permissions')
// ############################################################################
// ########################### setup middleware ###############################
diff --git a/server/lib/permissions/index.js b/server/lib/permissions/index.js
index e1157eb..dafa4d1 100644
--- a/server/lib/permissions/index.js
+++ b/server/lib/permissions/index.js
@@ -9,7 +9,7 @@ function updatePermissionDatabase () {
var permissionNames = []
// Insert / Update Entries in Database
- permissions.forEach(function(permission) {
+ permissions.forEach(function (permission) {
permissionNames.push(permission.name)
upsert(db.permission, { name: permission.name, descr: permission.descr, groupdependent: permission.groupdependent }, { name: permission.name })
})
@@ -35,4 +35,4 @@ function upsert (model, newItem, where) {
.update(newItem, {where: where})
.then(function (item) { return {item: item, created: false} })
})
-} \ No newline at end of file
+}
diff --git a/server/migrations/20180726033400-create-user_x_role.js b/server/migrations/20180726033400-create-user_x_role.js
index d82bc9a..cbf5735 100644
--- a/server/migrations/20180726033400-create-user_x_role.js
+++ b/server/migrations/20180726033400-create-user_x_role.js
@@ -6,7 +6,7 @@ module.exports = {
primaryKey: true,
allowNull: false,
type: Sequelize.INTEGER,
- onDelete: "cascade",
+ onDelete: 'cascade',
references: {
model: 'users',
key: 'id'
@@ -16,7 +16,7 @@ module.exports = {
primaryKey: true,
allowNull: false,
type: Sequelize.INTEGER,
- onDelete: "cascade",
+ onDelete: 'cascade',
references: {
model: 'roles',
key: 'id'
@@ -27,4 +27,4 @@ module.exports = {
down: (queryInterface, Sequelize) => {
return queryInterface.dropTable('user_x_role')
}
-} \ No newline at end of file
+}
diff --git a/server/migrations/20180726173100-create-role_x_permission.js b/server/migrations/20180726173100-create-role_x_permission.js
index edfcb8e..4136ef4 100644
--- a/server/migrations/20180726173100-create-role_x_permission.js
+++ b/server/migrations/20180726173100-create-role_x_permission.js
@@ -6,7 +6,7 @@ module.exports = {
primaryKey: true,
allowNull: false,
type: Sequelize.INTEGER,
- onDelete: "cascade",
+ onDelete: 'cascade',
references: {
model: 'roles',
key: 'id'
@@ -16,7 +16,7 @@ module.exports = {
primaryKey: true,
allowNull: false,
type: Sequelize.INTEGER,
- onDelete: "cascade",
+ onDelete: 'cascade',
references: {
model: 'permissions',
key: 'id'
@@ -27,4 +27,4 @@ module.exports = {
down: (queryInterface, Sequelize) => {
return queryInterface.dropTable('role_x_permission')
}
-} \ No newline at end of file
+}
diff --git a/server/migrations/20180804234000-create-role_x_group.js b/server/migrations/20180804234000-create-role_x_group.js
index d9024be..a6dd792 100644
--- a/server/migrations/20180804234000-create-role_x_group.js
+++ b/server/migrations/20180804234000-create-role_x_group.js
@@ -6,7 +6,7 @@ module.exports = {
primaryKey: true,
allowNull: false,
type: Sequelize.INTEGER,
- onDelete: "cascade",
+ onDelete: 'cascade',
references: {
model: 'roles',
key: 'id'
@@ -16,7 +16,7 @@ module.exports = {
primaryKey: true,
allowNull: false,
type: Sequelize.INTEGER,
- onDelete: "cascade",
+ onDelete: 'cascade',
references: {
model: 'groups',
key: 'id'
@@ -27,4 +27,4 @@ module.exports = {
down: (queryInterface, Sequelize) => {
return queryInterface.dropTable('role_x_group')
}
-} \ No newline at end of file
+}
diff --git a/server/models/role.js b/server/models/role.js
index 2ce1ad1..f33b042 100644
--- a/server/models/role.js
+++ b/server/models/role.js
@@ -14,10 +14,10 @@ module.exports = (sequelize, DataTypes) => {
})
role.associate = function (models) {
var RoleXPermission = sequelize.define('role_x_permission', {}, { timestamps: false, freezeTableName: true })
- role.belongsToMany(models.permission, { as: 'permissions', through: RoleXPermission, foreignKey: 'roleId', otherKey: 'permissionId'})
+ role.belongsToMany(models.permission, { as: 'permissions', through: RoleXPermission, foreignKey: 'roleId', otherKey: 'permissionId' })
var RoleXGroup = sequelize.define('role_x_group', {}, { timestamps: false, freezeTableName: true })
- role.belongsToMany(models.group, { as: 'groups', through: RoleXGroup, foreignKey: 'roleId', otherKey: 'groupId'})
+ role.belongsToMany(models.group, { as: 'groups', through: RoleXGroup, foreignKey: 'roleId', otherKey: 'groupId' })
}
return role
diff --git a/server/models/user.js b/server/models/user.js
index 7ef8afc..1747cd6 100644
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -16,7 +16,7 @@ module.exports = (sequelize, DataTypes) => {
})
user.associate = function (models) {
var UserXRole = sequelize.define('user_x_role', {}, { timestamps: false, freezeTableName: true })
- user.belongsToMany(models.role, { as: 'roles', through: UserXRole, foreignKey: 'userId', otherKey: 'roleId'})
+ user.belongsToMany(models.role, { as: 'roles', through: UserXRole, foreignKey: 'userId', otherKey: 'roleId' })
}
return user