bugfix permissions
This commit is contained in:
11
server.js
11
server.js
@@ -114,7 +114,7 @@ const server = https.createServer(httpsOptions, app);
|
||||
databaseModel.set('roleModel', require(`@models/roleModel`)(service.get('sqlManager').getInstance('main')));
|
||||
databaseModel.set('rolePermissionsModel', require(`@models/rolePermissionsModel`)(service.get('sqlManager').getInstance('main')));
|
||||
|
||||
service.set('rbacManager', new RBACManager(databaseModel));
|
||||
service.set('rbacManager', new RBACManager(databaseModel, runtimeFile.configuration.live.integration.token.secret));
|
||||
service.set('authenticationManager', new AuthenticationManager(databaseModel.get('authentication'), runtimeFile.configuration.live.integration.token.secret));
|
||||
|
||||
service.set('activeDirectoryManager', new ActiveDirectory(runtimeFile.configuration.live.integration.activedirectory))
|
||||
@@ -128,13 +128,11 @@ const server = https.createServer(httpsOptions, app);
|
||||
//#endregion
|
||||
|
||||
|
||||
//#region Service-Registration/Middleware/Utils/Helpers
|
||||
require(`${localPath.root}/utils.js`);
|
||||
let helpers = service.get('fileSystemManager').loadAllFiles(`${localPath.public}/helpers`, '.js');
|
||||
exports.helpers = helpers;
|
||||
|
||||
// app.use(service.get('vaultifyManager').createMiddleware());
|
||||
app.use(service.get('rbacManager').requirePermissionMiddleware());
|
||||
|
||||
app.use(express.urlencoded({ extended: true }));
|
||||
app.use(express.json());
|
||||
@@ -145,7 +143,9 @@ const server = https.createServer(httpsOptions, app);
|
||||
app.use(express.static(localPath.public));
|
||||
app.use(express.static(localPath.source));
|
||||
|
||||
|
||||
//#region Service-Registration/Middleware/Utils/Helpers
|
||||
app.use(service.get('rbacManager').authenticate());
|
||||
app.use(service.get('rbacManager').requirePermissionMiddleware());
|
||||
|
||||
app.use(function(request, response, next) {
|
||||
if (!request.secure) {
|
||||
@@ -200,14 +200,13 @@ const server = https.createServer(httpsOptions, app);
|
||||
});
|
||||
//#endregion
|
||||
|
||||
|
||||
//#region Implement routes
|
||||
require(`${localPath.source}/routes/loginRoutes.js`).route(app, service); // #1 - no token security! important: first!!!
|
||||
require(`${localPath.source}/routes/indexRoutes.js`).route(app, service); // #2 - token security enabled at this point
|
||||
require(`${localPath.source}/routes/adminRoutes.js`).route(app, service); // #3 - token security always enabled
|
||||
//#endregion
|
||||
|
||||
app.use(service.get('rbacManager').authenticate());
|
||||
|
||||
|
||||
//#region Implements sockets
|
||||
require(`${localPath.source}/sockets/mainSocket.js`)(
|
||||
|
||||
Reference in New Issue
Block a user