refs #6434 fix: bad merge

2023-12-13 13:31:32 +01:00 · 2023-12-13 13:31:32 +01:00 · 11b54d66af
parent 5a36fabf05
commit 11b54d66af
1 changed files with 5 additions and 8 deletions
--- a/back/methods/vn-user/sign-in.js
+++ b/back/methods/vn-user/sign-in.js
@ -40,14 +40,11 @@ module.exports = Self => {
        const validCredentials = vnUser
            && await vnUser.hasPassword(password);

-        if (!validCredentials)
-            throw new UserError('Invalid credentials');
-
-        if (!vnUser.active)
-            throw new UserError('User disabled');
-
-        await Self.sendTwoFactor(ctx, vnUser, myOptions);
-        await Self.passExpired(vnUser, myOptions);
+        if (validCredentials) {
+            if (!vnUser.active)
+                throw new UserError('User disabled');
+            await Self.sendTwoFactor(ctx, vnUser, myOptions);
+            await Self.passExpired(vnUser, myOptions);

            if (vnUser.twoFactor)
                throw new ForbiddenError(null, 'REQUIRES_2FA');