diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-12 12:48:41 -0500 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-12 12:48:41 -0500 |
commit | 4d84ba43d8db6a205e79dd8cf723be7ceebf6925 (patch) | |
tree | 708d81727b559a1043e98788e0ef296893c126e2 /app/services | |
parent | d05f0030a3de42ab3ec6d8c8be290b74698bb929 (diff) | |
parent | fc2d985bfaa156ad052858cd2025b0300327ff95 (diff) | |
download | gitlab-ce-4d84ba43d8db6a205e79dd8cf723be7ceebf6925.tar.gz |
Merge branch 'docker-registry' into docker-registry-view
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/jwt/container_registry_authentication_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/jwt/container_registry_authentication_service.rb b/app/services/jwt/container_registry_authentication_service.rb index 2edee1f0ab0..bc7e663caa6 100644 --- a/app/services/jwt/container_registry_authentication_service.rb +++ b/app/services/jwt/container_registry_authentication_service.rb @@ -1,4 +1,4 @@ -module Jwt +module JWT class ContainerRegistryAuthenticationService < BaseService AUDIENCE = 'container_registry' @@ -7,7 +7,7 @@ module Jwt return error('forbidden', 403) unless current_user end - return error('forbidden', 401) if scopes.empty? + return error('forbidden', 401) if scopes.blank? { token: authorized_token(scopes).encoded } end @@ -26,7 +26,7 @@ module Jwt private def authorized_token(access) - token = ::Jwt::RSAToken.new(registry.key) + token = ::JWT::RSAToken.new(registry.key) token.issuer = registry.issuer token.audience = AUDIENCE token.subject = current_user.try(:username) |