@fdm-monster/server 1.5.1 → 1.5.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/constants/authorization.constants.js +1 -2
- package/dist/constants/authorization.constants.js.map +1 -1
- package/dist/constants/http-status-codes.constants.js +62 -255
- package/dist/constants/http-status-codes.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +0 -4
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/constants/service.constants.js +3 -10
- package/dist/constants/service.constants.js.map +1 -1
- package/dist/container.js +66 -69
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +2 -7
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/auth.controller.js +0 -2
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/batch-call.controller.js +7 -5
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/camera-stream.controller.js +6 -4
- package/dist/controllers/camera-stream.controller.js.map +1 -1
- package/dist/controllers/custom-gcode.controller.js +11 -11
- package/dist/controllers/custom-gcode.controller.js.map +1 -1
- package/dist/controllers/floor.controller.js +9 -12
- package/dist/controllers/floor.controller.js.map +1 -1
- package/dist/controllers/plugin-firmware-update.controller.js +1 -3
- package/dist/controllers/plugin-firmware-update.controller.js.map +1 -1
- package/dist/controllers/print-completion.controller.js +1 -4
- package/dist/controllers/print-completion.controller.js.map +1 -1
- package/dist/controllers/printer-files.controller.js +22 -39
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer-settings.controller.js +8 -6
- package/dist/controllers/printer-settings.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +7 -37
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +0 -1
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +0 -1
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +0 -2
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/user.controller.js +10 -17
- package/dist/controllers/user.controller.js.map +1 -1
- package/dist/controllers/validation/batch-controller.validation.js +10 -9
- package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
- package/dist/controllers/validation/generic.validation.js +16 -7
- package/dist/controllers/validation/generic.validation.js.map +1 -1
- package/dist/controllers/validation/setting.validation.js +0 -1
- package/dist/controllers/validation/setting.validation.js.map +1 -1
- package/dist/handlers/cache-manager.js +1 -1
- package/dist/handlers/cache-manager.js.map +1 -1
- package/dist/handlers/event-emitter.js +0 -7
- package/dist/handlers/event-emitter.js.map +1 -1
- package/dist/handlers/logger.js +1 -1
- package/dist/handlers/logger.js.map +1 -1
- package/dist/handlers/validators.js +1 -1
- package/dist/handlers/validators.js.map +1 -1
- package/dist/middleware/authenticate.js +23 -23
- package/dist/middleware/authenticate.js.map +1 -1
- package/dist/middleware/exception.filter.js +0 -1
- package/dist/middleware/exception.filter.js.map +1 -1
- package/dist/middleware/global.middleware.js +6 -6
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/models/Auth/User.js +0 -2
- package/dist/models/Auth/User.js.map +1 -1
- package/dist/models/FloorPrinter.js.map +1 -1
- package/dist/models/PrintCompletion.js.map +1 -1
- package/dist/models/Printer.js +2 -11
- package/dist/models/Printer.js.map +1 -1
- package/dist/models/Settings.js +0 -1
- package/dist/models/Settings.js.map +1 -1
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js +0 -4
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js.map +1 -1
- package/dist/mongo-migrations/20210907173950-printers-enabled.js +0 -4
- package/dist/mongo-migrations/20210907173950-printers-enabled.js.map +1 -1
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js +0 -4
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map +1 -1
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js +35 -0
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js.map +1 -0
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js +41 -0
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js.map +1 -0
- package/dist/server.constants.js +1 -19
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +6 -7
- package/dist/server.core.js.map +1 -1
- package/dist/server.env.js +6 -18
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +6 -8
- package/dist/server.host.js.map +1 -1
- package/dist/services/authentication/auth.service.js +2 -20
- package/dist/services/authentication/auth.service.js.map +1 -1
- package/dist/services/authentication/jwt.service.js +1 -1
- package/dist/services/authentication/jwt.service.js.map +1 -1
- package/dist/services/authentication/permission.service.js.map +1 -1
- package/dist/services/authentication/refresh-token.service.js +8 -1
- package/dist/services/authentication/refresh-token.service.js.map +1 -1
- package/dist/services/authentication/role.service.js +1 -1
- package/dist/services/authentication/role.service.js.map +1 -1
- package/dist/services/authentication/user.service.js +1 -5
- package/dist/services/authentication/user.service.js.map +1 -1
- package/dist/services/batch-call.service.js +4 -8
- package/dist/services/batch-call.service.js.map +1 -1
- package/dist/services/camera-stream.service.js +1 -2
- package/dist/services/camera-stream.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +1 -4
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/core/logs-manager.service.js +1 -2
- package/dist/services/core/logs-manager.service.js.map +1 -1
- package/dist/services/core/multer.service.js +3 -6
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/core/server-release.service.js +4 -13
- package/dist/services/core/server-release.service.js.map +1 -1
- package/dist/services/core/server-update.service.js +0 -2
- package/dist/services/core/server-update.service.js.map +1 -1
- package/dist/services/core/task-manager.service.js +9 -22
- package/dist/services/core/task-manager.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +28 -22
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/custom-gcode.service.js +2 -2
- package/dist/services/custom-gcode.service.js.map +1 -1
- package/dist/services/floor.service.js +4 -45
- package/dist/services/floor.service.js.map +1 -1
- package/dist/services/interfaces/floor.dto.js +38 -0
- package/dist/services/interfaces/floor.dto.js.map +1 -1
- package/dist/services/interfaces/print-completion-context.dto.js +6 -0
- package/dist/services/interfaces/print-completion-context.dto.js.map +1 -0
- package/dist/services/interfaces/print-completion.dto.js +40 -0
- package/dist/services/interfaces/print-completion.dto.js.map +1 -0
- package/dist/services/interfaces/print-completion.service.js +6 -0
- package/dist/services/interfaces/print-completion.service.js.map +1 -0
- package/dist/services/interfaces/printer.dto.js +16 -3
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/interfaces/refresh-token.dto.js +0 -2
- package/dist/services/interfaces/refresh-token.dto.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js +0 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/interfaces/user-role.dto.js +18 -0
- package/dist/services/interfaces/user-role.dto.js.map +1 -0
- package/dist/services/octoprint/constants/octoprint-service.constants.js +0 -3
- package/dist/services/octoprint/constants/octoprint-service.constants.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.routes.js +2 -4
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.service.js +10 -27
- package/dist/services/octoprint/octoprint-api.service.js.map +1 -1
- package/dist/services/octoprint/octoprint-sockio.adapter.js +10 -43
- package/dist/services/octoprint/octoprint-sockio.adapter.js.map +1 -1
- package/dist/services/octoprint/plugin-base.service.js +0 -1
- package/dist/services/octoprint/plugin-base.service.js.map +1 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js +0 -3
- package/dist/services/octoprint/plugin-firmware-update.service.js.map +1 -1
- package/dist/services/print-completion.service.js +14 -45
- package/dist/services/print-completion.service.js.map +1 -1
- package/dist/services/print-completion.shared.js +59 -0
- package/dist/services/print-completion.shared.js.map +1 -0
- package/dist/services/printer-files.service.js +1 -5
- package/dist/services/printer-files.service.js.map +1 -1
- package/dist/services/printer.service.js +20 -15
- package/dist/services/printer.service.js.map +1 -1
- package/dist/services/settings.service.js +2 -8
- package/dist/services/settings.service.js.map +1 -1
- package/dist/services/validators/floor-service.validation.js +13 -11
- package/dist/services/validators/floor-service.validation.js.map +1 -1
- package/dist/services/validators/printer-service.validation.js +1 -2
- package/dist/services/validators/printer-service.validation.js.map +1 -1
- package/dist/services/validators/user-service.validation.js +10 -10
- package/dist/services/validators/user-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +13 -14
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/state/file-upload-tracker.cache.js +0 -1
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/file.cache.js +25 -33
- package/dist/state/file.cache.js.map +1 -1
- package/dist/state/floor.store.js +0 -1
- package/dist/state/floor.store.js.map +1 -1
- package/dist/state/printer-events.cache.js +1 -3
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/{files.store.js → printer-files.store.js} +12 -26
- package/dist/state/printer-files.store.js.map +1 -0
- package/dist/state/printer-socket.store.js +7 -32
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer.cache.js +4 -9
- package/dist/state/printer.cache.js.map +1 -1
- package/dist/state/settings.store.js +0 -2
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/socket-io.gateway.js +0 -2
- package/dist/state/socket-io.gateway.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +1 -7
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/task.presets.js +0 -11
- package/dist/task.presets.js.map +1 -1
- package/dist/tasks/boot.task.js +6 -10
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/print-completion.socketio.task.js +10 -11
- package/dist/tasks/print-completion.socketio.task.js.map +1 -1
- package/dist/tasks/printer-file-clean.task.js +13 -21
- package/dist/tasks/printer-file-clean.task.js.map +1 -1
- package/dist/tasks/printer-websocket-restore.task.js +1 -5
- package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
- package/dist/tasks/printer-websocket.task.js +5 -15
- package/dist/tasks/printer-websocket.task.js.map +1 -1
- package/dist/tasks/socketio.task.js +0 -1
- package/dist/tasks/socketio.task.js.map +1 -1
- package/dist/tasks.js +0 -2
- package/dist/tasks.js.map +1 -1
- package/dist/types/express/index.d.js +0 -1
- package/dist/types/express/index.d.js.map +1 -1
- package/dist/utils/env.utils.js +2 -5
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/is-docker.js +1 -1
- package/dist/utils/is-docker.js.map +1 -1
- package/dist/utils/normalize-url.js +0 -35
- package/dist/utils/normalize-url.js.map +1 -1
- package/dist/utils/semver.utils.js +0 -1
- package/dist/utils/semver.utils.js.map +1 -1
- package/dist/utils/url.utils.js +1 -0
- package/dist/utils/url.utils.js.map +1 -1
- package/dist/utils/websocket.adapter.js +8 -54
- package/dist/utils/websocket.adapter.js.map +1 -1
- package/package.json +37 -37
- package/dist/state/files.store.js.map +0 -1
- package/dist/utils/mapper.utils.js +0 -33
- package/dist/utils/mapper.utils.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","serverVersion","settingsStore","printerSocketStore","serverReleaseService","monsterPiService","userService","roleService","constructor","welcome","req","res","serverSettings","getSettings","getLoginRequired","send","message","getFeatures","batchReprintCalls","available","version","batchConnectSocketCalls","batchConnectUsbCalls","newSockets","anonymousDiagnosticsToggle","pauseResumePrinterCommand","logDumpZip","clearLogFiles","batchTogglePrinterEnabled","cameraStream","subFeatures","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isDockerContainer","isDocker","isNodemon","isNode","isPm2","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","createController","prefix","AppConstants","apiRoute","get","before","authenticate","authorizePermission","PERMS","ServerInfo","Get"],"mappings":";;;;;;;;;;;IAcaA,sBAAsB;eAAtBA;;IA2Hb,OAKyG;eALzG;;;+BAzIyC;iCACZ;0BACY;8BACS;wCAC5B;0BACG;AASlB,MAAMA;IACXC,cAAsB;IACtBC,cAA6B;IAC7BC,mBAAuC;IACvCC,qBAA2C;IAC3CC,iBAAmC;IACnCC,YAAyB;IACzBC,YAAyB;IAEzBC,YAAY,EACVN,aAAa,EACbC,kBAAkB,EAClBF,aAAa,EACbG,oBAAoB,EACpBC,gBAAgB,EAChBC,WAAW,EACXC,WAAW,EASZ,CAAE;QACD,IAAI,CAACL,aAAa,GAAGA;QACrB,IAAI,CAACD,aAAa,GAAGA;QACrB,IAAI,CAACE,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,oBAAoB,GAAGA;QAC5B,IAAI,CAACC,gBAAgB,GAAGA;QACxB,IAAI,CAACC,WAAW,GAAGA;QACnB,IAAI,CAACC,WAAW,GAAGA;IACrB;IAEAE,QAAQC,GAAY,EAAEC,GAAa,EAAE;QACnC,MAAMC,iBAAiB,IAAI,CAACV,aAAa,CAACW,WAAW;QAErD,IAAI,CAAC,IAAI,CAACX,aAAa,CAACY,gBAAgB,IAAI;YAC1C,OAAOH,IAAII,IAAI,CAAC;gBACdC,SAAS;YACX;QACF;QAEA,OAAOL,IAAII,IAAI,CAAC;YACdC,SAAS;QACX;IACF;IAEAC,YAAYP,GAAY,EAAEC,GAAa,EAAE;QACvCA,IAAII,IAAI,CAAC;YACPG,mBAAmB;gBACjBC,WAAW;
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","serverVersion","settingsStore","printerSocketStore","serverReleaseService","monsterPiService","userService","roleService","constructor","welcome","req","res","serverSettings","getSettings","getLoginRequired","send","message","getFeatures","batchReprintCalls","available","version","batchConnectSocketCalls","batchConnectUsbCalls","newSockets","anonymousDiagnosticsToggle","pauseResumePrinterCommand","logDumpZip","clearLogFiles","batchTogglePrinterEnabled","cameraStream","subFeatures","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isDockerContainer","isDocker","isNodemon","isNode","isPm2","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","createController","prefix","AppConstants","apiRoute","get","before","authenticate","authorizePermission","PERMS","ServerInfo","Get"],"mappings":"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"}
|
|
@@ -12,7 +12,6 @@ _export(exports, {
|
|
|
12
12
|
SettingsController: function() {
|
|
13
13
|
return SettingsController;
|
|
14
14
|
},
|
|
15
|
-
// prettier-ignore
|
|
16
15
|
default: function() {
|
|
17
16
|
return _default;
|
|
18
17
|
}
|
|
@@ -34,7 +33,6 @@ class SettingsController {
|
|
|
34
33
|
this.logger = loggerFactory(SettingsController.name);
|
|
35
34
|
}
|
|
36
35
|
getSettings(req, res) {
|
|
37
|
-
// Safely get IP address
|
|
38
36
|
let connection;
|
|
39
37
|
try {
|
|
40
38
|
const serverIp = (0, _ip.address)();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/settings.controller.ts"],"names":["SettingsController","settingsStore","logger","constructor","loggerFactory","name","getSettings","req","res","connection","serverIp","address","clientIp","socket","remoteAddress","ip","version","e","warn","settings","send","getSettingsSensitive","updateSentryDiagnosticsEnabled","enabled","validateInput","body","sentryDiagnosticsEnabledRules","result","setSentryDiagnosticsEnabled","updateWhitelistSettings","whitelistEnabled","whitelistedIpAddresses","whitelistSettingUpdateRules","includes","push","setWhitelist","updateFrontendSettings","updateServerSettings","updateLoginRequiredSettings","loginRequired","setLoginRequired","updateRegistrationEnabledSettings","registrationEnabled","setRegistrationEnabled","updateCredentialSettings","updateFileCleanSettings","patchFileCleanSettings","updateTimeoutSettings","createController","prefix","AppConstants","apiRoute","before","authenticate","get","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","patch","demoUserNotAllowedInterceptor","put"],"mappings":";;;;;;;;;;;IAeaA,kBAAkB;eAAlBA;;
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/settings.controller.ts"],"names":["SettingsController","settingsStore","logger","constructor","loggerFactory","name","getSettings","req","res","connection","serverIp","address","clientIp","socket","remoteAddress","ip","version","e","warn","settings","send","getSettingsSensitive","updateSentryDiagnosticsEnabled","enabled","validateInput","body","sentryDiagnosticsEnabledRules","result","setSentryDiagnosticsEnabled","updateWhitelistSettings","whitelistEnabled","whitelistedIpAddresses","whitelistSettingUpdateRules","includes","push","setWhitelist","updateFrontendSettings","updateServerSettings","updateLoginRequiredSettings","loginRequired","setLoginRequired","updateRegistrationEnabledSettings","registrationEnabled","setRegistrationEnabled","updateCredentialSettings","updateFileCleanSettings","patchFileCleanSettings","updateTimeoutSettings","createController","prefix","AppConstants","apiRoute","before","authenticate","get","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","patch","demoUserNotAllowedInterceptor","put"],"mappings":";;;;;;;;;;;IAeaA,kBAAkB;eAAlBA;;IAwFb,OAa+G;eAb/G;;;+BAvGiC;8BACY;iCAChB;wCACP;4BACQ;2CAC6C;oBAGnD;6BACA;gCAI0C;AAE3D,MAAMA;IACXC,cAA6B;IAC7BC,OAAsB;IAEtBC,YAAY,EAAEF,aAAa,EAAEG,aAAa,EAAmE,CAAE;QAC7G,IAAI,CAACH,aAAa,GAAGA;QACrB,IAAI,CAACC,MAAM,GAAGE,cAAcJ,mBAAmBK,IAAI;IACrD;IAEAC,YAAYC,GAAY,EAAEC,GAAa,EAAE;QAEvC,IAAIC;QACJ,IAAI;YACF,MAAMC,WAAWC,IAAAA,WAAO;YACxBF,aAAa;gBACXG,UAAUL,IAAIM,MAAM,EAAEC;gBACtBC,IAAIL;gBACJM,SAAAA,oBAAO;YACT;QACF,EAAE,OAAOC,GAAG;YACV,IAAI,CAACf,MAAM,CAACgB,IAAI,CAAC;QACnB;QACA,MAAMC,WAAW,IAAI,CAAClB,aAAa,CAACK,WAAW;QAC/CE,IAAIY,IAAI,CAAC;YAAE,GAAGD,QAAQ;YAAEV;QAAW;IACrC;IAEA,MAAMY,qBAAqBd,GAAY,EAAEC,GAAa,EAAE;QACtD,MAAMW,WAAW,IAAI,CAAClB,aAAa,CAACoB,oBAAoB;QACxDb,IAAIY,IAAI,CAACD;IACX;IAEA,MAAMG,+BAA+Bf,GAAY,EAAEC,GAAa,EAAE;QAChE,MAAM,EAAEe,OAAO,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAEC,wDAA6B;QAC/E,MAAMC,SAAS,IAAI,CAAC1B,aAAa,CAAC2B,2BAA2B,CAACL;QAC9Df,IAAIY,IAAI,CAACO;IACX;IAEA,MAAME,wBAAwBtB,GAAY,EAAEC,GAAa,EAAE;QACzD,MAAM,EAAEsB,gBAAgB,EAAEC,sBAAsB,EAAE,GAAG,MAAMP,IAAAA,yBAAa,EACtEjB,IAAIkB,IAAI,EACRO,sDAA2B;QAE7B,IAAI,CAACD,uBAAuBE,QAAQ,CAAC,cAAc;YACjDF,uBAAuBG,IAAI,CAAC;QAC9B;QACA,MAAM,IAAI,CAACjC,aAAa,CAACkC,YAAY,CAACL,kBAAkBC;QACxDvB,IAAIY,IAAI;IACV;IAEA,MAAMgB,uBAAuB7B,GAAY,EAAEC,GAAa,EAAE;QACxD,MAAMmB,SAAS,MAAM,IAAI,CAAC1B,aAAa,CAACmC,sBAAsB,CAAC7B,IAAIkB,IAAI;QACvEjB,IAAIY,IAAI,CAACO;IACX;IAEA,MAAMU,qBAAqB9B,GAAY,EAAEC,GAAa,EAAE;QACtD,MAAMmB,SAAS,MAAM,IAAI,CAAC1B,aAAa,CAACoC,oBAAoB,CAAC9B,IAAIkB,IAAI;QACrEjB,IAAIY,IAAI,CAACO;IACX;IAEA,MAAMW,4BAA4B/B,GAAY,EAAEC,GAAa,EAAE;QAC7D,MAAM,EAAE+B,aAAa,EAAE,GAAG,MAAMf,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAE;YAAEc,eAAe;QAAmB;QAC5F,MAAMZ,SAAS,MAAM,IAAI,CAAC1B,aAAa,CAACuC,gBAAgB,CAACD;QACzD/B,IAAIY,IAAI,CAACO;IACX;IAEA,MAAMc,kCAAkClC,GAAY,EAAEC,GAAa,EAAE;QACnE,MAAM,EAAEkC,mBAAmB,EAAE,GAAG,MAAMlB,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAE;YAAEiB,qBAAqB;QAAmB;QACxG,MAAMf,SAAS,MAAM,IAAI,CAAC1B,aAAa,CAAC0C,sBAAsB,CAACD;QAC/DlC,IAAIY,IAAI,CAACO;IACX;IAEA,MAAMiB,yBAAyBrC,GAAY,EAAEC,GAAa,EAAE;QAC1D,MAAM,IAAI,CAACP,aAAa,CAAC2C,wBAAwB,CAACrC,IAAIkB,IAAI;QAC1DjB,IAAIY,IAAI;IACV;IAEA,MAAMyB,wBAAwBtC,GAAY,EAAEC,GAAa,EAAE;QACzD,MAAMmB,SAAS,MAAM,IAAI,CAAC1B,aAAa,CAAC6C,sBAAsB,CAACvC,IAAIkB,IAAI;QACvEjB,IAAIY,IAAI,CAACO;IACX;IAEA,MAAMoB,sBAAsBxC,GAAY,EAAEC,GAAa,EAAE;QACvD,MAAMmB,SAAS,MAAM,IAAI,CAAC1B,aAAa,CAAC8C,qBAAqB,CAACxC,IAAIkB,IAAI;QACtEjB,IAAIY,IAAI,CAACO;IACX;AACF;MAGA,WAAeqB,IAAAA,+BAAgB,EAAChD,oBAC3BiD,MAAM,CAACC,6BAAY,CAACC,QAAQ,GAAG,aAC/BC,MAAM,CAAC;IAACC,IAAAA,0BAAY;CAAG,EACvBC,GAAG,CAAC,KAAK,eACTA,GAAG,CAAC,cAAc,wBAAwB;IAAEF,QAAQ;QAACG,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GACxGC,KAAK,CAAC,uBAAuB,kCAAkCC,6CAA6B,EAC5FC,GAAG,CAAC,WAAW,wBAAwB;IAAET,QAAQ;QAACG,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GACrGG,GAAG,CAAC,mBAAmB,+BAA+B;IAAET,QAAQ;QAACG,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GACpHG,GAAG,CAAC,yBAAyB,qCAAqC;IAAET,QAAQ;QAACG,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GAChIG,GAAG,CAAC,eAAe,4BAA4B;IAAET,QAAQ;QAACG,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GAC7GG,GAAG,CAAC,eAAe,2BAA2B;IAAET,QAAQ;QAACG,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GAC5GG,GAAG,CAAC,cAAc,2BAA2B;IAAET,QAAQ;QAACG,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GAC3GG,GAAG,CAAC,aAAa,0BAA0B;IAAET,QAAQ;QAACG,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;KAAE;AAAC,GACrFI,GAAG,CAAC,YAAY,yBAAyB;IAAET,QAAQ;QAACG,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC"}
|
|
@@ -32,12 +32,14 @@ class UserController {
|
|
|
32
32
|
authService;
|
|
33
33
|
settingsStore;
|
|
34
34
|
logger;
|
|
35
|
-
|
|
35
|
+
isTypeormMode;
|
|
36
|
+
constructor({ userService, configService, roleService, settingsStore, authService, loggerFactory, isTypeormMode }){
|
|
36
37
|
this.userService = userService;
|
|
37
38
|
this.configService = configService;
|
|
38
39
|
this.roleService = roleService;
|
|
39
40
|
this.authService = authService;
|
|
40
41
|
this.settingsStore = settingsStore;
|
|
42
|
+
this.isTypeormMode = isTypeormMode;
|
|
41
43
|
this.logger = loggerFactory(UserController.name);
|
|
42
44
|
}
|
|
43
45
|
async profile(req, res) {
|
|
@@ -57,7 +59,7 @@ class UserController {
|
|
|
57
59
|
res.send(roleDtos);
|
|
58
60
|
}
|
|
59
61
|
async delete(req, res) {
|
|
60
|
-
const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.
|
|
62
|
+
const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
|
|
61
63
|
const ownUserId = req.user?.id;
|
|
62
64
|
if (ownUserId) {
|
|
63
65
|
if (ownUserId === id) {
|
|
@@ -83,12 +85,12 @@ class UserController {
|
|
|
83
85
|
res.send();
|
|
84
86
|
}
|
|
85
87
|
async get(req, res) {
|
|
86
|
-
const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.
|
|
88
|
+
const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
|
|
87
89
|
const user = await this.userService.getUser(id);
|
|
88
90
|
res.send(this.userService.toDto(user));
|
|
89
91
|
}
|
|
90
92
|
async changeUsername(req, res) {
|
|
91
|
-
const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.
|
|
93
|
+
const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
|
|
92
94
|
if (req.user?.id !== id && await this.settingsStore.getLoginRequired()) {
|
|
93
95
|
throw new _runtimeexceptions.ForbiddenError("Not allowed to change username of other users");
|
|
94
96
|
}
|
|
@@ -99,7 +101,7 @@ class UserController {
|
|
|
99
101
|
res.send();
|
|
100
102
|
}
|
|
101
103
|
async changePassword(req, res) {
|
|
102
|
-
const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.
|
|
104
|
+
const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
|
|
103
105
|
if (req.user?.id !== id && await this.settingsStore.getLoginRequired()) {
|
|
104
106
|
throw new _runtimeexceptions.ForbiddenError("Not allowed to change password of other users");
|
|
105
107
|
}
|
|
@@ -111,7 +113,7 @@ class UserController {
|
|
|
111
113
|
res.send();
|
|
112
114
|
}
|
|
113
115
|
async setVerified(req, res) {
|
|
114
|
-
const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.
|
|
116
|
+
const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
|
|
115
117
|
const ownUserId = req.user?.id;
|
|
116
118
|
if (ownUserId) {
|
|
117
119
|
if (ownUserId === id) {
|
|
@@ -126,18 +128,10 @@ class UserController {
|
|
|
126
128
|
isVerified: "required|boolean"
|
|
127
129
|
});
|
|
128
130
|
await this.userService.setVerifiedById(id, isVerified);
|
|
129
|
-
// Note: this makes it impossible for the UI to determine if the user is verified or not
|
|
130
|
-
// if (!isVerified) {
|
|
131
|
-
// try {
|
|
132
|
-
// await this.authService.logoutUserId(id);
|
|
133
|
-
// } catch (e) {
|
|
134
|
-
// this.logger.error(errorSummary(e));
|
|
135
|
-
// }
|
|
136
|
-
// }
|
|
137
131
|
res.send();
|
|
138
132
|
}
|
|
139
133
|
async setRootUser(req, res) {
|
|
140
|
-
const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.
|
|
134
|
+
const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
|
|
141
135
|
const userId = req.user?.id;
|
|
142
136
|
if (req.user?.id) {
|
|
143
137
|
const isRootUser = await this.userService.isUserRootUser(userId);
|
|
@@ -179,8 +173,7 @@ const _default = (0, _awilixexpress.createController)(UserController).prefix(_se
|
|
|
179
173
|
]),
|
|
180
174
|
_demomiddleware.demoUserNotAllowed
|
|
181
175
|
]
|
|
182
|
-
})
|
|
183
|
-
.post("/:id/set-root-user", "setRootUser", {
|
|
176
|
+
}).post("/:id/set-root-user", "setRootUser", {
|
|
184
177
|
before: [
|
|
185
178
|
_demomiddleware.demoUserNotAllowed
|
|
186
179
|
]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/user.controller.ts"],"names":["UserController","userService","roleService","configService","authService","settingsStore","logger","constructor","loggerFactory","name","profile","req","res","user","id","send","getUser","toDto","list","users","listUsers","map","u","listRoles","roleDtos","roles","r","delete","validateInput","params","
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/user.controller.ts"],"names":["UserController","userService","roleService","configService","authService","settingsStore","logger","isTypeormMode","constructor","loggerFactory","name","profile","req","res","user","id","send","getUser","toDto","list","users","listUsers","map","u","listRoles","roleDtos","roles","r","delete","validateInput","params","idRulesV2","ownUserId","ForbiddenError","isRootUser","isUserRootUser","isDemoMode","demoUserId","getDemoUserId","throwIfDemoMode","deleteUser","logoutUserId","e","error","errorSummary","get","changeUsername","getLoginRequired","username","body","updateUsernameById","changePassword","oldPassword","newPassword","updatePasswordById","setVerified","isVerified","setVerifiedById","setRootUser","userId","setIsRootUserById","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","post","demoUserNotAllowedInterceptor"],"mappings":"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"}
|
|
@@ -16,14 +16,15 @@ _export(exports, {
|
|
|
16
16
|
return batchPrintersEnabledRules;
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
|
-
const
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
19
|
+
const _genericvalidation = require("./generic.validation");
|
|
20
|
+
const batchPrinterRules = (isSqlite)=>({
|
|
21
|
+
printerIds: "required|array",
|
|
22
|
+
"printerIds.*": (0, _genericvalidation.idRuleV2)(isSqlite)
|
|
23
|
+
});
|
|
24
|
+
const batchPrintersEnabledRules = (isSqlite)=>({
|
|
25
|
+
printerIds: "required|array",
|
|
26
|
+
"printerIds.*": (0, _genericvalidation.idRuleV2)(isSqlite),
|
|
27
|
+
enabled: "required|boolean"
|
|
28
|
+
});
|
|
28
29
|
|
|
29
30
|
//# sourceMappingURL=batch-controller.validation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/controllers/validation/batch-controller.validation.ts"],"names":["batchPrinterRules","batchPrintersEnabledRules","printerIds","enabled"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../../src/controllers/validation/batch-controller.validation.ts"],"names":["batchPrinterRules","batchPrintersEnabledRules","isSqlite","printerIds","idRuleV2","enabled"],"mappings":";;;;;;;;;;;IAEaA,iBAAiB;eAAjBA;;IAKAC,yBAAyB;eAAzBA;;;mCAPuB;AAE7B,MAAMD,oBAAoB,CAACE,WAAuB,CAAA;QACvDC,YAAY;QACZ,gBAAgBC,IAAAA,2BAAQ,EAACF;IAC3B,CAAA;AAEO,MAAMD,4BAA4B,CAACC,WAAuB,CAAA;QAC/DC,YAAY;QACZ,gBAAgBC,IAAAA,2BAAQ,EAACF;QACzBG,SAAS;IACX,CAAA"}
|
|
@@ -2,14 +2,23 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
5
|
+
function _export(target, all) {
|
|
6
|
+
for(var name in all)Object.defineProperty(target, name, {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: all[name]
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
_export(exports, {
|
|
12
|
+
idRuleV2: function() {
|
|
13
|
+
return idRuleV2;
|
|
14
|
+
},
|
|
15
|
+
idRulesV2: function() {
|
|
16
|
+
return idRulesV2;
|
|
9
17
|
}
|
|
10
18
|
});
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
19
|
+
const idRuleV2 = (isSqlite)=>`required|${isSqlite ? "integer|min:1" : "required|mongoId"}`;
|
|
20
|
+
const idRulesV2 = (isSqlite)=>({
|
|
21
|
+
id: idRuleV2(isSqlite)
|
|
22
|
+
});
|
|
14
23
|
|
|
15
24
|
//# sourceMappingURL=generic.validation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/controllers/validation/generic.validation.ts"],"names":["
|
|
1
|
+
{"version":3,"sources":["../../../src/controllers/validation/generic.validation.ts"],"names":["idRuleV2","idRulesV2","isSqlite","id"],"mappings":";;;;;;;;;;;IAAaA,QAAQ;eAARA;;IAEAC,SAAS;eAATA;;;AAFN,MAAMD,WAAW,CAACE,WAAsB,CAAC,SAAS,EAAEA,WAAW,kBAAkB,mBAAmB,CAAC;AAErG,MAAMD,YAAY,CAACC,WAAuB,CAAA;QAC/CC,IAAIH,SAASE;IACf,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/controllers/validation/setting.validation.ts"],"names":["wizardSettingsRules","loginRequired","registration","rootUsername","rootPassword"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../../src/controllers/validation/setting.validation.ts"],"names":["wizardSettingsRules","loginRequired","registration","rootUsername","rootPassword"],"mappings":";;;;+BACaA;;;eAAAA;;;AAAN,MAAMA,sBAAsB;IACjCC,eAAe;IACfC,cAAc;IACdC,cAAc;IACdC,cAAc;AAChB"}
|
|
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "configureCacheManager", {
|
|
|
8
8
|
return configureCacheManager;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
const _cachemanager =
|
|
11
|
+
const _cachemanager = _interop_require_default(require("cache-manager"));
|
|
12
12
|
function _interop_require_default(obj) {
|
|
13
13
|
return obj && obj.__esModule ? obj : {
|
|
14
14
|
default: obj
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/handlers/cache-manager.ts"],"names":["configureCacheManager","cacheManager","caching","store","max","ttl"],"mappings":";;;;+BAEgBA;;;eAAAA;;;
|
|
1
|
+
{"version":3,"sources":["../../src/handlers/cache-manager.ts"],"names":["configureCacheManager","cacheManager","caching","store","max","ttl"],"mappings":";;;;+BAEgBA;;;eAAAA;;;uDAFS;;;;;;AAElB,SAASA;IACd,OAAOC,qBAAY,CAACC,OAAO,CAAC;QAAEC,OAAO;QAAUC,KAAK;QAAKC,KAAK;IAAI;AACpE"}
|
|
@@ -11,19 +11,12 @@ Object.defineProperty(exports, "configureEventEmitter", {
|
|
|
11
11
|
const _eventemitter2 = require("eventemitter2");
|
|
12
12
|
function configureEventEmitter() {
|
|
13
13
|
return new _eventemitter2.EventEmitter2({
|
|
14
|
-
// set this to `true` to use wildcards
|
|
15
14
|
wildcard: true,
|
|
16
|
-
// the delimiter used to segment namespaces
|
|
17
15
|
delimiter: ".",
|
|
18
|
-
// set this to `true` if you want to emit the newListener event
|
|
19
16
|
newListener: false,
|
|
20
|
-
// set this to `true` if you want to emit the removeListener event
|
|
21
17
|
removeListener: false,
|
|
22
|
-
// the maximum amount of listeners that can be assigned to an event
|
|
23
18
|
maxListeners: 10,
|
|
24
|
-
// show event name in memory leak message when more than maximum amount of listeners is assigned
|
|
25
19
|
verboseMemoryLeak: true,
|
|
26
|
-
// disable throwing uncaughtException if an error event is emitted and it has no listeners
|
|
27
20
|
ignoreErrors: false
|
|
28
21
|
});
|
|
29
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/handlers/event-emitter.ts"],"names":["configureEventEmitter","EventEmitter2","wildcard","delimiter","newListener","removeListener","maxListeners","verboseMemoryLeak","ignoreErrors"],"mappings":";;;;+BAEgBA;;;eAAAA;;;+BAFc;AAEvB,SAASA;IACd,OAAO,IAAIC,4BAAa,CAAC;
|
|
1
|
+
{"version":3,"sources":["../../src/handlers/event-emitter.ts"],"names":["configureEventEmitter","EventEmitter2","wildcard","delimiter","newListener","removeListener","maxListeners","verboseMemoryLeak","ignoreErrors"],"mappings":";;;;+BAEgBA;;;eAAAA;;;+BAFc;AAEvB,SAASA;IACd,OAAO,IAAIC,4BAAa,CAAC;QAEvBC,UAAU;QAGVC,WAAW;QAGXC,aAAa;QAGbC,gBAAgB;QAGhBC,cAAc;QAGdC,mBAAmB;QAGnBC,cAAc;IAChB;AACF"}
|
package/dist/handlers/logger.js
CHANGED
|
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "LoggerService", {
|
|
|
8
8
|
return LoggerService;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
const _winston =
|
|
11
|
+
const _winston = _interop_require_default(require("winston"));
|
|
12
12
|
const _path = require("path");
|
|
13
13
|
const _luxon = require("luxon");
|
|
14
14
|
const _serverconstants = require("../server.constants");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/handlers/logger.ts"],"names":["LoggerService","dtFormat","Intl","DateTimeFormat","timeStyle","dateStyle","timeZone","dateFormat","format","Date","name","logger","constructor","enableFileLogs","logFilterLevel","isProd","process","env","AppConstants","NODE_ENV_KEY","defaultProductionEnv","isTest","defaultTestEnv","date","DateTime","now","toISODate","winston","createLogger","transports","Console","level","File","filename","join","superRootPath","defaultLogsFolder","logAppName","maxsize","maxFiles","printf","info","toUpperCase","message","meta","JSON","stringify","log","warn","debug","error"],"mappings":";;;;+BAgBaA;;;eAAAA;;;
|
|
1
|
+
{"version":3,"sources":["../../src/handlers/logger.ts"],"names":["LoggerService","dtFormat","Intl","DateTimeFormat","timeStyle","dateStyle","timeZone","dateFormat","format","Date","name","logger","constructor","enableFileLogs","logFilterLevel","isProd","process","env","AppConstants","NODE_ENV_KEY","defaultProductionEnv","isTest","defaultTestEnv","date","DateTime","now","toISODate","winston","createLogger","transports","Console","level","File","filename","join","superRootPath","defaultLogsFolder","logAppName","maxsize","maxFiles","printf","info","toUpperCase","message","meta","JSON","stringify","log","warn","debug","error"],"mappings":";;;;+BAgBaA;;;eAAAA;;;kDAhBO;sBACC;uBACI;iCACI;yBACC;;;;;;AAE9B,MAAMC,WAAW,IAAIC,KAAKC,cAAc,CAAC,SAAS;IAChDC,WAAW;IACXC,WAAW;IACXC,UAAU;AACZ;AAEA,MAAMC,aAAa;IACjB,OAAON,SAASO,MAAM,CAAC,IAAIC;AAC7B;AAEO,MAAMT;IACXU,KAAa;IACbC,OAAuB;IAEvBC,YAAYF,IAAY,EAAEG,iBAAiB,IAAI,EAAEC,iBAAyB,EAAE,CAAE;QAC5E,MAAMC,SAASC,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC,KAAKD,6BAAY,CAACE,oBAAoB;QAC3F,MAAMC,SAASL,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC,KAAKD,6BAAY,CAACI,cAAc;QAErF,IAAI,CAACR,gBAAgB;YACnBA,iBAAiBC,UAAUM,SAAS,SAAS;QAC/C;QAEA,MAAME,OAAOC,eAAQ,CAACC,GAAG,GAAGC,SAAS;QACrC,IAAI,CAAChB,IAAI,GAAGA;QACZ,IAAI,CAACC,MAAM,GAAGgB,gBAAO,CAACC,YAAY,CAAC;YACjCC,YAAY;gBACV,IAAIF,gBAAO,CAACE,UAAU,CAACC,OAAO,CAAC;oBAC7BC,OAAOjB;gBACT;mBACID,iBACA;oBACE,IAAIc,gBAAO,CAACE,UAAU,CAACG,IAAI,CAAC;wBAC1BD,OAAOV,SAAS,SAAS;wBACzBY,UAAUC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIjB,6BAAY,CAACkB,iBAAiB,EAAE,CAAC,EAAElB,6BAAY,CAACmB,UAAU,CAAC,CAAC,EAAEd,KAAK,IAAI,CAAC;wBACxGe,SAAS;wBACTC,UAAU;oBACZ;iBACD,GACD,EAAE;aACP;YACD/B,QAAQmB,gBAAO,CAACnB,MAAM,CAACgC,MAAM,CAAC,CAACC;gBAC7B,MAAMV,QAAQU,KAAKV,KAAK,CAACW,WAAW;gBACpC,MAAMnB,OAAOhB;gBACb,IAAIoC,UAAU,CAAC,EAAEpB,KAAK,GAAG,EAAEQ,MAAM,GAAG,EAAErB,KAAK,GAAG,EAAE+B,KAAKE,OAAO,CAAC,CAAC;gBAC9DA,UAAUF,KAAKG,IAAI,GAAGD,UAAU,CAAC,GAAG,EAAEE,KAAKC,SAAS,CAACL,KAAKG,IAAI,EAAE,CAAC,GAAGD;gBACpE,OAAOA;YACT;QACF;IACF;IAEAI,IAAIJ,OAAe,EAAEC,IAAU,EAAE;QAC/B,IAAI,CAACjC,MAAM,CAACoC,GAAG,CAAC,QAAQJ,SAAS;YAC/BC;QACF;IACF;IAEAI,KAAKL,OAAe,EAAEC,IAAU,EAAE;QAChC,IAAI,CAACjC,MAAM,CAACoC,GAAG,CAAC,QAAQJ,SAAS;YAC/BC;QACF;IACF;IAEAK,MAAMN,OAAe,EAAEC,IAAU,EAAE;QACjC,IAAI,CAACjC,MAAM,CAACoC,GAAG,CAAC,SAASJ,SAAS;YAChCC;QACF;IACF;IAEAM,MAAMP,OAAe,EAAEC,IAAU,EAAE;QACjC,IAAI,CAACjC,MAAM,CAACoC,GAAG,CAAC,SAASJ,SAAS;YAAEC;QAAK;IAC3C;AACF"}
|
|
@@ -25,7 +25,7 @@ _export(exports, {
|
|
|
25
25
|
const _runtimeexceptions = require("../exceptions/runtime.exceptions");
|
|
26
26
|
const _printer = require("../middleware/printer");
|
|
27
27
|
const _normalizeurl = require("../utils/normalize-url");
|
|
28
|
-
const _nodeinputvalidator =
|
|
28
|
+
const _nodeinputvalidator = _interop_require_wildcard(require("node-input-validator"));
|
|
29
29
|
function _getRequireWildcardCache(nodeInterop) {
|
|
30
30
|
if (typeof WeakMap !== "function") return null;
|
|
31
31
|
var cacheBabelInterop = new WeakMap();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/handlers/validators.ts"],"names":["getExtendedValidator","getScopedPrinter","validateInput","validateMiddleware","extend","value","args","validator","url","normalizeUrl","startsWith","e","URL","extendMessages","not","nodeInputValidator","req","tokens","printerLoginToken","currentPrinterToken","printerIdToken","resolvedDependencies","errors","forEach","t","dependency","container","resolve","push","InternalServerException","length","ValidationException","data","rules","localNIV","v","Validator","matched","check","inputs","body"],"mappings":";;;;;;;;;;;IAQgBA,oBAAoB;eAApBA;;IA+BAC,gBAAgB;eAAhBA;;IA4BMC,aAAa;eAAbA;;IAeAC,kBAAkB;eAAlBA;;;mCAjFuC;yBACU;8BAC1C;
|
|
1
|
+
{"version":3,"sources":["../../src/handlers/validators.ts"],"names":["getExtendedValidator","getScopedPrinter","validateInput","validateMiddleware","extend","value","args","validator","url","normalizeUrl","startsWith","e","URL","extendMessages","not","nodeInputValidator","req","tokens","printerLoginToken","currentPrinterToken","printerIdToken","resolvedDependencies","errors","forEach","t","dependency","container","resolve","push","InternalServerException","length","ValidationException","data","rules","localNIV","v","Validator","matched","check","inputs","body"],"mappings":";;;;;;;;;;;IAQgBA,oBAAoB;eAApBA;;IA+BAC,gBAAgB;eAAhBA;;IA4BMC,aAAa;eAAbA;;IAeAC,kBAAkB;eAAlBA;;;mCAjFuC;yBACU;8BAC1C;8DAC8B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIpD,SAASH;IACdI,IAAAA,0BAAM,EAAC,SAAS,CAAC,EAAEC,KAAK,EAAEC,IAAI,EAAE,EAAEC;QAChC,IAAI,CAACF,OAAO,OAAO;QACnB,IAAI;YACF,MAAMG,MAAMC,IAAAA,0BAAY,EAACJ;YACzB,OAAOG,IAAIE,UAAU,CAAC,YAAYF,IAAIE,UAAU,CAAC;QACnD,EAAE,OAAOC,GAAG;YACV,OAAO;QACT;IACF;IACAP,IAAAA,0BAAM,EAAC,WAAW,CAAC,EAAEC,KAAK,EAAEC,IAAI,EAAE,EAAEC;QAClC,IAAI,CAACF,OAAO,OAAO;QAEnB,IAAI;YACF,IAAI,CAACA,MAAMK,UAAU,CAAC,cAAc,CAACL,MAAMK,UAAU,CAAC,aAAa;gBACjE,OAAO;YACT;YACA,OAAO,IAAIE,IAAIH,IAAAA,0BAAY,EAACJ;QAC9B,EAAE,OAAOM,GAAG;YACV,OAAO;QACT;IACF;IACAP,IAAAA,0BAAM,EAAC,OAAO,CAAC,EAAEC,KAAK,EAAEC,IAAI,EAAE,EAAEC;QAC9B,OAAO,CAACF,SAASA,UAAU;IAC7B;IACAQ,IAAAA,kCAAc,EAAC;QACbC,KAAK;IACP;IACA,OAAOC,2BAAkB;AAC3B;AAEO,SAASd,iBAAiBe,GAAY;IAC3C,MAAMC,SAAS;QAACC,0BAAiB;QAAEC,4BAAmB;QAAEC,uBAAc;KAAC;IACvE,IAAIC,uBAAgH,CAAC;IACrH,IAAIC,SAAgB,EAAE;IACtBL,OAAOM,OAAO,CAAC,CAACC;QACd,IAAI;YACF,MAAMC,aAAaT,IAAIU,SAAS,CAACC,OAAO,CAACH;YACzC,IAAI,CAACC,YAAY;gBACfH,OAAOM,IAAI,CACT,CAAC,mBAAmB,EAAEJ,EAAE,gGAAgG,CAAC;YAE7H;YACAH,oBAAoB,CAACG,EAAE,GAAGC;QAC5B,EAAE,OAAOd,GAAG;YACV,MAAM,IAAIkB,0CAAuB,CAAC,CAAC,WAAW,EAAEL,EAAE,wCAAwC,CAAC;QAC7F;IACF;IAEA,IAAIF,OAAOQ,MAAM,GAAG,GAAG;QACrB,MAAM,IAAIC,sCAAmB,CAACT;IAChC;IAEA,OAAOD;AACT;AAKO,eAAenB,cAAiB8B,IAAS,EAAEC,KAAQ;IACxD,MAAMC,WAAWlC;IAEjB,MAAMmC,IAAI,IAAID,SAASE,SAAS,CAACJ,MAAMC;IAEvC,MAAMI,UAAU,MAAMF,EAAEG,KAAK;IAC7B,IAAI,CAACD,SAAS;QACZ,MAAM,IAAIN,sCAAmB,CAACI,EAAEb,MAAM;IACxC;IACA,OAAOa,EAAEI,MAAM;AACjB;AAKO,eAAepC,mBAAsBa,GAAY,EAAEiB,KAAQ;IAChE,OAAO/B,cAAcc,IAAIwB,IAAI,EAAEP;AACjC"}
|
|
@@ -25,37 +25,15 @@ _export(exports, {
|
|
|
25
25
|
const _awilixexpress = require("awilix-express");
|
|
26
26
|
const _runtimeexceptions = require("../exceptions/runtime.exceptions");
|
|
27
27
|
const _authorizationconstants = require("../constants/authorization.constants");
|
|
28
|
-
function authorizePermission(permission) {
|
|
29
|
-
return (0, _awilixexpress.inject)(({ permissionService, roleService })=>async (req, res, next)=>{
|
|
30
|
-
if (!req.roles?.length) {
|
|
31
|
-
throw new _runtimeexceptions.AuthorizationError({
|
|
32
|
-
permissions: [
|
|
33
|
-
permission
|
|
34
|
-
]
|
|
35
|
-
});
|
|
36
|
-
}
|
|
37
|
-
const assignedPermissions = roleService.getRolesPermissions(req.roles);
|
|
38
|
-
if (!permissionService.authorizePermission(permission, assignedPermissions)) {
|
|
39
|
-
throw new _runtimeexceptions.AuthorizationError({
|
|
40
|
-
permissions: [
|
|
41
|
-
permission
|
|
42
|
-
]
|
|
43
|
-
});
|
|
44
|
-
}
|
|
45
|
-
next();
|
|
46
|
-
});
|
|
47
|
-
}
|
|
48
28
|
const authenticate = ()=>(0, _awilixexpress.inject)(({ settingsStore, authService, loggerFactory })=>async (req, res, next)=>{
|
|
49
29
|
const logger = loggerFactory("Middleware:authenticate");
|
|
50
30
|
const isLoginRequired = await settingsStore.getLoginRequired();
|
|
51
31
|
if (!isLoginRequired) {
|
|
52
32
|
return next();
|
|
53
33
|
}
|
|
54
|
-
// Check if a password change is required
|
|
55
34
|
if (req.user?.needsPasswordChange) {
|
|
56
35
|
throw new _runtimeexceptions.AuthenticationError("Password change required", _authorizationconstants.AUTH_ERROR_REASON.PasswordChangeRequired);
|
|
57
36
|
}
|
|
58
|
-
// Check if a logout was called
|
|
59
37
|
const bearer = req.headers.authorization?.replace("Bearer ", "") || undefined;
|
|
60
38
|
const isJwtBlacklisted = authService.isJwtTokenBlacklisted(bearer);
|
|
61
39
|
if (!!bearer?.length && isJwtBlacklisted) {
|
|
@@ -67,8 +45,30 @@ const authenticate = ()=>(0, _awilixexpress.inject)(({ settingsStore, authServic
|
|
|
67
45
|
logger.log(`Not authenticated for route: ${req.originalUrl}`);
|
|
68
46
|
throw new _runtimeexceptions.AuthenticationError("Not authenticated", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredAuthToken);
|
|
69
47
|
});
|
|
48
|
+
function authorizePermission(permission) {
|
|
49
|
+
return (0, _awilixexpress.inject)(({ permissionService, roleService })=>async (req, res, next)=>{
|
|
50
|
+
const userRoles = req.roles;
|
|
51
|
+
if (!userRoles?.length) {
|
|
52
|
+
throw new _runtimeexceptions.AuthorizationError({
|
|
53
|
+
permissions: [
|
|
54
|
+
permission
|
|
55
|
+
]
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
const assignedPermissions = roleService.getRolesPermissions(userRoles);
|
|
59
|
+
if (!permissionService.authorizePermission(permission, assignedPermissions)) {
|
|
60
|
+
throw new _runtimeexceptions.AuthorizationError({
|
|
61
|
+
permissions: [
|
|
62
|
+
permission
|
|
63
|
+
]
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
next();
|
|
67
|
+
});
|
|
68
|
+
}
|
|
70
69
|
const authorizeRoles = (roles, subset = true)=>(0, _awilixexpress.inject)(({ roleService })=>async (req, res, next)=>{
|
|
71
|
-
|
|
70
|
+
const userRoles = req.roles;
|
|
71
|
+
if (!roleService.authorizeRoles(roles, userRoles, subset)) {
|
|
72
72
|
throw new _runtimeexceptions.AuthorizationError({
|
|
73
73
|
roles
|
|
74
74
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/middleware/authenticate.ts"],"names":["authenticate","authorizePermission","authorizeRoles","withPermission","
|
|
1
|
+
{"version":3,"sources":["../../src/middleware/authenticate.ts"],"names":["authenticate","authorizePermission","authorizeRoles","withPermission","inject","settingsStore","authService","loggerFactory","req","res","next","logger","isLoginRequired","getLoginRequired","user","needsPasswordChange","AuthenticationError","AUTH_ERROR_REASON","PasswordChangeRequired","bearer","headers","authorization","replace","undefined","isJwtBlacklisted","isJwtTokenBlacklisted","length","LoginRequired","isAuthenticated","log","originalUrl","InvalidOrExpiredAuthToken","permission","permissionService","roleService","userRoles","roles","AuthorizationError","permissions","assignedPermissions","getRolesPermissions","subset","before"],"mappings":";;;;;;;;;;;IAWaA,YAAY;eAAZA;;IAuCGC,mBAAmB;eAAnBA;;IAmBHC,cAAc;eAAdA;;IAUGC,cAAc;eAAdA;;;+BA/EO;mCACiC;wCAEtB;AAQ3B,MAAMH,eAAe,IAC1BI,IAAAA,qBAAM,EACJ,CAAC,EACGC,aAAa,EACbC,WAAW,EACXC,aAAa,EAKd,GACD,OAAOC,KAAcC,KAAeC;YAClC,MAAMC,SAASJ,cAAc;YAC7B,MAAMK,kBAAkB,MAAMP,cAAcQ,gBAAgB;YAC5D,IAAI,CAACD,iBAAiB;gBACpB,OAAOF;YACT;YAGA,IAAIF,IAAIM,IAAI,EAAEC,qBAAqB;gBACjC,MAAM,IAAIC,sCAAmB,CAAC,4BAA4BC,yCAAiB,CAACC,sBAAsB;YACpG;YAGA,MAAMC,SAASX,IAAIY,OAAO,CAACC,aAAa,EAAEC,QAAQ,WAAW,OAAOC;YACpE,MAAMC,mBAAmBlB,YAAYmB,qBAAqB,CAACN;YAC3D,IAAI,CAAC,CAACA,QAAQO,UAAUF,kBAAkB;gBACxC,MAAM,IAAIR,sCAAmB,CAAC,qBAAqBC,yCAAiB,CAACU,aAAa;YACpF;YAEA,IAAInB,IAAIoB,eAAe,IAAI;gBACzB,OAAOlB;YACT;YAEAC,OAAOkB,GAAG,CAAC,CAAC,6BAA6B,EAAErB,IAAIsB,WAAW,CAAC,CAAC;YAC5D,MAAM,IAAId,sCAAmB,CAAC,qBAAqBC,yCAAiB,CAACc,yBAAyB;QAChG;AAGC,SAAS9B,oBAAoB+B,UAAkB;IACpD,OAAO5B,IAAAA,qBAAM,EACX,CAAC,EAAE6B,iBAAiB,EAAEC,WAAW,EAAwE,GACvG,OAAO1B,KAAcC,KAAeC;YAClC,MAAMyB,YAAY3B,IAAI4B,KAAK;YAC3B,IAAI,CAACD,WAAWT,QAAQ;gBACtB,MAAM,IAAIW,qCAAkB,CAAC;oBAAEC,aAAa;wBAACN;qBAAW;gBAAC;YAC3D;YAEA,MAAMO,sBAAsBL,YAAYM,mBAAmB,CAACL;YAC5D,IAAI,CAACF,kBAAkBhC,mBAAmB,CAAC+B,YAAYO,sBAAsB;gBAC3E,MAAM,IAAIF,qCAAkB,CAAC;oBAAEC,aAAa;wBAACN;qBAAW;gBAAC;YAC3D;YAEAtB;QACF;AAEN;AAEO,MAAMR,iBAAiB,CAACkC,OAAiBK,SAAS,IAAI,GAC3DrC,IAAAA,qBAAM,EAAC,CAAC,EAAE8B,WAAW,EAAiC,GAAK,OAAO1B,KAAcC,KAAeC;YAC7F,MAAMyB,YAAY3B,IAAI4B,KAAK;YAC3B,IAAI,CAACF,YAAYhC,cAAc,CAACkC,OAAOD,WAAWM,SAAS;gBACzD,MAAM,IAAIJ,qCAAkB,CAAC;oBAAED;gBAAM;YACvC;YAEA1B;QACF;AAEK,SAASP,eAAe6B,UAAkB;IAC/C,OAAO;QACLU,QAAQ;YAACzC,oBAAoB+B;SAAY;IAC3C;AACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/middleware/exception.filter.ts"],"names":["exceptionFilter","err","req","res","next","isTest","process","env","NODE_ENV","AppConstants","defaultTestEnv","console","error","stack","response","data","isAxiosError","code","status","send","type","AuthenticationError","statusCode","message","reasonCode","AuthorizationError","HttpStatusCode","FORBIDDEN","permissions","roles","reason","ForbiddenError","NotFoundException","BadRequestException","ValidationException","name","errors","InternalServerException","ExternalServiceError"],"mappings":"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
|
|
1
|
+
{"version":3,"sources":["../../src/middleware/exception.filter.ts"],"names":["exceptionFilter","err","req","res","next","isTest","process","env","NODE_ENV","AppConstants","defaultTestEnv","console","error","stack","response","data","isAxiosError","code","status","send","type","AuthenticationError","statusCode","message","reasonCode","AuthorizationError","HttpStatusCode","FORBIDDEN","permissions","roles","reason","ForbiddenError","NotFoundException","BadRequestException","ValidationException","name","errors","InternalServerException","ExternalServiceError"],"mappings":"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"}
|
|
@@ -52,10 +52,7 @@ const validateWhitelistedIp = (0, _awilixexpress.inject)(({ settingsStore, logge
|
|
|
52
52
|
}
|
|
53
53
|
const whitelist = serverSettings[_serversettingsconstants.serverSettingsKey].whitelistedIpAddresses;
|
|
54
54
|
const ipAddress = req.socket.remoteAddress;
|
|
55
|
-
// Empty whitelist is treated as disabled as well
|
|
56
|
-
// Both ::ffff:127.0.0.1 and 127.0.0.1 will be accepted
|
|
57
55
|
if (whitelist?.length && !whitelist.includes(ipAddress) && ipAddress !== "::ffff:127.0.0.1") {
|
|
58
|
-
// Direct comparison did not pass - now parse wildcard subnets
|
|
59
56
|
const subnextMatched = whitelist.find((w)=>{
|
|
60
57
|
return ipAddress.startsWith(w);
|
|
61
58
|
});
|
|
@@ -66,10 +63,13 @@ const validateWhitelistedIp = (0, _awilixexpress.inject)(({ settingsStore, logge
|
|
|
66
63
|
}
|
|
67
64
|
next();
|
|
68
65
|
});
|
|
69
|
-
const interceptRoles = (0, _awilixexpress.inject)(({ settingsStore, roleService })=>async (req, res, next)=>{
|
|
66
|
+
const interceptRoles = (0, _awilixexpress.inject)(({ settingsStore, roleService, isTypeormMode })=>async (req, res, next)=>{
|
|
70
67
|
const serverSettings = await settingsStore.getSettings();
|
|
71
|
-
|
|
72
|
-
|
|
68
|
+
if (isTypeormMode) {
|
|
69
|
+
req.roles = req.user?.roles.map((r)=>r.id);
|
|
70
|
+
} else {
|
|
71
|
+
req.roles = req.user?.roles;
|
|
72
|
+
}
|
|
73
73
|
if (serverSettings && !req.user) {
|
|
74
74
|
const roleName = await roleService.getAppDefaultRole();
|
|
75
75
|
req.roles = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/middleware/global.middleware.ts"],"names":["interceptRoles","validateWhitelistedIp","validateWizardCompleted","inject","settingsStore","loggerFactory","req","res","next","logger","name","serverSettings","getSettings","getWizardSettings","wizardCompleted","allowedPaths","includes","path","startsWith","error","ForbiddenError","join","getServerSettings","whitelistEnabled","whitelist","serverSettingsKey","whitelistedIpAddresses","ipAddress","socket","remoteAddress","length","subnextMatched","find","w","roleService","roles","user","roleName","getAppDefaultRole"],"mappings":";;;;;;;;;;;IA+DaA,cAAc;eAAdA;;IA9BAC,qBAAqB;eAArBA;;IA1BAC,uBAAuB;eAAvBA;;;+BAPU;yCACW;mCACH;AAKxB,MAAMA,0BAA0BC,IAAAA,qBAAM,EAC3C,CAAC,EAAEC,aAAa,EAAEC,aAAa,EAAmE,GAChG,OAAOC,KAAcC,KAAeC;QAClC,MAAMC,SAASJ,cAAcJ,sBAAsBS,IAAI;QACvD,MAAMC,iBAAiBP,cAAcQ,WAAW;QAChD,IAAI,CAAC,CAACR,cAAcS,iBAAiB,IAAIC,iBAAiB;YACxDN;YACA;QACF;QAEA,MAAMO,eAAe;YACnB;YACA;YACA;YACA;SACD;QACD,IAAIA,aAAaC,QAAQ,CAACV,IAAIW,IAAI,KAAK,CAACX,IAAIW,IAAI,CAACC,UAAU,CAAC,SAAS;YACnEV;YACA;QACF,OAAO;YACLC,OAAOU,KAAK,CAAC,wBAAwBb,IAAIW,IAAI;YAC7C,MAAM,IAAIG,iCAAc,CAAC,CAAC,6DAA6D,EAAEL,aAAaM,IAAI,CAAC,MAAM,CAAC;QACpH;IACF;AAGG,MAAMpB,wBAAwBE,IAAAA,qBAAM,EACzC,CAAC,EAAEC,aAAa,EAAEC,aAAa,EAAmE,GAChG,OAAOC,KAAcC,KAAeC;QAClC,MAAMC,SAASJ,cAAcJ,sBAAsBS,IAAI;QACvD,MAAMC,iBAAiBP,cAAcQ,WAAW;QAChD,IAAI,AAAC,CAACD,kBAAkB,CAACP,cAAckB,iBAAiB,MAAO,CAAClB,cAAckB,iBAAiB,IAAIC,kBAAkB;YACnHf;YACA;QACF;QAEA,MAAMgB,YAAYb,cAAc,CAACc,0CAAiB,CAAC,CAACC,sBAAsB;QAC1E,MAAMC,YAAYrB,IAAIsB,MAAM,CAACC,aAAa;
|
|
1
|
+
{"version":3,"sources":["../../src/middleware/global.middleware.ts"],"names":["interceptRoles","validateWhitelistedIp","validateWizardCompleted","inject","settingsStore","loggerFactory","req","res","next","logger","name","serverSettings","getSettings","getWizardSettings","wizardCompleted","allowedPaths","includes","path","startsWith","error","ForbiddenError","join","getServerSettings","whitelistEnabled","whitelist","serverSettingsKey","whitelistedIpAddresses","ipAddress","socket","remoteAddress","length","subnextMatched","find","w","roleService","isTypeormMode","roles","user","map","r","id","roleName","getAppDefaultRole"],"mappings":";;;;;;;;;;;IA+DaA,cAAc;eAAdA;;IA9BAC,qBAAqB;eAArBA;;IA1BAC,uBAAuB;eAAvBA;;;+BAPU;yCACW;mCACH;AAKxB,MAAMA,0BAA0BC,IAAAA,qBAAM,EAC3C,CAAC,EAAEC,aAAa,EAAEC,aAAa,EAAmE,GAChG,OAAOC,KAAcC,KAAeC;QAClC,MAAMC,SAASJ,cAAcJ,sBAAsBS,IAAI;QACvD,MAAMC,iBAAiBP,cAAcQ,WAAW;QAChD,IAAI,CAAC,CAACR,cAAcS,iBAAiB,IAAIC,iBAAiB;YACxDN;YACA;QACF;QAEA,MAAMO,eAAe;YACnB;YACA;YACA;YACA;SACD;QACD,IAAIA,aAAaC,QAAQ,CAACV,IAAIW,IAAI,KAAK,CAACX,IAAIW,IAAI,CAACC,UAAU,CAAC,SAAS;YACnEV;YACA;QACF,OAAO;YACLC,OAAOU,KAAK,CAAC,wBAAwBb,IAAIW,IAAI;YAC7C,MAAM,IAAIG,iCAAc,CAAC,CAAC,6DAA6D,EAAEL,aAAaM,IAAI,CAAC,MAAM,CAAC;QACpH;IACF;AAGG,MAAMpB,wBAAwBE,IAAAA,qBAAM,EACzC,CAAC,EAAEC,aAAa,EAAEC,aAAa,EAAmE,GAChG,OAAOC,KAAcC,KAAeC;QAClC,MAAMC,SAASJ,cAAcJ,sBAAsBS,IAAI;QACvD,MAAMC,iBAAiBP,cAAcQ,WAAW;QAChD,IAAI,AAAC,CAACD,kBAAkB,CAACP,cAAckB,iBAAiB,MAAO,CAAClB,cAAckB,iBAAiB,IAAIC,kBAAkB;YACnHf;YACA;QACF;QAEA,MAAMgB,YAAYb,cAAc,CAACc,0CAAiB,CAAC,CAACC,sBAAsB;QAC1E,MAAMC,YAAYrB,IAAIsB,MAAM,CAACC,aAAa;QAG1C,IAAIL,WAAWM,UAAU,CAACN,UAAUR,QAAQ,CAACW,cAAcA,cAAc,oBAAoB;YAE3F,MAAMI,iBAAiBP,UAAUQ,IAAI,CAAC,CAACC;gBACrC,OAAON,UAAUT,UAAU,CAACe;YAC9B;YAEA,IAAI,CAACF,gBAAgB;gBACnBtB,OAAOU,KAAK,CAAC,sCAAsCb,IAAIsB,MAAM,CAACC,aAAa;gBAC3E,MAAM,IAAIT,iCAAc,CAAC,aAAad,IAAIsB,MAAM,CAACC,aAAa;YAChE;QACF;QAEArB;IACF;AAGG,MAAMR,iBAAiBG,IAAAA,qBAAM,EAClC,CAAC,EAAEC,aAAa,EAAE8B,WAAW,EAAEC,aAAa,EAAE,GAC5C,OAAO7B,KAAcC,KAAeC;QAClC,MAAMG,iBAAiB,MAAMP,cAAcQ,WAAW;QAEtD,IAAIuB,eAAe;YACjB7B,IAAI8B,KAAK,GAAG9B,IAAI+B,IAAI,EAAED,MAAME,IAAI,CAACC,IAAMA,EAAEC,EAAE;QAC7C,OAAO;YACLlC,IAAI8B,KAAK,GAAG9B,IAAI+B,IAAI,EAAED;QACxB;QAGA,IAAIzB,kBAAkB,CAACL,IAAI+B,IAAI,EAAE;YAC/B,MAAMI,WAAW,MAAMP,YAAYQ,iBAAiB;YACpDpC,IAAI8B,KAAK,GAAG;gBAACK;aAAS;QACxB;QAEAjC;IACF"}
|
package/dist/models/Auth/User.js
CHANGED
|
@@ -23,8 +23,6 @@ const UserSchema = new _mongoose.Schema({
|
|
|
23
23
|
type: Boolean,
|
|
24
24
|
default: false
|
|
25
25
|
},
|
|
26
|
-
// Requiring password change means that the user will be redirected to the change password page
|
|
27
|
-
// when they log in. The user will not be able to access any other page until they change their password.
|
|
28
26
|
needsPasswordChange: {
|
|
29
27
|
type: Boolean,
|
|
30
28
|
default: true
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/models/Auth/User.ts"],"names":["User","UserSchema","Schema","username","type","String","required","unique","isDemoUser","Boolean","default","isRootUser","needsPasswordChange","isVerified","passwordHash","createdAt","Date","now","roles","Array","model"],"mappings":";;;;+BAoDaA;;;eAAAA;;;0BApD2B;AAcxC,MAAMC,aAAa,IAAIC,gBAAM,CAAQ;IACnCC,UAAU;QACRC,MAAMC;QACNC,UAAU;QACVC,QAAQ;IACV;IACAC,YAAY;QACVJ,MAAMK;QACNC,SAAS;IACX;IACAC,YAAY;QACVP,MAAMK;QACNC,SAAS;IACX;
|
|
1
|
+
{"version":3,"sources":["../../../src/models/Auth/User.ts"],"names":["User","UserSchema","Schema","username","type","String","required","unique","isDemoUser","Boolean","default","isRootUser","needsPasswordChange","isVerified","passwordHash","createdAt","Date","now","roles","Array","model"],"mappings":";;;;+BAoDaA;;;eAAAA;;;0BApD2B;AAcxC,MAAMC,aAAa,IAAIC,gBAAM,CAAQ;IACnCC,UAAU;QACRC,MAAMC;QACNC,UAAU;QACVC,QAAQ;IACV;IACAC,YAAY;QACVJ,MAAMK;QACNC,SAAS;IACX;IACAC,YAAY;QACVP,MAAMK;QACNC,SAAS;IACX;IAGAE,qBAAqB;QACnBR,MAAMK;QACNC,SAAS;IACX;IACAG,YAAY;QACVT,MAAMK;QACNC,SAAS;IACX;IACAI,cAAc;QACZV,MAAMC;QACNC,UAAU;IACZ;IACAS,WAAW;QACTX,MAAMY;QACNN,SAASM,KAAKC,GAAG;IACnB;IACAC,OAAO;QACLd,MAAMe;QACNb,UAAU;IACZ;AACF;AAEO,MAAMN,OAAOoB,IAAAA,eAAK,EAAC,QAAQnB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/models/FloorPrinter.ts"],"names":["PrinterInFloorSchema","Schema","printerId","type","Types","ObjectId","ref","required","x","Number","y","_id"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../src/models/FloorPrinter.ts"],"names":["PrinterInFloorSchema","Schema","printerId","type","Types","ObjectId","ref","required","x","Number","y","_id"],"mappings":";;;;+BASaA;;;eAAAA;;;0BATiB;AASvB,MAAMA,uBAAuB,IAAIC,gBAAM,CAAkB;IAC9DC,WAAW;QACTC,MAAMF,gBAAM,CAACG,KAAK,CAACC,QAAQ;QAC3BC,KAAK;QACLC,UAAU;IACZ;IACAC,GAAG;QACDL,MAAMM;QACNF,UAAU;IACZ;IACAG,GAAG;QACDP,MAAMM;QACNF,UAAU;IACZ;IACAI,KAAK;AACP"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/models/PrintCompletion.ts"],"names":["PrintCompletion","PrintCompletionSchema","Schema","fileName","type","String","required","createdAt","Number","status","printerId","Types","ObjectId","completionLog","context","Object","model"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../src/models/PrintCompletion.ts"],"names":["PrintCompletion","PrintCompletionSchema","Schema","fileName","type","String","required","createdAt","Number","status","printerId","Types","ObjectId","completionLog","context","Object","model"],"mappings":";;;;+BAwCaA;;;eAAAA;;;0BAxCiB;AAa9B,MAAMC,wBAAwB,IAAIC,gBAAM,CAAmB;IACzDC,UAAU;QACRC,MAAMC;QACNC,UAAU;IACZ;IACAC,WAAW;QACTH,MAAMI;QACNF,UAAU;IACZ;IACAG,QAAQ;QACNL,MAAMC;QACNC,UAAU;IACZ;IACAI,WAAW;QACTN,MAAMF,gBAAM,CAACS,KAAK,CAACC,QAAQ;QAC3BN,UAAU;IACZ;IACAO,eAAe;QACbT,MAAMC;QACNC,UAAU;IACZ;IACAQ,SAAS;QACPV,MAAMW;QACNT,UAAU;IACZ;AACF;AAEO,MAAMN,kBAAkBgB,IAAAA,eAAK,EAAC,mBAAmBf"}
|
package/dist/models/Printer.js
CHANGED
|
@@ -35,17 +35,10 @@ const PrinterSchema = new _mongoose.Schema({
|
|
|
35
35
|
type: String,
|
|
36
36
|
required: false
|
|
37
37
|
},
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
type: {
|
|
41
|
-
name: {
|
|
42
|
-
type: String,
|
|
43
|
-
required: false
|
|
44
|
-
}
|
|
45
|
-
},
|
|
38
|
+
name: {
|
|
39
|
+
type: String,
|
|
46
40
|
required: true
|
|
47
41
|
},
|
|
48
|
-
// Auto-generated below
|
|
49
42
|
currentUser: {
|
|
50
43
|
type: String,
|
|
51
44
|
required: false
|
|
@@ -54,7 +47,6 @@ const PrinterSchema = new _mongoose.Schema({
|
|
|
54
47
|
type: Number,
|
|
55
48
|
required: false
|
|
56
49
|
},
|
|
57
|
-
// Deprecated, Will become many to many
|
|
58
50
|
lastPrintedFile: {
|
|
59
51
|
type: {
|
|
60
52
|
fileName: {
|
|
@@ -88,7 +80,6 @@ const PrinterSchema = new _mongoose.Schema({
|
|
|
88
80
|
},
|
|
89
81
|
required: false
|
|
90
82
|
},
|
|
91
|
-
// Deprecated in v1.5.0
|
|
92
83
|
fileList: {
|
|
93
84
|
type: Object,
|
|
94
85
|
default: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/models/Printer.ts"],"names":["Printer","PrinterSchema","Schema","apiKey","type","String","required","printerURL","enabled","Boolean","default","disabledReason","
|
|
1
|
+
{"version":3,"sources":["../../src/models/Printer.ts"],"names":["Printer","PrinterSchema","Schema","apiKey","type","String","required","printerURL","enabled","Boolean","default","disabledReason","name","currentUser","dateAdded","Number","lastPrintedFile","fileName","editTimestamp","parsedColor","parsedVisualizationRAL","parsedAmount","parsedMaterial","parsedOrderCode","fileList","Object","files","folders","free","total","feedRate","flowRate","model"],"mappings":";;;;;;;;;;;IAoHaA,OAAO;eAAPA;;IAtFAC,aAAa;eAAbA;;;0BA9BiB;AA8BvB,MAAMA,gBAAgB,IAAIC,gBAAM,CAAW;IAChDC,QAAQ;QACNC,MAAMC;QACNC,UAAU;IACZ;IACAC,YAAY;QACVH,MAAMC;QACNC,UAAU;IACZ;IACAE,SAAS;QACPJ,MAAMK;QACNH,UAAU;QACVI,SAAS;IACX;IACAC,gBAAgB;QACdP,MAAMC;QACNC,UAAU;IACZ;IACAM,MAAM;QACJR,MAAMC;QACNC,UAAU;IACZ;IAEAO,aAAa;QACXT,MAAMC;QACNC,UAAU;IACZ;IACAQ,WAAW;QACTV,MAAMW;QACNT,UAAU;IACZ;IAEAU,iBAAiB;QACfZ,MAAM;YACJa,UAAU;gBACRb,MAAMC;gBACNC,UAAU;YACZ;YACAY,eAAe;gBACbd,MAAMW;gBACNT,UAAU;YACZ;YACAa,aAAa;gBACXf,MAAMC;gBACNC,UAAU;YACZ;YACAc,wBAAwB;gBACtBhB,MAAMW;gBACNT,UAAU;YACZ;YACAe,cAAc;gBACZjB,MAAMW;gBACNT,UAAU;YACZ;YACAgB,gBAAgB;gBACdlB,MAAMC;gBACNC,UAAU;YACZ;YACAiB,iBAAiB;gBACfnB,MAAMC;gBACNC,UAAU;YACZ;QACF;QACAA,UAAU;IACZ;IAEAkB,UAAU;QACRpB,MAAMqB;QACNf,SAAS;YACPgB,OAAO,EAAE;YACTC,SAAS,EAAE;YACXC,MAAM;YACNC,OAAO;QACT;QACAvB,UAAU;IACZ;IACAwB,UAAU;QACR1B,MAAMW;QACNT,UAAU;IACZ;IACAyB,UAAU;QACR3B,MAAMW;QACNT,UAAU;IACZ;AACF;AAEO,MAAMN,UAAUgC,IAAAA,eAAK,EAAC,WAAW/B"}
|