back/methods/vn-user/sign-in.js

@@ -49,8 +49,13 @@ module.exports = Self => {
             if (vnUser.twoFactor)
                 throw new ForbiddenError(null, 'REQUIRES_2FA');
         }
-
+        const validateLogin = await Self.validateLogin(user, password);
-        return Self.validateLogin(user, password);
+        await Self.app.models.SignInLog.create({
+            id: validateLogin.token,
+            userFk: vnUser.id,
+            ip: ctx.req.ip
+        });
+        return validateLogin;
     };
 
     Self.passExpired = async vnUser => {

back/models/vn-user.js

@@ -2,6 +2,7 @@ const vnModel = require('vn-loopback/common/models/vn-model');
 const {Email} = require('vn-print');
 const ForbiddenError = require('vn-loopback/util/forbiddenError');
 const LoopBackContext = require('loopback-context');
+const UserError = require('vn-loopback/util/user-error');
 
 module.exports = function(Self) {
     vnModel(Self);
@@ -121,10 +122,16 @@ module.exports = function(Self) {
     });
 
     Self.validateLogin = async function(user, password) {
-        let loginInfo = Object.assign({password}, Self.userUses(user));
+        const loginInfo = Object.assign({password}, Self.userUses(user));
-        token = await Self.login(loginInfo, 'user');
+        const token = await Self.login(loginInfo, 'user');
 
         const userToken = await token.user.get();
+
+        if (userToken.username !== user) {
+            console.error('ERROR!!! - Signin with other user', userToken, user);
+            throw new UserError('Try again');
+        }
+
         try {
             await Self.app.models.Account.sync(userToken.name, password);
         } catch (err) {

db/changes/234603/00-createSignInLogTable.sql

@@ -0,0 +1,19 @@
+
+
+--
+-- Table structure for table `signInLog`
+--
+
+DROP TABLE IF EXISTS `account`.`signInLog`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `account`.`signInLog` (
+  `id` varchar(10) NOT NULL ,
+  `userFk` int(10) unsigned DEFAULT NULL,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
+  `ip` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `userFk` (`userFk`),
+  CONSTRAINT `signInLog_ibfk_1` FOREIGN KEY (`userFk`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+);
+

loopback/locale/es.json

@@ -321,9 +321,10 @@
 	"Select a different client": "Seleccione un cliente distinto",
 	"Fill all the fields": "Rellene todos los campos",
 	"The response is not a PDF": "La respuesta no es un PDF",
-	"Ticket without Route": "Ticket sin ruta",
 	"Booking completed": "Reserva completada",
 	"The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
 	"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mímina",
-	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mímina"
+	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mímina",
+	"The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
+	"User disabled": "Usuario desactivado"
 }

modules/account/back/model-config.json

@@ -35,6 +35,9 @@
     "SambaConfig": {
         "dataSource": "vn"
     },
+    "SignInLog": {
+        "dataSource": "vn"
+    },
     "Sip": {
         "dataSource": "vn"
     },

modules/account/back/models/sign_in-log.json

@@ -0,0 +1,34 @@
+{
+	"name": "SignInLog",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "account.signInLog"
+		}
+	},
+    "properties": {
+        "id": {
+			"id": true,
+			"type": "string"
+		},
+        "creationDate": {
+			"type": "date"
+		},
+        "userFk": {
+			"type": "number"
+		},
+        "ip": {
+			"type": "string"
+		}
+    },
+    "relations": {
+		"user": {
+			"type": "belongsTo",
+			"model": "VnUser",
+			"foreignKey": "userFk"
+		}
+	},
+	"scope": {
+		"order": ["creationDate DESC", "id DESC"]
+	}
+}