Logout users without 2FA when mandatory 2fa is enabled

Fixes #803

src/test/tokens-test.js

@@ -119,4 +119,34 @@ describe('Tokens', function () {
         result = await tokens.getByAccessToken(token1.accessToken);
         expect(result).to.eql(token1);
     });
+
+    it('delByUserIdAndType succeeds', async function () {
+        const token1 = {
+            name: 'token1',
+            identifier: 'user1',
+            clientId: tokens.ID_WEBADMIN,
+            expires: Number.MAX_SAFE_INTEGER,
+            lastUsedTime: null,
+            scope: 'unused'
+        };
+        const token2 = {
+            name: 'token2',
+            identifier: 'user1',
+            clientId: tokens.ID_SDK,
+            expires: Date.now(),
+            lastUsedTime: null
+        };
+
+        await tokens.add(token1);
+        await tokens.add(token2);
+
+        await tokens.delByUserIdAndType('user2', tokens.ID_WEBADMIN);
+        let result = await tokens.listByUserId('user1');
+        expect(result.length).to.be(2); // should not have deleted user1 tokens
+
+        await tokens.delByUserIdAndType('user1', tokens.ID_WEBADMIN);
+        result = await tokens.listByUserId('user1');
+        expect(result.length).to.be(1);
+        expect(result[0].name).to.be(token2.name);
+    });
 });