Improve code design after review

1 files changed, 2 insertions, 5 deletions

diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index e5affb1adc9..0a993bf280e 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -12,9 +12,8 @@ class JwtController < ApplicationController
     head :not_found unless service
 
     result = service.new(@project, @user, auth_params).execute
-    return head result[:http_status] if result[:http_status]
 
-    render json: result
+    render json: result, status: result[:http_status]
   end
 
   private
@@ -27,10 +26,8 @@ class JwtController < ApplicationController
 
       @user = authenticate_user(login, password)
       return if @user
-    end
 
-    if ActionController::HttpAuthentication::Basic.has_basic_credentials?(request)
-      head :forbidden
+      render_403
     end
   end