refs #6434 fix: bad merge

back/models/vn-user.js

@@ -125,6 +125,33 @@ module.exports = function(Self) {
         return email.send();
     });
 
+    /**
+     * Sign-in validate
+     * @param {String} user The user
+     * @param {Object} userToken Options
+     * @param {Object} token accessToken
+     * @param {Object} ctx context
+     */
+    Self.signInValidate = async(user, userToken, token, ctx) => {
+        const [[key, value]] = Object.entries(Self.userUses(user));
+        const isOwner = Self.rawSql(`SELECT ? = ? `, [userToken[key], value]);
+        await Self.app.models.SignInLog.create({
+            userName: user,
+            token: token.id,
+            userFk: userToken.id,
+            ip: ctx.req.ip,
+            owner: isOwner
+        });
+        if (!isOwner)
+            throw new UserError('Try again');
+    };
+
+    /**
+     * Validate login params
+     * @param {String} user The user
+     * @param {String} password
+      * @param {Object} ctx context
+     */
     Self.validateLogin = async function(user, password) {
         let loginInfo = Object.assign({password}, Self.userUses(user));
         token = await Self.login(loginInfo, 'user');

db/changes/234801/00-createSignInLogTable.sql

@@ -1,19 +0,0 @@
-
-
---
--- 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
-);
-