diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-20 17:07:34 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-20 19:15:13 +0200 |
| commit | cf6a35f09a3f38b124bd0e6013950f21b5bb1851 (patch) | |
| tree | e8b7664ffe5a4e7588cd57c94618a1843ab88327 /app/controllers/jwt_controller.rb | |
| parent | 0672c5a92e8be90da0cb79f277bb7aee82fdba8a (diff) | |
| download | gitlab-ce-cf6a35f09a3f38b124bd0e6013950f21b5bb1851.tar.gz | |
Improve JwtController implementationpost-merge-improve-of-ci-permissions
Diffstat (limited to 'app/controllers/jwt_controller.rb')
| -rw-r--r-- | app/controllers/jwt_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb index 06d96774754..34d5d99558e 100644 --- a/app/controllers/jwt_controller.rb +++ b/app/controllers/jwt_controller.rb @@ -11,10 +11,8 @@ class JwtController < ApplicationController service = SERVICES[params[:service]] return head :not_found unless service - @authentication_result ||= Gitlab::Auth::Result.new - result = service.new(@authentication_result.project, @authentication_result.actor, auth_params). - execute(authentication_abilities: @authentication_result.authentication_abilities) + execute(authentication_abilities: @authentication_result.authentication_abilities || []) render json: result, status: result[:http_status] end @@ -22,6 +20,8 @@ class JwtController < ApplicationController private def authenticate_project_or_user + @authentication_result = Gitlab::Auth::Result.new + authenticate_with_http_basic do |login, password| @authentication_result = Gitlab::Auth.find_for_git_client(login, password, project: nil, ip: request.ip) |