jira-ruby 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e2f1a7c44350f6423550154d1dd1929e38f5c2af002ebc463eef3bfa035b404
-  data.tar.gz: 4c2eb811cb02e66ff324a062fa27edaed2cf215b87cc89856a42dde1618fb3c5
+  metadata.gz: 280f02562d113b77a58fa5716f9cf9fe39fe6641893d3aecdd250caf4acf7d33
+  data.tar.gz: f29efc88140a3381b816bcbcec7a977120610470c72b4758bf359353f69eb316
 SHA512:
-  metadata.gz: 24f0604ca0ad23f7a4204b920f4ec90ec816033c607db5686cde519a0a00668ddf13828f03769f07f0a6cd36bee51186b02164e91ed144cf0892b5cd124d5df8
-  data.tar.gz: 2c7866e454e455465103803030f1fb40708d1ff9e04c09975594423884c5f84ceb43afb7ba853209ac26e8c9e12a91d3268b80452f8fb3641eee4a1556a787a8
+  metadata.gz: '087796061f2ef0472f91c36f64de9550ecb3f7ba6028e8ba91de43b3868e898d7ec4e82733bf31cf336f4a4fd4db9f2f89db320b9ff1db0759c303b6fcbf33ca'
+  data.tar.gz: b7fff299ec8eac30ff10f00bf36c6c659a6f29b2ab90a6b62e8ce810167ad9188d497a57f29dd389c536a393a2f8aa9897283c24f37b93ed554e8a21140b1e3e

data/jira-ruby.gemspec

@@ -13,8 +13,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.rubyforge_project = 'jira-ruby'
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }

data/lib/jira/jwt_client.rb

@@ -4,7 +4,7 @@ module JIRA
   class JwtClient < HttpClient
     def make_request(http_method, url, body = '', headers = {})
       # When a proxy is enabled, Net::HTTP expects that the request path omits the domain name
-      path = request_path(url) + "?jwt=#{jwt_header(http_method, url)}"
+      path = request_path(http_method, url)
 
       request = Net::HTTP.const_get(http_method.to_s.capitalize).new(path, headers)
       request.body = body unless body.nil?
@@ -15,18 +15,52 @@ module JIRA
       response
     end
 
+    class JwtUriBuilder
+      attr_reader :request_url, :http_method, :shared_secret, :site, :issuer
+
+      def initialize(request_url, http_method, shared_secret, site, issuer)
+        @request_url = request_url
+        @http_method = http_method
+        @shared_secret = shared_secret
+        @site = site
+        @issuer = issuer
+      end
+
+      def build
+        uri = URI.parse(request_url)
+        new_query = URI.decode_www_form(String(uri.query)) << ['jwt', jwt_header]
+        uri.query = URI.encode_www_form(new_query)
+
+        return uri.to_s unless uri.is_a?(URI::HTTP)
+
+        uri.request_uri
+      end
+
+      private
+
+      def jwt_header
+        claim = Atlassian::Jwt.build_claims \
+          issuer,
+          request_url,
+          http_method.to_s,
+          site,
+          (Time.now - 60).to_i,
+          (Time.now + 86_400).to_i
+
+        JWT.encode claim, shared_secret
+      end
+    end
+
     private
 
-    def jwt_header(http_method, url)
-      claim = Atlassian::Jwt.build_claims \
-        @options[:issuer],
+    def request_path(http_method, url)
+      JwtUriBuilder.new(
         url,
         http_method.to_s,
+        @options[:shared_secret],
         @options[:site],
-        (Time.now - 60).to_i,
-        (Time.now + (86400)).to_i
-
-      JWT.encode claim, @options[:shared_secret]
+        @options[:issuer]
+      ).build
     end
   end
 end

data/lib/jira/version.rb

@@ -1,3 +1,3 @@
 module JIRA
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.7.1'.freeze
 end

data/spec/jira/jwt_uri_builder_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe JIRA::JwtClient::JwtUriBuilder do
+  subject(:url_builder) do
+    JIRA::JwtClient::JwtUriBuilder.new(url, http_method, shared_secret, site, issuer)
+  end
+
+  let(:url) { '/foo' }
+  let(:http_method) { :get }
+  let(:shared_secret) { 'shared_secret' }
+  let(:site) { 'http://localhost:2990' }
+  let(:issuer) { nil }
+
+  describe '#build' do
+    subject { url_builder.build }
+
+    it 'includes the jwt param' do
+      expect(subject).to include('?jwt=')
+    end
+
+    context 'when the url already contains params' do
+      let(:url) { '/foo?expand=projects.issuetypes.fields' }
+
+      it 'includes the jwt param' do
+        expect(subject).to include('&jwt=')
+      end
+    end
+
+    context 'with a complete url' do
+      let(:url) { 'http://localhost:2990/rest/api/2/issue/createmeta' }
+
+      it 'includes the jwt param' do
+        expect(subject).to include('?jwt=')
+      end
+
+      it { is_expected.to start_with('/') }
+
+      it 'contains only one ?' do
+        expect(subject.count('?')).to eq(1)
+      end
+    end
+
+    context 'with a complete url containing a param' do
+      let(:url) do
+        'http://localhost:2990/rest/api/2/issue/createmeta?expand=projects.issuetypes.fields'
+      end
+
+      it 'includes the jwt param' do
+        expect(subject).to include('&jwt=')
+      end
+
+      it { is_expected.to start_with('/') }
+
+      it 'contains only one ?' do
+        expect(subject.count('?')).to eq(1)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jira-ruby
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - SUMO Heavy Industries
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-11 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -289,6 +289,7 @@ files:
 - spec/jira/has_many_proxy_spec.rb
 - spec/jira/http_client_spec.rb
 - spec/jira/http_error_spec.rb
+- spec/jira/jwt_uri_builder_spec.rb
 - spec/jira/oauth_client_spec.rb
 - spec/jira/request_client_spec.rb
 - spec/jira/resource/agile_spec.rb
@@ -383,7 +384,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: jira-ruby
+rubyforge_project: 
 rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
@@ -413,6 +414,7 @@ test_files:
 - spec/jira/has_many_proxy_spec.rb
 - spec/jira/http_client_spec.rb
 - spec/jira/http_error_spec.rb
+- spec/jira/jwt_uri_builder_spec.rb
 - spec/jira/oauth_client_spec.rb
 - spec/jira/request_client_spec.rb
 - spec/jira/resource/agile_spec.rb