mongodb-dynamic-api 3.2.1 → 4.0.0
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/CHANGELOG.md +54 -0
- package/README.md +34 -3
- package/package.json +5 -2
- package/src/adapters/socket-adapter.d.ts +3 -3
- package/src/adapters/socket-adapter.js.map +1 -1
- package/src/builders/route-decorators/auth-decorators.builder.d.ts +1 -1
- package/src/builders/route-decorators/route-decorators.builder.d.ts +1 -1
- package/src/builders/route-decorators/route-decorators.builder.js.map +1 -1
- package/src/decorators/validator-pipe.decorator.js.map +1 -1
- package/src/dynamic-api.module.js +4 -1
- package/src/dynamic-api.module.js.map +1 -1
- package/src/guards/jwt-socket.guard.js +1 -1
- package/src/guards/jwt-socket.guard.js.map +1 -1
- package/src/helpers/swagger-config.helper.js.map +1 -1
- package/src/interceptors/dynamic-api-cache.interceptor.d.ts +3 -2
- package/src/interceptors/dynamic-api-cache.interceptor.js +4 -0
- package/src/interceptors/dynamic-api-cache.interceptor.js.map +1 -1
- package/src/interfaces/dynamic-api-decorator-builder.interface.d.ts +1 -1
- package/src/interfaces/dynamic-api-global-state.interface.d.ts +3 -0
- package/src/interfaces/dynamic-api-swagger-options.type.d.ts +1 -1
- package/src/modules/auth/auth-broadcast.helper.d.ts +3 -0
- package/src/modules/auth/auth-broadcast.helper.js +11 -0
- package/src/modules/auth/auth-broadcast.helper.js.map +1 -0
- package/src/modules/auth/auth-events.constants.d.ts +13 -0
- package/src/modules/auth/auth-events.constants.js +28 -0
- package/src/modules/auth/auth-events.constants.js.map +1 -0
- package/src/modules/auth/auth.helper.d.ts +19 -5
- package/src/modules/auth/auth.helper.js +15 -8
- package/src/modules/auth/auth.helper.js.map +1 -1
- package/src/modules/auth/auth.module.d.ts +5 -2
- package/src/modules/auth/auth.module.js +45 -6
- package/src/modules/auth/auth.module.js.map +1 -1
- package/src/modules/auth/guards/index.d.ts +2 -0
- package/src/modules/auth/guards/index.js +2 -0
- package/src/modules/auth/guards/index.js.map +1 -1
- package/src/modules/auth/guards/jwt-refresh/jwt-refresh.guard.d.ts +4 -0
- package/src/modules/auth/guards/jwt-refresh/jwt-refresh.guard.js +18 -0
- package/src/modules/auth/guards/jwt-refresh/jwt-refresh.guard.js.map +1 -0
- package/src/modules/auth/guards/jwt-socket-auth/jwt-socket-auth.guard.js +1 -1
- package/src/modules/auth/guards/jwt-socket-auth/jwt-socket-auth.guard.js.map +1 -1
- package/src/modules/auth/guards/jwt-socket-refresh/jwt-socket-refresh.guard.d.ts +8 -0
- package/src/modules/auth/guards/jwt-socket-refresh/jwt-socket-refresh.guard.js +62 -0
- package/src/modules/auth/guards/jwt-socket-refresh/jwt-socket-refresh.guard.js.map +1 -0
- package/src/modules/auth/index.d.ts +2 -0
- package/src/modules/auth/index.js +2 -0
- package/src/modules/auth/index.js.map +1 -1
- package/src/modules/auth/interfaces/auth-controller.interface.d.ts +19 -4
- package/src/modules/auth/interfaces/auth-gateway.interface.d.ts +2 -0
- package/src/modules/auth/interfaces/auth-options.interface.d.ts +19 -2
- package/src/modules/auth/interfaces/auth-service.interface.d.ts +3 -0
- package/src/modules/auth/mixins/auth-controller.mixin.d.ts +2 -2
- package/src/modules/auth/mixins/auth-controller.mixin.js +112 -18
- package/src/modules/auth/mixins/auth-controller.mixin.js.map +1 -1
- package/src/modules/auth/mixins/auth-gateway.mixin.d.ts +2 -2
- package/src/modules/auth/mixins/auth-gateway.mixin.js +65 -31
- package/src/modules/auth/mixins/auth-gateway.mixin.js.map +1 -1
- package/src/modules/auth/services/base-auth.service.d.ts +9 -0
- package/src/modules/auth/services/base-auth.service.js +74 -15
- package/src/modules/auth/services/base-auth.service.js.map +1 -1
- package/src/modules/auth/strategies/index.d.ts +1 -0
- package/src/modules/auth/strategies/index.js +1 -0
- package/src/modules/auth/strategies/index.js.map +1 -1
- package/src/modules/auth/strategies/jwt-refresh.strategy.d.ts +14 -0
- package/src/modules/auth/strategies/jwt-refresh.strategy.js +45 -0
- package/src/modules/auth/strategies/jwt-refresh.strategy.js.map +1 -0
- package/src/modules/auth/strategies/jwt.strategy.d.ts +3 -1
- package/src/modules/auth/strategies/jwt.strategy.js.map +1 -1
- package/src/routes/aggregate/base-aggregate.service.js.map +1 -1
- package/src/routes/create-many/base-create-many.service.js.map +1 -1
- package/src/routes/create-one/base-create-one.service.js.map +1 -1
- package/src/routes/delete-many/base-delete-many.service.js.map +1 -1
- package/src/routes/delete-one/base-delete-one.service.js.map +1 -1
- package/src/routes/duplicate-many/base-duplicate-many.service.js +4 -3
- package/src/routes/duplicate-many/base-duplicate-many.service.js.map +1 -1
- package/src/routes/duplicate-one/base-duplicate-one.service.js +3 -2
- package/src/routes/duplicate-one/base-duplicate-one.service.js.map +1 -1
- package/src/routes/get-many/base-get-many.service.js.map +1 -1
- package/src/routes/get-one/base-get-one.service.js.map +1 -1
- package/src/routes/replace-one/base-replace-one.service.js +3 -2
- package/src/routes/replace-one/base-replace-one.service.js.map +1 -1
- package/src/routes/update-many/base-update-many.service.js.map +1 -1
- package/src/routes/update-one/base-update-one.service.js.map +1 -1
- package/src/services/base/base.service.d.ts +3 -3
- package/src/services/base/base.service.js +26 -8
- package/src/services/base/base.service.js.map +1 -1
- package/src/services/dynamic-api-global-state/dynamic-api-global-state.service.js +3 -0
- package/src/services/dynamic-api-global-state/dynamic-api-global-state.service.js.map +1 -1
- package/src/version.json +1 -1
- package/test/e2e.setup.d.ts +3 -2
- package/test/e2e.setup.js +5 -4
- package/test/e2e.setup.js.map +1 -1
- package/test/for-feature/base-entity.e2e-spec.js +316 -0
- package/test/for-feature/base-entity.e2e-spec.js.map +1 -0
- package/test/for-feature/http-broadcast.e2e-spec.js +187 -0
- package/test/for-feature/http-broadcast.e2e-spec.js.map +1 -0
- package/test/for-feature/soft-deletable-entity.e2e-spec.d.ts +1 -0
- package/test/for-feature/soft-deletable-entity.e2e-spec.js +335 -0
- package/test/for-feature/soft-deletable-entity.e2e-spec.js.map +1 -0
- package/test/for-feature/websockets.e2e-spec.d.ts +1 -0
- package/test/for-feature/websockets.e2e-spec.js +324 -0
- package/test/for-feature/websockets.e2e-spec.js.map +1 -0
- package/test/for-root/auth-api-basic.e2e-spec.d.ts +1 -0
- package/test/for-root/auth-api-basic.e2e-spec.js +338 -0
- package/test/for-root/auth-api-basic.e2e-spec.js.map +1 -0
- package/test/for-root/auth-api-broadcast.e2e-spec.d.ts +1 -0
- package/test/for-root/auth-api-broadcast.e2e-spec.js +82 -0
- package/test/for-root/auth-api-broadcast.e2e-spec.js.map +1 -0
- package/test/for-root/auth-api-login.e2e-spec.d.ts +1 -0
- package/test/for-root/auth-api-login.e2e-spec.js +103 -0
- package/test/for-root/auth-api-login.e2e-spec.js.map +1 -0
- package/test/for-root/auth-api-logout.e2e-spec.d.ts +1 -0
- package/test/for-root/auth-api-logout.e2e-spec.js +74 -0
- package/test/for-root/auth-api-logout.e2e-spec.js.map +1 -0
- package/test/for-root/auth-api-refresh-token-cookie.e2e-spec.d.ts +1 -0
- package/test/for-root/auth-api-refresh-token-cookie.e2e-spec.js +110 -0
- package/test/for-root/auth-api-refresh-token-cookie.e2e-spec.js.map +1 -0
- package/test/for-root/auth-api-refresh-token.e2e-spec.d.ts +1 -0
- package/test/for-root/auth-api-refresh-token.e2e-spec.js +153 -0
- package/test/for-root/auth-api-refresh-token.e2e-spec.js.map +1 -0
- package/test/for-root/auth-api-register.e2e-spec.d.ts +1 -0
- package/test/for-root/auth-api-register.e2e-spec.js +116 -0
- package/test/for-root/auth-api-register.e2e-spec.js.map +1 -0
- package/test/for-root/auth-api-reset-password.e2e-spec.d.ts +1 -0
- package/test/for-root/auth-api-reset-password.e2e-spec.js +168 -0
- package/test/for-root/auth-api-reset-password.e2e-spec.js.map +1 -0
- package/test/for-root/initialization.e2e-spec.d.ts +1 -0
- package/test/for-root/initialization.e2e-spec.js +84 -0
- package/test/for-root/initialization.e2e-spec.js.map +1 -0
- package/test/for-root/websockets-auth-basic.e2e-spec.d.ts +1 -0
- package/test/for-root/websockets-auth-basic.e2e-spec.js +313 -0
- package/test/for-root/websockets-auth-basic.e2e-spec.js.map +1 -0
- package/test/for-root/websockets-auth-broadcast.e2e-spec.d.ts +1 -0
- package/test/for-root/websockets-auth-broadcast.e2e-spec.js +86 -0
- package/test/for-root/websockets-auth-broadcast.e2e-spec.js.map +1 -0
- package/test/for-root/websockets-auth-login.e2e-spec.d.ts +1 -0
- package/test/for-root/websockets-auth-login.e2e-spec.js +107 -0
- package/test/for-root/websockets-auth-login.e2e-spec.js.map +1 -0
- package/test/for-root/websockets-auth-refresh-token.e2e-spec.d.ts +1 -0
- package/test/for-root/websockets-auth-refresh-token.e2e-spec.js +104 -0
- package/test/for-root/websockets-auth-refresh-token.e2e-spec.js.map +1 -0
- package/test/for-root/websockets-auth-register.e2e-spec.d.ts +1 -0
- package/test/for-root/websockets-auth-register.e2e-spec.js +131 -0
- package/test/for-root/websockets-auth-register.e2e-spec.js.map +1 -0
- package/test/for-root/websockets-auth-reset-password.e2e-spec.d.ts +1 -0
- package/test/for-root/websockets-auth-reset-password.e2e-spec.js +164 -0
- package/test/for-root/websockets-auth-reset-password.e2e-spec.js.map +1 -0
- package/test/shared/entities/basic-user.factory.d.ts +12 -0
- package/test/shared/entities/basic-user.factory.js +31 -0
- package/test/shared/entities/basic-user.factory.js.map +1 -0
- package/test/shared/entities/broadcast-user.factory.d.ts +13 -0
- package/test/shared/entities/broadcast-user.factory.js +35 -0
- package/test/shared/entities/broadcast-user.factory.js.map +1 -0
- package/test/shared/entities/index.d.ts +7 -0
- package/test/shared/entities/index.js +24 -0
- package/test/shared/entities/index.js.map +1 -0
- package/test/shared/entities/login-user.factory.d.ts +14 -0
- package/test/shared/entities/login-user.factory.js +39 -0
- package/test/shared/entities/login-user.factory.js.map +1 -0
- package/test/shared/entities/refresh-token-user.factory.d.ts +13 -0
- package/test/shared/entities/refresh-token-user.factory.js +35 -0
- package/test/shared/entities/refresh-token-user.factory.js.map +1 -0
- package/test/shared/entities/register-user.factory.d.ts +14 -0
- package/test/shared/entities/register-user.factory.js +39 -0
- package/test/shared/entities/register-user.factory.js.map +1 -0
- package/test/shared/entities/reset-password-user.factory.d.ts +14 -0
- package/test/shared/entities/reset-password-user.factory.js +39 -0
- package/test/shared/entities/reset-password-user.factory.js.map +1 -0
- package/test/shared/entities/validated-user.factory.d.ts +12 -0
- package/test/shared/entities/validated-user.factory.js +40 -0
- package/test/shared/entities/validated-user.factory.js.map +1 -0
- package/test/shared/fixtures/index.d.ts +2 -0
- package/test/shared/fixtures/index.js +19 -0
- package/test/shared/fixtures/index.js.map +1 -0
- package/test/shared/fixtures/login.fixtures.d.ts +16 -0
- package/test/shared/fixtures/login.fixtures.js +20 -0
- package/test/shared/fixtures/login.fixtures.js.map +1 -0
- package/test/shared/fixtures/register.fixtures.d.ts +10 -0
- package/test/shared/fixtures/register.fixtures.js +14 -0
- package/test/shared/fixtures/register.fixtures.js.map +1 -0
- package/test/shared/index.d.ts +4 -0
- package/test/shared/index.js +24 -0
- package/test/shared/index.js.map +1 -0
- package/test/shared/init-app.d.ts +3 -0
- package/test/shared/init-app.js +19 -0
- package/test/shared/init-app.js.map +1 -0
- package/test/shared/init-module.d.ts +4 -0
- package/test/shared/init-module.js +16 -0
- package/test/shared/init-module.js.map +1 -0
- package/tsconfig.tsbuildinfo +1 -1
- package/test/dynamic-api-for-feature.e2e-spec.js +0 -1100
- package/test/dynamic-api-for-feature.e2e-spec.js.map +0 -1
- package/test/dynamic-api-for-root.e2e-spec.js +0 -1573
- package/test/dynamic-api-for-root.e2e-spec.js.map +0 -1
- /package/test/{dynamic-api-for-feature.e2e-spec.d.ts → for-feature/base-entity.e2e-spec.d.ts} +0 -0
- /package/test/{dynamic-api-for-root.e2e-spec.d.ts → for-feature/http-broadcast.e2e-spec.d.ts} +0 -0
|
@@ -2,8 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BaseAuthService = void 0;
|
|
4
4
|
const common_1 = require("@nestjs/common");
|
|
5
|
+
const node_crypto_1 = require("node:crypto");
|
|
5
6
|
const logger_1 = require("../../../logger");
|
|
6
7
|
const services_1 = require("../../../services");
|
|
8
|
+
const dynamic_api_module_1 = require("../../../dynamic-api.module");
|
|
7
9
|
class BaseAuthService extends services_1.BaseService {
|
|
8
10
|
constructor(model, jwtService, bcryptService) {
|
|
9
11
|
super(model);
|
|
@@ -18,7 +20,7 @@ class BaseAuthService extends services_1.BaseService {
|
|
|
18
20
|
async validateUser(login, pass) {
|
|
19
21
|
this.logger.debug('Validating user', { login, pass: !!pass });
|
|
20
22
|
this.verifyArguments(login, pass);
|
|
21
|
-
const user =
|
|
23
|
+
const user = await this.model.findOne({ [this.loginField]: login }).lean().exec();
|
|
22
24
|
const isPasswordValid = user ? await this.bcryptService.comparePassword(pass, user[this.passwordField]) : false;
|
|
23
25
|
if (!user || !isPasswordValid) {
|
|
24
26
|
return null;
|
|
@@ -29,7 +31,7 @@ class BaseAuthService extends services_1.BaseService {
|
|
|
29
31
|
this.logger.debug('Logging in user', { userId: user?.id, fromMember });
|
|
30
32
|
this.verifyArguments(user);
|
|
31
33
|
if (!fromMember && !!this.loginCallback) {
|
|
32
|
-
const fullUser =
|
|
34
|
+
const fullUser = await this.model.findOne({ _id: user.id }).lean().exec();
|
|
33
35
|
const instance = this.buildInstance(fullUser);
|
|
34
36
|
await this.loginCallback(instance, this.callbackMethods);
|
|
35
37
|
}
|
|
@@ -39,12 +41,16 @@ class BaseAuthService extends services_1.BaseService {
|
|
|
39
41
|
this.loginField,
|
|
40
42
|
...this.additionalRequestFields,
|
|
41
43
|
];
|
|
42
|
-
const payload = {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
44
|
+
const payload = { ...this.buildUserFields(user, fieldsToBuild) };
|
|
45
|
+
const accessToken = this.jwtService.sign(payload);
|
|
46
|
+
const refreshToken = this.buildRefreshToken(payload);
|
|
47
|
+
if (this.refreshTokenField && (user._id || user.id)) {
|
|
48
|
+
const decodedRefresh = this.jwtService.decode(refreshToken);
|
|
49
|
+
const jti = decodedRefresh && typeof decodedRefresh !== 'string' ? decodedRefresh['jti'] : '';
|
|
50
|
+
const hashedRefreshToken = await this.bcryptService.hashPassword(jti);
|
|
51
|
+
await this.model.updateOne({ _id: user._id || user.id }, { $set: { [this.refreshTokenField]: hashedRefreshToken } }).exec();
|
|
52
|
+
}
|
|
53
|
+
return { accessToken, refreshToken };
|
|
48
54
|
}
|
|
49
55
|
async register(userToCreate) {
|
|
50
56
|
this.logger.debug('Registering user', { userToCreate });
|
|
@@ -58,11 +64,11 @@ class BaseAuthService extends services_1.BaseService {
|
|
|
58
64
|
}
|
|
59
65
|
const created = await this.model.create({ ...userToCreate, [this.passwordField]: hashedPassword });
|
|
60
66
|
if (this.registerCallback) {
|
|
61
|
-
const user =
|
|
67
|
+
const user = await this.model.findOne({ _id: created._id }).lean().exec();
|
|
62
68
|
const instance = this.buildInstance(user);
|
|
63
69
|
await this.registerCallback(instance, this.callbackMethods);
|
|
64
70
|
}
|
|
65
|
-
const user =
|
|
71
|
+
const user = await this.model.findOne({ _id: created._id }).lean().exec();
|
|
66
72
|
return this.login(user, true);
|
|
67
73
|
}
|
|
68
74
|
catch (error) {
|
|
@@ -89,7 +95,7 @@ class BaseAuthService extends services_1.BaseService {
|
|
|
89
95
|
this.logger.debug('Updating account', { userId: id, update });
|
|
90
96
|
this.verifyArguments(id, update);
|
|
91
97
|
if (this.beforeUpdateAccountCallback) {
|
|
92
|
-
const user =
|
|
98
|
+
const user = await this.model.findOne({ _id: id }).lean().exec();
|
|
93
99
|
update =
|
|
94
100
|
await this.beforeUpdateAccountCallback({ ...user, id: user._id.toString() }, { update }, this.callbackMethods);
|
|
95
101
|
}
|
|
@@ -139,7 +145,7 @@ class BaseAuthService extends services_1.BaseService {
|
|
|
139
145
|
email = decoded.email;
|
|
140
146
|
exp = decoded.exp;
|
|
141
147
|
}
|
|
142
|
-
catch
|
|
148
|
+
catch {
|
|
143
149
|
this.logger.warn('Invalid reset password token');
|
|
144
150
|
}
|
|
145
151
|
if (!email || !exp) {
|
|
@@ -165,17 +171,70 @@ class BaseAuthService extends services_1.BaseService {
|
|
|
165
171
|
}
|
|
166
172
|
const hashedPassword = await this.bcryptService.hashPassword(newPassword);
|
|
167
173
|
if (this.resetPasswordOptions?.beforeChangePasswordCallback) {
|
|
168
|
-
const user =
|
|
174
|
+
const user = await this.model.findOne({ _id: userId }).lean().exec();
|
|
169
175
|
await this.resetPasswordOptions.beforeChangePasswordCallback({ ...user, id: user._id.toString() }, { resetPasswordToken, newPassword, hashedPassword }, this.callbackMethods);
|
|
170
176
|
}
|
|
171
177
|
await this.model.updateOne({ _id: userId }, { $set: { [this.passwordField]: hashedPassword, resetPasswordToken: null } });
|
|
172
178
|
if (this.resetPasswordOptions?.changePasswordCallback) {
|
|
173
|
-
const user =
|
|
179
|
+
const user = await this.model.findOne({ _id: userId }).lean().exec();
|
|
174
180
|
await this.resetPasswordOptions.changePasswordCallback({ ...user, id: user._id.toString() }, this.callbackMethods);
|
|
175
181
|
}
|
|
176
182
|
}
|
|
183
|
+
async refreshToken(user, rawToken) {
|
|
184
|
+
this.logger.debug('Refreshing token', { userId: user?.id });
|
|
185
|
+
this.verifyArguments(user);
|
|
186
|
+
if (this.refreshTokenField) {
|
|
187
|
+
const storedUser = await this.model.findOne({ _id: user._id || user.id }).lean().exec();
|
|
188
|
+
const storedHash = storedUser?.[this.refreshTokenField];
|
|
189
|
+
const decodedRaw = rawToken ? this.jwtService.decode(rawToken) : undefined;
|
|
190
|
+
const jtiFromToken = decodedRaw && typeof decodedRaw !== 'string' ? decodedRaw['jti'] : undefined;
|
|
191
|
+
if (!storedHash || !jtiFromToken) {
|
|
192
|
+
throw new common_1.UnauthorizedException('Invalid refresh token');
|
|
193
|
+
}
|
|
194
|
+
const isValid = await this.bcryptService.comparePassword(jtiFromToken, storedHash);
|
|
195
|
+
if (!isValid) {
|
|
196
|
+
throw new common_1.UnauthorizedException('Invalid refresh token');
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
const fieldsToBuild = [
|
|
200
|
+
'_id',
|
|
201
|
+
'id',
|
|
202
|
+
this.loginField,
|
|
203
|
+
...this.additionalRequestFields,
|
|
204
|
+
];
|
|
205
|
+
const payload = { ...this.buildUserFields(user, fieldsToBuild) };
|
|
206
|
+
const accessToken = this.jwtService.sign(payload);
|
|
207
|
+
const refreshToken = this.buildRefreshToken(payload);
|
|
208
|
+
if (this.refreshTokenField && (user._id || user.id)) {
|
|
209
|
+
const decodedRefresh = this.jwtService.decode(refreshToken);
|
|
210
|
+
const jti = decodedRefresh && typeof decodedRefresh !== 'string' ? decodedRefresh['jti'] : '';
|
|
211
|
+
const hashedRefreshToken = await this.bcryptService.hashPassword(jti);
|
|
212
|
+
await this.model.updateOne({ _id: user._id || user.id }, { $set: { [this.refreshTokenField]: hashedRefreshToken } }).exec();
|
|
213
|
+
}
|
|
214
|
+
return { accessToken, refreshToken };
|
|
215
|
+
}
|
|
216
|
+
async logout(user) {
|
|
217
|
+
this.logger.debug('Logging out user', { userId: user.id });
|
|
218
|
+
this.verifyArguments(user);
|
|
219
|
+
if (!this.refreshTokenField) {
|
|
220
|
+
this.logger.warn('logout called without refreshTokenField configured. ' +
|
|
221
|
+
'Server-side token revocation is not possible. ' +
|
|
222
|
+
'To enable server-side revocation, add a field to your entity ' +
|
|
223
|
+
'and configure refreshToken.refreshTokenField in your auth options.');
|
|
224
|
+
return;
|
|
225
|
+
}
|
|
226
|
+
await this.model.updateOne({ _id: user._id || user.id }, { $set: { [this.refreshTokenField]: null } }).exec();
|
|
227
|
+
}
|
|
228
|
+
buildRefreshToken(payload) {
|
|
229
|
+
const refreshSecret = dynamic_api_module_1.DynamicApiModule.state.get('jwtRefreshSecret');
|
|
230
|
+
const refreshTokenExpiresIn = dynamic_api_module_1.DynamicApiModule.state.get('jwtRefreshTokenExpiresIn');
|
|
231
|
+
return this.jwtService.sign({ ...payload, jti: (0, node_crypto_1.randomUUID)() }, {
|
|
232
|
+
...(refreshSecret ? { secret: refreshSecret } : {}),
|
|
233
|
+
...(refreshTokenExpiresIn ? { expiresIn: refreshTokenExpiresIn } : {}),
|
|
234
|
+
});
|
|
235
|
+
}
|
|
177
236
|
buildUserFields(user, fieldsToBuild) {
|
|
178
|
-
return this.buildInstance(fieldsToBuild.reduce((acc, field) => (user[field]
|
|
237
|
+
return this.buildInstance(fieldsToBuild.reduce((acc, field) => (user[field] === undefined ? acc : { ...acc, [field]: user[field] }), {}));
|
|
179
238
|
}
|
|
180
239
|
checkFieldsValidity(userToCreate) {
|
|
181
240
|
const errors = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-auth.service.js","sourceRoot":"","sources":["../../../../../libs/dynamic-api/src/modules/auth/services/base-auth.service.ts"],"names":[],"mappings":";;;AAAA,2CAAsG;AAItG,4CAA0D;AAE1D,gDAA+D;AAG/D,MAAsB,eAA2C,SAAQ,sBAAmB;IAiB1F,YACqB,KAAoB,EACpB,UAAsB,EACtB,aAA4B;QAE/C,KAAK,CAAC,KAAK,CAAC,CAAC;QAJM,UAAK,GAAL,KAAK,CAAe;QACpB,eAAU,GAAV,UAAU,CAAY;QACtB,kBAAa,GAAb,aAAa,CAAe;QAlBvC,eAAU,GAAG,OAAuB,CAAC;QACrC,kBAAa,GAAG,UAA0B,CAAC;QAC3C,4BAAuB,GAAqB,EAAE,CAAC;QAWxC,WAAM,GAAG,IAAI,gCAAuB,CAAC,aAAa,CAAC,CAAC;IAQrE,CAAC;IAES,KAAK,CAAC,YAAY,CAAC,KAAa,EAAE,IAAY;QACtD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAElC,MAAM,IAAI,GAAG,CAEX,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAC3D,CAAC;QAGZ,MAAM,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAEhH,IAAI,CAAC,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAY,CAAC;IACxD,CAAC;IAES,KAAK,CAAC,KAAK,CAAC,IAAY,EAAE,UAAU,GAAG,KAAK;QACpD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QACvE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAE3B,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxC,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAW,CAAC;YACtF,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC9C,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,aAAa,GAAG;YACpB,KAAqB;YACrB,IAAoB;YACpB,IAAI,CAAC,UAAU;YACf,GAAG,IAAI,CAAC,uBAAuB;SAChC,CAAC;QAGF,MAAM,OAAO,GAAW;YACtB,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,aAAa,CAAC;SAC7C,CAAC;QAEF,OAAO;YACL,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC;SAC3C,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,QAAQ,CAAC,YAA6B;QACpD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QACnC,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;QAEvC,IAAI,CAAC;YAEH,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;YAE/F,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAChC,YAAY;oBACV,MAAM,IAAI,CAAC,sBAAsB,CAAC,YAAsB,EAAE,EAAE,cAAc,EAAE,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YACxG,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,YAAY,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;YAEnG,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC1B,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAW,CAAC;gBACtF,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gBAC1C,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YAC9D,CAAC;YAED,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAW,CAAC;YAEtF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,uBAAuB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC3C,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAES,KAAK,CAAC,UAAU,CAAC,EAAE,EAAE,EAAU;QACvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QACrD,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QAEzB,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAW,CAAC;QAE7E,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAC1C,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,aAAa,GAAG;YACpB,KAAqB;YACrB,IAAI,CAAC,UAAU;YACf,GAAG,IAAI,CAAC,uBAAuB;SAChC,CAAC;QAEF,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACnD,CAAC;IAES,KAAK,CAAC,aAAa,CAAC,EAAE,EAAE,EAAU,EAAE,MAAuB;QACnE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAEjC,IAAI,IAAI,CAAC,2BAA2B,EAAE,CAAC;YACrC,MAAM,IAAI,GAAG,CACX,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAC1C,CAAC;YACZ,MAAM;gBACJ,MAAM,IAAI,CAAC,2BAA2B,CAAC,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACnH,CAAC;QAED,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CACxB,EAAE,GAAG,EAAE,EAAE,EAAE,EAEX,EAAE,IAAI,EAAE,MAAM,EAAE,CACjB,CAAC,IAAI,EAAE,CAAC;QAET,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAW,CAAC;YACjF,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC9C,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACnE,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,EAAY,CAAC,CAAC;IAC3C,CAAC;IAES,KAAK,CAAC,aAAa,CAAC,KAAa;QACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAE5B,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC/B,OAAO;QACT,CAAC;QAED,IAAI,CAAC,4BAA4B,GAAG;YAClC,eAAe,EAAE,KAAK,IAAI,EAAE;gBAE1B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC;qBACvF,IAAI,EAAE;qBACN,IAAI,EAAE,CAAC;gBAER,IAAI,CAAC,IAAI,EAAE,CAAC;oBACV,OAAO;gBACT,CAAC;gBAED,OAAO,IAAI,CAAC,aAAa,CAAC,IAAc,CAAC,CAAC;YAC5C,CAAC;YACD,iBAAiB,EAAE,KAAK,EAAE,MAA2D,EAAE,EAAE;gBACvF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAE5C,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,EACjD,MAAM,EACN,EAAE,GAAG,EAAE,IAAI,EAAE,CACd,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;gBAEhB,IAAI,CAAC,IAAI,EAAE,CAAC;oBACV,OAAO;gBACT,CAAC;gBAED,OAAO,IAAI,CAAC,aAAa,CAAC,IAAc,CAAC,CAAC;YAC5C,CAAC;SACF,CAAC;QAEF,MAAM,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,oBAAoB,CAAC;QAEjF,MAAM,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAC7C,EAAE,KAAK,EAAE,EACT,EAAE,SAAS,EAAE,mBAAmB,GAAG,EAAE,EAAE,CACxC,CAAC;QAEF,MAAM,qBAAqB,CAAC,EAAE,kBAAkB,EAAE,KAAK,EAAE,EAAE,IAAI,CAAC,4BAA4B,CAAC,CAAC;IAChG,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,kBAA0B,EAAE,WAAmB;QAC5E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,kBAAkB,EAAE,CAAC,CAAC,kBAAkB,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QACjH,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC;QAEtD,IAAI,KAAa,CAAC;QAClB,IAAI,GAAW,CAAC;QAEhB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;YAC3D,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;YACtB,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;QACpB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC;YACnB,MAAM,IAAI,4BAAmB,CAAC,uEAAuE,CAAC,CAAC;QACzG,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QAC1C,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;YACf,MAAM,IAAI,8BAAqB,CAAC,6EAA6E,CAAC,CAAC;QACjH,CAAC;QAED,IAAI,MAAc,CAAC;QACnB,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,mCAAmC,CAC5D,SAAS,EAET,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,EACjD,IAAI,CAAC,oBAAoB,EAAE,8BAA8B,CAC1D,CAAC;YACF,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC1B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBACzB,MAAM,IAAI,2BAAkB,CAAC,8CAA8C,CAAC,CAAC;YAC/E,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QACpD,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO;QACT,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAE1E,IAAI,IAAI,CAAC,oBAAoB,EAAE,4BAA4B,EAAE,CAAC;YAC5D,MAAM,IAAI,GAAG,CACX,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAC9C,CAAC;YACZ,MAAM,IAAI,CAAC,oBAAoB,CAAC,4BAA4B,CAC1D,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,EACpC,EAAE,kBAAkB,EAAE,WAAW,EAAE,cAAc,EAAE,EACnD,IAAI,CAAC,eAAe,CACrB,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CACxB,EAAE,GAAG,EAAE,MAAM,EAAE,EAEf,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,cAAc,EAAE,kBAAkB,EAAE,IAAI,EAAE,EAAE,CAC7E,CAAC;QAEF,IAAI,IAAI,CAAC,oBAAoB,EAAE,sBAAsB,EAAE,CAAC;YACtD,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAW,CAAC;YACjF,MAAM,IAAI,CAAC,oBAAoB,CAAC,sBAAsB,CACpD,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,EACpC,IAAI,CAAC,eAAe,CACrB,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,IAAY,EAAE,aAA+B;QACnE,OAAO,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,CAC5C,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CACd,IAAI,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CACnE,EACD,EAAY,CACb,CAAC,CAAC;IACL,CAAC;IAEO,mBAAmB,CAAC,YAA6B;QACvD,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;QACjE,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YACtC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAAC;QACpE,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QAED,MAAM,IAAI,4BAAmB,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;CACF;AAtSD,0CAsSC"}
|
|
1
|
+
{"version":3,"file":"base-auth.service.js","sourceRoot":"","sources":["../../../../../libs/dynamic-api/src/modules/auth/services/base-auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./jwt.strategy"), exports);
|
|
18
|
+
__exportStar(require("./jwt-refresh.strategy"), exports);
|
|
18
19
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/dynamic-api/src/modules/auth/strategies/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/dynamic-api/src/modules/auth/strategies/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,yDAAuC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Strategy } from 'passport-jwt';
|
|
2
|
+
declare const JwtRefreshStrategy_base: new (...args: [opt: import("passport-jwt").StrategyOptionsWithRequest] | [opt: import("passport-jwt").StrategyOptionsWithoutRequest]) => Strategy & {
|
|
3
|
+
validate(...args: any[]): unknown;
|
|
4
|
+
};
|
|
5
|
+
export declare class JwtRefreshStrategy extends JwtRefreshStrategy_base {
|
|
6
|
+
static extractFromCookies(req: {
|
|
7
|
+
cookies?: Record<string, string>;
|
|
8
|
+
}): string | null;
|
|
9
|
+
constructor();
|
|
10
|
+
validate(payload: Record<string, unknown>): Promise<{
|
|
11
|
+
[x: string]: unknown;
|
|
12
|
+
}>;
|
|
13
|
+
}
|
|
14
|
+
export {};
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
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;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var JwtRefreshStrategy_1;
|
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
exports.JwtRefreshStrategy = void 0;
|
|
14
|
+
const common_1 = require("@nestjs/common");
|
|
15
|
+
const passport_1 = require("@nestjs/passport");
|
|
16
|
+
const passport_jwt_1 = require("passport-jwt");
|
|
17
|
+
const dynamic_api_module_1 = require("../../../dynamic-api.module");
|
|
18
|
+
let JwtRefreshStrategy = JwtRefreshStrategy_1 = class JwtRefreshStrategy extends (0, passport_1.PassportStrategy)(passport_jwt_1.Strategy, 'jwt-refresh') {
|
|
19
|
+
static extractFromCookies(req) {
|
|
20
|
+
return req?.cookies?.['refreshToken'] ?? null;
|
|
21
|
+
}
|
|
22
|
+
constructor() {
|
|
23
|
+
const useCookie = dynamic_api_module_1.DynamicApiModule.state.get('jwtRefreshUseCookie');
|
|
24
|
+
const refreshSecret = dynamic_api_module_1.DynamicApiModule.state.get('jwtRefreshSecret');
|
|
25
|
+
const jwtSecret = dynamic_api_module_1.DynamicApiModule.state.get('jwtSecret');
|
|
26
|
+
super({
|
|
27
|
+
jwtFromRequest: useCookie
|
|
28
|
+
? JwtRefreshStrategy_1.extractFromCookies
|
|
29
|
+
: passport_jwt_1.ExtractJwt.fromAuthHeaderAsBearerToken(),
|
|
30
|
+
ignoreExpiration: false,
|
|
31
|
+
secretOrKey: refreshSecret ?? jwtSecret,
|
|
32
|
+
passReqToCallback: false,
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
async validate(payload) {
|
|
36
|
+
const { iat, exp, jti, ...user } = payload;
|
|
37
|
+
return user;
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
exports.JwtRefreshStrategy = JwtRefreshStrategy;
|
|
41
|
+
exports.JwtRefreshStrategy = JwtRefreshStrategy = JwtRefreshStrategy_1 = __decorate([
|
|
42
|
+
(0, common_1.Injectable)(),
|
|
43
|
+
__metadata("design:paramtypes", [])
|
|
44
|
+
], JwtRefreshStrategy);
|
|
45
|
+
//# sourceMappingURL=jwt-refresh.strategy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jwt-refresh.strategy.js","sourceRoot":"","sources":["../../../../../libs/dynamic-api/src/modules/auth/strategies/jwt-refresh.strategy.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+CAAoD;AACpD,+CAAoD;AACpD,oEAA+D;AAGxD,IAAM,kBAAkB,0BAAxB,MAAM,kBAAmB,SAAQ,IAAA,2BAAgB,EAAC,uBAAQ,EAAE,aAAa,CAAC;IAC/E,MAAM,CAAC,kBAAkB,CAAC,GAAyC;QACjE,OAAO,GAAG,EAAE,OAAO,EAAE,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC;IAChD,CAAC;IAED;QACE,MAAM,SAAS,GAAG,qCAAgB,CAAC,KAAK,CAAC,GAAG,CAAsB,qBAAqB,CAAC,CAAC;QACzF,MAAM,aAAa,GAAG,qCAAgB,CAAC,KAAK,CAAC,GAAG,CAAqB,kBAAkB,CAAC,CAAC;QACzF,MAAM,SAAS,GAAG,qCAAgB,CAAC,KAAK,CAAC,GAAG,CAAS,WAAW,CAAC,CAAC;QAElE,KAAK,CAAC;YACJ,cAAc,EAAE,SAAS;gBACvB,CAAC,CAAC,oBAAkB,CAAC,kBAAkB;gBACvC,CAAC,CAAC,yBAAU,CAAC,2BAA2B,EAAE;YAC5C,gBAAgB,EAAE,KAAK;YACvB,WAAW,EAAE,aAAa,IAAI,SAAS;YACvC,iBAAiB,EAAE,KAAK;SACzB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgC;QAC7C,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QAC3C,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAxBY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;;GACA,kBAAkB,CAwB9B"}
|
|
@@ -5,6 +5,8 @@ declare const JwtStrategy_base: new (...args: [opt: import("passport-jwt").Strat
|
|
|
5
5
|
export declare class JwtStrategy extends JwtStrategy_base {
|
|
6
6
|
protected loginField: string;
|
|
7
7
|
constructor();
|
|
8
|
-
validate(payload:
|
|
8
|
+
validate(payload: Record<string, unknown>): Promise<{
|
|
9
|
+
[x: string]: unknown;
|
|
10
|
+
}>;
|
|
9
11
|
}
|
|
10
12
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.strategy.js","sourceRoot":"","sources":["../../../../../libs/dynamic-api/src/modules/auth/strategies/jwt.strategy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+CAAoD;AACpD,+CAAoD;AACpD,oEAA+D;AAIxD,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,IAAA,2BAAgB,EAAC,uBAAQ,CAAC;IAKzD;QACE,KAAK,CAAC;YACJ,cAAc,EAAE,yBAAU,CAAC,2BAA2B,EAAE;YACxD,gBAAgB,EAAE,KAAK;YACvB,WAAW,EAAE,qCAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC;SACrD,CAAC,CAAC;QATK,eAAU,GAAG,CACrB,qCAAgB,CAAC,KAAK,CAAC,GAAG,CAAc,aAAa,CAAC,CACvD,CAAC,UAAU,CAAC;IAQb,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"jwt.strategy.js","sourceRoot":"","sources":["../../../../../libs/dynamic-api/src/modules/auth/strategies/jwt.strategy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+CAAoD;AACpD,+CAAoD;AACpD,oEAA+D;AAIxD,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,IAAA,2BAAgB,EAAC,uBAAQ,CAAC;IAKzD;QACE,KAAK,CAAC;YACJ,cAAc,EAAE,yBAAU,CAAC,2BAA2B,EAAE;YACxD,gBAAgB,EAAE,KAAK;YACvB,WAAW,EAAE,qCAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC;SACrD,CAAC,CAAC;QATK,eAAU,GAAG,CACrB,qCAAgB,CAAC,KAAK,CAAC,GAAG,CAAc,aAAa,CAAC,CACvD,CAAC,UAAU,CAAC;IAQb,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgC;QAC7C,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAjBY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;;GACA,WAAW,CAiBvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-aggregate.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/aggregate/base-aggregate.service.ts"],"names":[],"mappings":";;;AACA,uEAAqF;AAIrF,6CAA6C;AAG7C,MAAsB,oBACpB,SAAQ,sBAAmB;IAM3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,QAAyB;QACvC,IAAI,CAAC;YACH,IAAI,SAAmB,CAAC;YACxB,IAAI,KAAa,CAAC;YAClB,IAAI,SAAiB,CAAC;YAEtB,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAClC,MAAM,YAAY,GAAG,MAAM,IAAA,0CAAe,EAAS,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;gBACzE,SAAS,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC;gBACnC,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;gBAChC,SAAS,GAAG,YAAY,CAAC,kBAAkB,EAAE,CAAC;YAChD,CAAC;iBAAM,CAAC;gBACN,MAAM,MAAM,GAAG,MAAM,IAAA,oCAAS,EAAS,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;gBAC7D,SAAS,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;gBAC7B,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAC1B,SAAS,GAAG,CAAC,CAAC;YAChB,CAAC;YAED,IAAI,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;gBACtC,MAAM,OAAO,CAAC,GAAG,CACf,SAAS,CAAC,GAAG,CACX,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAChF,CACF,CAAC;YACJ,CAAC;YAED,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;QACjF,CAAC;QAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"base-aggregate.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/aggregate/base-aggregate.service.ts"],"names":[],"mappings":";;;AACA,uEAAqF;AAIrF,6CAA6C;AAG7C,MAAsB,oBACpB,SAAQ,sBAAmB;IAM3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,QAAyB;QACvC,IAAI,CAAC;YACH,IAAI,SAAmB,CAAC;YACxB,IAAI,KAAa,CAAC;YAClB,IAAI,SAAiB,CAAC;YAEtB,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAClC,MAAM,YAAY,GAAG,MAAM,IAAA,0CAAe,EAAS,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;gBACzE,SAAS,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC;gBACnC,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;gBAChC,SAAS,GAAG,YAAY,CAAC,kBAAkB,EAAE,CAAC;YAChD,CAAC;iBAAM,CAAC;gBACN,MAAM,MAAM,GAAG,MAAM,IAAA,oCAAS,EAAS,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;gBAC7D,SAAS,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;gBAC7B,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAC1B,SAAS,GAAG,CAAC,CAAC;YAChB,CAAC;YAED,IAAI,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;gBACtC,MAAM,OAAO,CAAC,GAAG,CACf,SAAS,CAAC,GAAG,CACX,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAChF,CACF,CAAC;YACJ,CAAC;YAED,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;QACjF,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACrC,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,QAAyB;QAC9C,MAAM,eAAe,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAC3C,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAC5F,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,eAAe,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QAE/F,OAAO,YAAY,IAAI,aAAa,CAAC;IACvC,CAAC;CACF;AAvDD,oDAuDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-create-many.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/create-many/base-create-many.service.ts"],"names":[],"mappings":";;;AACA,yDAAoD;AAIpD,6CAA6C;AAG7C,MAAsB,qBACpB,SAAQ,sBAAmB;IAM3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,QAA2B;QAC1C,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CACrC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,mCAAe,EAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CACrD,CAAC;YACF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK;iBACjC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;iBAChE,IAAI,EAAE;iBACN,IAAI,EAAE,CAAC;YAER,IAAI,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;gBACtC,MAAM,OAAO,CAAC,GAAG,CACf,SAAS,CAAC,GAAG,CACX,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,QAAkB,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAC1F,CACF,CAAC;YACJ,CAAC;YAED,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAW,CAAC,CAAC,CAAC;QAC/D,CAAC;QAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"base-create-many.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/create-many/base-create-many.service.ts"],"names":[],"mappings":";;;AACA,yDAAoD;AAIpD,6CAA6C;AAG7C,MAAsB,qBACpB,SAAQ,sBAAmB;IAM3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,QAA2B;QAC1C,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CACrC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,mCAAe,EAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CACrD,CAAC;YACF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK;iBACjC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;iBAChE,IAAI,EAAE;iBACN,IAAI,EAAE,CAAC;YAER,IAAI,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;gBACtC,MAAM,OAAO,CAAC,GAAG,CACf,SAAS,CAAC,GAAG,CACX,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,QAAkB,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAC1F,CACF,CAAC;YACJ,CAAC;YAED,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAW,CAAC,CAAC,CAAC;QAC/D,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACrC,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;CACF;AAnCD,sDAmCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-create-one.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/create-one/base-create-one.service.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AACpD,mCAAmC;AAQnC,6CAA6C;AAG7C,MAAsB,oBACpB,SAAQ,sBAAmB;IAS3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAwB;QACtC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB;gBACtC,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAC7B,SAAS,EACT,EAAE,QAAQ,EAAE,IAAA,kBAAS,EAAC,OAAO,CAAC,EAAE,EAChC,IAAI,CAAC,eAAe,CACrB;gBACD,CAAC,CAAC,OAAO,CAAC;YAEZ,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAA,mCAAe,EAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;YAEhF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"base-create-one.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/create-one/base-create-one.service.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AACpD,mCAAmC;AAQnC,6CAA6C;AAG7C,MAAsB,oBACpB,SAAQ,sBAAmB;IAS3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAwB;QACtC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB;gBACtC,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAC7B,SAAS,EACT,EAAE,QAAQ,EAAE,IAAA,kBAAS,EAAC,OAAO,CAAC,EAAE,EAChC,IAAI,CAAC,eAAe,CACrB;gBACD,CAAC,CAAC,OAAO,CAAC;YAEZ,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAA,mCAAe,EAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;YAEhF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,IAAI,EAAU,CAAC,IAAI,EAAE,CAAC;YAEzE,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YAC1E,CAAC;YAED,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;CACF;AArCD,oDAqCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-delete-many.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/delete-many/base-delete-many.service.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AAEpD,qCAA6C;AAG7C,6CAA6C;AAG7C,MAAsB,qBACpB,SAAQ,sBAAmB;IAG3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAa;QAC5B,IAAI,CAAC;YACH,IAAI,EAAgB,CAAC;YAErB,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACzB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK;qBAC/B,UAAU,CACT;oBACE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE;oBACjB,SAAS,EAAE,KAAK;iBACjB,EACD,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,CACrD;qBACA,IAAI,EAAE,CAAC;gBAER,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACN,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YACjE,CAAC;YAED,OAAO,IAAA,mCAAe,EAAC,sBAAe,EAAE,EAAE,YAAY,EAAE,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC;QAC7E,CAAC;QAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"base-delete-many.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/delete-many/base-delete-many.service.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AAEpD,qCAA6C;AAG7C,6CAA6C;AAG7C,MAAsB,qBACpB,SAAQ,sBAAmB;IAG3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAa;QAC5B,IAAI,CAAC;YACH,IAAI,EAAgB,CAAC;YAErB,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACzB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK;qBAC/B,UAAU,CACT;oBACE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE;oBACjB,SAAS,EAAE,KAAK;iBACjB,EACD,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,CACrD;qBACA,IAAI,EAAE,CAAC;gBAER,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACN,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YACjE,CAAC;YAED,OAAO,IAAA,mCAAe,EAAC,sBAAe,EAAE,EAAE,YAAY,EAAE,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC;QAC7E,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,IAAA,mCAAe,EAAC,sBAAe,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;CACF;AAjCD,sDAiCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-delete-one.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/delete-one/base-delete-one.service.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AAEpD,qCAA6C;AAG7C,6CAA6C;AAG7C,MAAsB,oBACpB,SAAQ,sBAAmB;IAG3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EAAU;QACxB,IAAI,CAAC;YACH,IAAI,EAAgB,CAAC;YAErB,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACzB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK;qBAC/B,SAAS,CACR;oBACE,GAAG,EAAE,EAAE;oBACP,SAAS,EAAE,KAAK;iBACjB,EACD,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,CACrD;qBACA,IAAI,EAAE,CAAC;gBAER,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACN,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YACtD,CAAC;YAED,OAAO,IAAA,mCAAe,EAAC,sBAAe,EAAE,EAAE,YAAY,EAAE,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC;QAC7E,CAAC;QAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"base-delete-one.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/delete-one/base-delete-one.service.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AAEpD,qCAA6C;AAG7C,6CAA6C;AAG7C,MAAsB,oBACpB,SAAQ,sBAAmB;IAG3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EAAU;QACxB,IAAI,CAAC;YACH,IAAI,EAAgB,CAAC;YAErB,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACzB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK;qBAC/B,SAAS,CACR;oBACE,GAAG,EAAE,EAAE;oBACP,SAAS,EAAE,KAAK;iBACjB,EACD,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,CACrD;qBACA,IAAI,EAAE,CAAC;gBAER,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACN,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YACtD,CAAC;YAED,OAAO,IAAA,mCAAe,EAAC,sBAAe,EAAE,EAAE,YAAY,EAAE,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC;QAC7E,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,IAAA,mCAAe,EAAC,sBAAe,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;CACF;AAjCD,oDAiCC"}
|
|
@@ -28,7 +28,7 @@ class BaseDuplicateManyService extends services_1.BaseService {
|
|
|
28
28
|
}
|
|
29
29
|
return { ...acc, [key]: value };
|
|
30
30
|
}, {}),
|
|
31
|
-
...partial
|
|
31
|
+
...partial,
|
|
32
32
|
})));
|
|
33
33
|
const documents = await this.model.find({ _id: { $in: duplicatedList.map(({ _id }) => _id.toString()) } })
|
|
34
34
|
.lean()
|
|
@@ -39,8 +39,9 @@ class BaseDuplicateManyService extends services_1.BaseService {
|
|
|
39
39
|
return documents.map((d) => this.buildInstance(d));
|
|
40
40
|
}
|
|
41
41
|
catch (error) {
|
|
42
|
-
|
|
43
|
-
this.
|
|
42
|
+
const err = error instanceof Error ? error : new Error(JSON.stringify(error));
|
|
43
|
+
this.handleMongoErrors(err, false);
|
|
44
|
+
this.handleDuplicateKeyError(err);
|
|
44
45
|
}
|
|
45
46
|
}
|
|
46
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-duplicate-many.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/duplicate-many/base-duplicate-many.service.ts"],"names":[],"mappings":";;;AACA,yDAAoD;AAGpD,yCAAuD;AAEvD,6CAA6C;AAG7C,MAAsB,wBACpB,SAAQ,sBAAmB;IAM3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAa,EAAE,OAAoC;QACrE,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,KAAK;iBACvC,IAAI,CAAC;gBACJ,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE;gBACjB,GAAG,CACD,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CACxD;aACF,CAAC;iBACD,IAAI,
|
|
1
|
+
{"version":3,"file":"base-duplicate-many.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/duplicate-many/base-duplicate-many.service.ts"],"names":[],"mappings":";;;AACA,yDAAoD;AAGpD,yCAAuD;AAEvD,6CAA6C;AAG7C,MAAsB,wBACpB,SAAQ,sBAAmB;IAM3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAa,EAAE,OAAoC;QACrE,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,KAAK;iBACvC,IAAI,CAAC;gBACJ,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE;gBACjB,GAAG,CACD,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CACxD;aACF,CAAC;iBACD,IAAI,EAAY;iBAChB,IAAI,EAAE,CAAC;YAER,IAAI,CAAC,eAAe,EAAE,MAAM,EAAE,CAAC;gBAC7B,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAChC,CAAC;YAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,mCAAe,EACvF,IAAI,CAAC,MAAM,EACX;gBACE,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;oBAChD,IACE,IAAA,gCAAuB,GACxB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;wBAChB,OAAO,GAAG,CAAC;oBACb,CAAC;oBAED,OAAO,EAAE,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC;gBAClC,CAAC,EAAE,EAAE,CAAC;gBACN,GAAG,OAAO;aACX,CACF,CAAC,CAAC,CAAC;YACJ,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;iBACzG,IAAI,EAAY;iBAChB,IAAI,EAAE,CAAC;YAER,IAAI,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;gBACtC,MAAM,OAAO,CAAC,GAAG,CACf,SAAS,CAAC,GAAG,CACX,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAChF,CACF,CAAC;YACJ,CAAC;YAED,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,MAAM,GAAG,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;YAC9E,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACnC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;CACF;AA7DD,4DA6DC"}
|
|
@@ -37,8 +37,9 @@ class BaseDuplicateOneService extends services_1.BaseService {
|
|
|
37
37
|
return this.buildInstance(document);
|
|
38
38
|
}
|
|
39
39
|
catch (error) {
|
|
40
|
-
|
|
41
|
-
this.
|
|
40
|
+
const err = error instanceof Error ? error : new Error(JSON.stringify(error));
|
|
41
|
+
this.handleMongoErrors(err, false);
|
|
42
|
+
this.handleDuplicateKeyError(err);
|
|
42
43
|
}
|
|
43
44
|
}
|
|
44
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-duplicate-one.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/duplicate-one/base-duplicate-one.service.ts"],"names":[],"mappings":";;;AACA,yDAAoD;AAGpD,yCAAuD;AAEvD,6CAA6C;AAG7C,MAAsB,uBACpB,SAAQ,sBAAmB;IAM3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EAAU,EAAE,OAAoC;QACjE,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,KAAK;iBACjC,OAAO,CAAC;gBACP,GAAG,EAAE,EAAE;gBACP,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;aAC7D,CAAC;iBACD,IAAI,
|
|
1
|
+
{"version":3,"file":"base-duplicate-one.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/duplicate-one/base-duplicate-one.service.ts"],"names":[],"mappings":";;;AACA,yDAAoD;AAGpD,yCAAuD;AAEvD,6CAA6C;AAG7C,MAAsB,uBACpB,SAAQ,sBAAmB;IAM3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EAAU,EAAE,OAAoC;QACjE,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,KAAK;iBACjC,OAAO,CAAC;gBACP,GAAG,EAAE,EAAE;gBACP,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;aAC7D,CAAC;iBACD,IAAI,EAAU;iBACd,IAAI,EAAE,CAAC;YAEV,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAChC,CAAC;YAED,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAA,mCAAe,EAAC,IAAI,CAAC,MAAM,EAAE;gBACnE,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;oBAC1D,IAAK,IAAA,gCAAuB,GAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;wBAC1D,OAAO,GAAG,CAAC;oBACb,CAAC;oBAED,OAAO,EAAE,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC;gBAClC,CAAC,EAAE,EAAE,CAAC;gBACN,GAAG,OAAO;aACX,CAAC,CAAC,CAAC;YACJ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,IAAI,EAAU,CAAC,IAAI,EAAE,CAAC;YAEzE,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YAC1E,CAAC;YAED,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,MAAM,GAAG,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;YAC9E,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACnC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;CACF;AAhDD,0DAgDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-get-many.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/get-many/base-get-many.service.ts"],"names":[],"mappings":";;;AAGA,6CAA6C;AAG7C,MAAsB,kBACpB,SAAQ,sBAAmB;IAI3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAc;QAC1B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK;aACjC,IAAI,CAAC;YACJ,GAAG,CACD,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CACjD;YACD,GAAG,CACD,KAAK,IAAI,EAAE,CACZ;SACF,CAAC;aACD,IAAI,
|
|
1
|
+
{"version":3,"file":"base-get-many.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/get-many/base-get-many.service.ts"],"names":[],"mappings":";;;AAGA,6CAA6C;AAG7C,MAAsB,kBACpB,SAAQ,sBAAmB;IAI3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAc;QAC1B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK;aACjC,IAAI,CAAC;YACJ,GAAG,CACD,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CACjD;YACD,GAAG,CACD,KAAK,IAAI,EAAE,CACZ;SACF,CAAC;aACD,IAAI,EAAY;aAChB,IAAI,EAAE,CAAC;QAER,IAAI,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACtC,MAAM,OAAO,CAAC,GAAG,CACf,SAAS,CAAC,GAAG,CACX,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAChF,CACF,CAAC;QACJ,CAAC;QAED,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC;CACF;AAhCD,gDAgCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-get-one.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/get-one/base-get-one.service.ts"],"names":[],"mappings":";;;AAGA,6CAA6C;AAG7C,MAAsB,iBACpB,SAAQ,sBAAmB;IAI3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU;QACrB,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK;iBAChC,OAAO,CAAC;gBACP,GAAG,EAAE,EAAE;gBACP,GAAG,CACD,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CACxD;aACF,CAAC;iBACD,IAAI,
|
|
1
|
+
{"version":3,"file":"base-get-one.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/get-one/base-get-one.service.ts"],"names":[],"mappings":";;;AAGA,6CAA6C;AAG7C,MAAsB,iBACpB,SAAQ,sBAAmB;IAI3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU;QACrB,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK;iBAChC,OAAO,CAAC;gBACP,GAAG,EAAE,EAAE;gBACP,GAAG,CACD,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CACxD;aACF,CAAC;iBACD,IAAI,EAAU;iBACd,IAAI,EAAE,CAAC;YAER,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAChC,CAAC;YAED,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YAC1E,CAAC;YAED,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;CACF;AAlCD,8CAkCC"}
|
|
@@ -29,8 +29,9 @@ class BaseReplaceOneService extends services_1.BaseService {
|
|
|
29
29
|
return this.buildInstance(document);
|
|
30
30
|
}
|
|
31
31
|
catch (error) {
|
|
32
|
-
|
|
33
|
-
this.
|
|
32
|
+
const err = error instanceof Error ? error : new Error(JSON.stringify(error));
|
|
33
|
+
this.handleMongoErrors(err, false);
|
|
34
|
+
this.handleDuplicateKeyError(err);
|
|
34
35
|
}
|
|
35
36
|
}
|
|
36
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-replace-one.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/replace-one/base-replace-one.service.ts"],"names":[],"mappings":";;;AACA,yDAAoD;AAIpD,6CAA6C;AAG7C,MAAsB,qBACpB,SAAQ,sBAAmB;IAM3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU,EAAE,OAAwB;QACnD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK;iBAChC,iBAAiB,CAChB;gBACE,GAAG,EAAE,EAAE;gBACP,GAAG,CACD,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CACxD;aACF,EACD,IAAA,mCAAe,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC;gBACE,GAAG,EAAE,IAAI;gBACT,mBAAmB,EAAE,IAAI;aAC1B,CACF;iBACA,IAAI,
|
|
1
|
+
{"version":3,"file":"base-replace-one.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/replace-one/base-replace-one.service.ts"],"names":[],"mappings":";;;AACA,yDAAoD;AAIpD,6CAA6C;AAG7C,MAAsB,qBACpB,SAAQ,sBAAmB;IAM3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU,EAAE,OAAwB;QACnD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK;iBAChC,iBAAiB,CAChB;gBACE,GAAG,EAAE,EAAE;gBACP,GAAG,CACD,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CACxD;aACF,EACD,IAAA,mCAAe,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC;gBACE,GAAG,EAAE,IAAI;gBACT,mBAAmB,EAAE,IAAI;aAC1B,CACF;iBACA,IAAI,EAAU;iBACd,IAAI,EAAE,CAAC;YAER,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAChC,CAAC;YAED,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YAC1E,CAAC;YAED,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,MAAM,GAAG,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;YAC9E,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACnC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;CACF;AA7CD,sDA6CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-update-many.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/update-many/base-update-many.service.ts"],"names":[],"mappings":";;;AAGA,6CAA6C;AAG7C,MAAsB,qBACpB,SAAQ,sBAAmB;IAI3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAa,EAAE,OAAwB;QACtD,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"base-update-many.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/update-many/base-update-many.service.ts"],"names":[],"mappings":";;;AAGA,6CAA6C;AAG7C,MAAsB,qBACpB,SAAQ,sBAAmB;IAI3B,YAAyC,KAAoB;QAC3D,KAAK,CAAC,KAAK,CAAC,CAAC;QAD0B,UAAK,GAAL,KAAK,CAAe;IAE7D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAa,EAAE,OAAwB;QACtD,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,EAAY,CAAC,IAAI,EAAE,CAAC;YAC1F,IAAI,YAAY,EAAE,MAAM,KAAK,GAAG,CAAC,MAAM,EAAE,CAAC;gBACxC,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAChC,CAAC;YAED,MAAM,IAAI,CAAC,KAAK;iBACf,UAAU,CACT;gBACE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE;gBACjB,GAAG,CACD,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CACxD;aACF,EACD,OAAO,CACR;iBACA,IAAI,EAAE;iBACN,IAAI,EAAE,CAAC;YAER,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,EAAY,CAAC,IAAI,EAAE,CAAC;YAEvF,IAAI,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;gBACtC,MAAM,OAAO,CAAC,GAAG,CACf,SAAS,CAAC,GAAG,CACX,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAChF,CACF,CAAC;YACJ,CAAC;YAED,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACrC,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;CACF;AA7CD,sDA6CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-update-one.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/update-one/base-update-one.service.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAInC,6CAA6C;AAG7C,MAAsB,oBACpB,SAAQ,sBAAmB;IAS3B,YACqB,KAAoB;QAEvC,KAAK,CAAC,KAAK,CAAC,CAAC;QAFM,UAAK,GAAL,KAAK,CAAe;IAGzC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EAAU,EAAE,OAAwB;QAClD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK;iBAChC,OAAO,CAAC;gBACP,GAAG,EAAE,EAAE;gBACP,GAAG,CACD,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CACxD;aACF,CAAC;iBACD,IAAI,
|
|
1
|
+
{"version":3,"file":"base-update-one.service.js","sourceRoot":"","sources":["../../../../libs/dynamic-api/src/routes/update-one/base-update-one.service.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAInC,6CAA6C;AAG7C,MAAsB,oBACpB,SAAQ,sBAAmB;IAS3B,YACqB,KAAoB;QAEvC,KAAK,CAAC,KAAK,CAAC,CAAC;QAFM,UAAK,GAAL,KAAK,CAAe;IAGzC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EAAU,EAAE,OAAwB;QAClD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK;iBAChC,OAAO,CAAC;gBACP,GAAG,EAAE,EAAE;gBACP,GAAG,CACD,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CACxD;aACF,CAAC;iBACD,IAAI,EAAU;iBACd,IAAI,EAAE,CAAC;YAER,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAChC,CAAC;YAED,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB;gBACpC,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAC7B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAC5B,EAAE,EAAE,EAAE,MAAM,EAAE,IAAA,kBAAS,EAAC,OAAO,CAAC,EAAE,EAClC,IAAI,CAAC,eAAe,CACrB;gBACD,CAAC,CAAC,OAAO,CAAC;YAEZ,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,KAAK;iBACvC,gBAAgB,CACf,EAAE,GAAG,EAAE,EAAE,EAAE,EACX,EAAE,IAAI,EAAE,MAAM,EAAE,EAChB,EAAE,GAAG,EAAE,IAAI,EAAE,CACd;iBACA,IAAI,EAAU;iBACd,IAAI,EAAE,CAAC;YAER,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YACjF,CAAC;YAED,OAAO,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QAC7C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACrC,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;CACF;AA3DD,oDA2DC"}
|
|
@@ -16,7 +16,7 @@ export declare abstract class BaseService<Entity extends BaseEntity> {
|
|
|
16
16
|
protected constructor(model: Model<Entity>);
|
|
17
17
|
get isSoftDeletable(): boolean;
|
|
18
18
|
protected verifyArguments(...args: unknown[]): void;
|
|
19
|
-
protected aggregateDocumentsWithAbilityPredicate(pipeline:
|
|
19
|
+
protected aggregateDocumentsWithAbilityPredicate(pipeline: PipelineStage[]): Promise<Entity[]>;
|
|
20
20
|
protected findManyDocumentsWithAbilityPredicate(conditions?: FilterQuery<Entity>): Promise<Entity[]>;
|
|
21
21
|
protected findOneDocumentWithAbilityPredicate(_id: string | Schema.Types.ObjectId | undefined, conditions?: FilterQuery<Entity>, authAbilityPredicate?: AuthAbilityPredicate<Entity>): Promise<Entity>;
|
|
22
22
|
protected aggregateDocuments<T extends BaseEntity>(entity: Type<T>, pipeline: PipelineStage[]): Promise<T[]>;
|
|
@@ -30,8 +30,8 @@ export declare abstract class BaseService<Entity extends BaseEntity> {
|
|
|
30
30
|
protected deleteOneDocument<T extends BaseEntity>(entity: Type<T>, id: string): Promise<DeleteResult>;
|
|
31
31
|
protected buildInstance(document: Entity): Entity;
|
|
32
32
|
protected handleAbilityPredicate(document: Entity, authAbilityPredicate?: AuthAbilityPredicate<Entity>): void;
|
|
33
|
-
protected handleDuplicateKeyError(error:
|
|
34
|
-
protected handleMongoErrors(error:
|
|
33
|
+
protected handleDuplicateKeyError(error: unknown, reThrow?: boolean): void;
|
|
34
|
+
protected handleMongoErrors(error: unknown, reThrow?: boolean): void;
|
|
35
35
|
protected handleDocumentNotFound(): void;
|
|
36
36
|
protected addDocumentId<T extends BaseEntity>(document: T): T;
|
|
37
37
|
}
|
|
@@ -26,7 +26,7 @@ class BaseService {
|
|
|
26
26
|
return paths.includes('deletedAt') && paths.includes('isDeleted');
|
|
27
27
|
}
|
|
28
28
|
verifyArguments(...args) {
|
|
29
|
-
if (args.
|
|
29
|
+
if (args.includes(undefined)) {
|
|
30
30
|
throw new common_1.BadRequestException('Invalid or missing argument');
|
|
31
31
|
}
|
|
32
32
|
}
|
|
@@ -148,8 +148,9 @@ class BaseService {
|
|
|
148
148
|
}
|
|
149
149
|
}
|
|
150
150
|
handleDuplicateKeyError(error, reThrow = true) {
|
|
151
|
-
|
|
152
|
-
|
|
151
|
+
const mongoError = error;
|
|
152
|
+
if (mongoError.code === 11000) {
|
|
153
|
+
const properties = Object.entries(mongoError.keyValue ?? {})
|
|
153
154
|
.filter(([key]) => key !== 'deletedAt')
|
|
154
155
|
.map(([key, value]) => `${key} '${value}'`);
|
|
155
156
|
throw new common_1.ConflictException(properties.length === 1
|
|
@@ -162,14 +163,23 @@ class BaseService {
|
|
|
162
163
|
if (error instanceof common_1.HttpException) {
|
|
163
164
|
throw error;
|
|
164
165
|
}
|
|
165
|
-
|
|
166
|
+
let errorMessage;
|
|
167
|
+
if (error instanceof Error) {
|
|
168
|
+
errorMessage = error.message;
|
|
169
|
+
}
|
|
170
|
+
else {
|
|
171
|
+
const errRecord = error;
|
|
172
|
+
errorMessage = typeof errRecord.message === 'string' ? errRecord.message : JSON.stringify(error);
|
|
173
|
+
}
|
|
174
|
+
throw new common_1.ServiceUnavailableException(errorMessage);
|
|
166
175
|
}
|
|
167
176
|
handleMongoErrors(error, reThrow = true) {
|
|
168
|
-
|
|
177
|
+
const mongoError = error;
|
|
178
|
+
if (mongoError.name === 'CastError') {
|
|
169
179
|
throw new common_1.NotFoundException(`${this.entity?.name ?? 'Document'} not found`);
|
|
170
180
|
}
|
|
171
|
-
if (
|
|
172
|
-
const errorDetails = Object.values(
|
|
181
|
+
if (mongoError.name === 'ValidationError') {
|
|
182
|
+
const errorDetails = Object.values(mongoError.errors ?? {})?.map(({ properties }) => properties.message);
|
|
173
183
|
throw new common_1.BadRequestException(errorDetails?.length ? errorDetails : ['Invalid payload']);
|
|
174
184
|
}
|
|
175
185
|
if (!reThrow) {
|
|
@@ -178,7 +188,15 @@ class BaseService {
|
|
|
178
188
|
if (error instanceof common_1.HttpException) {
|
|
179
189
|
throw error;
|
|
180
190
|
}
|
|
181
|
-
|
|
191
|
+
let errorMessage;
|
|
192
|
+
if (error instanceof Error) {
|
|
193
|
+
errorMessage = error.message;
|
|
194
|
+
}
|
|
195
|
+
else {
|
|
196
|
+
const errRecord = error;
|
|
197
|
+
errorMessage = typeof errRecord.message === 'string' ? errRecord.message : JSON.stringify(error);
|
|
198
|
+
}
|
|
199
|
+
throw new common_1.ServiceUnavailableException(errorMessage);
|
|
182
200
|
}
|
|
183
201
|
handleDocumentNotFound() {
|
|
184
202
|
throw new common_1.NotFoundException('Document not found');
|