@fdm-monster/server 1.6.0-rc1 → 1.6.0-rc2
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/.gitattributes +2 -0
- package/.yarn/install-state.gz +0 -0
- package/.yarn/releases/yarn-4.1.0.cjs +893 -0
- package/.yarnrc.yml +4 -0
- package/README.md +1 -1
- package/dist/consoles/sqlite-torm.js +31 -0
- package/dist/consoles/sqlite-torm.js.map +1 -0
- package/dist/consoles/typeorm-generate.js +194 -0
- package/dist/consoles/typeorm-generate.js.map +1 -0
- package/dist/consoles/typeorm-migrate.js +48 -0
- package/dist/consoles/typeorm-migrate.js.map +1 -0
- package/dist/container.js +64 -19
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +2 -0
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/batch-call.controller.js +10 -5
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/dto/update-client-dist.dto.js +38 -0
- package/dist/controllers/dto/update-client-dist.dto.js.map +1 -0
- package/dist/controllers/printer-files.controller.js +2 -8
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +1 -1
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +25 -6
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/validation/batch-controller.validation.js +9 -0
- package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
- package/dist/data-source.js +66 -0
- package/dist/data-source.js.map +1 -0
- package/dist/entities/camera-stream.entity.js +94 -0
- package/dist/entities/camera-stream.entity.js.map +1 -0
- package/dist/entities/custom-gcode.entity.js +50 -0
- package/dist/entities/custom-gcode.entity.js.map +1 -0
- package/dist/entities/floor-position.entity.js +78 -0
- package/dist/entities/floor-position.entity.js.map +1 -0
- package/dist/entities/floor.entity.js +53 -0
- package/dist/entities/floor.entity.js.map +1 -0
- package/dist/entities/index.js +58 -0
- package/dist/entities/index.js.map +1 -0
- package/dist/entities/permission.entity.js +38 -0
- package/dist/entities/permission.entity.js.map +1 -0
- package/dist/entities/print-completion.entity.js +91 -0
- package/dist/entities/print-completion.entity.js.map +1 -0
- package/dist/entities/printer-file.entity.js +140 -0
- package/dist/entities/printer-file.entity.js.map +1 -0
- package/dist/entities/printer.entity.js +105 -0
- package/dist/entities/printer.entity.js.map +1 -0
- package/dist/entities/refresh-token.entity.js +70 -0
- package/dist/entities/refresh-token.entity.js.map +1 -0
- package/dist/entities/role.entity.js +46 -0
- package/dist/entities/role.entity.js.map +1 -0
- package/dist/entities/settings.entity.js +89 -0
- package/dist/entities/settings.entity.js.map +1 -0
- package/dist/entities/user-role.entity.js +70 -0
- package/dist/entities/user-role.entity.js.map +1 -0
- package/dist/entities/user.entity.js +90 -0
- package/dist/entities/user.entity.js.map +1 -0
- package/dist/middleware/exception.filter.js +2 -1
- package/dist/middleware/exception.filter.js.map +1 -1
- package/dist/middleware/passport.js.map +1 -1
- package/dist/migrations/1706829146617-InitSqlite.js +670 -0
- package/dist/migrations/1706829146617-InitSqlite.js.map +1 -0
- package/dist/models/Floor.js.map +1 -1
- package/dist/models/PrinterFile.js +4 -0
- package/dist/models/PrinterFile.js.map +1 -1
- package/dist/server.constants.js +4 -2
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +10 -1
- package/dist/server.core.js.map +1 -1
- package/dist/server.host.js +11 -3
- package/dist/server.host.js.map +1 -1
- package/dist/services/batch-call.service.js +43 -20
- package/dist/services/batch-call.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +92 -25
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/core/github.service.js +18 -14
- package/dist/services/core/github.service.js.map +1 -1
- package/dist/services/core/task-manager.service.js +1 -1
- package/dist/services/core/task-manager.service.js.map +1 -1
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/floor.service.js +1 -1
- package/dist/services/floor.service.js.map +1 -1
- package/dist/services/interfaces/printer-file.dto.js +29 -3
- package/dist/services/interfaces/printer-file.dto.js.map +1 -1
- package/dist/services/octoprint/dto/connection-state.dto.js +0 -25
- package/dist/services/octoprint/dto/connection-state.dto.js.map +1 -1
- package/dist/services/octoprint/dto/connection.dto.js +6 -0
- package/dist/services/octoprint/dto/connection.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
- package/dist/services/octoprint/models/octoprint-file.dto.js +6 -0
- package/dist/services/octoprint/models/octoprint-file.dto.js.map +1 -0
- package/dist/services/octoprint/octoprint-api.routes.js +9 -3
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.service.js +17 -2
- package/dist/services/octoprint/octoprint-api.service.js.map +1 -1
- package/dist/services/octoprint/octoprint-sockio.adapter.js +53 -45
- package/dist/services/octoprint/octoprint-sockio.adapter.js.map +1 -1
- package/dist/services/octoprint/utils/file.utils.js +44 -0
- package/dist/services/octoprint/utils/file.utils.js.map +1 -0
- package/dist/services/orm/base.service.js +3 -0
- package/dist/services/orm/base.service.js.map +1 -1
- package/dist/services/orm/camera-stream.service.js +25 -0
- package/dist/services/orm/camera-stream.service.js.map +1 -0
- package/dist/services/orm/custom-gcode.service.js +42 -0
- package/dist/services/orm/custom-gcode.service.js.map +1 -0
- package/dist/services/orm/floor-position.service.js +55 -0
- package/dist/services/orm/floor-position.service.js.map +1 -0
- package/dist/services/orm/floor.service.js +122 -0
- package/dist/services/orm/floor.service.js.map +1 -0
- package/dist/services/orm/permission.service.js +77 -0
- package/dist/services/orm/permission.service.js.map +1 -0
- package/dist/services/orm/print-completion.service.js +90 -0
- package/dist/services/orm/print-completion.service.js.map +1 -0
- package/dist/services/orm/printer-files.service.js +123 -0
- package/dist/services/orm/printer-files.service.js.map +1 -0
- package/dist/services/orm/printer.service.js +145 -0
- package/dist/services/orm/printer.service.js.map +1 -0
- package/dist/services/orm/refresh-token.service.js +107 -0
- package/dist/services/orm/refresh-token.service.js.map +1 -0
- package/dist/services/orm/role.service.js +131 -0
- package/dist/services/orm/role.service.js.map +1 -0
- package/dist/services/orm/settings.service.js +208 -0
- package/dist/services/orm/settings.service.js.map +1 -0
- package/dist/services/orm/user-role.service.js +55 -0
- package/dist/services/orm/user-role.service.js.map +1 -0
- package/dist/services/orm/user.service.js +146 -0
- package/dist/services/orm/user.service.js.map +1 -0
- package/dist/services/orm-migration.service.js +20 -0
- package/dist/services/orm-migration.service.js.map +1 -0
- package/dist/services/printer-files.service.js +3 -0
- package/dist/services/printer-files.service.js.map +1 -1
- package/dist/services/typeorm/typeorm.service.js +48 -0
- package/dist/services/typeorm/typeorm.service.js.map +1 -0
- package/dist/state/file.cache.js +2 -9
- package/dist/state/file.cache.js.map +1 -1
- package/dist/state/printer-connection.cache.js +21 -0
- package/dist/state/printer-connection.cache.js.map +1 -0
- package/dist/state/printer-events.cache.js +13 -7
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/printer-files.store.js +3 -4
- package/dist/state/printer-files.store.js.map +1 -1
- package/dist/state/printer-socket.store.js +3 -3
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer.cache.js +3 -0
- package/dist/state/printer.cache.js.map +1 -1
- package/dist/state/settings.store.js +3 -0
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +1 -1
- package/dist/task.presets.js.map +1 -1
- package/dist/tasks/boot.task.js +30 -18
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/print-completion.socketio.task.js +15 -1
- package/dist/tasks/print-completion.socketio.task.js.map +1 -1
- package/dist/tasks/printer-file-clean.task.js +14 -0
- package/dist/tasks/printer-file-clean.task.js.map +1 -1
- package/dist/tasks/printer-state-update-poll.task.js +89 -0
- package/dist/tasks/printer-state-update-poll.task.js.map +1 -0
- package/dist/tasks/printer-websocket-restore.task.js +4 -3
- package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
- package/dist/tasks/printer-websocket.task.js +1 -1
- package/dist/tasks/printer-websocket.task.js.map +1 -1
- package/dist/tasks.js +2 -1
- package/dist/tasks.js.map +1 -1
- package/dist/utils/semver.utils.js +19 -4
- package/dist/utils/semver.utils.js.map +1 -1
- package/package.json +30 -29
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "Settings", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return Settings;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _serversettingsconstants = require("../constants/server-settings.constants");
|
|
12
|
+
const _typeorm = require("typeorm");
|
|
13
|
+
const _baseentity = require("./base.entity");
|
|
14
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
15
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
16
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
17
|
+
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
18
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
19
|
+
}
|
|
20
|
+
function _ts_metadata(k, v) {
|
|
21
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
22
|
+
}
|
|
23
|
+
var _key, _key1, _key2, _key3, _key4, _key5;
|
|
24
|
+
_key = _serversettingsconstants.serverSettingsKey;
|
|
25
|
+
_key1 = _serversettingsconstants.credentialSettingsKey;
|
|
26
|
+
_key2 = _serversettingsconstants.wizardSettingKey;
|
|
27
|
+
_key3 = _serversettingsconstants.fileCleanSettingKey;
|
|
28
|
+
_key4 = _serversettingsconstants.frontendSettingKey;
|
|
29
|
+
_key5 = _serversettingsconstants.timeoutSettingKey;
|
|
30
|
+
class Settings extends _baseentity.BaseEntity {
|
|
31
|
+
id;
|
|
32
|
+
[_key];
|
|
33
|
+
[_key1];
|
|
34
|
+
[_key2];
|
|
35
|
+
[_key3];
|
|
36
|
+
[_key4];
|
|
37
|
+
[_key5];
|
|
38
|
+
}
|
|
39
|
+
_ts_decorate([
|
|
40
|
+
(0, _typeorm.PrimaryGeneratedColumn)(),
|
|
41
|
+
_ts_metadata("design:type", Number)
|
|
42
|
+
], Settings.prototype, "id", void 0);
|
|
43
|
+
_ts_decorate([
|
|
44
|
+
(0, _typeorm.Column)({
|
|
45
|
+
type: "simple-json",
|
|
46
|
+
nullable: false
|
|
47
|
+
}),
|
|
48
|
+
_ts_metadata("design:type", Object)
|
|
49
|
+
], Settings.prototype, _key, void 0);
|
|
50
|
+
_ts_decorate([
|
|
51
|
+
(0, _typeorm.Column)({
|
|
52
|
+
type: "simple-json",
|
|
53
|
+
nullable: false
|
|
54
|
+
}),
|
|
55
|
+
_ts_metadata("design:type", Object)
|
|
56
|
+
], Settings.prototype, _key1, void 0);
|
|
57
|
+
_ts_decorate([
|
|
58
|
+
(0, _typeorm.Column)({
|
|
59
|
+
type: "simple-json",
|
|
60
|
+
nullable: false
|
|
61
|
+
}),
|
|
62
|
+
_ts_metadata("design:type", Object)
|
|
63
|
+
], Settings.prototype, _key2, void 0);
|
|
64
|
+
_ts_decorate([
|
|
65
|
+
(0, _typeorm.Column)({
|
|
66
|
+
type: "simple-json",
|
|
67
|
+
nullable: false
|
|
68
|
+
}),
|
|
69
|
+
_ts_metadata("design:type", Object)
|
|
70
|
+
], Settings.prototype, _key3, void 0);
|
|
71
|
+
_ts_decorate([
|
|
72
|
+
(0, _typeorm.Column)({
|
|
73
|
+
type: "simple-json",
|
|
74
|
+
nullable: false
|
|
75
|
+
}),
|
|
76
|
+
_ts_metadata("design:type", Object)
|
|
77
|
+
], Settings.prototype, _key4, void 0);
|
|
78
|
+
_ts_decorate([
|
|
79
|
+
(0, _typeorm.Column)({
|
|
80
|
+
type: "simple-json",
|
|
81
|
+
nullable: false
|
|
82
|
+
}),
|
|
83
|
+
_ts_metadata("design:type", Object)
|
|
84
|
+
], Settings.prototype, _key5, void 0);
|
|
85
|
+
Settings = _ts_decorate([
|
|
86
|
+
(0, _typeorm.Entity)()
|
|
87
|
+
], Settings);
|
|
88
|
+
|
|
89
|
+
//# sourceMappingURL=settings.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/entities/settings.entity.ts"],"names":["Settings","serverSettingsKey","credentialSettingsKey","wizardSettingKey","fileCleanSettingKey","frontendSettingKey","timeoutSettingKey","BaseEntity","id","PrimaryGeneratedColumn","Column","type","nullable","Entity"],"mappings":";;;;+BAYaA;;;eAAAA;;;yCALN;yBACgD;4BAC5B;;;;;;;;;;IAQzB,MAiBA,OAQA,OAOA,OAOA,OAOA;AA9CA,OAACC,0CAAiB;AAiBlB,QAACC,8CAAqB;AAQtB,QAACC,yCAAgB;AAOjB,QAACC,4CAAmB;AAOpB,QAACC,2CAAkB;AAOnB,QAACC,0CAAiB;AAnDb,MAAMN,iBAAiBO,sBAAU;IAEtCC,GAAY;IAGZ,CAAA,KAAmB,CAcjB;IAGF,CAAA,MAAuB,CAKrB;IAGF,CAAA,MAAkB,CAIhB;IAGF,CAAA,MAAqB,CAInB;IAGF,CAAA,MAAoB,CAIlB;IAGF,CAAA,MAAmB,CAEjB;AACJ;;IArDGC,IAAAA,+BAAsB;;GADZT;;IAIVU,IAAAA,eAAM,EAAC;QAAEC,MAAM;QAAeC,UAAU;IAAM;;GAJpCZ,oBAKX;;IAgBCU,IAAAA,eAAM,EAAC;QAAEC,MAAM;QAAeC,UAAU;IAAM;;GArBpCZ,oBAsBX;;IAOCU,IAAAA,eAAM,EAAC;QAAEC,MAAM;QAAeC,UAAU;IAAM;;GA7BpCZ,oBA8BX;;IAMCU,IAAAA,eAAM,EAAC;QAAEC,MAAM;QAAeC,UAAU;IAAM;;GApCpCZ,oBAqCX;;IAMCU,IAAAA,eAAM,EAAC;QAAEC,MAAM;QAAeC,UAAU;IAAM;;GA3CpCZ,oBA4CX;;IAMCU,IAAAA,eAAM,EAAC;QAAEC,MAAM;QAAeC,UAAU;IAAM;;GAlDpCZ,oBAmDX;AAnDWA;IADZa,IAAAA,eAAM;GACMb"}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "UserRole", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return UserRole;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _typeorm = require("typeorm");
|
|
12
|
+
const _roleentity = require("./role.entity");
|
|
13
|
+
const _userentity = require("./user.entity");
|
|
14
|
+
const _baseentity = require("./base.entity");
|
|
15
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
16
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
17
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
18
|
+
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
19
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
20
|
+
}
|
|
21
|
+
function _ts_metadata(k, v) {
|
|
22
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
23
|
+
}
|
|
24
|
+
class UserRole extends _baseentity.BaseEntity {
|
|
25
|
+
id;
|
|
26
|
+
role;
|
|
27
|
+
roleId;
|
|
28
|
+
user;
|
|
29
|
+
userId;
|
|
30
|
+
createdAt;
|
|
31
|
+
}
|
|
32
|
+
_ts_decorate([
|
|
33
|
+
(0, _typeorm.PrimaryGeneratedColumn)(),
|
|
34
|
+
_ts_metadata("design:type", Number)
|
|
35
|
+
], UserRole.prototype, "id", void 0);
|
|
36
|
+
_ts_decorate([
|
|
37
|
+
(0, _typeorm.ManyToOne)(()=>_roleentity.Role, {
|
|
38
|
+
onDelete: "CASCADE",
|
|
39
|
+
nullable: false
|
|
40
|
+
}),
|
|
41
|
+
_ts_metadata("design:type", typeof _typeorm.Relation === "undefined" ? Object : _typeorm.Relation)
|
|
42
|
+
], UserRole.prototype, "role", void 0);
|
|
43
|
+
_ts_decorate([
|
|
44
|
+
(0, _typeorm.Column)(),
|
|
45
|
+
_ts_metadata("design:type", Number)
|
|
46
|
+
], UserRole.prototype, "roleId", void 0);
|
|
47
|
+
_ts_decorate([
|
|
48
|
+
(0, _typeorm.ManyToOne)(()=>_userentity.User, {
|
|
49
|
+
onDelete: "CASCADE",
|
|
50
|
+
nullable: false
|
|
51
|
+
}),
|
|
52
|
+
_ts_metadata("design:type", typeof _typeorm.Relation === "undefined" ? Object : _typeorm.Relation)
|
|
53
|
+
], UserRole.prototype, "user", void 0);
|
|
54
|
+
_ts_decorate([
|
|
55
|
+
(0, _typeorm.Column)(),
|
|
56
|
+
_ts_metadata("design:type", Number)
|
|
57
|
+
], UserRole.prototype, "userId", void 0);
|
|
58
|
+
_ts_decorate([
|
|
59
|
+
(0, _typeorm.CreateDateColumn)(),
|
|
60
|
+
_ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
|
|
61
|
+
], UserRole.prototype, "createdAt", void 0);
|
|
62
|
+
UserRole = _ts_decorate([
|
|
63
|
+
(0, _typeorm.Entity)(),
|
|
64
|
+
(0, _typeorm.Unique)([
|
|
65
|
+
"roleId",
|
|
66
|
+
"userId"
|
|
67
|
+
])
|
|
68
|
+
], UserRole);
|
|
69
|
+
|
|
70
|
+
//# sourceMappingURL=user-role.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/entities/user-role.entity.ts"],"names":["UserRole","BaseEntity","id","role","roleId","user","userId","createdAt","PrimaryGeneratedColumn","ManyToOne","Role","onDelete","nullable","Column","User","CreateDateColumn","Entity","Unique"],"mappings":";;;;+BAOaA;;;eAAAA;;;yBAPyF;4BACjF;4BACA;4BACM;;;;;;;;;;AAIpB,MAAMA,iBAAiBC,sBAAU;IAEtCC,GAAY;IAMZC,KAAsB;IAEtBC,OAAgB;IAMhBC,KAAsB;IAEtBC,OAAgB;IAGhBC,UAAiB;AACnB;;IArBGC,IAAAA,+BAAsB;;GADZR;;IAIVS,IAAAA,kBAAS,EAAC,IAAMC,gBAAI,EAAE;QACrBC,UAAU;QACVC,UAAU;IACZ;uCACO,iBAAQ,4BAAR,iBAAQ;GARJZ;;IASVa,IAAAA,eAAM;;GATIb;;IAYVS,IAAAA,kBAAS,EAAC,IAAMK,gBAAI,EAAE;QACrBH,UAAU;QACVC,UAAU;IACZ;uCACO,iBAAQ,4BAAR,iBAAQ;GAhBJZ;;IAiBVa,IAAAA,eAAM;;GAjBIb;;IAoBVe,IAAAA,yBAAgB;uCACL,gCAAA;GArBDf;AAAAA;IAFZgB,IAAAA,eAAM;IACNC,IAAAA,eAAM,EAAC;QAAC;QAAU;KAAS;GACfjB"}
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "User", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return User;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _typeorm = require("typeorm");
|
|
12
|
+
const _refreshtokenentity = require("./refresh-token.entity");
|
|
13
|
+
const _baseentity = require("./base.entity");
|
|
14
|
+
const _userroleentity = require("./user-role.entity");
|
|
15
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
16
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
17
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
18
|
+
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
19
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
20
|
+
}
|
|
21
|
+
function _ts_metadata(k, v) {
|
|
22
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
23
|
+
}
|
|
24
|
+
class User extends _baseentity.BaseEntity {
|
|
25
|
+
id;
|
|
26
|
+
username;
|
|
27
|
+
isDemoUser;
|
|
28
|
+
isRootUser;
|
|
29
|
+
isVerified;
|
|
30
|
+
needsPasswordChange;
|
|
31
|
+
passwordHash;
|
|
32
|
+
createdAt;
|
|
33
|
+
roles;
|
|
34
|
+
refreshTokens;
|
|
35
|
+
}
|
|
36
|
+
_ts_decorate([
|
|
37
|
+
(0, _typeorm.PrimaryGeneratedColumn)(),
|
|
38
|
+
_ts_metadata("design:type", Number)
|
|
39
|
+
], User.prototype, "id", void 0);
|
|
40
|
+
_ts_decorate([
|
|
41
|
+
(0, _typeorm.Column)(),
|
|
42
|
+
_ts_metadata("design:type", String)
|
|
43
|
+
], User.prototype, "username", void 0);
|
|
44
|
+
_ts_decorate([
|
|
45
|
+
(0, _typeorm.Column)({
|
|
46
|
+
default: false
|
|
47
|
+
}),
|
|
48
|
+
_ts_metadata("design:type", Boolean)
|
|
49
|
+
], User.prototype, "isDemoUser", void 0);
|
|
50
|
+
_ts_decorate([
|
|
51
|
+
(0, _typeorm.Column)({
|
|
52
|
+
default: false
|
|
53
|
+
}),
|
|
54
|
+
_ts_metadata("design:type", Boolean)
|
|
55
|
+
], User.prototype, "isRootUser", void 0);
|
|
56
|
+
_ts_decorate([
|
|
57
|
+
(0, _typeorm.Column)({
|
|
58
|
+
default: false
|
|
59
|
+
}),
|
|
60
|
+
_ts_metadata("design:type", Boolean)
|
|
61
|
+
], User.prototype, "isVerified", void 0);
|
|
62
|
+
_ts_decorate([
|
|
63
|
+
(0, _typeorm.Column)({
|
|
64
|
+
default: true
|
|
65
|
+
}),
|
|
66
|
+
_ts_metadata("design:type", Boolean)
|
|
67
|
+
], User.prototype, "needsPasswordChange", void 0);
|
|
68
|
+
_ts_decorate([
|
|
69
|
+
(0, _typeorm.Column)(),
|
|
70
|
+
_ts_metadata("design:type", String)
|
|
71
|
+
], User.prototype, "passwordHash", void 0);
|
|
72
|
+
_ts_decorate([
|
|
73
|
+
(0, _typeorm.CreateDateColumn)(),
|
|
74
|
+
_ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
|
|
75
|
+
], User.prototype, "createdAt", void 0);
|
|
76
|
+
_ts_decorate([
|
|
77
|
+
(0, _typeorm.OneToMany)(()=>_userroleentity.UserRole, (ur)=>ur.user, {
|
|
78
|
+
eager: true
|
|
79
|
+
}),
|
|
80
|
+
_ts_metadata("design:type", Array)
|
|
81
|
+
], User.prototype, "roles", void 0);
|
|
82
|
+
_ts_decorate([
|
|
83
|
+
(0, _typeorm.OneToMany)(()=>_refreshtokenentity.RefreshToken, (refreshToken)=>refreshToken.user),
|
|
84
|
+
_ts_metadata("design:type", Array)
|
|
85
|
+
], User.prototype, "refreshTokens", void 0);
|
|
86
|
+
User = _ts_decorate([
|
|
87
|
+
(0, _typeorm.Entity)()
|
|
88
|
+
], User);
|
|
89
|
+
|
|
90
|
+
//# sourceMappingURL=user.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/entities/user.entity.ts"],"names":["User","BaseEntity","id","username","isDemoUser","isRootUser","isVerified","needsPasswordChange","passwordHash","createdAt","roles","refreshTokens","PrimaryGeneratedColumn","Column","default","CreateDateColumn","OneToMany","UserRole","ur","user","eager","RefreshToken","refreshToken","Entity"],"mappings":";;;;+BAMaA;;;eAAAA;;;yBANiF;oCACjE;4BACF;gCACF;;;;;;;;;;AAGlB,MAAMA,aAAaC,sBAAU;IAElCC,GAAY;IAGZC,SAAkB;IAKlBC,WAAqB;IAKrBC,WAAqB;IAKrBC,WAAqB;IAKrBC,oBAA8B;IAG9BC,aAAsB;IAGtBC,UAAiB;IAGjBC,MAA6B;IAG7BC,cAA+B;AACjC;;IArCGC,IAAAA,+BAAsB;;GADZZ;;IAIVa,IAAAA,eAAM;;GAJIb;;IAOVa,IAAAA,eAAM,EAAC;QACNC,SAAS;IACX;;GATWd;;IAYVa,IAAAA,eAAM,EAAC;QACNC,SAAS;IACX;;GAdWd;;IAiBVa,IAAAA,eAAM,EAAC;QACNC,SAAS;IACX;;GAnBWd;;IAsBVa,IAAAA,eAAM,EAAC;QACNC,SAAS;IACX;;GAxBWd;;IA2BVa,IAAAA,eAAM;;GA3BIb;;IA8BVe,IAAAA,yBAAgB;uCACL,gCAAA;GA/BDf;;IAiCVgB,IAAAA,kBAAS,EAAC,IAAMC,wBAAQ,EAAE,CAACC,KAAOA,GAAGC,IAAI,EAAE;QAAEC,OAAO;IAAK;;GAjC/CpB;;IAoCVgB,IAAAA,kBAAS,EAAC,IAAMK,gCAAY,EAAE,CAACC,eAAiBA,aAAaH,IAAI;;GApCvDnB;AAAAA;IADZuB,IAAAA,eAAM;GACMvB"}
|
|
@@ -11,6 +11,7 @@ Object.defineProperty(exports, "exceptionFilter", {
|
|
|
11
11
|
const _runtimeexceptions = require("../exceptions/runtime.exceptions");
|
|
12
12
|
const _serverconstants = require("../server.constants");
|
|
13
13
|
const _httpstatuscodesconstants = require("../constants/http-status-codes.constants");
|
|
14
|
+
const _typeorm = require("typeorm");
|
|
14
15
|
function exceptionFilter(err, req, res, next) {
|
|
15
16
|
const isTest = process.env.NODE_ENV === _serverconstants.AppConstants.defaultTestEnv;
|
|
16
17
|
if (!isTest) {
|
|
@@ -50,7 +51,7 @@ function exceptionFilter(err, req, res, next) {
|
|
|
50
51
|
error: err.message
|
|
51
52
|
});
|
|
52
53
|
}
|
|
53
|
-
if (err instanceof _runtimeexceptions.NotFoundException) {
|
|
54
|
+
if (err instanceof _runtimeexceptions.NotFoundException || err instanceof _typeorm.EntityNotFoundError) {
|
|
54
55
|
const code = err.statusCode || 404;
|
|
55
56
|
return res.status(code).send({
|
|
56
57
|
error: err.message
|
|
@@ -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":";;;;+
|
|
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","EntityNotFoundError","BadRequestException","ValidationException","name","errors","InternalServerException","ExternalServiceError"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/middleware/passport.ts"],"names":["getPassportJwtOptions","initializePassportStrategies","verifyUserCallback","settingsStore","configService","jwtFromRequest","ExtractJwt","fromAuthHeaderAsBearerToken","secretOrKeyProvider","req","token","done","jwtSecret","getCredentialSettings","audience","get","AppConstants","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","issuer","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","userService","jwt_payload","getUser","userId","then","user","isVerified","needsPasswordChange","console","log","AuthenticationError","AUTH_ERROR_REASON","PasswordChangeRequired","AccountNotVerified","catch","err","passport","container","resolve","DITokens","opts","use","JwtStrategy","AnonymousStrategy"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/middleware/passport.ts"],"names":["getPassportJwtOptions","initializePassportStrategies","verifyUserCallback","settingsStore","configService","jwtFromRequest","ExtractJwt","fromAuthHeaderAsBearerToken","secretOrKeyProvider","req","token","done","jwtSecret","getCredentialSettings","audience","get","AppConstants","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","issuer","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","userService","jwt_payload","getUser","userId","then","user","isVerified","needsPasswordChange","console","log","AuthenticationError","AUTH_ERROR_REASON","PasswordChangeRequired","AccountNotVerified","catch","err","passport","container","resolve","DITokens","opts","use","JwtStrategy","AnonymousStrategy"],"mappings":";;;;;;;;;;;IAmBgBA,qBAAqB;eAArBA;;IA2CAC,4BAA4B;eAA5BA;;IA3BAC,kBAAkB;eAAlBA;;;6BAnC+F;mCACjE;iCACrB;iCACI;mCAQO;wCACF;AAO3B,SAASF,sBACdG,aAA4B,EAC5BC,aAA4B,EAC5BC,iBAAiEC,uBAAU,CAACC,2BAA2B,EAAE;IAEzG,OAAO;QACLF,gBAAgBA;QAChBG,qBAAqB,OAAOC,KAAKC,OAAeC;YAC9C,MAAM,EAAEC,SAAS,EAAE,GAAG,MAAMT,cAAcU,qBAAqB;YAC/D,OAAOF,KAAK,MAAMC;QACpB;QACAE,UAAUV,cAAcW,GAAG,CAACC,6BAAY,CAACC,qBAAqB,EAAED,6BAAY,CAACE,oBAAoB;QACjGC,QAAQf,cAAcW,GAAG,CAACC,6BAAY,CAACI,mBAAmB,EAAEJ,6BAAY,CAACK,kBAAkB;IAC7F;AACF;AAEO,SAASnB,mBAAmBoB,WAAyB;IAC1D,OAAO,SAAUC,WAAgB,EAAEZ,IAAsB;QACvDW,YACGE,OAAO,CAACD,YAAYE,MAAM,EAC1BC,IAAI,CAAC,CAACC;YACL,IAAIA,QAAQA,KAAKC,UAAU,IAAI,CAACD,KAAKE,mBAAmB,EAAE;gBACxD,OAAOlB,KAAK,MAAMgB;YACpB;YACA,IAAIA,QAAQA,KAAKE,mBAAmB,EAAE;gBACpCC,QAAQC,GAAG,CAAC;gBACZ,OAAOpB,KAAK,IAAIqB,sCAAmB,CAAC,4BAA4BC,yCAAiB,CAACC,sBAAsB,GAAG;YAC7G;YACA,IAAIP,QAAQ,CAACA,MAAMC,YAAY;gBAC7BE,QAAQC,GAAG,CAAC;gBACZ,OAAOpB,KAAK,IAAIqB,sCAAmB,CAAC,qBAAqBC,yCAAiB,CAACE,kBAAkB,GAAG;YAClG;YAEA,OAAOxB,KAAK,MAAM;QACpB,GACCyB,KAAK,CAAC,CAACC;YACN,IAAIA,KAAK;gBACP,OAAO1B,KAAK0B,KAAK;YACnB;QACF;IACJ;AACF;AAEO,SAASpC,6BAA6BqC,QAAwB,EAAEC,SAA+B;IACpG,MAAMpC,gBAAgBoC,UAAUC,OAAO,CAAgBC,yBAAQ,CAACtC,aAAa;IAC7E,MAAMC,gBAAgBmC,UAAUC,OAAO,CAAgBC,yBAAQ,CAACrC,aAAa;IAC7E,MAAMkB,cAAciB,UAAUC,OAAO,CAAeC,yBAAQ,CAACnB,WAAW;IAExE,MAAMoB,OAAO1C,sBAAsBG,eAAeC,eAAeE,uBAAU,CAACC,2BAA2B;IAEvG+B,SAASK,GAAG,CACV,IAAIC,qBAAW,CAACF,MAAM,SAAUnB,WAAW,EAAEZ,IAAI;QAC/CT,mBAAmBoB,aAAaC,aAAaZ;IAC/C;IAEF2B,SAASK,GAAG,CAAC,IAAIE,2BAAiB;IAClC,OAAOP;AACT"}
|