auth bugfix + licences
This commit is contained in:
25
server.js
25
server.js
@@ -97,6 +97,7 @@ const server = https.createServer(httpsOptions, app);
|
||||
let FileSystemManager = require(`@services/fileSystemManager.js`);
|
||||
let AuthenticationManager = require(`@services/authenticationManager.js`);
|
||||
let ActiveDirectory = require(`@services/activeDirectoryManager.js`);
|
||||
let VaultifyManager = require(`@services/vaultifyManager.js`);
|
||||
|
||||
service.set('socketManager', new SocketManager(io));
|
||||
await service.get('socketManager').addAsync('/');
|
||||
@@ -129,10 +130,9 @@ const server = https.createServer(httpsOptions, app);
|
||||
databaseModel.set('permissionModel', require(`@models/permissionModel`)(service.get('sqlManager').getInstance('main')));
|
||||
databaseModel.set('roleModel', require(`@models/roleModel`)(service.get('sqlManager').getInstance('main')));
|
||||
databaseModel.set('rolePermissionsModel', require(`@models/rolePermissionsModel`)(service.get('sqlManager').getInstance('main')));
|
||||
|
||||
service.set('authenticationManager', new AuthenticationManager(databaseModel.get('authentication'), app.locals.configuration.integration.token.secret, databaseModel));
|
||||
|
||||
|
||||
// service.set('vaultifyManager', new VaultifyManager());
|
||||
service.set('activeDirectoryManager', new ActiveDirectory(app.locals.configuration.integration.activedirectory))
|
||||
|
||||
// everytime last created service!
|
||||
@@ -149,6 +149,8 @@ const server = https.createServer(httpsOptions, app);
|
||||
let helpers = service.get('fileSystemManager').loadAllFiles(`${app.locals.path.public}/helpers`, '.js');
|
||||
exports.helpers = helpers;
|
||||
|
||||
// app.use(service.get('vaultifyManager').createMiddleware());
|
||||
|
||||
app.use(express.urlencoded({ extended: true }));
|
||||
app.use(express.json());
|
||||
app.use(cookieParser());
|
||||
@@ -214,22 +216,9 @@ const server = https.createServer(httpsOptions, app);
|
||||
|
||||
|
||||
//#region Implement routes
|
||||
require(`${app.locals.path.source}/routes/indexRoutes.js`).route(app, service);
|
||||
require(`${app.locals.path.source}/routes/loginRoutes.js`).route(
|
||||
app,
|
||||
service.get('authenticationManager'),
|
||||
service.get('socketManager'),
|
||||
service.get('eventManager')
|
||||
);
|
||||
require(`${app.locals.path.source}/routes/adminRoutes.js`).route(
|
||||
app,
|
||||
service.get('authenticationManager'),
|
||||
service.get('pluginManager'),
|
||||
service.get('eventManager'),
|
||||
service.get('socketManager'),
|
||||
service.get('activeDirectoryManager'),
|
||||
`${app.locals.path.source}/models/stylesheet.json`
|
||||
);
|
||||
require(`${app.locals.path.source}/routes/loginRoutes.js`).route(app, service); // #1 - no token security! important: first!!!
|
||||
require(`${app.locals.path.source}/routes/indexRoutes.js`).route(app, service); // #2 - token security enabled at this point
|
||||
require(`${app.locals.path.source}/routes/adminRoutes.js`).route(app, service); // #3 - token security always enabled
|
||||
//#endregion
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user