serverpreconfigured 2.1.7 → 2.1.8
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/routes/users.js +8 -0
- package/package.json +1 -1
- package/src/routes/users.ts +8 -0
package/dist/routes/users.js
CHANGED
|
@@ -22,6 +22,7 @@ const auth_2 = require("../middlewares/auth");
|
|
|
22
22
|
const env_1 = __importDefault(require("../settings/env"));
|
|
23
23
|
const auth_3 = require("../auth/auth");
|
|
24
24
|
const auth_4 = require("../auth/auth");
|
|
25
|
+
const server_1 = require("../server");
|
|
25
26
|
const DEBUG = env_1.default.NODE_ENV === 'development' ? true : false;
|
|
26
27
|
var LoginErrorCode;
|
|
27
28
|
(function (LoginErrorCode) {
|
|
@@ -62,6 +63,13 @@ router.post('/login', (req, res) => __awaiter(void 0, void 0, void 0, function*
|
|
|
62
63
|
try {
|
|
63
64
|
const checkPass = yield (0, users_1.checkUserPassword)(email, password);
|
|
64
65
|
if (checkPass) {
|
|
66
|
+
const user = yield server_1.User.findOne({ where: { email: email } });
|
|
67
|
+
if (!user) {
|
|
68
|
+
return res.status(500).send((0, response_1.JSONResponse)(false, 0, "I_E"));
|
|
69
|
+
}
|
|
70
|
+
if (!user.is_active) {
|
|
71
|
+
return res.status(400).send((0, response_1.JSONResponse)(false, 0, "User deleted"));
|
|
72
|
+
}
|
|
65
73
|
(0, auth_3.setUserLogged)(req, email);
|
|
66
74
|
return res.status(200).send((0, response_1.JSONResponse)(true, LoginErrorCode.NoError, "Login Ok"));
|
|
67
75
|
}
|
package/package.json
CHANGED
package/src/routes/users.ts
CHANGED
|
@@ -10,6 +10,7 @@ import { setUserDataMiddleware } from "../middlewares/auth";
|
|
|
10
10
|
import ENV from "../settings/env";
|
|
11
11
|
import { setUserLogged } from "../auth/auth";
|
|
12
12
|
import { logoutUser } from "../auth/auth";
|
|
13
|
+
import { User } from "../server";
|
|
13
14
|
|
|
14
15
|
const DEBUG=ENV.NODE_ENV==='development'?true:false;
|
|
15
16
|
enum LoginErrorCode{
|
|
@@ -49,6 +50,13 @@ router.post('/login',async (req,res)=>{
|
|
|
49
50
|
try{
|
|
50
51
|
const checkPass=await checkUserPassword(email,password);
|
|
51
52
|
if(checkPass){
|
|
53
|
+
const user:User=await User.findOne({where:{email:email}});
|
|
54
|
+
if(!user){
|
|
55
|
+
return res.status(500).send(JSONResponse(false,0,"I_E"));
|
|
56
|
+
}
|
|
57
|
+
if(!user.is_active){
|
|
58
|
+
return res.status(400).send(JSONResponse(false,0,"User deleted"));
|
|
59
|
+
}
|
|
52
60
|
setUserLogged(req,email);
|
|
53
61
|
return res.status(200).send(JSONResponse(true,LoginErrorCode.NoError,"Login Ok"));
|
|
54
62
|
}
|