arkos 0.0.8 → 0.0.9
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/app.d.ts.map +1 -1
- package/dist/app.js +2 -2
- package/dist/app.js.map +1 -1
- package/dist/modules/auth/auth.controller.d.ts +1 -1
- package/dist/modules/auth/auth.controller.d.ts.map +1 -1
- package/dist/modules/auth/auth.controller.js +64 -73
- package/dist/modules/auth/auth.controller.js.map +1 -1
- package/dist/modules/auth/auth.service.d.ts.map +1 -1
- package/dist/modules/auth/auth.service.js +3 -4
- package/dist/modules/auth/auth.service.js.map +1 -1
- package/dist/modules/base/base.service.d.ts.map +1 -1
- package/dist/modules/base/base.service.js +2 -2
- package/dist/modules/base/base.service.js.map +1 -1
- package/dist/server.d.ts +2 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +4 -2
- package/dist/server.js.map +1 -1
- package/dist/utils/features/api.features.d.ts +1 -1
- package/dist/utils/features/api.features.d.ts.map +1 -1
- package/dist/utils/features/api.features.js +36 -38
- package/dist/utils/features/api.features.js.map +1 -1
- package/package.json +1 -1
package/dist/app.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AA6B9B,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,GAAG,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,QAAA,IAAI,WAAW,EAAE,WAAW,CAAC;AAE7B,wBAAgB,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,mBA6DnE;AAED,wBAAgB,cAAc,uBAG7B;AAED,OAAO,EAAE,WAAW,EAAE,CAAC"}
|
package/dist/app.js
CHANGED
|
@@ -53,6 +53,7 @@ const dotenv = __importStar(require("dotenv"));
|
|
|
53
53
|
const compression_1 = __importDefault(require("compression"));
|
|
54
54
|
const base_middlewares_1 = require("./modules/base/base.middlewares");
|
|
55
55
|
const prisma_helpers_1 = require("./utils/features/prisma.helpers");
|
|
56
|
+
const server_1 = require("./server");
|
|
56
57
|
const ENV = process.env.NODE_ENV || "development";
|
|
57
58
|
let envPath = ".env";
|
|
58
59
|
if (ENV === "production") {
|
|
@@ -103,8 +104,7 @@ function bootstrap(app, configs) {
|
|
|
103
104
|
parseBoolean: true,
|
|
104
105
|
parseNumber: true,
|
|
105
106
|
}));
|
|
106
|
-
app.use((0, prisma_helpers_1.checkDatabaseConnection)(
|
|
107
|
-
// const specs = swaggerJsdoc(options)
|
|
107
|
+
app.use((0, prisma_helpers_1.checkDatabaseConnection)(server_1.prisma));
|
|
108
108
|
app.use(base_middlewares_1.handleRequestLogs);
|
|
109
109
|
if (configs.authentication)
|
|
110
110
|
app.use("/api", auth_router_1.default);
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.controller.d.ts","sourceRoot":"","sources":["../../../src/modules/auth/auth.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiB,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"auth.controller.d.ts","sourceRoot":"","sources":["../../../src/modules/auth/auth.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiB,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAMzE,eAAO,MAAM,kBAAkB;;;;;;;;;;CAU9B,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,cAAa,GAAQ;;;;;;;;;CAqc1D,CAAC"}
|
|
@@ -8,7 +8,7 @@ const catch_async_1 = __importDefault(require("../error-handler/utils/catch-asyn
|
|
|
8
8
|
const app_error_1 = __importDefault(require("../error-handler/utils/app-error"));
|
|
9
9
|
const auth_service_1 = __importDefault(require("./auth.service"));
|
|
10
10
|
const base_service_1 = __importDefault(require("../base/base.service"));
|
|
11
|
-
const
|
|
11
|
+
const server_1 = require("../../server");
|
|
12
12
|
exports.excludedUserFields = {
|
|
13
13
|
password: false,
|
|
14
14
|
passwordChangedAt: false,
|
|
@@ -21,7 +21,6 @@ exports.excludedUserFields = {
|
|
|
21
21
|
active: false,
|
|
22
22
|
};
|
|
23
23
|
const authControllerFactory = (middlewares = {}) => {
|
|
24
|
-
const prisma = app_1.initConfigs.prisma;
|
|
25
24
|
return {
|
|
26
25
|
getMe: (0, catch_async_1.default)(async (req, res, next) => {
|
|
27
26
|
Object.keys(exports.excludedUserFields).forEach((key) => {
|
|
@@ -29,7 +28,6 @@ const authControllerFactory = (middlewares = {}) => {
|
|
|
29
28
|
delete req.user[key];
|
|
30
29
|
});
|
|
31
30
|
if (middlewares?.afterGetMe) {
|
|
32
|
-
;
|
|
33
31
|
req.responseData = req.user;
|
|
34
32
|
req.responseStatus = 200;
|
|
35
33
|
return next();
|
|
@@ -37,12 +35,11 @@ const authControllerFactory = (middlewares = {}) => {
|
|
|
37
35
|
res.status(200).json(req.user);
|
|
38
36
|
}),
|
|
39
37
|
logout: (0, catch_async_1.default)(async (req, res, next) => {
|
|
40
|
-
res.cookie(
|
|
38
|
+
res.cookie("jwt", "no-token", {
|
|
41
39
|
expires: new Date(Date.now() + 10 * 1000),
|
|
42
40
|
httpOnly: true,
|
|
43
41
|
});
|
|
44
42
|
if (middlewares?.afterLogout) {
|
|
45
|
-
;
|
|
46
43
|
req.responseData = null;
|
|
47
44
|
req.responseStatus = 204;
|
|
48
45
|
return next();
|
|
@@ -52,28 +49,27 @@ const authControllerFactory = (middlewares = {}) => {
|
|
|
52
49
|
login: (0, catch_async_1.default)(async (req, res, next) => {
|
|
53
50
|
const { email, password } = req.body;
|
|
54
51
|
if (!email || !password) {
|
|
55
|
-
return next(new app_error_1.default(
|
|
52
|
+
return next(new app_error_1.default("Please provide an email and a password", 400));
|
|
56
53
|
}
|
|
57
|
-
const user = await prisma.user.findUnique({ where: { email } });
|
|
54
|
+
const user = await server_1.prisma.user.findUnique({ where: { email } });
|
|
58
55
|
if (!user ||
|
|
59
56
|
!(await auth_service_1.default.isCorrectPassword(password, user.password))) {
|
|
60
|
-
return next(new app_error_1.default(
|
|
57
|
+
return next(new app_error_1.default("Incorrect email or password", 401));
|
|
61
58
|
}
|
|
62
59
|
if (!user.isVerified)
|
|
63
|
-
return next(new app_error_1.default(
|
|
60
|
+
return next(new app_error_1.default("You must verifiy your email in order to proceed!", 423));
|
|
64
61
|
const token = auth_service_1.default.signJwtToken(user.id);
|
|
65
62
|
const cookieOptions = {
|
|
66
63
|
expires: new Date(Date.now() +
|
|
67
64
|
Number(process.env.JWT_COOKIE_EXPIRES_IN) * 24 * 60 * 60 * 1000),
|
|
68
65
|
httpOnly: true,
|
|
69
|
-
secure: req.secure || req.headers[
|
|
70
|
-
sameSite: process.env.JWT_SECURE !=
|
|
66
|
+
secure: req.secure || req.headers["x-forwarded-proto"] === "https",
|
|
67
|
+
sameSite: process.env.JWT_SECURE != "false" ? "lax" : "none",
|
|
71
68
|
};
|
|
72
|
-
if (process.env.NODE_ENV ===
|
|
69
|
+
if (process.env.NODE_ENV === "production")
|
|
73
70
|
cookieOptions.secure = true;
|
|
74
|
-
res.cookie(
|
|
71
|
+
res.cookie("jwt", token, cookieOptions);
|
|
75
72
|
if (middlewares?.afterLogin) {
|
|
76
|
-
;
|
|
77
73
|
req.responseData = { token };
|
|
78
74
|
req.responseStatus = 200;
|
|
79
75
|
return next();
|
|
@@ -81,7 +77,7 @@ const authControllerFactory = (middlewares = {}) => {
|
|
|
81
77
|
res.status(200).send();
|
|
82
78
|
}),
|
|
83
79
|
signup: (0, catch_async_1.default)(async (req, res, next) => {
|
|
84
|
-
const userService = base_service_1.default[
|
|
80
|
+
const userService = base_service_1.default["user"];
|
|
85
81
|
const user = await userService.createOne(req.body);
|
|
86
82
|
// const user = await prisma.user.create({
|
|
87
83
|
// data: {
|
|
@@ -90,7 +86,6 @@ const authControllerFactory = (middlewares = {}) => {
|
|
|
90
86
|
// } as any,
|
|
91
87
|
// })
|
|
92
88
|
if (middlewares?.afterSignup) {
|
|
93
|
-
;
|
|
94
89
|
req.responseData = { data: user };
|
|
95
90
|
req.responseStatus = 201;
|
|
96
91
|
return next();
|
|
@@ -104,32 +99,32 @@ const authControllerFactory = (middlewares = {}) => {
|
|
|
104
99
|
const { otp, email } = req.body;
|
|
105
100
|
// Check if email and OTP are provided
|
|
106
101
|
if (!email || !otp) {
|
|
107
|
-
return next(new app_error_1.default(
|
|
108
|
-
error:
|
|
102
|
+
return next(new app_error_1.default("Email and otp are required", 400, {
|
|
103
|
+
error: "Missing parameters",
|
|
109
104
|
}));
|
|
110
105
|
}
|
|
111
|
-
const user = await prisma.user.findUnique({
|
|
106
|
+
const user = await server_1.prisma.user.findUnique({
|
|
112
107
|
where: { email },
|
|
113
108
|
});
|
|
114
109
|
if (!user) {
|
|
115
|
-
return next(new app_error_1.default(
|
|
116
|
-
error:
|
|
110
|
+
return next(new app_error_1.default("No account found with this email.", 400, {
|
|
111
|
+
error: "user_not_found",
|
|
117
112
|
}));
|
|
118
113
|
}
|
|
119
114
|
if (user.isVerified)
|
|
120
|
-
return next(new app_error_1.default(
|
|
121
|
-
error:
|
|
115
|
+
return next(new app_error_1.default("Your email is already verified.", 400, {
|
|
116
|
+
error: "already_verified",
|
|
122
117
|
}));
|
|
123
118
|
if (user.verificationOtp !== otp)
|
|
124
|
-
return next(new app_error_1.default(
|
|
125
|
-
error:
|
|
119
|
+
return next(new app_error_1.default("The OTP is incorrect.", 400, {
|
|
120
|
+
error: "invalid_otp",
|
|
126
121
|
}));
|
|
127
122
|
if (user.verificationOptExpiresAt &&
|
|
128
123
|
new Date() > user.verificationOptExpiresAt)
|
|
129
|
-
return next(new app_error_1.default(
|
|
130
|
-
error:
|
|
124
|
+
return next(new app_error_1.default("The OTP has expired. Please request a new one.", 400, {
|
|
125
|
+
error: "expired_otp",
|
|
131
126
|
}));
|
|
132
|
-
await prisma.user.update({
|
|
127
|
+
await server_1.prisma.user.update({
|
|
133
128
|
where: { email },
|
|
134
129
|
data: {
|
|
135
130
|
isVerified: true,
|
|
@@ -138,24 +133,23 @@ const authControllerFactory = (middlewares = {}) => {
|
|
|
138
133
|
},
|
|
139
134
|
});
|
|
140
135
|
if (middlewares?.afterVerifyEmail) {
|
|
141
|
-
;
|
|
142
136
|
req.additionalData = {
|
|
143
137
|
user,
|
|
144
138
|
};
|
|
145
139
|
req.responseData = {
|
|
146
|
-
message:
|
|
140
|
+
message: "Email verified successfully.",
|
|
147
141
|
};
|
|
148
142
|
req.responseStatus = 200;
|
|
149
143
|
return next();
|
|
150
144
|
}
|
|
151
145
|
res.status(200).json({
|
|
152
|
-
message:
|
|
146
|
+
message: "Email verified successfully.",
|
|
153
147
|
});
|
|
154
148
|
}),
|
|
155
149
|
forgotPassword: (0, catch_async_1.default)(async (req, res, next) => {
|
|
156
150
|
if (!req.body.email)
|
|
157
|
-
return next(new app_error_1.default(
|
|
158
|
-
const user = await prisma.user.findUnique({
|
|
151
|
+
return next(new app_error_1.default("Email is required in order to trigger forgot password", 400));
|
|
152
|
+
const user = await server_1.prisma.user.findUnique({
|
|
159
153
|
where: {
|
|
160
154
|
email: req.body.email,
|
|
161
155
|
},
|
|
@@ -163,10 +157,10 @@ const authControllerFactory = (middlewares = {}) => {
|
|
|
163
157
|
if (!user ||
|
|
164
158
|
user?.active === false ||
|
|
165
159
|
user?.deletedSelfAccount === true)
|
|
166
|
-
return next(new app_error_1.default(
|
|
160
|
+
return next(new app_error_1.default("User not found!", 404));
|
|
167
161
|
if (!user.isVerified)
|
|
168
|
-
return next(new app_error_1.default(
|
|
169
|
-
error:
|
|
162
|
+
return next(new app_error_1.default("You need to verify your account to proceed", 423, {
|
|
163
|
+
error: "email_verification_required",
|
|
170
164
|
}));
|
|
171
165
|
// Verifica se um OTP foi solicitado recentemente
|
|
172
166
|
if (user.passwordResetOtpExpiresAt) {
|
|
@@ -181,7 +175,7 @@ const authControllerFactory = (middlewares = {}) => {
|
|
|
181
175
|
}
|
|
182
176
|
const resetOtp = Math.floor(100000 + Math.random() * 900000).toString();
|
|
183
177
|
const resetOtpExpiresAt = new Date(Date.now() + 15 * 60 * 1000);
|
|
184
|
-
await prisma.user.update({
|
|
178
|
+
await server_1.prisma.user.update({
|
|
185
179
|
where: {
|
|
186
180
|
id: user.id,
|
|
187
181
|
},
|
|
@@ -191,56 +185,55 @@ const authControllerFactory = (middlewares = {}) => {
|
|
|
191
185
|
},
|
|
192
186
|
});
|
|
193
187
|
if (middlewares?.afterForgotPassword) {
|
|
194
|
-
;
|
|
195
188
|
req.additionalData = {
|
|
196
189
|
user,
|
|
197
190
|
resetOtp,
|
|
198
191
|
};
|
|
199
192
|
req.responseData = {
|
|
200
|
-
status:
|
|
201
|
-
message:
|
|
193
|
+
status: "success",
|
|
194
|
+
message: "OTP code sent successfully!",
|
|
202
195
|
};
|
|
203
196
|
req.responseStatus = 200;
|
|
204
197
|
return next();
|
|
205
198
|
}
|
|
206
199
|
res.status(200).json({
|
|
207
|
-
status:
|
|
208
|
-
message:
|
|
200
|
+
status: "success",
|
|
201
|
+
message: "OTP code sent successfully!",
|
|
209
202
|
});
|
|
210
203
|
}),
|
|
211
204
|
resetPassword: (0, catch_async_1.default)(async (req, res, next) => {
|
|
212
205
|
const { email, otp, newPassword } = req.body;
|
|
213
206
|
if (!otp || !email || !newPassword)
|
|
214
|
-
return next(new app_error_1.default(
|
|
207
|
+
return next(new app_error_1.default("email, otp and newPassword are required to reset password", 400));
|
|
215
208
|
if (!auth_service_1.default.isPasswordStrong(newPassword))
|
|
216
|
-
return next(new app_error_1.default(
|
|
217
|
-
const user = await prisma.user.findUnique({
|
|
209
|
+
return next(new app_error_1.default("Password must contain at least one uppercase letter, one lowercase letter, and one number", 400));
|
|
210
|
+
const user = await server_1.prisma.user.findUnique({
|
|
218
211
|
where: { email },
|
|
219
212
|
});
|
|
220
213
|
if (!user?.passwordResetOtp)
|
|
221
|
-
return next(new app_error_1.default(
|
|
222
|
-
error:
|
|
214
|
+
return next(new app_error_1.default("You must request an otp in order to reset password!", 400, {
|
|
215
|
+
error: "no_requested_otp",
|
|
223
216
|
}));
|
|
224
217
|
if (await auth_service_1.default.isCorrectPassword(newPassword, user?.password))
|
|
225
|
-
return next(new app_error_1.default(
|
|
226
|
-
error:
|
|
218
|
+
return next(new app_error_1.default("New password must not be the same as last one!", 400, {
|
|
219
|
+
error: "new_password_equals_last_password",
|
|
227
220
|
}));
|
|
228
221
|
if (!user ||
|
|
229
222
|
user?.active === false ||
|
|
230
223
|
user?.deletedSelfAccount === true)
|
|
231
|
-
return next(new app_error_1.default(
|
|
224
|
+
return next(new app_error_1.default("User not found!", 404));
|
|
232
225
|
if (!user.isVerified)
|
|
233
|
-
return next(new app_error_1.default(
|
|
234
|
-
error:
|
|
226
|
+
return next(new app_error_1.default("You need to verify your account to proceed", 423, {
|
|
227
|
+
error: "email_verification_required",
|
|
235
228
|
}));
|
|
236
229
|
if (!user.passwordResetOtp || !user.passwordResetOtpExpiresAt)
|
|
237
|
-
return next(new app_error_1.default(
|
|
230
|
+
return next(new app_error_1.default("Invalid or expired OTP.", 400));
|
|
238
231
|
const now = new Date();
|
|
239
232
|
if (now > new Date(user.passwordResetOtpExpiresAt))
|
|
240
|
-
return next(new app_error_1.default(
|
|
233
|
+
return next(new app_error_1.default("OTP expired. Please request a new one.", 400));
|
|
241
234
|
if (user.passwordResetOtp != otp)
|
|
242
|
-
return next(new app_error_1.default(
|
|
243
|
-
await prisma.user.update({
|
|
235
|
+
return next(new app_error_1.default("Invalid OTP. Please try again.", 400));
|
|
236
|
+
await server_1.prisma.user.update({
|
|
244
237
|
where: { id: user.id },
|
|
245
238
|
data: {
|
|
246
239
|
password: await auth_service_1.default.hashPassword(newPassword),
|
|
@@ -250,44 +243,43 @@ const authControllerFactory = (middlewares = {}) => {
|
|
|
250
243
|
},
|
|
251
244
|
});
|
|
252
245
|
if (middlewares?.afterResetPassword) {
|
|
253
|
-
;
|
|
254
246
|
req.additionalData = {
|
|
255
247
|
user,
|
|
256
248
|
};
|
|
257
249
|
req.responseData = {
|
|
258
|
-
status:
|
|
259
|
-
message:
|
|
250
|
+
status: "success",
|
|
251
|
+
message: "Password reset successfully!",
|
|
260
252
|
};
|
|
261
253
|
req.responseStatus = 200;
|
|
262
254
|
return next();
|
|
263
255
|
}
|
|
264
256
|
res.status(200).json({
|
|
265
|
-
status:
|
|
266
|
-
message:
|
|
257
|
+
status: "success",
|
|
258
|
+
message: "Password reset successfully!",
|
|
267
259
|
});
|
|
268
260
|
}),
|
|
269
261
|
updatePassword: (0, catch_async_1.default)(async (req, res, next) => {
|
|
270
262
|
const { currentPassword, newPassword } = req.body;
|
|
271
263
|
if (!currentPassword || !newPassword)
|
|
272
|
-
return next(new app_error_1.default(
|
|
264
|
+
return next(new app_error_1.default("currentPassword and newPassword are required", 400));
|
|
273
265
|
const user = req.user;
|
|
274
266
|
if (!user ||
|
|
275
267
|
user?.active === false ||
|
|
276
268
|
user?.deletedSelfAccount === true)
|
|
277
|
-
return next(new app_error_1.default(
|
|
269
|
+
return next(new app_error_1.default("User not found!", 404));
|
|
278
270
|
if (!user.isVerified)
|
|
279
|
-
return next(new app_error_1.default(
|
|
280
|
-
error:
|
|
271
|
+
return next(new app_error_1.default("You need to verify your account to proceed", 423, {
|
|
272
|
+
error: "email_verification_required",
|
|
281
273
|
}));
|
|
282
274
|
// Check if the current password is correct
|
|
283
275
|
const isPasswordCorrect = await auth_service_1.default.isCorrectPassword(String(currentPassword), String(user.password));
|
|
284
276
|
if (!isPasswordCorrect)
|
|
285
|
-
return next(new app_error_1.default(
|
|
277
|
+
return next(new app_error_1.default("Current password is incorrect.", 400));
|
|
286
278
|
// Check password strength (optional but recommended)
|
|
287
279
|
if (!auth_service_1.default.isPasswordStrong(String(newPassword)))
|
|
288
|
-
return next(new app_error_1.default(
|
|
280
|
+
return next(new app_error_1.default("Password must contain at least one uppercase letter, one lowercase letter, and one number", 400));
|
|
289
281
|
// Update the password
|
|
290
|
-
await prisma.user.update({
|
|
282
|
+
await server_1.prisma.user.update({
|
|
291
283
|
where: { id: user.id },
|
|
292
284
|
data: {
|
|
293
285
|
password: await auth_service_1.default.hashPassword(newPassword),
|
|
@@ -295,20 +287,19 @@ const authControllerFactory = (middlewares = {}) => {
|
|
|
295
287
|
},
|
|
296
288
|
});
|
|
297
289
|
if (middlewares?.afterUpdatePassword) {
|
|
298
|
-
;
|
|
299
290
|
req.additionalData = {
|
|
300
291
|
user,
|
|
301
292
|
};
|
|
302
293
|
req.responseData = {
|
|
303
|
-
status:
|
|
304
|
-
message:
|
|
294
|
+
status: "success",
|
|
295
|
+
message: "Password updated successfully!",
|
|
305
296
|
};
|
|
306
297
|
req.responseStatus = 200;
|
|
307
298
|
return next();
|
|
308
299
|
}
|
|
309
300
|
res.status(200).json({
|
|
310
|
-
status:
|
|
311
|
-
message:
|
|
301
|
+
status: "success",
|
|
302
|
+
message: "Password updated successfully!",
|
|
312
303
|
});
|
|
313
304
|
}),
|
|
314
305
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.controller.js","sourceRoot":"","sources":["../../../src/modules/auth/auth.controller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth.controller.js","sourceRoot":"","sources":["../../../src/modules/auth/auth.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../src/modules/auth/auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,EACX,cAAc,EACd,iBAAiB,EACjB,IAAI,EAEL,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../src/modules/auth/auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,EACX,cAAc,EACd,iBAAiB,EACjB,IAAI,EAEL,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAM1D,cAAM,WAAW;IACf,YAAY,CACV,EAAE,EAAE,MAAM,GAAG,MAAM,EACnB,SAAS,GAAE,MAAM,GAAG,MAA2C,EAC/D,MAAM,GAAE,MAAwD,GAC/D,MAAM;IAMH,iBAAiB,CAAC,iBAAiB,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAIjE,YAAY,CAAC,QAAQ,EAAE,MAAM;IAInC,gBAAgB,CAAC,QAAQ,EAAE,MAAM;IAQjC,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM;IAYnD,cAAc,CAClB,KAAK,EAAE,MAAM,EACb,MAAM,GAAE,MAAgC,GACvC,OAAO,CAAC,cAAc,CAAC;IAS1B,yBAAyB,CACvB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,iBAAiB,EACzB,SAAS,EAAE,MAAM;IA8BnB,YAAY,4DA2EV;IAEF,2BAA2B,CACzB,WAAW,EAAE,WAAW,GAAG,SAAS,EACpC,MAAM,EAAE,iBAAiB,EACzB,SAAS,EAAE,MAAM;CAapB;AAED,QAAA,MAAM,WAAW,aAAoB,CAAC;AAEtC,eAAe,WAAW,CAAC"}
|
|
@@ -9,6 +9,7 @@ const catch_async_1 = __importDefault(require("../error-handler/utils/catch-asyn
|
|
|
9
9
|
const app_error_1 = __importDefault(require("../error-handler/utils/app-error"));
|
|
10
10
|
const base_middlewares_1 = require("../base/base.middlewares");
|
|
11
11
|
const app_1 = require("../../app");
|
|
12
|
+
const server_1 = require("../../server");
|
|
12
13
|
class AuthService {
|
|
13
14
|
signJwtToken(id, expiresIn = process.env.JWT_EXPIRES_IN || "1h", secret = process.env.JWT_SECRET || "your_default_secret") {
|
|
14
15
|
return jsonwebtoken_1.default.sign({ id }, secret, {
|
|
@@ -45,11 +46,10 @@ class AuthService {
|
|
|
45
46
|
});
|
|
46
47
|
}
|
|
47
48
|
handleActionAccessControl(authConfigs, action, modelName) {
|
|
48
|
-
const prisma = app_1.initConfigs.prisma;
|
|
49
49
|
return (0, catch_async_1.default)(async (req, res, next) => {
|
|
50
50
|
if (req.user) {
|
|
51
51
|
const user = req.user;
|
|
52
|
-
const permissions = await prisma.authPermission.count({
|
|
52
|
+
const permissions = await server_1.prisma.authPermission.count({
|
|
53
53
|
where: {
|
|
54
54
|
resource: modelName,
|
|
55
55
|
action,
|
|
@@ -65,7 +65,6 @@ class AuthService {
|
|
|
65
65
|
}
|
|
66
66
|
authenticate = (0, catch_async_1.default)(async (req, res, next) => {
|
|
67
67
|
let token;
|
|
68
|
-
const prisma = app_1.initConfigs.prisma;
|
|
69
68
|
if (req?.headers?.authorization &&
|
|
70
69
|
req?.headers?.authorization.startsWith("Bearer")) {
|
|
71
70
|
token = req?.headers?.authorization.split(" ")[1];
|
|
@@ -84,7 +83,7 @@ class AuthService {
|
|
|
84
83
|
}
|
|
85
84
|
if (!decoded?.id)
|
|
86
85
|
return next(new app_error_1.default("Your auth token is invalid, please login again.", 401));
|
|
87
|
-
const user = await prisma.user.findUnique({
|
|
86
|
+
const user = await server_1.prisma.user.findUnique({
|
|
88
87
|
where: { id: String(decoded.id) },
|
|
89
88
|
include: {
|
|
90
89
|
roles: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/modules/auth/auth.service.ts"],"names":[],"mappings":";;;;;AAAA,gEAA+B;AAC/B,oDAA4B;AAQ5B,qFAA4D;AAE5D,iFAAwD;AACxD,+DAAoD;AACpD,mCAAwC;
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/modules/auth/auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.service.d.ts","sourceRoot":"","sources":["../../../src/modules/base/base.service.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,cAAc,EACf,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"base.service.d.ts","sourceRoot":"","sources":["../../../src/modules/base/base.service.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,cAAc,EACf,MAAM,oCAAoC,CAAC;AAS5C,QAAA,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAM,CAAC;AAErD,qBAAa,WAAW;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,cAAc,CAAC;IAC/B,8BAA8B,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxD,0BAA0B,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEpD,MAAM,EAAE,GAAG,CAAC;gBAEA,SAAS,EAAE,MAAM;IAoBvB,SAAS,CACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,GAAG,CAAC;IAsBT,UAAU,CACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAC1B,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAE,CAAC;IAelC,QAAQ,CACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC3B,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAE,CAAC;IAwBlC,OAAO,CACX,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,GAAG,CAAC;IAiCT,SAAS,CACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,GAAG,CAAC;IA6BT,UAAU,CACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACxB,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAE,CAAC;IAqBlC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IASpD,UAAU,CACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAE,CAAC;CAczC;AAMD,eAAe,YAAY,CAAC"}
|
|
@@ -11,7 +11,7 @@ const deepmerge_1 = __importDefault(require("deepmerge"));
|
|
|
11
11
|
const app_error_1 = __importDefault(require("../error-handler/utils/app-error"));
|
|
12
12
|
const pluralize_1 = __importDefault(require("pluralize"));
|
|
13
13
|
const base_helpers_1 = require("./utils/base.helpers");
|
|
14
|
-
const
|
|
14
|
+
const server_1 = require("../../server");
|
|
15
15
|
const baseServices = {};
|
|
16
16
|
class BaseService {
|
|
17
17
|
modelName;
|
|
@@ -31,7 +31,7 @@ class BaseService {
|
|
|
31
31
|
acc[curr.name] = true;
|
|
32
32
|
return acc;
|
|
33
33
|
}, {});
|
|
34
|
-
this.prisma =
|
|
34
|
+
this.prisma = server_1.prisma;
|
|
35
35
|
}
|
|
36
36
|
async createOne(body, queryOptions) {
|
|
37
37
|
const bodyWithRelationFieldsHandled = (0, base_helpers_1.handleRelationFieldsInBody)(body, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.service.js","sourceRoot":"","sources":["../../../src/modules/base/base.service.ts"],"names":[],"mappings":";;;;;;AAAA,qDAAwD;AACxD,uEAI4C;AAC5C,0DAAkC;AAClC,4DAA4D;AAC5D,iFAAwD;AACxD,0DAAkC;AAClC,uDAAkE;
|
|
1
|
+
{"version":3,"file":"base.service.js","sourceRoot":"","sources":["../../../src/modules/base/base.service.ts"],"names":[],"mappings":"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"}
|
package/dist/server.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { Express } from "express";
|
|
|
3
3
|
import { InitConfigs } from "./app";
|
|
4
4
|
declare let server: Server<typeof IncomingMessage, typeof ServerResponse>;
|
|
5
5
|
declare let app: Express;
|
|
6
|
+
declare let prisma: any;
|
|
6
7
|
/**
|
|
7
8
|
* Initializes the application server.
|
|
8
9
|
*
|
|
@@ -17,5 +18,5 @@ declare let app: Express;
|
|
|
17
18
|
* @returns {void} This function does not return a value.
|
|
18
19
|
*/
|
|
19
20
|
declare function initApp(app: Express, initConfigs: InitConfigs): void;
|
|
20
|
-
export { server, app, initApp };
|
|
21
|
+
export { server, app, initApp, prisma };
|
|
21
22
|
//# sourceMappingURL=server.d.ts.map
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAE/D,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAa,WAAW,EAAE,MAAM,OAAO,CAAC;AAS/C,QAAA,IAAI,MAAM,EAAE,MAAM,CAAC,OAAO,eAAe,EAAE,OAAO,cAAc,CAAC,CAAC;AAClE,QAAA,IAAI,GAAG,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAE/D,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAa,WAAW,EAAE,MAAM,OAAO,CAAC;AAS/C,QAAA,IAAI,MAAM,EAAE,MAAM,CAAC,OAAO,eAAe,EAAE,OAAO,cAAc,CAAC,CAAC;AAClE,QAAA,IAAI,GAAG,EAAE,OAAO,CAAC;AACjB,QAAA,IAAI,MAAM,EAAE,GAAG,CAAC;AAEhB;;;;;;;;;;;;GAYG;AACH,iBAAS,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,CAc7D;AAiBD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC"}
|
package/dist/server.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.app = exports.server = void 0;
|
|
3
|
+
exports.prisma = exports.app = exports.server = void 0;
|
|
4
4
|
exports.initApp = initApp;
|
|
5
5
|
const app_1 = require("./app");
|
|
6
6
|
process.on("uncaughtException", (err) => {
|
|
@@ -11,6 +11,7 @@ process.on("uncaughtException", (err) => {
|
|
|
11
11
|
});
|
|
12
12
|
let server;
|
|
13
13
|
let app;
|
|
14
|
+
let prisma;
|
|
14
15
|
/**
|
|
15
16
|
* Initializes the application server.
|
|
16
17
|
*
|
|
@@ -26,9 +27,10 @@ let app;
|
|
|
26
27
|
*/
|
|
27
28
|
function initApp(app, initConfigs) {
|
|
28
29
|
const port = initConfigs.port || Number(process.env.PORT) || 8000;
|
|
30
|
+
exports.prisma = prisma = initConfigs.prisma;
|
|
29
31
|
const application = (0, app_1.bootstrap)(app, {
|
|
30
32
|
authentication: false,
|
|
31
|
-
prisma
|
|
33
|
+
prisma,
|
|
32
34
|
});
|
|
33
35
|
exports.server = server = application.listen(port, () => {
|
|
34
36
|
const time = new Date().toTimeString().split(" ")[0];
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;AA4DsB,0BAAO;AAzD7B,+BAA+C;AAE/C,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,GAAG,EAAE,EAAE;IACtC,OAAO,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACtD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACrC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH,IAAI,MAA6D,CAAC;AAClE,IAAI,GAAY,CAAC;AACjB,IAAI,MAAW,CAAC;AAEhB;;;;;;;;;;;;GAYG;AACH,SAAS,OAAO,CAAC,GAAY,EAAE,WAAwB;IACrD,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;IAClE,iBAAA,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;IAC5B,MAAM,WAAW,GAAG,IAAA,eAAS,EAAC,GAAG,EAAE;QACjC,cAAc,EAAE,KAAK;QACrB,MAAM;KACP,CAAC,CAAC;IAEH,iBAAA,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;QACrC,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,OAAO,CAAC,IAAI,CACV,kCAAkC,IAAI,uCAAuC,IAAI,+CAA+C,IAAI,EAAE,CACvI,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,GAAa,EAAE,EAAE;IACjD,OAAO,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;IACvD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;QAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;IACzB,OAAO,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;IAClE,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;QAChB,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.features.d.ts","sourceRoot":"","sources":["../../../src/utils/features/api.features.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"api.features.d.ts","sourceRoot":"","sources":["../../../src/utils/features/api.features.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAOlC,KAAK,SAAS,GAAG,MAAM,CAAC;AAExB,MAAM,CAAC,OAAO,OAAO,WAAW;IAC9B,GAAG,EAAE,OAAO,CAAC;IACb,YAAY,EAAE,GAAG,CAAC;IAClB,yBAAyB,EAAE,GAAG,CAAC;IAC/B,OAAO,EAAE,GAAG,CAAM;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,cAAc,WAaZ;gBAGA,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,SAAS,EACpB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAW1C,MAAM;IA8DN,MAAM;IAUN,IAAI;IAcJ,WAAW;IA2EX,QAAQ;IAaF,IAAI;CAGX"}
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const deepmerge_1 = __importDefault(require("deepmerge"));
|
|
7
7
|
const api_features_helpers_1 = require("../helpers/api.features.helpers");
|
|
8
8
|
const app_error_1 = __importDefault(require("../../modules/error-handler/utils/app-error"));
|
|
9
|
-
const
|
|
9
|
+
const server_1 = require("../../server");
|
|
10
10
|
class APIFeatures {
|
|
11
11
|
req; // The Prisma query
|
|
12
12
|
searchParams; // The query string parameters from the request
|
|
@@ -15,18 +15,18 @@ class APIFeatures {
|
|
|
15
15
|
modelName;
|
|
16
16
|
relationFields;
|
|
17
17
|
excludedFields = [
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
18
|
+
"page",
|
|
19
|
+
"sort",
|
|
20
|
+
"limit",
|
|
21
|
+
"fields",
|
|
22
|
+
"addFields",
|
|
23
|
+
"removeFields",
|
|
24
|
+
"search",
|
|
25
|
+
"include",
|
|
26
|
+
"filterMode",
|
|
27
|
+
"where",
|
|
28
|
+
"prismaQueryOptions",
|
|
29
|
+
"ignoredFields",
|
|
30
30
|
];
|
|
31
31
|
constructor(req, modelName, relationFields) {
|
|
32
32
|
this.req = req;
|
|
@@ -39,7 +39,6 @@ class APIFeatures {
|
|
|
39
39
|
}
|
|
40
40
|
filter() {
|
|
41
41
|
const searchableFields = [];
|
|
42
|
-
const prisma = app_1.initConfigs.prisma;
|
|
43
42
|
const queryObj = { ...this.searchParams };
|
|
44
43
|
this.excludedFields.forEach((el) => delete queryObj[el]);
|
|
45
44
|
let queryStr = JSON.stringify(queryObj);
|
|
@@ -50,21 +49,21 @@ class APIFeatures {
|
|
|
50
49
|
}));
|
|
51
50
|
let whereOptions = whereLogicalOperatorFilters.length > 0
|
|
52
51
|
? {
|
|
53
|
-
[this.req.query?.filterMode ??
|
|
52
|
+
[this.req.query?.filterMode ?? "OR"]: whereLogicalOperatorFilters,
|
|
54
53
|
}
|
|
55
54
|
: {};
|
|
56
55
|
if (!!this.searchParams.search) {
|
|
57
|
-
Object.keys(prisma[this.modelName].fields).forEach((key) => {
|
|
58
|
-
const field = prisma[this.modelName].fields[key];
|
|
59
|
-
if (field.typeName ===
|
|
60
|
-
key !==
|
|
56
|
+
Object.keys(server_1.prisma[this.modelName].fields).forEach((key) => {
|
|
57
|
+
const field = server_1.prisma[this.modelName].fields[key];
|
|
58
|
+
if (field.typeName === "String" &&
|
|
59
|
+
key !== "id" &&
|
|
61
60
|
!field.isList &&
|
|
62
|
-
!field.name.includes(
|
|
63
|
-
!field.name.includes(
|
|
61
|
+
!field.name.includes("Id") &&
|
|
62
|
+
!field.name.includes("ID")) {
|
|
64
63
|
searchableFields.push({
|
|
65
64
|
[`${key}`]: {
|
|
66
65
|
contains: this.searchParams.search,
|
|
67
|
-
mode:
|
|
66
|
+
mode: "insensitive",
|
|
68
67
|
},
|
|
69
68
|
});
|
|
70
69
|
}
|
|
@@ -73,7 +72,7 @@ class APIFeatures {
|
|
|
73
72
|
OR: searchableFields,
|
|
74
73
|
});
|
|
75
74
|
}
|
|
76
|
-
const parsedQueryOptions = typeof this.req.query?.prismaQueryOptions ===
|
|
75
|
+
const parsedQueryOptions = typeof this.req.query?.prismaQueryOptions === "string"
|
|
77
76
|
? JSON.parse(this.req.query?.prismaQueryOptions)
|
|
78
77
|
: {};
|
|
79
78
|
this.filters = (0, deepmerge_1.default)({
|
|
@@ -93,9 +92,9 @@ class APIFeatures {
|
|
|
93
92
|
sort() {
|
|
94
93
|
if (this.searchParams.sort) {
|
|
95
94
|
const sortBy = this.searchParams?.sort
|
|
96
|
-
?.split(
|
|
95
|
+
?.split(",")
|
|
97
96
|
?.map((field) => ({
|
|
98
|
-
[field.startsWith(
|
|
97
|
+
[field.startsWith("-") ? field.substring(1) : field]: field.startsWith("-") ? "desc" : "asc",
|
|
99
98
|
}));
|
|
100
99
|
this.filters = (0, deepmerge_1.default)(this.filters, { orderBy: sortBy });
|
|
101
100
|
}
|
|
@@ -106,8 +105,8 @@ class APIFeatures {
|
|
|
106
105
|
!this.searchParams?.addFields &&
|
|
107
106
|
!this.searchParams?.removeFields) {
|
|
108
107
|
const fieldsToSelect = this.searchParams.fields
|
|
109
|
-
.split(
|
|
110
|
-
.filter((field) => !field.startsWith(
|
|
108
|
+
.split(",")
|
|
109
|
+
.filter((field) => !field.startsWith("+") && !field.startsWith("-"));
|
|
111
110
|
this.filters = {
|
|
112
111
|
...this.filters,
|
|
113
112
|
select: fieldsToSelect.reduce((acc, field) => {
|
|
@@ -120,41 +119,41 @@ class APIFeatures {
|
|
|
120
119
|
}
|
|
121
120
|
else if (this.searchParams?.fields &&
|
|
122
121
|
(this.searchParams?.addFields || this.searchParams?.removeFields))
|
|
123
|
-
throw new app_error_1.default(
|
|
122
|
+
throw new app_error_1.default("Cannot use fields in the same query with addFields or removeFields.", 400);
|
|
124
123
|
if (this.searchParams?.addFields && !this.searchParams?.fields) {
|
|
125
124
|
const fieldsToAdd = this.searchParams.addFields
|
|
126
|
-
.split(
|
|
127
|
-
.filter((field) => field.startsWith(
|
|
125
|
+
.split(",")
|
|
126
|
+
.filter((field) => field.startsWith("+"));
|
|
128
127
|
this.filters = {
|
|
129
128
|
...this.filters,
|
|
130
129
|
select: {
|
|
131
130
|
...this.filters.include,
|
|
132
131
|
...fieldsToAdd.reduce((acc, field) => {
|
|
133
|
-
acc[field.replace(
|
|
132
|
+
acc[field.replace("+", "")] = true;
|
|
134
133
|
return acc;
|
|
135
134
|
}, {}),
|
|
136
135
|
},
|
|
137
136
|
};
|
|
138
137
|
}
|
|
139
138
|
else if (this.searchParams?.fields && this.searchParams?.addFields)
|
|
140
|
-
throw new app_error_1.default(
|
|
139
|
+
throw new app_error_1.default("Cannot use addFields in the same query with fields.", 400);
|
|
141
140
|
if (this.searchParams?.removeFields && !this.searchParams?.fields) {
|
|
142
141
|
const fieldsToRemove = this.searchParams.removeFields
|
|
143
|
-
.split(
|
|
144
|
-
.filter((field) => field.startsWith(
|
|
142
|
+
.split(",")
|
|
143
|
+
.filter((field) => field.startsWith("-"));
|
|
145
144
|
this.filters = {
|
|
146
145
|
...this.filters,
|
|
147
146
|
select: {
|
|
148
147
|
...this.filters.include,
|
|
149
148
|
...fieldsToRemove.reduce((acc, field) => {
|
|
150
|
-
acc[field.replace(
|
|
149
|
+
acc[field.replace("-", "")] = false;
|
|
151
150
|
return acc;
|
|
152
151
|
}, {}),
|
|
153
152
|
},
|
|
154
153
|
};
|
|
155
154
|
}
|
|
156
155
|
else if (this.searchParams?.removeFields && this.searchParams?.addFields)
|
|
157
|
-
throw new app_error_1.default(
|
|
156
|
+
throw new app_error_1.default("Cannot use removeFields in the same query with fields.", 400);
|
|
158
157
|
return this;
|
|
159
158
|
}
|
|
160
159
|
paginate() {
|
|
@@ -169,8 +168,7 @@ class APIFeatures {
|
|
|
169
168
|
return this;
|
|
170
169
|
}
|
|
171
170
|
async exec() {
|
|
172
|
-
|
|
173
|
-
return await prisma[this.modelName].findMany(this.filters);
|
|
171
|
+
return await server_1.prisma[this.modelName].findMany(this.filters);
|
|
174
172
|
}
|
|
175
173
|
}
|
|
176
174
|
exports.default = APIFeatures;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.features.js","sourceRoot":"","sources":["../../../src/utils/features/api.features.ts"],"names":[],"mappings":";;;;;AACA,
|
|
1
|
+
{"version":3,"file":"api.features.js","sourceRoot":"","sources":["../../../src/utils/features/api.features.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "arkos",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.9",
|
|
4
4
|
"description": "A super customizable TypeScript package for auto-generating API routes with built-in authentication, email service, error handling, file upload routes, image upload optimization, and seamless Prisma integration.",
|
|
5
5
|
"main": "dist/server.js",
|
|
6
6
|
"types": "dist/server.d.ts",
|