aptible-auth 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7149e22dc5b4312e17d2b6c3ba4ca28f66be30dfa279639caa2d44277019e121
-  data.tar.gz: eb4361df78b1cace82024b72c67f270f1c93a013f3f21a6a5fbe6b3f9d2aeff1
+  metadata.gz: ea651d922fcb32af2299bd0d1b5604719d2cbfcb394afb6a1de0ce092c5354de
+  data.tar.gz: 82a7f4f71e75404b484aee97e5d2fa8028e2b57b1c0359ea8133a5c0a3726434
 SHA512:
-  metadata.gz: 0df7b7e3c90027786a38571116d4c142ccb2bf7a8bcb346893cd5e1f8b3316ecee7facf2d6aa465f444da8d79a4aaf91ca3f164d74c589003648655ab858c2e7
-  data.tar.gz: dcc58a8174e38ae47d2af44bed42dd1cea0b4dd9981cdde4a96b1069b5881e2cd34ce367b4fc1367f21798079b157254d4ae341848bcb9cf96ae7f119204a2f5
+  metadata.gz: '069f1f5893a205704d2bbe3705b64c2c62c12072d6fbdba7ed5959163f6e0d6a80da7416d61420d7129dd292ce0734d0822cd06a05708f4c377dc1a27226caa1'
+  data.tar.gz: 482e8a2e3a50d1b68ee1fa2c60bc08355c873c0896af739cd09327c806087a3f0c664051f01620ca772137850d8c90d2232a87a798819b3034d4a3b6d7bdd118

data/lib/aptible/auth/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Auth
-    VERSION = '1.2.1'.freeze
+    VERSION = '1.2.2'.freeze
   end
 end

data/lib/oauth2/strategy/token_exchange.rb

@@ -25,7 +25,7 @@ module OAuth2
                   'actor_token_type'    => actor_token_type,
                   'subject_token'       => subject_token,
                   'subject_token_type'  => subject_token_type
-        }.merge(client_params).merge(params)
+        }.merge(params)
         @client.get_token(params, opts)
       end
     end

data/spec/oauth2/lib/token_exchange_spec.rb

@@ -0,0 +1,58 @@
+# rubocop:disable all
+require 'oauth2'
+require 'oauth2/strategy/token_exchange'
+RSpec.describe OAuth2::Strategy::TokenExchange do
+  let(:client) do
+    cli = OAuth2::Client.new('abc', 'def', :site => 'http://api.example.com')
+    cli.connection.build do |b|
+      b.adapter :test do |stub|
+        stub.post('/oauth/token') do |env|
+          case @mode
+          when 'formencoded'
+            [200, {'Content-Type' => 'application/x-www-form-urlencoded'}, 'expires_in=600&access_token=salmon&refresh_token=trout']
+          when 'json'
+            [200, {'Content-Type' => 'application/json'}, '{"expires_in":600,"access_token":"salmon","refresh_token":"trout"}']
+          end
+        end
+      end
+    end
+    cli
+  end
+  subject { client.token_exchange }
+
+  describe '#authorize_url' do
+    it 'raises NotImplementedError' do
+      expect { subject.authorize_url }.to raise_error(NotImplementedError)
+    end
+  end
+
+  %w(json formencoded).each do |mode|
+    describe "#get_token (#{mode})" do
+      before do
+        @mode = mode
+        @access = subject.get_token('actor token', 'actor token type', 'subject token', 'subject token type')
+      end
+
+      it 'returns AccessToken with same Client' do
+        expect(@access.client).to eq(client)
+      end
+
+      it 'returns AccessToken with #token' do
+        expect(@access.token).to eq('salmon')
+      end
+
+      it 'returns AccessToken with #refresh_token' do
+        expect(@access.refresh_token).to eq('trout')
+      end
+
+      it 'returns AccessToken with #expires_in' do
+        expect(@access.expires_in).to eq(600)
+      end
+
+      it 'returns AccessToken with #expires_at' do
+        expect(@access.expires_at).not_to be_nil
+      end
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-auth
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Frank Macreery
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-resource
@@ -176,13 +176,14 @@ files:
 - spec/aptible/auth/token_spec.rb
 - spec/aptible/auth/user_spec.rb
 - spec/aptible/auth_spec.rb
+- spec/oauth2/lib/token_exchange_spec.rb
 - spec/shared/set_env.rb
 - spec/spec_helper.rb
 homepage: https://github.com/aptible/aptible-auth-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -198,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby client for auth.aptible.com
 test_files:
@@ -208,5 +209,6 @@ test_files:
 - spec/aptible/auth/token_spec.rb
 - spec/aptible/auth/user_spec.rb
 - spec/aptible/auth_spec.rb
+- spec/oauth2/lib/token_exchange_spec.rb
 - spec/shared/set_env.rb
 - spec/spec_helper.rb