Added checks for 2FA to the API `/sessions` endpoint and the Resource Owner Password Credentials flow.

2 files changed, 5 insertions, 0 deletions

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index d0469d6602d..bbd647684a4 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -275,6 +275,10 @@ module API
       end
     end
 
+    def render_2fa_error!
+      render_api_error!('401 You have 2FA enabled. Please use a personal access token to access the API', 401)
+    end
+
     def render_api_error!(message, status)
       error!({ 'message' => message }, status)
     end
diff --git a/lib/api/session.rb b/lib/api/session.rb
index 56c202f1294..b26be3be22e 100644
--- a/lib/api/session.rb
+++ b/lib/api/session.rb
@@ -14,6 +14,7 @@ module API
       user = Gitlab::Auth.find_with_user_password(params[:email] || params[:login], params[:password])
 
       return unauthorized! unless user
+      return render_2fa_error! if user.two_factor_enabled?
       present user, with: Entities::UserLogin
     end
   end