Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

1 files changed, 11 insertions, 3 deletions

diff --git a/spec/support/helpers/dependency_proxy_helpers.rb b/spec/support/helpers/dependency_proxy_helpers.rb
index 9413cb93199..75dc09ec159 100644
--- a/spec/support/helpers/dependency_proxy_helpers.rb
+++ b/spec/support/helpers/dependency_proxy_helpers.rb
@@ -34,12 +34,20 @@ module DependencyProxyHelpers
 
   def build_jwt(user = nil, expire_time: nil)
     JSONWebToken::HMACToken.new(::Auth::DependencyProxyAuthenticationService.secret).tap do |jwt|
-      jwt['user_id'] = user.id if user.is_a?(User)
-      jwt['deploy_token'] = user.token if user.is_a?(DeployToken)
-      jwt.expire_time = expire_time || jwt.issued_at + 1.minute
+      if block_given?
+        yield(jwt)
+      else
+        jwt['user_id'] = user.id if user.is_a?(User)
+        jwt['deploy_token'] = user.token if user.is_a?(DeployToken)
+        jwt.expire_time = expire_time || jwt.issued_at + 1.minute
+      end
     end
   end
 
+  def jwt_token_authorization_headers(jwt)
+    { 'AUTHORIZATION' => "Bearer #{jwt.encoded}" }
+  end
+
   private
 
   def registry