@lenne.tech/nest-server 8.6.26 → 8.6.29
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 +37 -12
- package/dist/config.env.js.map +1 -1
- package/dist/core/common/helpers/input.helper.d.ts +10 -1
- package/dist/core/common/helpers/input.helper.js +46 -4
- package/dist/core/common/helpers/input.helper.js.map +1 -1
- package/dist/core/common/helpers/model.helper.d.ts +4 -0
- package/dist/core/common/helpers/model.helper.js +22 -15
- package/dist/core/common/helpers/model.helper.js.map +1 -1
- package/dist/core/common/helpers/service.helper.d.ts +12 -0
- package/dist/core/common/helpers/service.helper.js +15 -8
- package/dist/core/common/helpers/service.helper.js.map +1 -1
- package/dist/core/common/interfaces/server-options.interface.d.ts +1 -0
- package/dist/core/common/services/config.service.d.ts +75 -5
- package/dist/core/common/services/config.service.js +168 -4
- package/dist/core/common/services/config.service.js.map +1 -1
- package/dist/core/common/services/email.service.js +2 -2
- package/dist/core/common/services/email.service.js.map +1 -1
- package/dist/core/common/services/mailjet.service.js +4 -4
- package/dist/core/common/services/mailjet.service.js.map +1 -1
- package/dist/core/common/services/template.service.js +1 -1
- package/dist/core/common/services/template.service.js.map +1 -1
- package/dist/core/modules/user/core-user.service.d.ts +5 -3
- package/dist/core/modules/user/core-user.service.js +5 -3
- package/dist/core/modules/user/core-user.service.js.map +1 -1
- package/dist/server/common/services/cron-jobs.service.d.ts +3 -1
- package/dist/server/common/services/cron-jobs.service.js +5 -4
- package/dist/server/common/services/cron-jobs.service.js.map +1 -1
- package/dist/server/modules/auth/auth.service.d.ts +3 -1
- package/dist/server/modules/auth/auth.service.js +9 -4
- package/dist/server/modules/auth/auth.service.js.map +1 -1
- package/dist/server/modules/user/user.service.js +5 -3
- package/dist/server/modules/user/user.service.js.map +1 -1
- package/dist/server/server.controller.js +2 -2
- package/dist/server/server.controller.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +10 -9
- package/src/config.env.ts +39 -12
- package/src/core/common/helpers/input.helper.ts +68 -4
- package/src/core/common/helpers/model.helper.ts +26 -15
- package/src/core/common/helpers/service.helper.ts +27 -8
- package/src/core/common/interfaces/server-options.interface.ts +8 -1
- package/src/core/common/services/config.service.ts +378 -12
- package/src/core/common/services/email.service.ts +2 -2
- package/src/core/common/services/mailjet.service.ts +4 -4
- package/src/core/common/services/template.service.ts +1 -1
- package/src/core/modules/user/core-user.service.ts +7 -4
- package/src/server/common/services/cron-jobs.service.ts +3 -3
- package/src/server/modules/auth/auth.service.ts +7 -3
- package/src/server/modules/user/user.service.ts +5 -3
- package/src/server/server.controller.ts +2 -2
|
@@ -1,13 +1,83 @@
|
|
|
1
|
+
import { BehaviorSubject } from 'rxjs';
|
|
1
2
|
import { IServerOptions } from '../interfaces/server-options.interface';
|
|
2
3
|
export declare class ConfigService {
|
|
3
|
-
protected
|
|
4
|
+
protected static _configSubject$: BehaviorSubject<{
|
|
4
5
|
[key: string]: any;
|
|
5
|
-
} & Partial<IServerOptions
|
|
6
|
-
|
|
6
|
+
} & Partial<IServerOptions>>;
|
|
7
|
+
protected static _frozenConfigSubject$: BehaviorSubject<{
|
|
8
|
+
[key: string]: any;
|
|
9
|
+
} & Partial<IServerOptions>>;
|
|
10
|
+
protected static _instance: ConfigService;
|
|
11
|
+
constructor(configObject?: {
|
|
12
|
+
[key: string]: any;
|
|
13
|
+
} & Partial<IServerOptions>, options?: {
|
|
14
|
+
reInit?: boolean;
|
|
15
|
+
warn?: boolean;
|
|
16
|
+
});
|
|
17
|
+
get config(): any;
|
|
18
|
+
static get config(): any;
|
|
19
|
+
get configFastButReadOnly(): {
|
|
7
20
|
[key: string]: any;
|
|
8
|
-
} & Partial<IServerOptions
|
|
9
|
-
get
|
|
21
|
+
} & Partial<IServerOptions>;
|
|
22
|
+
static get configFastButReadOnly(): {
|
|
10
23
|
[key: string]: any;
|
|
11
24
|
} & Partial<IServerOptions>;
|
|
12
25
|
get(key: string, defaultValue?: any): any;
|
|
26
|
+
static get(key: string, defaultValue?: any): any;
|
|
27
|
+
getFastButReadOnly(key: string, defaultValue?: any): any;
|
|
28
|
+
static getFastButReadOnly(key: string, defaultValue?: any): any;
|
|
29
|
+
get isInitialized(): boolean;
|
|
30
|
+
static get isInitialized(): boolean;
|
|
31
|
+
get observableClone(): import("rxjs").Observable<any>;
|
|
32
|
+
static get observable(): import("rxjs").Observable<any>;
|
|
33
|
+
get observableFastButReadOnly(): import("rxjs").Observable<{
|
|
34
|
+
[key: string]: any;
|
|
35
|
+
} & Partial<IServerOptions>>;
|
|
36
|
+
static get observableFastButReadOnly(): import("rxjs").Observable<{
|
|
37
|
+
[key: string]: any;
|
|
38
|
+
} & Partial<IServerOptions>>;
|
|
39
|
+
get promise(): Promise<any>;
|
|
40
|
+
static get promise(): Promise<any>;
|
|
41
|
+
get promiseFastButReadOnly(): Promise<{
|
|
42
|
+
[key: string]: any;
|
|
43
|
+
} & Partial<IServerOptions>>;
|
|
44
|
+
static get promiseFastButReadOnly(): Promise<{
|
|
45
|
+
[key: string]: any;
|
|
46
|
+
} & Partial<IServerOptions>>;
|
|
47
|
+
mergeConfig(configData: {
|
|
48
|
+
[key: string]: any;
|
|
49
|
+
} & Partial<IServerOptions>, options?: {
|
|
50
|
+
warn?: boolean;
|
|
51
|
+
}): any;
|
|
52
|
+
static mergeConfig(configData: {
|
|
53
|
+
[key: string]: any;
|
|
54
|
+
} & Partial<IServerOptions>, options?: {
|
|
55
|
+
init?: boolean;
|
|
56
|
+
warn?: boolean;
|
|
57
|
+
}): any;
|
|
58
|
+
mergeProperty(key: string, value: any, options?: {
|
|
59
|
+
warn?: boolean;
|
|
60
|
+
}): any;
|
|
61
|
+
static mergeProperty(key: string, value: any, options?: {
|
|
62
|
+
warn?: boolean;
|
|
63
|
+
}): any;
|
|
64
|
+
setConfig(configData: {
|
|
65
|
+
[key: string]: any;
|
|
66
|
+
} & Partial<IServerOptions>, options?: {
|
|
67
|
+
reInit?: boolean;
|
|
68
|
+
warn?: boolean;
|
|
69
|
+
}): any;
|
|
70
|
+
static setConfig(configObject: {
|
|
71
|
+
[key: string]: any;
|
|
72
|
+
} & Partial<IServerOptions>, options?: {
|
|
73
|
+
init?: boolean;
|
|
74
|
+
reInit?: boolean;
|
|
75
|
+
warn?: boolean;
|
|
76
|
+
}): any;
|
|
77
|
+
setProperty(key: string, value: any, options?: {
|
|
78
|
+
warn?: boolean;
|
|
79
|
+
}): any;
|
|
80
|
+
static setProperty(key: string, value: any, options?: {
|
|
81
|
+
warn?: boolean;
|
|
82
|
+
}): any;
|
|
13
83
|
}
|
|
@@ -2,16 +2,180 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ConfigService = void 0;
|
|
4
4
|
const _ = require("lodash");
|
|
5
|
+
const lodash_1 = require("lodash");
|
|
6
|
+
const rxjs_1 = require("rxjs");
|
|
7
|
+
const operators_1 = require("rxjs/operators");
|
|
8
|
+
const config_helper_1 = require("../helpers/config.helper");
|
|
9
|
+
const input_helper_1 = require("../helpers/input.helper");
|
|
5
10
|
class ConfigService {
|
|
6
|
-
constructor(
|
|
7
|
-
|
|
11
|
+
constructor(configObject, options) {
|
|
12
|
+
const config = {
|
|
13
|
+
reInit: false,
|
|
14
|
+
warn: true,
|
|
15
|
+
...options,
|
|
16
|
+
};
|
|
17
|
+
const isInitialized = ConfigService.isInitialized;
|
|
18
|
+
if (!isInitialized) {
|
|
19
|
+
ConfigService._configSubject$.subscribe((config) => {
|
|
20
|
+
ConfigService._frozenConfigSubject$.next((0, input_helper_1.deepFreeze)(config));
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
if (typeof configObject === 'object') {
|
|
24
|
+
isInitialized
|
|
25
|
+
? ConfigService.mergeConfig(configObject, { ...config, ...{ init: false } })
|
|
26
|
+
: ConfigService.setConfig(configObject, { ...config, ...{ init: false } });
|
|
27
|
+
}
|
|
28
|
+
if (!isInitialized) {
|
|
29
|
+
ConfigService._instance = this;
|
|
30
|
+
}
|
|
31
|
+
return ConfigService._instance;
|
|
8
32
|
}
|
|
9
33
|
get config() {
|
|
10
|
-
return
|
|
34
|
+
return ConfigService.config;
|
|
35
|
+
}
|
|
36
|
+
static get config() {
|
|
37
|
+
return (0, input_helper_1.clone)(ConfigService._configSubject$.getValue(), { circles: false });
|
|
38
|
+
}
|
|
39
|
+
get configFastButReadOnly() {
|
|
40
|
+
return ConfigService.configFastButReadOnly;
|
|
41
|
+
}
|
|
42
|
+
static get configFastButReadOnly() {
|
|
43
|
+
return ConfigService._frozenConfigSubject$.getValue();
|
|
11
44
|
}
|
|
12
45
|
get(key, defaultValue = undefined) {
|
|
13
|
-
return
|
|
46
|
+
return ConfigService.get(key, defaultValue);
|
|
47
|
+
}
|
|
48
|
+
static get(key, defaultValue = undefined) {
|
|
49
|
+
return (0, input_helper_1.clone)(_.get(ConfigService._configSubject$.getValue(), key, defaultValue), { circles: false });
|
|
50
|
+
}
|
|
51
|
+
getFastButReadOnly(key, defaultValue = undefined) {
|
|
52
|
+
return ConfigService.getFastButReadOnly(key, defaultValue);
|
|
53
|
+
}
|
|
54
|
+
static getFastButReadOnly(key, defaultValue = undefined) {
|
|
55
|
+
return _.get(ConfigService._frozenConfigSubject$.getValue(), key, defaultValue);
|
|
56
|
+
}
|
|
57
|
+
get isInitialized() {
|
|
58
|
+
return ConfigService.isInitialized;
|
|
59
|
+
}
|
|
60
|
+
static get isInitialized() {
|
|
61
|
+
return !!ConfigService._instance;
|
|
62
|
+
}
|
|
63
|
+
get observableClone() {
|
|
64
|
+
return ConfigService.observable;
|
|
65
|
+
}
|
|
66
|
+
static get observable() {
|
|
67
|
+
return ConfigService._configSubject$.asObservable().pipe((0, operators_1.filter)((config) => !config), (0, operators_1.map)((config) => (0, input_helper_1.clone)(config, { circles: false })));
|
|
68
|
+
}
|
|
69
|
+
get observableFastButReadOnly() {
|
|
70
|
+
return ConfigService.observableFastButReadOnly;
|
|
71
|
+
}
|
|
72
|
+
static get observableFastButReadOnly() {
|
|
73
|
+
return ConfigService._frozenConfigSubject$.asObservable().pipe((0, operators_1.filter)((config) => !config));
|
|
74
|
+
}
|
|
75
|
+
get promise() {
|
|
76
|
+
return ConfigService.promise;
|
|
77
|
+
}
|
|
78
|
+
static get promise() {
|
|
79
|
+
return (0, rxjs_1.firstValueFrom)(ConfigService.observable);
|
|
80
|
+
}
|
|
81
|
+
get promiseFastButReadOnly() {
|
|
82
|
+
return ConfigService.promiseFastButReadOnly;
|
|
83
|
+
}
|
|
84
|
+
static get promiseFastButReadOnly() {
|
|
85
|
+
return (0, rxjs_1.firstValueFrom)(ConfigService.observableFastButReadOnly);
|
|
86
|
+
}
|
|
87
|
+
mergeConfig(configData, options) {
|
|
88
|
+
return ConfigService.mergeConfig(configData, options);
|
|
89
|
+
}
|
|
90
|
+
static mergeConfig(configData, options) {
|
|
91
|
+
const config = {
|
|
92
|
+
init: true,
|
|
93
|
+
warn: false,
|
|
94
|
+
...options,
|
|
95
|
+
};
|
|
96
|
+
const isInitialized = ConfigService.isInitialized;
|
|
97
|
+
if (!isInitialized && config.init) {
|
|
98
|
+
new ConfigService();
|
|
99
|
+
}
|
|
100
|
+
const activity = isInitialized ? 'merged' : 'initialized';
|
|
101
|
+
const merged = (0, config_helper_1.merge)(ConfigService._configSubject$.getValue() || {}, (0, lodash_1.cloneDeep)(configData));
|
|
102
|
+
ConfigService._configSubject$.next(merged);
|
|
103
|
+
if (config.warn) {
|
|
104
|
+
console.warn('ConfigService ' + activity, JSON.stringify(merged, null, 2));
|
|
105
|
+
}
|
|
106
|
+
return ConfigService.config;
|
|
107
|
+
}
|
|
108
|
+
mergeProperty(key, value, options) {
|
|
109
|
+
return ConfigService.mergeProperty(key, options);
|
|
110
|
+
}
|
|
111
|
+
static mergeProperty(key, value, options) {
|
|
112
|
+
const config = {
|
|
113
|
+
warn: false,
|
|
114
|
+
...options,
|
|
115
|
+
};
|
|
116
|
+
if (!ConfigService.isInitialized) {
|
|
117
|
+
new ConfigService();
|
|
118
|
+
}
|
|
119
|
+
const current = ConfigService._configSubject$.getValue() || {};
|
|
120
|
+
if (typeof value === 'object') {
|
|
121
|
+
current[key] = (0, config_helper_1.merge)(current[key], (0, lodash_1.cloneDeep)(value));
|
|
122
|
+
}
|
|
123
|
+
else {
|
|
124
|
+
current[key] = value;
|
|
125
|
+
}
|
|
126
|
+
ConfigService._configSubject$.next(current);
|
|
127
|
+
if (config.warn) {
|
|
128
|
+
console.warn('ConfigService ' + key + ':', JSON.stringify(current[key], null, 2));
|
|
129
|
+
}
|
|
130
|
+
return ConfigService.config;
|
|
131
|
+
}
|
|
132
|
+
setConfig(configData, options) {
|
|
133
|
+
return ConfigService.setConfig(configData, options);
|
|
134
|
+
}
|
|
135
|
+
static setConfig(configObject, options) {
|
|
136
|
+
const config = {
|
|
137
|
+
init: true,
|
|
138
|
+
reInit: true,
|
|
139
|
+
warn: false,
|
|
140
|
+
...options,
|
|
141
|
+
};
|
|
142
|
+
const firstInitialization = !ConfigService.isInitialized;
|
|
143
|
+
if (!firstInitialization && !config.reInit) {
|
|
144
|
+
throw new Error('Unintentional overwriting of the configuration. ' +
|
|
145
|
+
'If overwriting is desired, please set `reInit` in setConfig of ConfigService to `true`.');
|
|
146
|
+
}
|
|
147
|
+
if (firstInitialization && config.init) {
|
|
148
|
+
new ConfigService();
|
|
149
|
+
}
|
|
150
|
+
if (firstInitialization || config.reInit) {
|
|
151
|
+
ConfigService._configSubject$.next(configObject || {});
|
|
152
|
+
if (config.warn && !firstInitialization) {
|
|
153
|
+
console.warn('ConfigService reinitialized', JSON.stringify(configObject, null, 2));
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
return ConfigService.config;
|
|
157
|
+
}
|
|
158
|
+
setProperty(key, value, options) {
|
|
159
|
+
return ConfigService.setProperty(key, options);
|
|
160
|
+
}
|
|
161
|
+
static setProperty(key, value, options) {
|
|
162
|
+
const config = {
|
|
163
|
+
warn: false,
|
|
164
|
+
...options,
|
|
165
|
+
};
|
|
166
|
+
if (!ConfigService.isInitialized) {
|
|
167
|
+
new ConfigService();
|
|
168
|
+
}
|
|
169
|
+
const current = ConfigService._configSubject$.getValue() || {};
|
|
170
|
+
current[key] = value;
|
|
171
|
+
ConfigService._configSubject$.next(current);
|
|
172
|
+
if (config.warn) {
|
|
173
|
+
console.warn('ConfigService ' + key + ':', JSON.stringify(value, null, 2));
|
|
174
|
+
}
|
|
175
|
+
return ConfigService.config;
|
|
14
176
|
}
|
|
15
177
|
}
|
|
16
178
|
exports.ConfigService = ConfigService;
|
|
179
|
+
ConfigService._configSubject$ = new rxjs_1.BehaviorSubject(undefined);
|
|
180
|
+
ConfigService._frozenConfigSubject$ = new rxjs_1.BehaviorSubject(undefined);
|
|
17
181
|
//# sourceMappingURL=config.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/config.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;
|
|
1
|
+
{"version":3,"file":"config.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/config.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,8 +22,8 @@ let EmailService = class EmailService {
|
|
|
22
22
|
}
|
|
23
23
|
async sendMail(recipients, subject, config) {
|
|
24
24
|
const { attachments, htmlTemplate, senderName, senderEmail, templateData, textTemplate } = {
|
|
25
|
-
senderEmail: this.configService.
|
|
26
|
-
senderName: this.configService.
|
|
25
|
+
senderEmail: this.configService.getFastButReadOnly('email.defaultSender.email'),
|
|
26
|
+
senderName: this.configService.getFastButReadOnly('email.defaultSender.name'),
|
|
27
27
|
...config,
|
|
28
28
|
};
|
|
29
29
|
let html = config.html;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/email.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yCAAyC;AAEzC,0DAAgF;AAChF,qDAAiD;AACjD,yDAAqD;AAMrD,IAAa,YAAY,GAAzB,MAAa,YAAY;IAIvB,YAAsB,aAA4B,EAAY,eAAgC;QAAxE,kBAAa,GAAb,aAAa,CAAe;QAAY,oBAAe,GAAf,eAAe,CAAiB;IAAG,CAAC;IAK3F,KAAK,CAAC,QAAQ,CACnB,UAA6B,EAC7B,OAAe,EACf,MASC;QAGD,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG;YACzF,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"email.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/email.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yCAAyC;AAEzC,0DAAgF;AAChF,qDAAiD;AACjD,yDAAqD;AAMrD,IAAa,YAAY,GAAzB,MAAa,YAAY;IAIvB,YAAsB,aAA4B,EAAY,eAAgC;QAAxE,kBAAa,GAAb,aAAa,CAAe;QAAY,oBAAe,GAAf,eAAe,CAAiB;IAAG,CAAC;IAK3F,KAAK,CAAC,QAAQ,CACnB,UAA6B,EAC7B,OAAe,EACf,MASC;QAGD,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG;YACzF,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,2BAA2B,CAAC;YAC/E,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,0BAA0B,CAAC;YAC7E,GAAG,MAAM;SACV,CAAC;QAEF,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACvB,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QAGvB,IAAA,qBAAM,EAAC,UAAU,CAAC,CAAC;QACnB,IAAA,+BAAgB,EAAC,OAAO,CAAC,CAAC;QAC1B,IAAA,+BAAgB,EAAC,UAAU,CAAC,CAAC;QAC7B,IAAA,+BAAgB,EAAC,WAAW,CAAC,CAAC;QAG9B,IAAI,YAAY,EAAE;YAChB,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;SAC9E;QAGD,IAAI,YAAY,EAAE;YAChB,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;SAC9E;QAGD,IAAI,CAAC,IAAA,+BAAgB,EAAC,IAAI,EAAE,0BAAW,CAAC,EAAE;YACxC,IAAA,+BAAgB,EAAC,IAAI,CAAC,CAAC;SACxB;QACD,IAAI,CAAC,IAAA,+BAAgB,EAAC,IAAI,EAAE,0BAAW,CAAC,EAAE;YACxC,IAAA,+BAAgB,EAAC,IAAI,CAAC,CAAC;SACxB;QAGD,MAAM,WAAW,GAAG,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;QAGrF,OAAO,WAAW,CAAC,QAAQ,CAAC;YAC1B,IAAI,EAAE,IAAI,UAAU,MAAM,WAAW,GAAG;YACxC,EAAE,EAAE,UAAU;YACd,OAAO;YACP,IAAI;YACJ,IAAI;YACJ,WAAW;SACZ,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAtEY,YAAY;IADxB,IAAA,mBAAU,GAAE;qCAK0B,8BAAa,EAA6B,kCAAe;GAJnF,YAAY,CAsExB;AAtEY,oCAAY"}
|
|
@@ -19,8 +19,8 @@ let MailjetService = class MailjetService {
|
|
|
19
19
|
}
|
|
20
20
|
async sendMail(recipients, subject, templateId, config) {
|
|
21
21
|
const { senderName, senderEmail, templateData, attachments, sandbox } = {
|
|
22
|
-
senderEmail: this.configService.
|
|
23
|
-
senderName: this.configService.
|
|
22
|
+
senderEmail: this.configService.getFastButReadOnly('email.defaultSender.email'),
|
|
23
|
+
senderName: this.configService.getFastButReadOnly('email.defaultSender.name'),
|
|
24
24
|
sandbox: false,
|
|
25
25
|
attachments: null,
|
|
26
26
|
templateData: null,
|
|
@@ -56,8 +56,8 @@ let MailjetService = class MailjetService {
|
|
|
56
56
|
let connection;
|
|
57
57
|
try {
|
|
58
58
|
connection = new node_mailjet_1.default({
|
|
59
|
-
apiKey: this.configService.
|
|
60
|
-
apiSecret: this.configService.
|
|
59
|
+
apiKey: this.configService.getFastButReadOnly('email.mailjet.api_key_public'),
|
|
60
|
+
apiSecret: this.configService.getFastButReadOnly('email.mailjet.api_key_private'),
|
|
61
61
|
});
|
|
62
62
|
}
|
|
63
63
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mailjet.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/mailjet.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qDAAiD;AACjD,+CAAmC;AAMnC,IAAa,cAAc,GAA3B,MAAa,cAAc;IAIzB,YAAsB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAK/C,KAAK,CAAC,QAAQ,CACnB,UAA6B,EAC7B,OAAe,EACf,UAAkB,EAClB,MAWC;QAGD,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG;YACtE,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"mailjet.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/mailjet.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qDAAiD;AACjD,+CAAmC;AAMnC,IAAa,cAAc,GAA3B,MAAa,cAAc;IAIzB,YAAsB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAK/C,KAAK,CAAC,QAAQ,CACnB,UAA6B,EAC7B,OAAe,EACf,UAAkB,EAClB,MAWC;QAGD,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG;YACtE,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,2BAA2B,CAAC;YAC/E,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,0BAA0B,CAAC;YAC7E,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,IAAI;YACjB,YAAY,EAAE,IAAI;YAClB,GAAG,MAAM;SACV,CAAC;QAGF,IAAI,EAAE,CAAC;QACP,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC7B,EAAE,GAAG,EAAE,CAAC;YACR,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;gBAClC,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;aAC/B;SACF;aAAM;YACL,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;SAC9B;QAGD,MAAM,IAAI,GAAG;YACX,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE;wBACJ,KAAK,EAAE,WAAW;wBAClB,IAAI,EAAE,UAAU;qBACjB;oBACD,EAAE,EAAE,EAAE;oBACN,UAAU,EAAE,UAAU;oBACtB,gBAAgB,EAAE,IAAI;oBACtB,SAAS,EAAE,YAAY;oBACvB,OAAO,EAAE,OAAO;oBAChB,WAAW,EAAE,WAAW;iBACzB;aACF;YACD,WAAW,EAAE,OAAO;SACrB,CAAC;QAEF,IAAI,UAAU,CAAC;QACf,IAAI;YAEF,UAAU,GAAG,IAAI,sBAAO,CAAC;gBACvB,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,8BAA8B,CAAC;gBAC7E,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,+BAA+B,CAAC;aAClF,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;SAC/C;QAGD,OAAO,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpE,CAAC;CACF,CAAA;AAhFY,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAK0B,8BAAa;GAJvC,cAAc,CAgF1B;AAhFY,wCAAc"}
|
|
@@ -30,7 +30,7 @@ let TemplateService = class TemplateService {
|
|
|
30
30
|
resolve(this.templates[filePath]);
|
|
31
31
|
return;
|
|
32
32
|
}
|
|
33
|
-
fs.readFile((0, path_1.join)(this.configService.
|
|
33
|
+
fs.readFile((0, path_1.join)(this.configService.getFastButReadOnly('templates.path'), filePath) + '.ejs', { encoding: 'utf8' }, (err, data) => {
|
|
34
34
|
if (err) {
|
|
35
35
|
reject(err);
|
|
36
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/template.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2BAA2B;AAE3B,yBAAyB;AACzB,+BAA4B;AAC5B,qDAAiD;AAMjD,IAAa,eAAe,GAA5B,MAAa,eAAe;IAS1B,YAA+B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QALjD,cAAS,GAAwC,EAAE,CAAC;IAKA,CAAC;IAOxD,KAAK,CAAC,cAAc,CAAC,QAAgB,EAAE,YAAoC;QAChF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAClD,OAAO,QAAQ,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC;IAMS,KAAK,CAAC,WAAW,CAAC,QAAgB;QAC1C,OAAO,IAAI,OAAO,CAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAEvD,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;gBAC5B,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAClC,OAAO;aACR;YAGD,EAAE,CAAC,QAAQ,CACT,IAAA,WAAI,EAAC,IAAI,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"template.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/template.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2BAA2B;AAE3B,yBAAyB;AACzB,+BAA4B;AAC5B,qDAAiD;AAMjD,IAAa,eAAe,GAA5B,MAAa,eAAe;IAS1B,YAA+B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QALjD,cAAS,GAAwC,EAAE,CAAC;IAKA,CAAC;IAOxD,KAAK,CAAC,cAAc,CAAC,QAAgB,EAAE,YAAoC;QAChF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAClD,OAAO,QAAQ,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC;IAMS,KAAK,CAAC,WAAW,CAAC,QAAgB;QAC1C,OAAO,IAAI,OAAO,CAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAEvD,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;gBAC5B,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAClC,OAAO;aACR;YAGD,EAAE,CAAC,QAAQ,CACT,IAAA,WAAI,EAAC,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,QAAQ,CAAC,GAAG,MAAM,EAChF,EAAE,QAAQ,EAAE,MAAM,EAAE,EACpB,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;gBACZ,IAAI,GAAG,EAAE;oBACP,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;qBAAM;oBAEL,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;oBAC7C,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;iBACnC;YACH,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAjDY,eAAe;IAD3B,IAAA,mBAAU,GAAE;qCAUmC,8BAAa;GAThD,eAAe,CAiD3B;AAjDY,0CAAe"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Document, Model } from 'mongoose';
|
|
2
2
|
import { ServiceOptions } from '../../common/interfaces/service-options.interface';
|
|
3
|
+
import { ConfigService } from '../../common/services/config.service';
|
|
3
4
|
import { CrudService } from '../../common/services/crud.service';
|
|
4
5
|
import { EmailService } from '../../common/services/email.service';
|
|
5
6
|
import { CoreModelConstructor } from '../../common/types/core-model-constructor.type';
|
|
@@ -7,10 +8,11 @@ import { CoreUserModel } from './core-user.model';
|
|
|
7
8
|
import { CoreUserCreateInput } from './inputs/core-user-create.input';
|
|
8
9
|
import { CoreUserInput } from './inputs/core-user.input';
|
|
9
10
|
export declare abstract class CoreUserService<TUser extends CoreUserModel, TUserInput extends CoreUserInput, TUserCreateInput extends CoreUserCreateInput> extends CrudService<TUser> {
|
|
10
|
-
protected emailService: EmailService;
|
|
11
|
+
protected readonly emailService: EmailService;
|
|
11
12
|
protected readonly mainDbModel: Model<TUser & Document>;
|
|
12
|
-
protected mainModelConstructor: CoreModelConstructor<TUser>;
|
|
13
|
-
protected
|
|
13
|
+
protected readonly mainModelConstructor: CoreModelConstructor<TUser>;
|
|
14
|
+
protected readonly configService?: ConfigService;
|
|
15
|
+
protected constructor(emailService: EmailService, mainDbModel: Model<TUser & Document>, mainModelConstructor: CoreModelConstructor<TUser>, configService?: ConfigService);
|
|
14
16
|
create(input: any, serviceOptions?: ServiceOptions): Promise<TUser>;
|
|
15
17
|
getViaEmail(email: string, serviceOptions?: ServiceOptions): Promise<TUser>;
|
|
16
18
|
getVerifiedState(token: string, serviceOptions?: ServiceOptions): Promise<boolean>;
|
|
@@ -5,16 +5,16 @@ const common_1 = require("@nestjs/common");
|
|
|
5
5
|
const bcrypt = require("bcrypt");
|
|
6
6
|
const crypto = require("crypto");
|
|
7
7
|
const js_sha256_1 = require("js-sha256");
|
|
8
|
-
const config_env_1 = require("../../../config.env");
|
|
9
8
|
const config_helper_1 = require("../../common/helpers/config.helper");
|
|
10
9
|
const input_helper_1 = require("../../common/helpers/input.helper");
|
|
11
10
|
const crud_service_1 = require("../../common/services/crud.service");
|
|
12
11
|
class CoreUserService extends crud_service_1.CrudService {
|
|
13
|
-
constructor(emailService, mainDbModel, mainModelConstructor) {
|
|
12
|
+
constructor(emailService, mainDbModel, mainModelConstructor, configService) {
|
|
14
13
|
super();
|
|
15
14
|
this.emailService = emailService;
|
|
16
15
|
this.mainDbModel = mainDbModel;
|
|
17
16
|
this.mainModelConstructor = mainModelConstructor;
|
|
17
|
+
this.configService = configService;
|
|
18
18
|
}
|
|
19
19
|
async create(input, serviceOptions) {
|
|
20
20
|
serviceOptions = (0, config_helper_1.merge)({ prepareInput: { create: true } }, serviceOptions);
|
|
@@ -75,7 +75,9 @@ class CoreUserService extends crud_service_1.CrudService {
|
|
|
75
75
|
throw new common_1.NotFoundException(`No user found with password reset token: ${token}`);
|
|
76
76
|
}
|
|
77
77
|
return this.process(async () => {
|
|
78
|
-
|
|
78
|
+
if (this.configService.configFastButReadOnly.sha256 && !/^[a-f0-9]{64}$/i.test(newPassword)) {
|
|
79
|
+
newPassword = (0, js_sha256_1.sha256)(newPassword);
|
|
80
|
+
}
|
|
79
81
|
return await (0, input_helper_1.assignPlain)(dbObject, {
|
|
80
82
|
password: await bcrypt.hash(newPassword, 10),
|
|
81
83
|
passwordResetToken: null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-user.service.js","sourceRoot":"","sources":["../../../../src/core/modules/user/core-user.service.ts"],"names":[],"mappings":";;;AAAA,2CAAsG;AACtG,iCAAiC;AACjC,iCAAiC;AACjC,yCAAmC;AAEnC,
|
|
1
|
+
{"version":3,"file":"core-user.service.js","sourceRoot":"","sources":["../../../../src/core/modules/user/core-user.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { SchedulerRegistry } from '@nestjs/schedule';
|
|
2
|
+
import { ConfigService } from '../../../core/common/services/config.service';
|
|
2
3
|
import { CoreCronJobs } from '../../../core/common/services/core-cron-jobs.service';
|
|
3
4
|
export declare class CronJobs extends CoreCronJobs {
|
|
4
5
|
protected schedulerRegistry: SchedulerRegistry;
|
|
5
|
-
|
|
6
|
+
protected configService: ConfigService;
|
|
7
|
+
constructor(schedulerRegistry: SchedulerRegistry, configService: ConfigService);
|
|
6
8
|
protected sayHello(): Promise<void>;
|
|
7
9
|
}
|
|
@@ -12,12 +12,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.CronJobs = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const schedule_1 = require("@nestjs/schedule");
|
|
15
|
-
const
|
|
15
|
+
const config_service_1 = require("../../../core/common/services/config.service");
|
|
16
16
|
const core_cron_jobs_service_1 = require("../../../core/common/services/core-cron-jobs.service");
|
|
17
17
|
let CronJobs = class CronJobs extends core_cron_jobs_service_1.CoreCronJobs {
|
|
18
|
-
constructor(schedulerRegistry) {
|
|
19
|
-
super(schedulerRegistry,
|
|
18
|
+
constructor(schedulerRegistry, configService) {
|
|
19
|
+
super(schedulerRegistry, configService.config.cronJobs, { log: true });
|
|
20
20
|
this.schedulerRegistry = schedulerRegistry;
|
|
21
|
+
this.configService = configService;
|
|
21
22
|
}
|
|
22
23
|
async sayHello() {
|
|
23
24
|
console.info('Hello :)');
|
|
@@ -28,7 +29,7 @@ let CronJobs = class CronJobs extends core_cron_jobs_service_1.CoreCronJobs {
|
|
|
28
29
|
};
|
|
29
30
|
CronJobs = __decorate([
|
|
30
31
|
(0, common_1.Injectable)(),
|
|
31
|
-
__metadata("design:paramtypes", [schedule_1.SchedulerRegistry])
|
|
32
|
+
__metadata("design:paramtypes", [schedule_1.SchedulerRegistry, config_service_1.ConfigService])
|
|
32
33
|
], CronJobs);
|
|
33
34
|
exports.CronJobs = CronJobs;
|
|
34
35
|
//# sourceMappingURL=cron-jobs.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron-jobs.service.js","sourceRoot":"","sources":["../../../../src/server/common/services/cron-jobs.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+CAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"cron-jobs.service.js","sourceRoot":"","sources":["../../../../src/server/common/services/cron-jobs.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+CAAqD;AACrD,iFAA6E;AAC7E,iGAAoF;AAGpF,IAAa,QAAQ,GAArB,MAAa,QAAS,SAAQ,qCAAY;IAQxC,YAAsB,iBAAoC,EAAY,aAA4B;QAChG,KAAK,CAAC,iBAAiB,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QADnD,sBAAiB,GAAjB,iBAAiB,CAAmB;QAAY,kBAAa,GAAb,aAAa,CAAe;IAElG,CAAC;IAMS,KAAK,CAAC,QAAQ;QACtB,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACzB,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAtBY,QAAQ;IADpB,IAAA,mBAAU,GAAE;qCAS8B,4BAAiB,EAA2B,8BAAa;GARvF,QAAQ,CAsBpB;AAtBY,4BAAQ"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { JwtService } from '@nestjs/jwt';
|
|
2
2
|
import { ServiceOptions } from '../../../core/common/interfaces/service-options.interface';
|
|
3
|
+
import { ConfigService } from '../../../core/common/services/config.service';
|
|
3
4
|
import { EmailService } from '../../../core/common/services/email.service';
|
|
4
5
|
import { UserService } from '../user/user.service';
|
|
5
6
|
import { Auth } from './auth.model';
|
|
@@ -9,7 +10,8 @@ export declare class AuthService {
|
|
|
9
10
|
protected readonly jwtService: JwtService;
|
|
10
11
|
protected readonly emailService: EmailService;
|
|
11
12
|
protected readonly userService: UserService;
|
|
12
|
-
|
|
13
|
+
protected readonly configService: ConfigService;
|
|
14
|
+
constructor(jwtService: JwtService, emailService: EmailService, userService: UserService, configService: ConfigService);
|
|
13
15
|
signIn(input: AuthSignInInput, serviceOptions?: ServiceOptions): Promise<Auth>;
|
|
14
16
|
signUp(input: AuthSignUpInput, serviceOptions?: ServiceOptions): Promise<Auth>;
|
|
15
17
|
}
|
|
@@ -14,20 +14,21 @@ const common_1 = require("@nestjs/common");
|
|
|
14
14
|
const jwt_1 = require("@nestjs/jwt");
|
|
15
15
|
const bcrypt = require("bcrypt");
|
|
16
16
|
const js_sha256_1 = require("js-sha256");
|
|
17
|
-
const config_env_1 = require("../../../config.env");
|
|
18
17
|
const roles_decorator_1 = require("../../../core/common/decorators/roles.decorator");
|
|
19
18
|
const role_enum_1 = require("../../../core/common/enums/role.enum");
|
|
20
19
|
const service_helper_1 = require("../../../core/common/helpers/service.helper");
|
|
20
|
+
const config_service_1 = require("../../../core/common/services/config.service");
|
|
21
21
|
const email_service_1 = require("../../../core/common/services/email.service");
|
|
22
22
|
const user_service_1 = require("../user/user.service");
|
|
23
23
|
const auth_model_1 = require("./auth.model");
|
|
24
24
|
const auth_sign_in_input_1 = require("./inputs/auth-sign-in.input");
|
|
25
25
|
const auth_sign_up_input_1 = require("./inputs/auth-sign-up.input");
|
|
26
26
|
let AuthService = class AuthService {
|
|
27
|
-
constructor(jwtService, emailService, userService) {
|
|
27
|
+
constructor(jwtService, emailService, userService, configService) {
|
|
28
28
|
this.jwtService = jwtService;
|
|
29
29
|
this.emailService = emailService;
|
|
30
30
|
this.userService = userService;
|
|
31
|
+
this.configService = configService;
|
|
31
32
|
}
|
|
32
33
|
async signIn(input, serviceOptions) {
|
|
33
34
|
const serviceOptionsForUserService = (0, service_helper_1.prepareServiceOptions)(serviceOptions, {
|
|
@@ -56,7 +57,10 @@ let AuthService = class AuthService {
|
|
|
56
57
|
}
|
|
57
58
|
await this.emailService.sendMail(user.email, 'Welcome', {
|
|
58
59
|
htmlTemplate: 'welcome',
|
|
59
|
-
templateData: {
|
|
60
|
+
templateData: {
|
|
61
|
+
name: user.username,
|
|
62
|
+
link: this.configService.configFastButReadOnly.email.verificationLink + '/' + user.verificationToken,
|
|
63
|
+
},
|
|
60
64
|
});
|
|
61
65
|
const payload = { email: user.email };
|
|
62
66
|
return auth_model_1.Auth.map({
|
|
@@ -82,7 +86,8 @@ AuthService = __decorate([
|
|
|
82
86
|
(0, roles_decorator_1.Roles)(role_enum_1.RoleEnum.ADMIN),
|
|
83
87
|
__metadata("design:paramtypes", [jwt_1.JwtService,
|
|
84
88
|
email_service_1.EmailService,
|
|
85
|
-
user_service_1.UserService
|
|
89
|
+
user_service_1.UserService,
|
|
90
|
+
config_service_1.ConfigService])
|
|
86
91
|
], AuthService);
|
|
87
92
|
exports.AuthService = AuthService;
|
|
88
93
|
//# sourceMappingURL=auth.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../src/server/modules/auth/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAmE;AACnE,qCAAyC;AACzC,iCAAiC;AACjC,yCAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../src/server/modules/auth/auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,6 @@ const mongoose_1 = require("@nestjs/mongoose");
|
|
|
18
18
|
const fs = require("fs");
|
|
19
19
|
const graphql_subscriptions_1 = require("graphql-subscriptions");
|
|
20
20
|
const mongoose_2 = require("mongoose");
|
|
21
|
-
const config_env_1 = require("../../../config.env");
|
|
22
21
|
const config_service_1 = require("../../../core/common/services/config.service");
|
|
23
22
|
const email_service_1 = require("../../../core/common/services/email.service");
|
|
24
23
|
const core_user_service_1 = require("../../../core/modules/user/core-user.service");
|
|
@@ -47,7 +46,10 @@ let UserService = class UserService extends core_user_service_1.CoreUserService
|
|
|
47
46
|
const user = await super.setPasswordResetTokenForEmail(email, serviceOptions);
|
|
48
47
|
await this.emailService.sendMail(user.email, 'Password reset', {
|
|
49
48
|
htmlTemplate: 'password-reset',
|
|
50
|
-
templateData: {
|
|
49
|
+
templateData: {
|
|
50
|
+
name: user.username,
|
|
51
|
+
link: this.configService.configFastButReadOnly.email.passwordResetLink + '/' + user.passwordResetToken,
|
|
52
|
+
},
|
|
51
53
|
});
|
|
52
54
|
return user;
|
|
53
55
|
}
|
|
@@ -60,7 +62,7 @@ let UserService = class UserService extends core_user_service_1.CoreUserService
|
|
|
60
62
|
throw new common_1.UnprocessableEntityException('Missing avatar file');
|
|
61
63
|
}
|
|
62
64
|
if (user.avatar) {
|
|
63
|
-
fs.unlink(
|
|
65
|
+
fs.unlink(this.configService.configFastButReadOnly.staticAssets.path + '/avatars/' + user.avatar, (err) => {
|
|
64
66
|
if (err) {
|
|
65
67
|
console.error(err);
|
|
66
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/server/modules/user/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyG;AACzG,+CAA+C;AAC/C,yBAAyB;AACzB,iEAA+C;AAC/C,uCAAiC;
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/server/modules/user/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyG;AACzG,+CAA+C;AAC/C,yBAAyB;AACzB,iEAA+C;AAC/C,uCAAiC;AAEjC,iFAA6E;AAC7E,+EAA2E;AAE3E,oFAA+E;AAG/E,6CAAkD;AAMlD,IAAa,WAAW,GAAxB,MAAa,WAAY,SAAQ,mCAAiD;IAQhF,YACqB,aAA4B,EAC5B,YAA0B,EACJ,oBAAgD,EACjD,WAAgC,EAClC,MAAc;QAEpD,KAAK,CAAC,YAAY,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;QANpC,kBAAa,GAAb,aAAa,CAAe;QAC5B,iBAAY,GAAZ,YAAY,CAAc;QACJ,yBAAoB,GAApB,oBAAoB,CAA4B;QACjD,gBAAW,GAAX,WAAW,CAAqB;QAClC,WAAM,GAAN,MAAM,CAAQ;IAGtD,CAAC;IASD,KAAK,CAAC,MAAM,CAAC,KAAsB,EAAE,cAA+B;QAElE,IAAI,IAAI,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAIrD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YAC1E,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,IAAI,IAAI,EAAE,CAAC,CAAC;SACzG;QAGD,IAAI,cAAc,EAAE,MAAM,KAAK,SAAS,IAAI,cAAc,CAAC,MAAM,EAAE;YACjE,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,iBAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;SAC1D;QAGD,OAAO,IAAI,CAAC;IACd,CAAC;IAKD,KAAK,CAAC,qBAAqB,CAAC,KAAa,EAAE,cAA+B;QAExE,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,6BAA6B,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAG9E,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,gBAAgB,EAAE;YAC7D,YAAY,EAAE,gBAAgB;YAC9B,YAAY,EAAE;gBACZ,IAAI,EAAE,IAAI,CAAC,QAAQ;gBACnB,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,KAAK,CAAC,iBAAiB,GAAG,GAAG,GAAG,IAAI,CAAC,kBAAkB;aACvG;SACF,CAAC,CAAC;QAGH,OAAO,IAAI,CAAC;IACd,CAAC;IAKD,KAAK,CAAC,SAAS,CAAC,IAAyB,EAAE,IAAU;QACnD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAEtE,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,8BAAqB,EAAE,CAAC;SACnC;QAGD,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,qCAA4B,CAAC,qBAAqB,CAAC,CAAC;SAC/D;QAGD,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,YAAY,CAAC,IAAI,GAAG,WAAW,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;gBACxG,IAAI,GAAG,EAAE;oBACP,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBACpB;YACH,CAAC,CAAC,CAAC;SACJ;QAGD,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC;QAE9B,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QAGpB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF,CAAA;AAjGY,WAAW;IADvB,IAAA,mBAAU,GAAE;IAYR,WAAA,IAAA,eAAM,EAAC,YAAY,CAAC,CAAA;IACpB,WAAA,IAAA,sBAAW,EAAC,MAAM,CAAC,CAAA;IACnB,WAAA,IAAA,eAAM,EAAC,SAAS,CAAC,CAAA;qCAJgB,8BAAa;QACd,4BAAY,UAEQ,gBAAK;QACZ,8BAAM;GAb3C,WAAW,CAiGvB;AAjGY,kCAAW"}
|
|
@@ -18,11 +18,11 @@ let ServerController = class ServerController {
|
|
|
18
18
|
}
|
|
19
19
|
root() {
|
|
20
20
|
return {
|
|
21
|
-
env: this.configService.
|
|
21
|
+
env: this.configService.getFastButReadOnly('env'),
|
|
22
22
|
};
|
|
23
23
|
}
|
|
24
24
|
config() {
|
|
25
|
-
return this.configService.
|
|
25
|
+
return this.configService.configFastButReadOnly;
|
|
26
26
|
}
|
|
27
27
|
};
|
|
28
28
|
__decorate([
|