@lenne.tech/nest-server 10.0.2 → 10.0.3
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/dist/config.env.js +29 -17
- package/dist/config.env.js.map +1 -1
- package/dist/core/common/args/filter.args.js +3 -3
- package/dist/core/common/args/filter.args.js.map +1 -1
- package/dist/core/common/args/pagination.args.js +6 -6
- package/dist/core/common/args/pagination.args.js.map +1 -1
- package/dist/core/common/decorators/restricted.decorator.js +15 -17
- package/dist/core/common/decorators/restricted.decorator.js.map +1 -1
- package/dist/core/common/filters/http-exception-log.filter.js +1 -3
- package/dist/core/common/filters/http-exception-log.filter.js.map +1 -1
- package/dist/core/common/helpers/db.helper.js +14 -14
- package/dist/core/common/helpers/db.helper.js.map +1 -1
- package/dist/core/common/helpers/file.helper.js +2 -2
- package/dist/core/common/helpers/file.helper.js.map +1 -1
- package/dist/core/common/helpers/filter.helper.d.ts +2 -2
- package/dist/core/common/helpers/filter.helper.js +1 -1
- package/dist/core/common/helpers/filter.helper.js.map +1 -1
- package/dist/core/common/helpers/graphql.helper.js +1 -1
- package/dist/core/common/helpers/graphql.helper.js.map +1 -1
- package/dist/core/common/helpers/input.helper.js +31 -38
- package/dist/core/common/helpers/input.helper.js.map +1 -1
- package/dist/core/common/helpers/model.helper.js +7 -7
- package/dist/core/common/helpers/model.helper.js.map +1 -1
- package/dist/core/common/helpers/service.helper.js +2 -2
- package/dist/core/common/helpers/service.helper.js.map +1 -1
- package/dist/core/common/inputs/combined-filter.input.js +3 -3
- package/dist/core/common/inputs/combined-filter.input.js.map +1 -1
- package/dist/core/common/inputs/core-input.input.js +1 -1
- package/dist/core/common/inputs/core-input.input.js.map +1 -1
- package/dist/core/common/inputs/filter.input.js +3 -3
- package/dist/core/common/inputs/filter.input.js.map +1 -1
- package/dist/core/common/inputs/single-filter.input.js +4 -4
- package/dist/core/common/inputs/single-filter.input.js.map +1 -1
- package/dist/core/common/inputs/sort.input.js +1 -1
- package/dist/core/common/inputs/sort.input.js.map +1 -1
- package/dist/core/common/interceptors/check-security.interceptor.d.ts +1 -1
- package/dist/core/common/interceptors/check-security.interceptor.js +2 -2
- package/dist/core/common/interceptors/check-security.interceptor.js.map +1 -1
- package/dist/core/common/interfaces/server-options.interface.d.ts +27 -0
- package/dist/core/common/models/core-model.model.js.map +1 -1
- package/dist/core/common/models/core-persistence.model.js +3 -3
- package/dist/core/common/models/core-persistence.model.js.map +1 -1
- package/dist/core/common/pipes/map-and-validate.pipe.d.ts +1 -1
- package/dist/core/common/pipes/map-and-validate.pipe.js +1 -1
- package/dist/core/common/pipes/map-and-validate.pipe.js.map +1 -1
- package/dist/core/common/scalars/any.scalar.js +2 -2
- package/dist/core/common/scalars/any.scalar.js.map +1 -1
- package/dist/core/common/scalars/date-timestamp.scalar.js +1 -1
- package/dist/core/common/scalars/date-timestamp.scalar.js.map +1 -1
- package/dist/core/common/scalars/date.scalar.js +1 -1
- package/dist/core/common/scalars/date.scalar.js.map +1 -1
- package/dist/core/common/scalars/json.scalar.js +2 -2
- package/dist/core/common/scalars/json.scalar.js.map +1 -1
- package/dist/core/common/services/config.service.js +7 -7
- package/dist/core/common/services/config.service.js.map +1 -1
- package/dist/core/common/services/core-cron-jobs.service.js +5 -5
- package/dist/core/common/services/core-cron-jobs.service.js.map +1 -1
- package/dist/core/common/services/crud.service.js +1 -1
- package/dist/core/common/services/crud.service.js.map +1 -1
- package/dist/core/common/services/mailjet.service.js +5 -5
- package/dist/core/common/services/mailjet.service.js.map +1 -1
- package/dist/core/common/services/module.service.js.map +1 -1
- package/dist/core/common/services/template.service.js +3 -3
- package/dist/core/common/services/template.service.js.map +1 -1
- package/dist/core/common/types/core-model-constructor.type.d.ts +2 -2
- package/dist/core/modules/auth/core-auth.module.js +3 -3
- package/dist/core/modules/auth/core-auth.module.js.map +1 -1
- package/dist/core/modules/auth/core-auth.resolver.js +5 -5
- package/dist/core/modules/auth/core-auth.resolver.js.map +1 -1
- package/dist/core/modules/auth/guards/auth.guard.js +4 -4
- package/dist/core/modules/auth/guards/auth.guard.js.map +1 -1
- package/dist/core/modules/auth/guards/roles.guard.js +1 -1
- package/dist/core/modules/auth/guards/roles.guard.js.map +1 -1
- package/dist/core/modules/auth/services/core-auth.service.js +5 -5
- package/dist/core/modules/auth/services/core-auth.service.js.map +1 -1
- package/dist/core/modules/auth/strategies/jwt.strategy.js.map +1 -1
- package/dist/core/modules/auth/tokens.decorator.js +2 -2
- package/dist/core/modules/auth/tokens.decorator.js.map +1 -1
- package/dist/core/modules/file/core-file-info.model.js +2 -2
- package/dist/core/modules/file/core-file-info.model.js.map +1 -1
- package/dist/core/modules/file/core-file.controller.d.ts +1 -2
- package/dist/core/modules/file/core-file.controller.js +3 -6
- package/dist/core/modules/file/core-file.controller.js.map +1 -1
- package/dist/core/modules/file/core-file.service.js +1 -1
- package/dist/core/modules/file/core-file.service.js.map +1 -1
- package/dist/core/modules/file/interfaces/file-upload.interface.d.ts +1 -1
- package/dist/core/modules/health-check/core-health-check-result.model.d.ts +8 -0
- package/dist/core/modules/health-check/core-health-check-result.model.js +53 -0
- package/dist/core/modules/health-check/core-health-check-result.model.js.map +1 -0
- package/dist/core/modules/health-check/core-health-check.controller.d.ts +6 -0
- package/dist/core/modules/health-check/core-health-check.controller.js +33 -0
- package/dist/core/modules/health-check/core-health-check.controller.js.map +1 -0
- package/dist/core/modules/health-check/core-health-check.module.d.ts +2 -0
- package/dist/core/modules/health-check/core-health-check.module.js +24 -0
- package/dist/core/modules/health-check/core-health-check.module.js.map +1 -0
- package/dist/core/modules/health-check/core-health-check.resolver.d.ts +6 -0
- package/dist/core/modules/health-check/core-health-check.resolver.js +38 -0
- package/dist/core/modules/health-check/core-health-check.resolver.js.map +1 -0
- package/dist/core/modules/health-check/core-health-check.service.d.ts +11 -0
- package/dist/core/modules/health-check/core-health-check.service.js +52 -0
- package/dist/core/modules/health-check/core-health-check.service.js.map +1 -0
- package/dist/core/modules/user/core-user.model.js +4 -4
- package/dist/core/modules/user/core-user.model.js.map +1 -1
- package/dist/core/modules/user/core-user.service.js +2 -2
- package/dist/core/modules/user/core-user.service.js.map +1 -1
- package/dist/core/modules/user/inputs/core-user.input.js +1 -1
- package/dist/core/modules/user/inputs/core-user.input.js.map +1 -1
- package/dist/core.module.js +10 -5
- package/dist/core.module.js.map +1 -1
- package/dist/index.d.ts +5 -0
- package/dist/index.js +5 -0
- package/dist/index.js.map +1 -1
- package/dist/main.js +1 -1
- package/dist/main.js.map +1 -1
- package/dist/server/modules/auth/auth.service.js +1 -1
- package/dist/server/modules/auth/auth.service.js.map +1 -1
- package/dist/server/modules/file/file.controller.js +1 -1
- package/dist/server/modules/file/file.controller.js.map +1 -1
- package/dist/server/modules/file/file.resolver.js +2 -2
- package/dist/server/modules/file/file.resolver.js.map +1 -1
- package/dist/server/modules/file/file.service.js +1 -1
- package/dist/server/modules/file/file.service.js.map +1 -1
- package/dist/server/modules/file/multer-config.service.js +1 -1
- package/dist/server/modules/file/multer-config.service.js.map +1 -1
- package/dist/server/modules/user/avatar.controller.js +1 -1
- package/dist/server/modules/user/avatar.controller.js.map +1 -1
- package/dist/server/modules/user/user.resolver.js +1 -1
- package/dist/server/modules/user/user.resolver.js.map +1 -1
- package/dist/server/modules/user/user.service.js +3 -3
- package/dist/server/modules/user/user.service.js.map +1 -1
- package/dist/templates/index.ejs +2 -0
- package/dist/templates/password-reset.ejs +3 -0
- package/dist/templates/welcome.ejs +3 -0
- package/dist/test/test.helper.d.ts +1 -1
- package/dist/test/test.helper.js +7 -7
- package/dist/test/test.helper.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +26 -23
- package/src/config.env.ts +32 -20
- package/src/core/common/args/filter.args.ts +4 -4
- package/src/core/common/args/pagination.args.ts +7 -7
- package/src/core/common/decorators/graphql-service-options.decorator.ts +2 -2
- package/src/core/common/decorators/graphql-user.decorator.ts +1 -1
- package/src/core/common/decorators/rest-user.decorator.ts +1 -1
- package/src/core/common/decorators/restricted.decorator.ts +18 -18
- package/src/core/common/filters/http-exception-log.filter.ts +4 -4
- package/src/core/common/helpers/db.helper.ts +35 -40
- package/src/core/common/helpers/decorator.helper.ts +1 -1
- package/src/core/common/helpers/file.helper.ts +2 -2
- package/src/core/common/helpers/filter.helper.ts +7 -8
- package/src/core/common/helpers/graphql.helper.ts +6 -6
- package/src/core/common/helpers/input.helper.ts +54 -61
- package/src/core/common/helpers/model.helper.ts +33 -41
- package/src/core/common/helpers/service.helper.ts +8 -8
- package/src/core/common/inputs/combined-filter.input.ts +4 -4
- package/src/core/common/inputs/core-input.input.ts +2 -2
- package/src/core/common/inputs/filter.input.ts +4 -4
- package/src/core/common/inputs/single-filter.input.ts +4 -4
- package/src/core/common/inputs/sort.input.ts +1 -1
- package/src/core/common/interceptors/check-response.interceptor.ts +1 -1
- package/src/core/common/interceptors/check-security.interceptor.ts +5 -5
- package/src/core/common/interfaces/server-options.interface.ts +31 -0
- package/src/core/common/models/core-model.model.ts +6 -4
- package/src/core/common/models/core-persistence.model.ts +3 -3
- package/src/core/common/pipes/map-and-validate.pipe.ts +2 -2
- package/src/core/common/scalars/any.scalar.ts +2 -2
- package/src/core/common/scalars/date-timestamp.scalar.ts +1 -2
- package/src/core/common/scalars/date.scalar.ts +1 -2
- package/src/core/common/scalars/json.scalar.ts +4 -4
- package/src/core/common/services/config.service.ts +16 -16
- package/src/core/common/services/core-cron-jobs.service.ts +7 -7
- package/src/core/common/services/crud.service.ts +22 -22
- package/src/core/common/services/email.service.ts +1 -1
- package/src/core/common/services/mailjet.service.ts +8 -8
- package/src/core/common/services/module.service.ts +5 -6
- package/src/core/common/services/template.service.ts +4 -4
- package/src/core/common/types/core-model-constructor.type.ts +2 -2
- package/src/core/modules/auth/core-auth.controller.ts +2 -2
- package/src/core/modules/auth/core-auth.module.ts +4 -4
- package/src/core/modules/auth/core-auth.resolver.ts +9 -9
- package/src/core/modules/auth/guards/auth.guard.ts +8 -7
- package/src/core/modules/auth/guards/roles.guard.ts +1 -1
- package/src/core/modules/auth/services/core-auth.service.ts +9 -9
- package/src/core/modules/auth/strategies/jwt-refresh.strategy.ts +1 -1
- package/src/core/modules/auth/strategies/jwt.strategy.ts +1 -1
- package/src/core/modules/auth/tokens.decorator.ts +6 -7
- package/src/core/modules/file/core-file-info.model.ts +2 -2
- package/src/core/modules/file/core-file.controller.ts +2 -4
- package/src/core/modules/file/core-file.service.ts +6 -5
- package/src/core/modules/file/interfaces/file-upload.interface.ts +1 -1
- package/src/core/modules/health-check/core-health-check-result.model.ts +46 -0
- package/src/core/modules/health-check/core-health-check.controller.ts +24 -0
- package/src/core/modules/health-check/core-health-check.module.ts +17 -0
- package/src/core/modules/health-check/core-health-check.resolver.ts +32 -0
- package/src/core/modules/health-check/core-health-check.service.ts +60 -0
- package/src/core/modules/user/core-user.model.ts +5 -5
- package/src/core/modules/user/core-user.service.ts +10 -9
- package/src/core/modules/user/inputs/core-user.input.ts +1 -2
- package/src/core.module.ts +16 -10
- package/src/index.ts +10 -0
- package/src/main.ts +2 -2
- package/src/server/modules/auth/auth.controller.ts +1 -1
- package/src/server/modules/auth/auth.resolver.ts +3 -3
- package/src/server/modules/auth/auth.service.ts +2 -2
- package/src/server/modules/file/file.controller.ts +1 -2
- package/src/server/modules/file/file.module.ts +1 -1
- package/src/server/modules/file/file.resolver.ts +4 -3
- package/src/server/modules/file/file.service.ts +1 -1
- package/src/server/modules/file/multer-config.service.ts +1 -1
- package/src/server/modules/user/avatar.controller.ts +3 -3
- package/src/server/modules/user/user.model.ts +1 -1
- package/src/server/modules/user/user.resolver.ts +4 -4
- package/src/server/modules/user/user.service.ts +4 -4
- package/src/test/test.helper.ts +11 -11
package/dist/config.env.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const schedule_1 = require("@nestjs/schedule");
|
|
4
3
|
const path_1 = require("path");
|
|
4
|
+
const schedule_1 = require("@nestjs/schedule");
|
|
5
5
|
const config_helper_1 = require("./core/common/helpers/config.helper");
|
|
6
6
|
const config = {
|
|
7
7
|
local: {
|
|
@@ -49,6 +49,9 @@ const config = {
|
|
|
49
49
|
},
|
|
50
50
|
maxComplexity: 20,
|
|
51
51
|
},
|
|
52
|
+
healthCheck: {
|
|
53
|
+
enabled: true,
|
|
54
|
+
},
|
|
52
55
|
ignoreSelectionsForPopulate: true,
|
|
53
56
|
jwt: {
|
|
54
57
|
secret: 'SECRET_OR_PRIVATE_KEY_LOCAL',
|
|
@@ -63,7 +66,7 @@ const config = {
|
|
|
63
66
|
},
|
|
64
67
|
},
|
|
65
68
|
},
|
|
66
|
-
loadLocalConfig:
|
|
69
|
+
loadLocalConfig: true,
|
|
67
70
|
logExceptions: true,
|
|
68
71
|
mongoose: {
|
|
69
72
|
collation: {
|
|
@@ -118,6 +121,9 @@ const config = {
|
|
|
118
121
|
},
|
|
119
122
|
maxComplexity: 20,
|
|
120
123
|
},
|
|
124
|
+
healthCheck: {
|
|
125
|
+
enabled: true,
|
|
126
|
+
},
|
|
121
127
|
ignoreSelectionsForPopulate: true,
|
|
122
128
|
jwt: {
|
|
123
129
|
secret: 'SECRET_OR_PRIVATE_KEY_DEV',
|
|
@@ -187,6 +193,9 @@ const config = {
|
|
|
187
193
|
},
|
|
188
194
|
maxComplexity: 20,
|
|
189
195
|
},
|
|
196
|
+
healthCheck: {
|
|
197
|
+
enabled: true,
|
|
198
|
+
},
|
|
190
199
|
ignoreSelectionsForPopulate: true,
|
|
191
200
|
jwt: {
|
|
192
201
|
secret: 'SECRET_OR_PRIVATE_KEY_PROD',
|
|
@@ -221,28 +230,31 @@ const config = {
|
|
|
221
230
|
},
|
|
222
231
|
},
|
|
223
232
|
};
|
|
224
|
-
const env = process.env['NODE' + '_ENV'] || '
|
|
225
|
-
const envConfig = config[env] || config.
|
|
226
|
-
console.info(
|
|
233
|
+
const env = process.env['NODE' + '_ENV'] || 'local';
|
|
234
|
+
const envConfig = config[env] || config.local;
|
|
235
|
+
console.info(`Configured for: ${envConfig.env}${env !== envConfig.env ? ` (requested: ${env})` : ''}`);
|
|
227
236
|
if (envConfig.loadLocalConfig) {
|
|
228
237
|
let localConfig;
|
|
229
238
|
if (typeof envConfig.loadLocalConfig === 'string') {
|
|
230
|
-
|
|
231
|
-
|
|
239
|
+
Promise.resolve(`${envConfig.loadLocalConfig}`).then(s => require(s)).then((loadedConfig) => {
|
|
240
|
+
localConfig = loadedConfig.default || loadedConfig;
|
|
241
|
+
(0, config_helper_1.merge)(envConfig, localConfig);
|
|
242
|
+
}).catch(() => {
|
|
243
|
+
console.info(`Configuration ${envConfig.loadLocalConfig} not found!`);
|
|
244
|
+
});
|
|
232
245
|
}
|
|
233
246
|
else {
|
|
234
|
-
|
|
235
|
-
localConfig =
|
|
247
|
+
Promise.resolve(`${(0, path_1.join)(__dirname, 'config.json')}`).then(s => require(s)).then((loadedConfig) => {
|
|
248
|
+
localConfig = loadedConfig.default || loadedConfig;
|
|
236
249
|
(0, config_helper_1.merge)(envConfig, localConfig);
|
|
237
|
-
}
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
localConfig = require(__dirname + '/../config.json');
|
|
250
|
+
}).catch(() => {
|
|
251
|
+
Promise.resolve(`${(0, path_1.join)(__dirname, '..', 'config.json')}`).then(s => require(s)).then((loadedConfig) => {
|
|
252
|
+
localConfig = loadedConfig.default || loadedConfig;
|
|
241
253
|
(0, config_helper_1.merge)(envConfig, localConfig);
|
|
242
|
-
}
|
|
243
|
-
|
|
244
|
-
}
|
|
245
|
-
}
|
|
254
|
+
}).catch(() => {
|
|
255
|
+
console.info('No local config.json found!');
|
|
256
|
+
});
|
|
257
|
+
});
|
|
246
258
|
}
|
|
247
259
|
}
|
|
248
260
|
exports.default = envConfig;
|
package/dist/config.env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.env.js","sourceRoot":"","sources":["../src/config.env.ts"],"names":[],"mappings":";;AAAA,+CAAkD;AAClD
|
|
1
|
+
{"version":3,"file":"config.env.js","sourceRoot":"","sources":["../src/config.env.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,12 +23,12 @@ let FilterArgs = exports.FilterArgs = class FilterArgs extends pagination_args_1
|
|
|
23
23
|
map(data, options = {}) {
|
|
24
24
|
super.map(data, options);
|
|
25
25
|
this.filter = data.filter ? filter_input_1.FilterInput.map(data.filter, options) : undefined;
|
|
26
|
-
Object.keys(this).forEach(
|
|
26
|
+
Object.keys(this).forEach(key => this[key] === undefined && delete this[key]);
|
|
27
27
|
return this;
|
|
28
28
|
}
|
|
29
29
|
};
|
|
30
30
|
__decorate([
|
|
31
|
-
(0, graphql_1.Field)(
|
|
31
|
+
(0, graphql_1.Field)(type => filter_input_1.FilterInput, {
|
|
32
32
|
description: 'Input for filtering',
|
|
33
33
|
nullable: true,
|
|
34
34
|
}),
|
|
@@ -36,7 +36,7 @@ __decorate([
|
|
|
36
36
|
__metadata("design:type", filter_input_1.FilterInput)
|
|
37
37
|
], FilterArgs.prototype, "filter", void 0);
|
|
38
38
|
__decorate([
|
|
39
|
-
(0, graphql_1.Field)(
|
|
39
|
+
(0, graphql_1.Field)(type => Number, {
|
|
40
40
|
description: 'Request only a specified number of samples from the filter results; if not specified, all results are returned.',
|
|
41
41
|
nullable: true,
|
|
42
42
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.args.js","sourceRoot":"","sources":["../../../../src/core/common/args/filter.args.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAA6C;AAC7C,6CAAkD;AAClD,yDAAqD;AACrD,uDAAmD;AAG5C,IAAM,UAAU,wBAAhB,MAAM,UAAW,SAAQ,gCAAc;IAAvC;;QASL,WAAM,GAAiB,SAAS,CAAC;QAUjC,YAAO,GAAY,SAAS,CAAC;IAsB/B,CAAC;IAbU,GAAG,CACV,IAAyC,EACzC,UAII,EAAE;QAEN,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,0BAAW,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9E,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"filter.args.js","sourceRoot":"","sources":["../../../../src/core/common/args/filter.args.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAA6C;AAC7C,6CAAkD;AAClD,yDAAqD;AACrD,uDAAmD;AAG5C,IAAM,UAAU,wBAAhB,MAAM,UAAW,SAAQ,gCAAc;IAAvC;;QASL,WAAM,GAAiB,SAAS,CAAC;QAUjC,YAAO,GAAY,SAAS,CAAC;IAsB/B,CAAC;IAbU,GAAG,CACV,IAAyC,EACzC,UAII,EAAE;QAEN,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,0BAAW,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9E,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9E,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAhCC;IALC,IAAA,eAAK,EAAC,IAAI,CAAC,EAAE,CAAC,0BAAW,EAAE;QAC1B,WAAW,EAAE,qBAAqB;QAClC,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,4BAAU,GAAE;8BACJ,0BAAW;0CAAa;AAUjC;IALC,IAAA,eAAK,EAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE;QACrB,WAAW,EACT,iHAAiH;QACnH,QAAQ,EAAE,IAAI;KACf,CAAC;;2CAC2B;qBAnBlB,UAAU;IADtB,IAAA,kBAAQ,GAAE;GACE,UAAU,CAyCtB"}
|
|
@@ -27,12 +27,12 @@ let PaginationArgs = exports.PaginationArgs = class PaginationArgs extends core_
|
|
|
27
27
|
map(data, options = {}) {
|
|
28
28
|
super.map(data, options);
|
|
29
29
|
this.sort = (0, model_helper_1.maps)(data.sort, sort_input_1.SortInput, options.cloneDeep);
|
|
30
|
-
Object.keys(this).forEach(
|
|
30
|
+
Object.keys(this).forEach(key => this[key] === undefined && delete this[key]);
|
|
31
31
|
return this;
|
|
32
32
|
}
|
|
33
33
|
};
|
|
34
34
|
__decorate([
|
|
35
|
-
(0, graphql_1.Field)(
|
|
35
|
+
(0, graphql_1.Field)(type => graphql_1.Int, {
|
|
36
36
|
description: 'Limit specifies the maximum number of elements found that are to be returned',
|
|
37
37
|
nullable: true,
|
|
38
38
|
}),
|
|
@@ -40,7 +40,7 @@ __decorate([
|
|
|
40
40
|
__metadata("design:type", Number)
|
|
41
41
|
], PaginationArgs.prototype, "limit", void 0);
|
|
42
42
|
__decorate([
|
|
43
|
-
(0, graphql_1.Field)(
|
|
43
|
+
(0, graphql_1.Field)(type => graphql_1.Int, {
|
|
44
44
|
description: 'Alias for skip',
|
|
45
45
|
nullable: true,
|
|
46
46
|
}),
|
|
@@ -48,7 +48,7 @@ __decorate([
|
|
|
48
48
|
__metadata("design:type", Number)
|
|
49
49
|
], PaginationArgs.prototype, "offset", void 0);
|
|
50
50
|
__decorate([
|
|
51
|
-
(0, graphql_1.Field)(
|
|
51
|
+
(0, graphql_1.Field)(type => graphql_1.Int, {
|
|
52
52
|
description: 'Skip specifies how many found elements should be skipped on return',
|
|
53
53
|
nullable: true,
|
|
54
54
|
}),
|
|
@@ -56,7 +56,7 @@ __decorate([
|
|
|
56
56
|
__metadata("design:type", Number)
|
|
57
57
|
], PaginationArgs.prototype, "skip", void 0);
|
|
58
58
|
__decorate([
|
|
59
|
-
(0, graphql_1.Field)(
|
|
59
|
+
(0, graphql_1.Field)(type => [sort_input_1.SortInput], {
|
|
60
60
|
description: 'Sorting the returned elements',
|
|
61
61
|
nullable: true,
|
|
62
62
|
}),
|
|
@@ -64,7 +64,7 @@ __decorate([
|
|
|
64
64
|
__metadata("design:type", Array)
|
|
65
65
|
], PaginationArgs.prototype, "sort", void 0);
|
|
66
66
|
__decorate([
|
|
67
|
-
(0, graphql_1.Field)(
|
|
67
|
+
(0, graphql_1.Field)(type => graphql_1.Int, {
|
|
68
68
|
description: 'Alias for limit',
|
|
69
69
|
nullable: true,
|
|
70
70
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pagination.args.js","sourceRoot":"","sources":["../../../../src/core/common/args/pagination.args.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAuD;AACvD,qDAA6C;AAC7C,0DAA+C;AAC/C,iEAAuD;AACvD,qDAAiD;AAG1C,IAAM,cAAc,4BAApB,MAAM,cAAe,SAAQ,4BAAS;IAAtC;;QASL,UAAK,GAAY,SAAS,CAAC;QAU3B,WAAM,GAAY,SAAS,CAAC;QAU5B,SAAI,GAAY,SAAS,CAAC;QAU1B,SAAI,GAAiB,SAAS,CAAC;QAU/B,SAAI,GAAY,SAAS,CAAC;IAsB5B,CAAC;IAbU,GAAG,CACV,IAAyC,EACzC,UAII,EAAE;QAEN,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,IAAA,mBAAI,EAAC,IAAI,CAAC,IAAI,EAAE,sBAAS,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"pagination.args.js","sourceRoot":"","sources":["../../../../src/core/common/args/pagination.args.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAuD;AACvD,qDAA6C;AAC7C,0DAA+C;AAC/C,iEAAuD;AACvD,qDAAiD;AAG1C,IAAM,cAAc,4BAApB,MAAM,cAAe,SAAQ,4BAAS;IAAtC;;QASL,UAAK,GAAY,SAAS,CAAC;QAU3B,WAAM,GAAY,SAAS,CAAC;QAU5B,SAAI,GAAY,SAAS,CAAC;QAU1B,SAAI,GAAiB,SAAS,CAAC;QAU/B,SAAI,GAAY,SAAS,CAAC;IAsB5B,CAAC;IAbU,GAAG,CACV,IAAyC,EACzC,UAII,EAAE;QAEN,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,IAAA,mBAAI,EAAC,IAAI,CAAC,IAAI,EAAE,sBAAS,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9E,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA9DC;IALC,IAAA,eAAK,EAAC,IAAI,CAAC,EAAE,CAAC,aAAG,EAAE;QAClB,WAAW,EAAE,8EAA8E;QAC3F,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,4BAAU,GAAE;;6CACc;AAU3B;IALC,IAAA,eAAK,EAAC,IAAI,CAAC,EAAE,CAAC,aAAG,EAAE;QAClB,WAAW,EAAE,gBAAgB;QAC7B,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,4BAAU,GAAE;;8CACe;AAU5B;IALC,IAAA,eAAK,EAAC,IAAI,CAAC,EAAE,CAAC,aAAG,EAAE;QAClB,WAAW,EAAE,oEAAoE;QACjF,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,4BAAU,GAAE;;4CACa;AAU1B;IALC,IAAA,eAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,sBAAS,CAAC,EAAE;QAC1B,WAAW,EAAE,+BAA+B;QAC5C,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,4BAAU,GAAE;;4CACkB;AAU/B;IALC,IAAA,eAAK,EAAC,IAAI,CAAC,EAAE,CAAC,aAAG,EAAE;QAClB,WAAW,EAAE,iBAAiB;QAC9B,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,4BAAU,GAAE;;4CACa;yBAjDf,cAAc;IAD1B,IAAA,kBAAQ,GAAE;GACE,cAAc,CAuE1B"}
|
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.checkRestricted = exports.getRestricted = exports.Restricted = void 0;
|
|
4
4
|
require("reflect-metadata");
|
|
5
5
|
const common_1 = require("@nestjs/common");
|
|
6
|
+
const _ = require("lodash");
|
|
6
7
|
const role_enum_1 = require("../enums/role.enum");
|
|
7
8
|
const db_helper_1 = require("../helpers/db.helper");
|
|
8
|
-
const _ = require("lodash");
|
|
9
9
|
const restrictedMetaKey = Symbol('restricted');
|
|
10
10
|
const Restricted = (...rolesOrMember) => {
|
|
11
11
|
return Reflect.metadata(restrictedMetaKey, rolesOrMember);
|
|
@@ -37,9 +37,9 @@ const checkRestricted = (data, user, options = {}, processedObjects = []) => {
|
|
|
37
37
|
}
|
|
38
38
|
processedObjects.push(data);
|
|
39
39
|
if (Array.isArray(data)) {
|
|
40
|
-
let result = data.map(
|
|
40
|
+
let result = data.map(item => (0, exports.checkRestricted)(item, user, config, processedObjects));
|
|
41
41
|
if (!config.throwError && config.removeUndefinedFromResultArray) {
|
|
42
|
-
result = result.filter(
|
|
42
|
+
result = result.filter(item => item !== undefined);
|
|
43
43
|
}
|
|
44
44
|
return result;
|
|
45
45
|
}
|
|
@@ -53,8 +53,8 @@ const checkRestricted = (data, user, options = {}, processedObjects = []) => {
|
|
|
53
53
|
if (typeof item === 'string') {
|
|
54
54
|
roles.push(item);
|
|
55
55
|
}
|
|
56
|
-
else if (item?.roles?.length
|
|
57
|
-
(config.processType && item.processType ? config.processType === item.processType : true)) {
|
|
56
|
+
else if (item?.roles?.length
|
|
57
|
+
&& (config.processType && item.processType ? config.processType === item.processType : true)) {
|
|
58
58
|
if (Array.isArray(item.roles)) {
|
|
59
59
|
roles.push(...item.roles);
|
|
60
60
|
}
|
|
@@ -67,19 +67,19 @@ const checkRestricted = (data, user, options = {}, processedObjects = []) => {
|
|
|
67
67
|
if (roles.includes(role_enum_1.RoleEnum.S_NO_ONE)) {
|
|
68
68
|
return false;
|
|
69
69
|
}
|
|
70
|
-
if (roles.includes(role_enum_1.RoleEnum.S_EVERYONE)
|
|
71
|
-
user?.hasRole?.(roles)
|
|
72
|
-
(user?.id && roles.includes(role_enum_1.RoleEnum.S_USER))
|
|
73
|
-
(roles.includes(role_enum_1.RoleEnum.S_SELF) && (0, db_helper_1.getIncludedIds)(config.dbObject, user))
|
|
74
|
-
(roles.includes(role_enum_1.RoleEnum.S_CREATOR) && (0, db_helper_1.getIncludedIds)(config.dbObject?.createdBy, user))) {
|
|
70
|
+
if (roles.includes(role_enum_1.RoleEnum.S_EVERYONE)
|
|
71
|
+
|| user?.hasRole?.(roles)
|
|
72
|
+
|| (user?.id && roles.includes(role_enum_1.RoleEnum.S_USER))
|
|
73
|
+
|| (roles.includes(role_enum_1.RoleEnum.S_SELF) && (0, db_helper_1.getIncludedIds)(config.dbObject, user))
|
|
74
|
+
|| (roles.includes(role_enum_1.RoleEnum.S_CREATOR) && (0, db_helper_1.getIncludedIds)(config.dbObject?.createdBy, user))) {
|
|
75
75
|
valid = true;
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
if (!valid) {
|
|
79
79
|
const groups = restricted.filter((item) => {
|
|
80
|
-
return (typeof item === 'object'
|
|
81
|
-
item.memberOf?.length
|
|
82
|
-
(config.processType && item.processType ? config.processType === item.processType : true));
|
|
80
|
+
return (typeof item === 'object'
|
|
81
|
+
&& item.memberOf?.length
|
|
82
|
+
&& (config.processType && item.processType ? config.processType === item.processType : true));
|
|
83
83
|
});
|
|
84
84
|
if (groups.length) {
|
|
85
85
|
const members = [];
|
|
@@ -115,7 +115,7 @@ const checkRestricted = (data, user, options = {}, processedObjects = []) => {
|
|
|
115
115
|
const objectIsValid = validateRestricted(objectRestrictions);
|
|
116
116
|
if (!objectIsValid) {
|
|
117
117
|
if (config.throwError) {
|
|
118
|
-
throw new common_1.UnauthorizedException(
|
|
118
|
+
throw new common_1.UnauthorizedException(`The current user has no access rights for ${data.constructor?.name}`);
|
|
119
119
|
}
|
|
120
120
|
return null;
|
|
121
121
|
}
|
|
@@ -132,9 +132,7 @@ const checkRestricted = (data, user, options = {}, processedObjects = []) => {
|
|
|
132
132
|
}
|
|
133
133
|
else {
|
|
134
134
|
if (config.throwError) {
|
|
135
|
-
throw new common_1.UnauthorizedException(
|
|
136
|
-
propertyKey +
|
|
137
|
-
(data.constructor?.name ? ' of ' + data.constructor.name : ''));
|
|
135
|
+
throw new common_1.UnauthorizedException(`The current user has no access rights for ${propertyKey}${data.constructor?.name ? ` of ${data.constructor.name}` : ''}`);
|
|
138
136
|
}
|
|
139
137
|
delete data[propertyKey];
|
|
140
138
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restricted.decorator.js","sourceRoot":"","sources":["../../../../src/core/common/decorators/restricted.decorator.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAC1B,2CAAuD;
|
|
1
|
+
{"version":3,"file":"restricted.decorator.js","sourceRoot":"","sources":["../../../../src/core/common/decorators/restricted.decorator.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,9 +18,7 @@ let HttpExceptionLogFilter = exports.HttpExceptionLogFilter = class HttpExceptio
|
|
|
18
18
|
const ctx = host.switchToHttp();
|
|
19
19
|
const res = ctx.getResponse();
|
|
20
20
|
const status = exception.getStatus();
|
|
21
|
-
res.status(status).json({
|
|
22
|
-
...exception,
|
|
23
|
-
});
|
|
21
|
+
res.status(status).json(exception instanceof common_1.ServiceUnavailableException ? { ...exception }.response : { ...exception });
|
|
24
22
|
}
|
|
25
23
|
};
|
|
26
24
|
exports.HttpExceptionLogFilter = HttpExceptionLogFilter = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-exception-log.filter.js","sourceRoot":"","sources":["../../../../src/core/common/filters/http-exception-log.filter.ts"],"names":[],"mappings":";;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"http-exception-log.filter.js","sourceRoot":"","sources":["../../../../src/core/common/filters/http-exception-log.filter.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAmH;AAK5G,IAAM,sBAAsB,oCAA5B,MAAM,sBAAsB;IAIjC,KAAK,CAAC,SAAwB,EAAE,IAAmB;QAEjD,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAG/B,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAkB,CAAC;QAC5C,IAAI,IAAI,KAAK,SAAS,EAAE;YACtB,OAAO,SAAS,CAAC;SAClB;QAGD,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAChC,MAAM,GAAG,GAAG,GAAG,CAAC,WAAW,EAAY,CAAC;QACxC,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;QACrC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CACrB,SAAS,YAAY,oCAA2B,CAAC,CAAC,CAAE,EAAE,GAAG,SAAS,EAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,SAAS,EAAE,CACzG,CAAC;IACJ,CAAC;CACF,CAAA;iCAtBY,sBAAsB;IADlC,IAAA,cAAK,EAAC,sBAAa,CAAC;GACR,sBAAsB,CAsBlC"}
|
|
@@ -20,10 +20,10 @@ function addIds(target, ids, convert = 'auto', options) {
|
|
|
20
20
|
removeIds(ids, target);
|
|
21
21
|
}
|
|
22
22
|
if (ids.length) {
|
|
23
|
-
if (result.length
|
|
24
|
-
convert === 'auto'
|
|
25
|
-
((result[0] instanceof mongoose_1.Types.ObjectId && !(ids instanceof mongoose_1.Types.ObjectId))
|
|
26
|
-
(typeof result[0] === 'string' && typeof ids !== 'string'))) {
|
|
23
|
+
if (result.length
|
|
24
|
+
&& convert === 'auto'
|
|
25
|
+
&& ((result[0] instanceof mongoose_1.Types.ObjectId && !(ids instanceof mongoose_1.Types.ObjectId))
|
|
26
|
+
|| (typeof result[0] === 'string' && typeof ids !== 'string'))) {
|
|
27
27
|
const converted = result[0] instanceof mongoose_1.Types.ObjectId ? getObjectIds(ids) : getStringIds(ids);
|
|
28
28
|
result.push(...converted);
|
|
29
29
|
}
|
|
@@ -63,7 +63,7 @@ function equalIds(...ids) {
|
|
|
63
63
|
if (!compare) {
|
|
64
64
|
return false;
|
|
65
65
|
}
|
|
66
|
-
return ids.every(
|
|
66
|
+
return ids.every(id => getStringIds(id) === compare);
|
|
67
67
|
}
|
|
68
68
|
exports.equalIds = equalIds;
|
|
69
69
|
function getIncludedIds(includes, ids, convert) {
|
|
@@ -141,7 +141,7 @@ function getStringIds(elements, options) {
|
|
|
141
141
|
exports.getStringIds = getStringIds;
|
|
142
142
|
function getObjectIds(ids) {
|
|
143
143
|
if (Array.isArray(ids)) {
|
|
144
|
-
return ids.map(
|
|
144
|
+
return ids.map(id => new mongoose_1.Types.ObjectId(getStringId(id)));
|
|
145
145
|
}
|
|
146
146
|
return new mongoose_1.Types.ObjectId(getStringId(ids));
|
|
147
147
|
}
|
|
@@ -167,7 +167,7 @@ function getElementsViaIds(ids, array, options = {}) {
|
|
|
167
167
|
});
|
|
168
168
|
if (config.unique) {
|
|
169
169
|
return elements.filter((value, index, self) => {
|
|
170
|
-
return self.findIndex(
|
|
170
|
+
return self.findIndex(e => getStringIds(e)) === index;
|
|
171
171
|
});
|
|
172
172
|
}
|
|
173
173
|
return elements;
|
|
@@ -251,7 +251,7 @@ function objectIdsToStrings(element, prepared = new WeakMap()) {
|
|
|
251
251
|
return element.toHexString();
|
|
252
252
|
}
|
|
253
253
|
if (Array.isArray(element)) {
|
|
254
|
-
return element.map(
|
|
254
|
+
return element.map(e => objectIdsToStrings(e, prepared));
|
|
255
255
|
}
|
|
256
256
|
if (typeof element === 'object') {
|
|
257
257
|
if (prepared.has(element)) {
|
|
@@ -271,12 +271,12 @@ function removeUnresolvedReferences(populated, populatedOptions, ignoreFirst = t
|
|
|
271
271
|
return populated;
|
|
272
272
|
}
|
|
273
273
|
if (Array.isArray(populated)) {
|
|
274
|
-
populated.forEach(
|
|
274
|
+
populated.forEach(p => removeUnresolvedReferences(p, populatedOptions, false));
|
|
275
275
|
return populated;
|
|
276
276
|
}
|
|
277
277
|
if (typeof populated === 'object') {
|
|
278
278
|
if (Array.isArray(populatedOptions)) {
|
|
279
|
-
populatedOptions.forEach(
|
|
279
|
+
populatedOptions.forEach(po => removeUnresolvedReferences(populated, ignoreFirst && typeof po === 'object' ? po.populate : po, false));
|
|
280
280
|
return populated;
|
|
281
281
|
}
|
|
282
282
|
if (typeof populatedOptions === 'string') {
|
|
@@ -303,8 +303,8 @@ async function popAndMap(queryOrDocument, populate, modelClass, mongooseModel, o
|
|
|
303
303
|
let populateOptions = [];
|
|
304
304
|
const ignoreSelections = options?.ignoreSelections;
|
|
305
305
|
if (populate) {
|
|
306
|
-
if (Array.isArray(populate)
|
|
307
|
-
(typeof populate[0] === 'string' || typeof populate[0]?.path === 'string')) {
|
|
306
|
+
if (Array.isArray(populate)
|
|
307
|
+
&& (typeof populate[0] === 'string' || typeof populate[0]?.path === 'string')) {
|
|
308
308
|
populateOptions = populate;
|
|
309
309
|
}
|
|
310
310
|
else if (Array.isArray(populate) && typeof populate[0]?.kind === 'string') {
|
|
@@ -323,7 +323,7 @@ async function popAndMap(queryOrDocument, populate, modelClass, mongooseModel, o
|
|
|
323
323
|
result = await result.exec();
|
|
324
324
|
}
|
|
325
325
|
if (Array.isArray(result)) {
|
|
326
|
-
result = result.map(
|
|
326
|
+
result = result.map(item => modelClass.map(item));
|
|
327
327
|
}
|
|
328
328
|
else {
|
|
329
329
|
result = modelClass.map(result);
|
|
@@ -332,7 +332,7 @@ async function popAndMap(queryOrDocument, populate, modelClass, mongooseModel, o
|
|
|
332
332
|
else {
|
|
333
333
|
if (Array.isArray(queryOrDocument)) {
|
|
334
334
|
await setPopulates(queryOrDocument, populateOptions, mongooseModel, { ignoreSelections });
|
|
335
|
-
result = queryOrDocument.map(
|
|
335
|
+
result = queryOrDocument.map(item => modelClass.map(item));
|
|
336
336
|
}
|
|
337
337
|
else {
|
|
338
338
|
await setPopulates(queryOrDocument, populateOptions, mongooseModel, { ignoreSelections });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/db.helper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"db.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/db.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.multerOptionsForImageUpload = exports.multerFileFilter = exports.multerRandomFileName = void 0;
|
|
4
|
-
const multer_1 = require("multer");
|
|
5
4
|
const path_1 = require("path");
|
|
5
|
+
const multer_1 = require("multer");
|
|
6
6
|
class FileHelper {
|
|
7
7
|
static multerRandomFileName(numberOfDigits = 32) {
|
|
8
8
|
return multerRandomFileName(numberOfDigits);
|
|
@@ -32,7 +32,7 @@ function multerFileFilter(fileTypeRegex = /jpeg|jpg|png/) {
|
|
|
32
32
|
if (mimetype && extName) {
|
|
33
33
|
return cb(null, true);
|
|
34
34
|
}
|
|
35
|
-
cb(
|
|
35
|
+
cb(`Error: File upload only supports the following filetypes - ${fileTypeRegex}`);
|
|
36
36
|
};
|
|
37
37
|
}
|
|
38
38
|
exports.multerFileFilter = multerFileFilter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/file.helper.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"file.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/file.helper.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAE/B,mCAAqC;AAMrC,MAAqB,UAAU;IAKtB,MAAM,CAAC,oBAAoB,CAAC,cAAc,GAAG,EAAE;QACpD,OAAO,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC9C,CAAC;IAKM,MAAM,CAAC,gBAAgB,CAAC,aAAa,GAAG,cAAc;QAC3D,OAAO,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACzC,CAAC;IAKM,MAAM,CAAC,2BAA2B,CAAC,OAIzC;QACC,OAAO,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;CACF;AA1BD,6BA0BC;AAMD,SAAgB,oBAAoB,CAAC,cAAc,GAAG,EAAE;IACtD,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;QAEvB,MAAM,UAAU,GAAG,KAAK,CAAC,cAAc,CAAC;aACrC,IAAI,CAAC,IAAI,CAAC;aACV,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;aACtD,IAAI,CAAC,EAAE,CAAC,CAAC;QAIZ,EAAE,CAAC,IAAI,EAAE,GAAG,UAAU,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC;AACJ,CAAC;AAZD,oDAYC;AAKD,SAAgB,gBAAgB,CAAC,aAAa,GAAG,cAAc;IAC7D,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;QACvB,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,IAAA,cAAO,EAAC,IAAI,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAE7E,IAAI,QAAQ,IAAI,OAAO,EAAE;YACvB,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SACvB;QACD,EAAE,CAAC,8DAA8D,aAAa,EAAE,CAAC,CAAC;IACpF,CAAC,CAAC;AACJ,CAAC;AAVD,4CAUC;AAKD,SAAgB,2BAA2B,CAAC,OAI3C;IAEC,MAAM,MAAM,GAAG;QACb,QAAQ,EAAE,IAAI,GAAG,IAAI;QACrB,aAAa,EAAE,cAAc;QAC7B,GAAG,OAAO;KACX,CAAC;IAEF,OAAO;QAEL,UAAU,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS;QAGrF,MAAM,EAAE;YAEN,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;SACxD;QAID,OAAO,EAAE,IAAA,oBAAW,EAAC;YAInB,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;YAGhE,QAAQ,EAAE,oBAAoB,EAAE;SACjC,CAAC;KACH,CAAC;AACJ,CAAC;AAlCD,kEAkCC"}
|
|
@@ -4,7 +4,7 @@ import { FilterInput } from '../inputs/filter.input';
|
|
|
4
4
|
export declare class Filter {
|
|
5
5
|
static convertFilterArgsToQuery<T = any>(filterArgs: Partial<FilterArgs>): [FilterQuery<T>, QueryOptions];
|
|
6
6
|
static generateFilterQuery<T = any>(filter?: Partial<FilterInput>): FilterQuery<T> | any;
|
|
7
|
-
static generateFindOptions
|
|
7
|
+
static generateFindOptions(filterArgs: Partial<FilterArgs>): QueryOptions;
|
|
8
8
|
}
|
|
9
9
|
export declare function findFilter(options?: {
|
|
10
10
|
conditions?: Record<string, any>[];
|
|
@@ -17,6 +17,6 @@ export declare function convertFilterArgsToQuery<T = any>(filterArgs: Partial<Fi
|
|
|
17
17
|
export declare function generateFilterQuery<T = any>(filter?: Partial<FilterInput>, options?: {
|
|
18
18
|
automaticObjectIdFiltering?: boolean;
|
|
19
19
|
}): FilterQuery<T> | any;
|
|
20
|
-
export declare function generateFindOptions
|
|
20
|
+
export declare function generateFindOptions(filterArgs: Partial<FilterArgs>, options?: {
|
|
21
21
|
maxLimit?: number;
|
|
22
22
|
}): QueryOptions;
|
|
@@ -45,7 +45,7 @@ function findFilter(options) {
|
|
|
45
45
|
if (config?.conditions) {
|
|
46
46
|
filterOptions[config.type] = [...filterOptions[config.type], ...config.conditions];
|
|
47
47
|
}
|
|
48
|
-
filterOptions[config.type] = filterOptions[config.type].filter(
|
|
48
|
+
filterOptions[config.type] = filterOptions[config.type].filter(value => value);
|
|
49
49
|
if (!filterOptions[config.type].length) {
|
|
50
50
|
filterOptions = {};
|
|
51
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/filter.helper.ts"],"names":[],"mappings":";;;AAEA,gFAA2E;AAC3E,0EAAqE;AACrE,8DAAyD;AAGzD,+DAA2D;AAC3D,2CAA2D;AAC3D,iDAAoD;AAMpD,MAAa,MAAM;IAKV,MAAM,CAAC,wBAAwB,CAAU,UAA+B;QAC7E,OAAO,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAC9C,CAAC;IAKM,MAAM,CAAC,mBAAmB,CAAU,MAA6B;QACtE,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IAKM,MAAM,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"filter.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/filter.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,7 +73,7 @@ function getArguments(ast) {
|
|
|
73
73
|
const valueNode = argument.value;
|
|
74
74
|
const argumentValue = !isListValueNode(valueNode)
|
|
75
75
|
? valueNode.value
|
|
76
|
-
: valueNode.values.map(
|
|
76
|
+
: valueNode.values.map(value => value.value);
|
|
77
77
|
return {
|
|
78
78
|
[argument.name.value]: {
|
|
79
79
|
kind: argument.value.kind,
|