Spaces:
Running
Running
Merge pull request #16 from Modarb-Ai-Trainer:refactor/controllers
Browse files- src/lib/controllers/controller.base.ts +3 -5
- src/modules/common/decorators/prefix.decorator.ts +8 -1
- src/modules/common/users/services/users.base.service.ts +33 -31
- src/modules/console/admins/controllers/admins.controller.ts +25 -22
- src/modules/console/admins/services/admins.service.ts +8 -8
- src/modules/console/users/controllers/users.controller.ts +10 -8
- src/modules/console/users/services/users.service.ts +1 -1
- src/modules/user/auth/controllers/auth.controller.ts +13 -13
- src/modules/user/auth/services/users.service.ts +73 -78
- src/routes.ts +6 -4
src/lib/controllers/controller.base.ts
CHANGED
@@ -1,10 +1,8 @@
|
|
1 |
import { Router } from "express";
|
2 |
|
3 |
export abstract class BaseController {
|
4 |
-
public
|
5 |
-
public
|
6 |
|
7 |
-
public
|
8 |
-
throw new Error(`routes not set for ${this.name}`);
|
9 |
-
}
|
10 |
}
|
|
|
1 |
import { Router } from "express";
|
2 |
|
3 |
export abstract class BaseController {
|
4 |
+
public router: Router = Router();
|
5 |
+
public prefix: string = "/";
|
6 |
|
7 |
+
public abstract setRoutes(): void;
|
|
|
|
|
8 |
}
|
src/modules/common/decorators/prefix.decorator.ts
CHANGED
@@ -2,6 +2,13 @@ import { BaseController } from "../../../lib/controllers/controller.base";
|
|
2 |
|
3 |
export const Prefix = (prefix: string) => {
|
4 |
return (target: typeof BaseController) => {
|
5 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
6 |
};
|
7 |
};
|
|
|
2 |
|
3 |
export const Prefix = (prefix: string) => {
|
4 |
return (target: typeof BaseController) => {
|
5 |
+
const originalConstructor = target;
|
6 |
+
const newConstructor: any = function (...args: any[]) {
|
7 |
+
const instance = new (originalConstructor as any)(...args);
|
8 |
+
instance.prefix = prefix || instance.prefix;
|
9 |
+
return instance;
|
10 |
+
};
|
11 |
+
newConstructor.prototype = originalConstructor.prototype;
|
12 |
+
return newConstructor;
|
13 |
};
|
14 |
};
|
src/modules/common/users/services/users.base.service.ts
CHANGED
@@ -1,8 +1,7 @@
|
|
1 |
-
import { userModel
|
2 |
|
3 |
-
|
4 |
-
|
5 |
-
static async find(filterObject) {
|
6 |
try {
|
7 |
const resultObject = await userModel.findOne(filterObject).lean();
|
8 |
|
@@ -28,33 +27,40 @@ export class UsersBaseService {
|
|
28 |
}
|
29 |
}
|
30 |
|
31 |
-
|
32 |
try {
|
33 |
-
|
34 |
-
|
35 |
-
|
36 |
-
|
37 |
-
|
38 |
-
let newUser = new userModel(form);
|
39 |
-
await newUser.save();
|
40 |
-
return {
|
41 |
-
success: true,
|
42 |
-
code: 201
|
43 |
-
};
|
44 |
-
|
45 |
-
} catch (err) {
|
46 |
-
console.log(`err.message`, err.message);
|
47 |
-
return {
|
48 |
success: false,
|
49 |
-
|
50 |
-
|
51 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
52 |
}
|
53 |
-
}
|
54 |
|
55 |
-
|
56 |
try {
|
57 |
-
const resultObject = await userModel
|
|
|
|
|
|
|
58 |
if (!resultObject)
|
59 |
return {
|
60 |
success: false,
|
@@ -76,7 +82,7 @@ export class UsersBaseService {
|
|
76 |
}
|
77 |
}
|
78 |
|
79 |
-
|
80 |
try {
|
81 |
const resultArray = await userModel
|
82 |
.find(filterObject)
|
@@ -105,8 +111,4 @@ export class UsersBaseService {
|
|
105 |
};
|
106 |
}
|
107 |
}
|
108 |
-
|
109 |
}
|
110 |
-
|
111 |
-
|
112 |
-
|
|
|
1 |
+
import { userModel } from "../models/user.model";
|
2 |
|
3 |
+
export abstract class UsersBaseService {
|
4 |
+
async find(filterObject) {
|
|
|
5 |
try {
|
6 |
const resultObject = await userModel.findOne(filterObject).lean();
|
7 |
|
|
|
27 |
}
|
28 |
}
|
29 |
|
30 |
+
async create(form: any) {
|
31 |
try {
|
32 |
+
if (form.email) {
|
33 |
+
form.email = form.email.toLowerCase();
|
34 |
+
let user = await this.find({ email: form.email });
|
35 |
+
if (user.success)
|
36 |
+
return {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
37 |
success: false,
|
38 |
+
error: "This email already exists",
|
39 |
+
code: 409,
|
40 |
+
};
|
41 |
+
}
|
42 |
+
let newUser = new userModel(form);
|
43 |
+
await newUser.save();
|
44 |
+
return {
|
45 |
+
success: true,
|
46 |
+
code: 201,
|
47 |
+
};
|
48 |
+
} catch (err) {
|
49 |
+
console.log(`err.message`, err.message);
|
50 |
+
return {
|
51 |
+
success: false,
|
52 |
+
code: 500,
|
53 |
+
error: err.message,
|
54 |
+
};
|
55 |
}
|
56 |
+
}
|
57 |
|
58 |
+
async get(filterObject) {
|
59 |
try {
|
60 |
+
const resultObject = await userModel
|
61 |
+
.findOne(filterObject)
|
62 |
+
.lean()
|
63 |
+
.select("-password");
|
64 |
if (!resultObject)
|
65 |
return {
|
66 |
success: false,
|
|
|
82 |
}
|
83 |
}
|
84 |
|
85 |
+
async list(filterObject) {
|
86 |
try {
|
87 |
const resultArray = await userModel
|
88 |
.find(filterObject)
|
|
|
111 |
};
|
112 |
}
|
113 |
}
|
|
|
114 |
}
|
|
|
|
|
|
src/modules/console/admins/controllers/admins.controller.ts
CHANGED
@@ -10,48 +10,51 @@ import {
|
|
10 |
|
11 |
@Prefix("/console/admins")
|
12 |
export class AdminsController extends BaseController {
|
13 |
-
|
14 |
-
|
15 |
-
|
16 |
-
router.
|
17 |
-
router.
|
|
|
|
|
18 |
"/:id",
|
19 |
paramsValidator("id"),
|
20 |
bodyValidator(createAdminSchema),
|
21 |
-
|
22 |
);
|
23 |
-
router.delete("/:id", paramsValidator("id"),
|
24 |
}
|
25 |
|
26 |
-
|
27 |
-
|
|
|
28 |
.then((result) => {
|
29 |
res.status(result.code).json(result);
|
30 |
})
|
31 |
.catch((err) => {
|
32 |
res.status(500).json(err);
|
33 |
});
|
34 |
-
}
|
35 |
|
36 |
-
|
37 |
-
const data = await
|
38 |
_id: req.params.id,
|
39 |
});
|
40 |
res.json(data);
|
41 |
-
}
|
42 |
|
43 |
-
|
44 |
-
const data = await
|
45 |
res.json(data);
|
46 |
-
}
|
47 |
|
48 |
-
|
49 |
-
const data = await
|
50 |
res.json(data);
|
51 |
-
}
|
52 |
|
53 |
-
|
54 |
-
const data = await
|
55 |
res.json(data);
|
56 |
-
}
|
57 |
}
|
|
|
10 |
|
11 |
@Prefix("/console/admins")
|
12 |
export class AdminsController extends BaseController {
|
13 |
+
private adminsService = new AdminsService();
|
14 |
+
|
15 |
+
setRoutes() {
|
16 |
+
this.router.get("/", this.list);
|
17 |
+
this.router.get("/:id", paramsValidator("id"), this.get);
|
18 |
+
this.router.post("/", bodyValidator(createAdminSchema), this.create);
|
19 |
+
this.router.patch(
|
20 |
"/:id",
|
21 |
paramsValidator("id"),
|
22 |
bodyValidator(createAdminSchema),
|
23 |
+
this.update
|
24 |
);
|
25 |
+
this.router.delete("/:id", paramsValidator("id"), this.delete);
|
26 |
}
|
27 |
|
28 |
+
list = (_, res: Response) => {
|
29 |
+
this.adminsService
|
30 |
+
.list({})
|
31 |
.then((result) => {
|
32 |
res.status(result.code).json(result);
|
33 |
})
|
34 |
.catch((err) => {
|
35 |
res.status(500).json(err);
|
36 |
});
|
37 |
+
};
|
38 |
|
39 |
+
get = async (req: Request, res: Response) => {
|
40 |
+
const data = await this.adminsService.get({
|
41 |
_id: req.params.id,
|
42 |
});
|
43 |
res.json(data);
|
44 |
+
};
|
45 |
|
46 |
+
create = async (req: Request, res: Response) => {
|
47 |
+
const data = await this.adminsService.create(req.body);
|
48 |
res.json(data);
|
49 |
+
};
|
50 |
|
51 |
+
update = async (req: Request, res: Response) => {
|
52 |
+
const data = await this.adminsService.update(req.params.id, req.body);
|
53 |
res.json(data);
|
54 |
+
};
|
55 |
|
56 |
+
delete = async (req: Request, res: Response) => {
|
57 |
+
const data = await this.adminsService.remove(req.params.id);
|
58 |
res.json(data);
|
59 |
+
};
|
60 |
}
|
src/modules/console/admins/services/admins.service.ts
CHANGED
@@ -4,7 +4,7 @@ import { config } from "../../../../configs/config";
|
|
4 |
import { FilterQuery } from "mongoose";
|
5 |
|
6 |
export class AdminsService {
|
7 |
-
|
8 |
try {
|
9 |
const resultObject = await Admin.findOne(filterObject).lean();
|
10 |
|
@@ -30,7 +30,7 @@ export class AdminsService {
|
|
30 |
}
|
31 |
}
|
32 |
|
33 |
-
|
34 |
try {
|
35 |
const resultObject = await Admin.findOne(filterObject)
|
36 |
.lean()
|
@@ -56,7 +56,7 @@ export class AdminsService {
|
|
56 |
}
|
57 |
}
|
58 |
|
59 |
-
|
60 |
try {
|
61 |
const resultArray = await Admin.find(filterObject)
|
62 |
.lean()
|
@@ -85,7 +85,7 @@ export class AdminsService {
|
|
85 |
}
|
86 |
}
|
87 |
|
88 |
-
|
89 |
try {
|
90 |
if (formObject.email) formObject.email = formObject.email.toLowerCase();
|
91 |
const resultObject = new Admin(formObject);
|
@@ -113,7 +113,7 @@ export class AdminsService {
|
|
113 |
}
|
114 |
}
|
115 |
|
116 |
-
|
117 |
try {
|
118 |
const existingObject = await this.find({ _id });
|
119 |
if (!existingObject.success)
|
@@ -161,7 +161,7 @@ export class AdminsService {
|
|
161 |
}
|
162 |
}
|
163 |
|
164 |
-
|
165 |
try {
|
166 |
const resultObject = await Admin.findByIdAndDelete({ _id });
|
167 |
if (!resultObject)
|
@@ -185,7 +185,7 @@ export class AdminsService {
|
|
185 |
}
|
186 |
}
|
187 |
|
188 |
-
|
189 |
try {
|
190 |
emailString = emailString.toLowerCase();
|
191 |
const existingObject = await this.find({ email: emailString });
|
@@ -223,7 +223,7 @@ export class AdminsService {
|
|
223 |
}
|
224 |
}
|
225 |
|
226 |
-
|
227 |
try {
|
228 |
emailString = emailString.toLowerCase();
|
229 |
const existingObject = await this.find({ email: emailString });
|
|
|
4 |
import { FilterQuery } from "mongoose";
|
5 |
|
6 |
export class AdminsService {
|
7 |
+
async find(filterObject) {
|
8 |
try {
|
9 |
const resultObject = await Admin.findOne(filterObject).lean();
|
10 |
|
|
|
30 |
}
|
31 |
}
|
32 |
|
33 |
+
async get(filterObject: FilterQuery<IAdmin>) {
|
34 |
try {
|
35 |
const resultObject = await Admin.findOne(filterObject)
|
36 |
.lean()
|
|
|
56 |
}
|
57 |
}
|
58 |
|
59 |
+
async list(filterObject) {
|
60 |
try {
|
61 |
const resultArray = await Admin.find(filterObject)
|
62 |
.lean()
|
|
|
85 |
}
|
86 |
}
|
87 |
|
88 |
+
async create(formObject) {
|
89 |
try {
|
90 |
if (formObject.email) formObject.email = formObject.email.toLowerCase();
|
91 |
const resultObject = new Admin(formObject);
|
|
|
113 |
}
|
114 |
}
|
115 |
|
116 |
+
async update(_id, formObject) {
|
117 |
try {
|
118 |
const existingObject = await this.find({ _id });
|
119 |
if (!existingObject.success)
|
|
|
161 |
}
|
162 |
}
|
163 |
|
164 |
+
async remove(_id) {
|
165 |
try {
|
166 |
const resultObject = await Admin.findByIdAndDelete({ _id });
|
167 |
if (!resultObject)
|
|
|
185 |
}
|
186 |
}
|
187 |
|
188 |
+
async comparePassword(emailString, passwordString) {
|
189 |
try {
|
190 |
emailString = emailString.toLowerCase();
|
191 |
const existingObject = await this.find({ email: emailString });
|
|
|
223 |
}
|
224 |
}
|
225 |
|
226 |
+
async resetPassword(emailString, newPasswordString) {
|
227 |
try {
|
228 |
emailString = emailString.toLowerCase();
|
229 |
const existingObject = await this.find({ email: emailString });
|
src/modules/console/users/controllers/users.controller.ts
CHANGED
@@ -3,24 +3,26 @@ import { bodyValidator } from "../../../../helpers/validation.helper";
|
|
3 |
import { BaseController } from "../../../../lib/controllers/controller.base";
|
4 |
import { Prefix } from "../../../common/decorators/prefix.decorator";
|
5 |
import { userRegisterValidation } from "../../../common/users/validation/user.baseValidation";
|
6 |
-
import {
|
7 |
|
8 |
const allowedRoles = ["superAdmin", "admin"];
|
9 |
|
10 |
@Prefix("/console/users")
|
11 |
-
export class
|
12 |
-
|
13 |
-
|
|
|
|
|
14 |
"/create",
|
15 |
jwtHelper.verifyToken(allowedRoles),
|
16 |
bodyValidator(userRegisterValidation),
|
17 |
-
|
18 |
);
|
19 |
}
|
20 |
|
21 |
-
|
22 |
try {
|
23 |
-
let result = await usersService.create(req.body);
|
24 |
return res.status(result.code).json(result);
|
25 |
} catch (err) {
|
26 |
console.log(`err.message`, err.message);
|
@@ -30,5 +32,5 @@ export class adminUsersController extends BaseController {
|
|
30 |
error: err.message,
|
31 |
});
|
32 |
}
|
33 |
-
}
|
34 |
}
|
|
|
3 |
import { BaseController } from "../../../../lib/controllers/controller.base";
|
4 |
import { Prefix } from "../../../common/decorators/prefix.decorator";
|
5 |
import { userRegisterValidation } from "../../../common/users/validation/user.baseValidation";
|
6 |
+
import { UsersService } from "../services/users.service";
|
7 |
|
8 |
const allowedRoles = ["superAdmin", "admin"];
|
9 |
|
10 |
@Prefix("/console/users")
|
11 |
+
export class AdminUsersController extends BaseController {
|
12 |
+
private usersService: UsersService = new UsersService();
|
13 |
+
|
14 |
+
setRoutes() {
|
15 |
+
this.router.post(
|
16 |
"/create",
|
17 |
jwtHelper.verifyToken(allowedRoles),
|
18 |
bodyValidator(userRegisterValidation),
|
19 |
+
this.create
|
20 |
);
|
21 |
}
|
22 |
|
23 |
+
create = async (req, res) => {
|
24 |
try {
|
25 |
+
let result = await this.usersService.create(req.body);
|
26 |
return res.status(result.code).json(result);
|
27 |
} catch (err) {
|
28 |
console.log(`err.message`, err.message);
|
|
|
32 |
error: err.message,
|
33 |
});
|
34 |
}
|
35 |
+
};
|
36 |
}
|
src/modules/console/users/services/users.service.ts
CHANGED
@@ -1,3 +1,3 @@
|
|
1 |
import { UsersBaseService } from "../../../common/users/services/users.base.service";
|
2 |
|
3 |
-
export class
|
|
|
1 |
import { UsersBaseService } from "../../../common/users/services/users.base.service";
|
2 |
|
3 |
+
export class UsersService extends UsersBaseService {}
|
src/modules/user/auth/controllers/auth.controller.ts
CHANGED
@@ -1,27 +1,27 @@
|
|
1 |
-
import {
|
2 |
import { jwtHelper } from "../../../../helpers/jwt.helper";
|
3 |
import { BaseController } from "../../../../lib/controllers/controller.base";
|
4 |
-
import { Router } from "express";
|
5 |
import { Prefix } from "../../../common/decorators/prefix.decorator";
|
6 |
-
import { Env } from "../../../../configs/env";
|
7 |
import { bodyValidator } from "../../../../helpers/validation.helper";
|
8 |
import { userRegisterValidation } from "../../../common/users/validation/user.baseValidation";
|
9 |
import { loginValidation } from "../validation/user.Validation";
|
10 |
|
11 |
@Prefix("/user/auth")
|
12 |
export class AuthController extends BaseController {
|
13 |
-
|
14 |
-
|
|
|
|
|
15 |
"/register",
|
16 |
bodyValidator(userRegisterValidation),
|
17 |
-
|
18 |
);
|
19 |
-
router.post("/login", bodyValidator(loginValidation),
|
20 |
}
|
21 |
|
22 |
-
|
23 |
try {
|
24 |
-
let result = await usersService.create(req.body);
|
25 |
return res.status(result.code).json(result);
|
26 |
} catch (err) {
|
27 |
console.log(`err.message`, err.message);
|
@@ -31,9 +31,9 @@ export class AuthController extends BaseController {
|
|
31 |
error: err.message,
|
32 |
});
|
33 |
}
|
34 |
-
}
|
35 |
|
36 |
-
|
37 |
try {
|
38 |
const { email, password } = req.body;
|
39 |
let result: {
|
@@ -41,7 +41,7 @@ export class AuthController extends BaseController {
|
|
41 |
code: number;
|
42 |
record?: any;
|
43 |
message?: string;
|
44 |
-
} = await usersService.comparePassword(email, password);
|
45 |
if (!result.success) return res.status(result.code).json(result);
|
46 |
let payload = {
|
47 |
_id: result.record?._id,
|
@@ -64,5 +64,5 @@ export class AuthController extends BaseController {
|
|
64 |
message: err.message,
|
65 |
});
|
66 |
}
|
67 |
-
}
|
68 |
}
|
|
|
1 |
+
import { UsersService } from "../services/users.service";
|
2 |
import { jwtHelper } from "../../../../helpers/jwt.helper";
|
3 |
import { BaseController } from "../../../../lib/controllers/controller.base";
|
|
|
4 |
import { Prefix } from "../../../common/decorators/prefix.decorator";
|
|
|
5 |
import { bodyValidator } from "../../../../helpers/validation.helper";
|
6 |
import { userRegisterValidation } from "../../../common/users/validation/user.baseValidation";
|
7 |
import { loginValidation } from "../validation/user.Validation";
|
8 |
|
9 |
@Prefix("/user/auth")
|
10 |
export class AuthController extends BaseController {
|
11 |
+
private usersService = new UsersService();
|
12 |
+
|
13 |
+
setRoutes(): void {
|
14 |
+
this.router.post(
|
15 |
"/register",
|
16 |
bodyValidator(userRegisterValidation),
|
17 |
+
this.register
|
18 |
);
|
19 |
+
this.router.post("/login", bodyValidator(loginValidation), this.login);
|
20 |
}
|
21 |
|
22 |
+
register = async (req, res) => {
|
23 |
try {
|
24 |
+
let result = await this.usersService.create(req.body);
|
25 |
return res.status(result.code).json(result);
|
26 |
} catch (err) {
|
27 |
console.log(`err.message`, err.message);
|
|
|
31 |
error: err.message,
|
32 |
});
|
33 |
}
|
34 |
+
};
|
35 |
|
36 |
+
login = async (req, res) => {
|
37 |
try {
|
38 |
const { email, password } = req.body;
|
39 |
let result: {
|
|
|
41 |
code: number;
|
42 |
record?: any;
|
43 |
message?: string;
|
44 |
+
} = await this.usersService.comparePassword(email, password);
|
45 |
if (!result.success) return res.status(result.code).json(result);
|
46 |
let payload = {
|
47 |
_id: result.record?._id,
|
|
|
64 |
message: err.message,
|
65 |
});
|
66 |
}
|
67 |
+
};
|
68 |
}
|
src/modules/user/auth/services/users.service.ts
CHANGED
@@ -1,92 +1,87 @@
|
|
1 |
import { UsersBaseService } from "../../../common/users/services/users.base.service";
|
2 |
-
import { userModel, } from "../../../common/users/models/user.model";
|
3 |
import bcrypt from "bcrypt";
|
4 |
|
5 |
-
export class
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
6 |
|
7 |
-
|
8 |
-
|
9 |
-
if (email != undefined) {
|
10 |
-
email = email.toLowerCase();
|
11 |
-
}
|
12 |
-
let result = await UsersBaseService.find({ email })
|
13 |
-
if (!result.success) return result;
|
14 |
|
15 |
-
|
16 |
-
|
|
|
|
|
|
|
|
|
17 |
|
18 |
-
|
19 |
-
|
20 |
-
|
21 |
-
|
22 |
-
|
23 |
-
|
24 |
-
|
25 |
-
|
26 |
-
|
27 |
-
|
28 |
-
|
29 |
-
|
30 |
-
} catch (err) {
|
31 |
-
console.log(`err.message`, err.message);
|
32 |
-
return {
|
33 |
-
success: false,
|
34 |
-
code: 500,
|
35 |
-
error: err.message
|
36 |
-
};
|
37 |
-
}
|
38 |
}
|
|
|
39 |
|
40 |
-
|
41 |
-
|
42 |
-
|
43 |
-
|
44 |
-
|
45 |
-
|
46 |
|
47 |
-
|
48 |
|
49 |
-
|
50 |
-
|
51 |
-
|
52 |
-
|
53 |
-
|
54 |
|
55 |
-
|
56 |
-
|
57 |
-
|
58 |
-
|
59 |
-
|
60 |
|
61 |
-
|
62 |
-
|
63 |
-
|
64 |
-
|
65 |
-
|
66 |
|
67 |
-
|
68 |
-
|
69 |
-
|
70 |
-
|
71 |
-
|
72 |
-
|
73 |
-
|
74 |
-
|
75 |
-
|
76 |
-
|
77 |
-
|
78 |
-
|
79 |
-
|
80 |
-
|
81 |
-
|
82 |
-
|
83 |
-
|
84 |
-
|
85 |
-
|
86 |
-
|
87 |
-
|
88 |
-
|
89 |
}
|
90 |
-
|
91 |
-
|
92 |
-
|
|
|
1 |
import { UsersBaseService } from "../../../common/users/services/users.base.service";
|
|
|
2 |
import bcrypt from "bcrypt";
|
3 |
|
4 |
+
export class UsersService extends UsersBaseService {
|
5 |
+
async comparePassword(email: string, password: string) {
|
6 |
+
try {
|
7 |
+
if (email != undefined) {
|
8 |
+
email = email.toLowerCase();
|
9 |
+
}
|
10 |
+
let result = await this.find({ email });
|
11 |
+
if (!result.success) return result;
|
12 |
|
13 |
+
let match = await bcrypt.compare(password, result.record.password);
|
14 |
+
delete result.record.password;
|
|
|
|
|
|
|
|
|
|
|
15 |
|
16 |
+
if (!match)
|
17 |
+
return {
|
18 |
+
success: false,
|
19 |
+
code: 409,
|
20 |
+
message: "password isn't correct",
|
21 |
+
};
|
22 |
|
23 |
+
return {
|
24 |
+
success: true,
|
25 |
+
code: 200,
|
26 |
+
record: result.record,
|
27 |
+
};
|
28 |
+
} catch (err) {
|
29 |
+
console.log(`err.message`, err.message);
|
30 |
+
return {
|
31 |
+
success: false,
|
32 |
+
code: 500,
|
33 |
+
error: err.message,
|
34 |
+
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
35 |
}
|
36 |
+
}
|
37 |
|
38 |
+
// async resetPassword(_id: any, currentPassword: string, newPassword: string, confirmPassword: string) {
|
39 |
+
// try {
|
40 |
+
// let user = await UserBaseService.find({ _id })
|
41 |
+
// let saltrouds = 5;
|
42 |
+
// let oldPassword = user.record.password;
|
43 |
+
// let ok = await bcrypt.compare(currentPassword, oldPassword)
|
44 |
|
45 |
+
// if (user.success) {
|
46 |
|
47 |
+
// if (!ok) return {
|
48 |
+
// success: false,
|
49 |
+
// code: 409,
|
50 |
+
// message: "current password isn't correct"
|
51 |
+
// };
|
52 |
|
53 |
+
// if (newPassword == currentPassword) return {
|
54 |
+
// success: false,
|
55 |
+
// code: 409,
|
56 |
+
// message: "new password must be different from current password"
|
57 |
+
// };
|
58 |
|
59 |
+
// if (newPassword != confirmPassword) return {
|
60 |
+
// success: false,
|
61 |
+
// code: 409,
|
62 |
+
// message: "passwords don't match"
|
63 |
+
// };
|
64 |
|
65 |
+
// const hashedPassword = await bcrypt.hash(newPassword, saltrouds)
|
66 |
+
// await userModel.findByIdAndUpdate(_id, { password: hashedPassword })
|
67 |
+
// return {
|
68 |
+
// success: true,
|
69 |
+
// code: 200,
|
70 |
+
// message: "password changed successfully"
|
71 |
+
// };
|
72 |
+
// }
|
73 |
+
// else return {
|
74 |
+
// success: false,
|
75 |
+
// code: 404,
|
76 |
+
// error: user.error
|
77 |
+
// };
|
78 |
+
// } catch (err) {
|
79 |
+
// console.log(`err.message`, err.message);
|
80 |
+
// return {
|
81 |
+
// success: false,
|
82 |
+
// code: 500,
|
83 |
+
// error: err.message
|
84 |
+
// };
|
85 |
+
// }
|
86 |
+
// }
|
87 |
}
|
|
|
|
|
|
src/routes.ts
CHANGED
@@ -43,9 +43,10 @@ const importControllers = async (router: Router) => {
|
|
43 |
|
44 |
await Promise.all(
|
45 |
files.map(async (file) => {
|
46 |
-
const
|
47 |
-
if (!
|
48 |
-
controller
|
|
|
49 |
router.use(controller.prefix, controller.router);
|
50 |
})
|
51 |
);
|
@@ -54,6 +55,7 @@ const importControllers = async (router: Router) => {
|
|
54 |
const importController = async (file: string) => {
|
55 |
const controllers = Object.values(await import(file));
|
56 |
return controllers.find(
|
57 |
-
(controller: {
|
|
|
58 |
) as typeof BaseController;
|
59 |
};
|
|
|
43 |
|
44 |
await Promise.all(
|
45 |
files.map(async (file) => {
|
46 |
+
const controllerClass = await importController(file);
|
47 |
+
if (!controllerClass) return;
|
48 |
+
const controller: BaseController = new (controllerClass as any)();
|
49 |
+
controller.setRoutes();
|
50 |
router.use(controller.prefix, controller.router);
|
51 |
})
|
52 |
);
|
|
|
55 |
const importController = async (file: string) => {
|
56 |
const controllers = Object.values(await import(file));
|
57 |
return controllers.find(
|
58 |
+
(controller: { prototype: typeof BaseController }) =>
|
59 |
+
controller.prototype instanceof BaseController
|
60 |
) as typeof BaseController;
|
61 |
};
|