Fix RC Bugs for Non-MFA Users

TheRealNate · May 23, 2020 · aaa6dea · aaa6dea
1 parent d28e6d4
commit aaa6dea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mfa-client.js b/mfa-client.js
@@ -200,7 +200,7 @@ let finishLogin = (finishLoginParams, code) => new Promise(async (resolve, rejec
 let loginWithPasswordless = (query) => new Promise((resolve, reject) => {
     Meteor.call(loginChallengeHandler(), query, {passwordless:true}, async (err, res) => {
         if(err) {
-            if(err.error === "not-passwordless") {
+            if(err.error === "not-passwordless" || err.error === "not-mfa") {
                 resolve(true);
             }
             else {
@@ -235,9 +235,9 @@ let loginWithMFA = (username, password) => new Promise((resolve, reject) => {
         }
 
         let finishLoginParams = {res, _type:"login"};
-        let supportsU2FLogin = supportsU2FLogin();
+        let doesSupportU2FLogin = supportsU2FLogin();
 
-        resolve({supportsU2FLogin, method:res.method, finishLoginParams, finishParams:finishLoginParams});
+        resolve({supportsU2FLogin:doesSupportU2FLogin, method:res.method, finishLoginParams, finishParams:finishLoginParams});
     });
 });
 

diff --git a/mfa-server.js b/mfa-server.js
@@ -458,7 +458,7 @@ Meteor.methods({
         }
 
         if(!user.services.mfaenabled) {
-            throw new Meteor.Error(400);
+            throw new Meteor.Error("not-mfa", "Not MFA");
         }
 
         if(password.passwordless) {