aptible-auth 0.11.15 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 988f035b08404c743665c27fc943def97d1ef3ce
-  data.tar.gz: 1542ad296a37085507dbcfff254bb36914d7988f
+  metadata.gz: 9d1a369415687169cb1c1b3e7719962c376ad90e
+  data.tar.gz: 76977a7c3bba157abb62d95c67a0b4acdca812e9
 SHA512:
-  metadata.gz: ecb2f54c418c34412ab0d154f931134698f92d49c3762f9fcfd2d565d65b1ff38d886d595c8c3f81f4f4d7e3b3d39ac1b528181196c5a4df374f371dde809edc
-  data.tar.gz: 750343384012634983eb521d2a2c0d53ed22036aaf3f9d08db2b3c94edff6109ca76575be183fd1a4360dc1fe5e38438cb3319ed6c49a7fb9f4f35122b978d59
+  metadata.gz: 9084781288cbb151cb96dcd37ef751e98b31f89a658dd6df2f6dc6e1cc0c4b44f084b58f99c2ec48a4b44eb99e4c2401a81924469db81e4e78aedfbf2ae90dc8
+  data.tar.gz: 8407ed89866dcbe80c8f691083252c6674194c5a1ed2bc2e66d154cb3a6561f8da83fb95fed56f8857b82f8ad96b7d3852aa540cf3e2e57e03755fd26d8660e5

data/.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
+  - "2.0"
+  - "2.1"
+  - "2.2"
   - jruby-9.0.5.0

data/Rakefile

@@ -1,4 +1,8 @@
 require 'bundler/gem_tasks'
 
-require 'aptible/tasks'
-Aptible::Tasks.load_tasks
+begin
+  require 'aptible/tasks'
+  Aptible::Tasks.load_tasks
+rescue LoadError
+  $stderr.puts 'Skipping Aptible::Tasks initialization...'
+end

data/lib/aptible/auth/token.rb

@@ -60,14 +60,7 @@ module Aptible
       end
 
       def authenticate_impersonate(subject_token, subject_token_type, options)
-        # TODO: This duplicates aptible-resource, is it worth extracting?
-        actor_token = \
-          case actor_token = options.delete(:token)
-          when Aptible::Resource::Base then actor_token.access_token
-          when Fridge::AccessToken then actor_token.to_s
-          when String then actor_token
-          else bearer_token
-          end
+        actor_token = token_as_string(options.delete(:token)) || bearer_token
 
         # TODO: Do we want to check whether the token is non-nil at this stage?
         options[:scope] ||= 'manage'
@@ -75,6 +68,7 @@ module Aptible
           actor_token, 'urn:ietf:params:oauth:token-type:jwt',
           subject_token, subject_token_type, options
         )
+
         apply_oauth_response(oauth_token)
       end
 
@@ -106,10 +100,12 @@ module Aptible
           authenticate_impersonate(href, 'aptible:organization:href', options)
         elsif (email = options.delete(:user_email))
           authenticate_impersonate(email, 'aptible:user:email', options)
+        elsif (user_token = options.delete(:user_token))
+          authenticate_impersonate(
+            token_as_string(user_token), 'aptible:token', options
+          )
         else
-          # rubocop:disable Style/SignalException
-          fail 'Unrecognized options'
-          # rubocop:enable Style/SignalException
+          raise 'Unrecognized options'
         end
       end
 
@@ -169,6 +165,19 @@ module Aptible
         # http://stackoverflow.com/questions/13747212
         private_key.n.num_bytes * 8
       end
+
+      def token_as_string(tok)
+        # TODO: This duplicates aptible-resource, is it worth extracting?
+        return nil if tok.nil?
+
+        case tok
+        when Aptible::Resource::Base then tok.access_token
+        when Fridge::AccessToken then tok.to_s
+        when String then tok
+        else
+          raise "Unrecognized token: #{tok.class}: #{tok}"
+        end
+      end
     end
   end
 end

data/lib/aptible/auth/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Auth
-    VERSION = '0.11.15'.freeze
+    VERSION = '0.12.0'.freeze
   end
 end

data/spec/aptible/auth/token_spec.rb

@@ -31,6 +31,7 @@ describe Aptible::Auth::Token do
         Aptible::Auth::Token.any_instance.should_receive(
           :authenticate_client
         ).with 'id', 'secret', 'user@example.com', {}
+
         described_class.create(
           client_id: 'id',
           client_secret: 'secret',
@@ -38,6 +39,34 @@ describe Aptible::Auth::Token do
         )
       end
 
+      it 'should #authenticate_impersonate if passed user_href' do
+        Aptible::Auth::Token.any_instance.should_receive(
+          :authenticate_impersonate
+        ).with('foo.href', 'aptible:user:href', {})
+        described_class.create(user_href: 'foo.href')
+      end
+
+      it 'should #authenticate_impersonate if passed organization_href' do
+        Aptible::Auth::Token.any_instance.should_receive(
+          :authenticate_impersonate
+        ).with('foo.href', 'aptible:organization:href', {})
+        described_class.create(organization_href: 'foo.href')
+      end
+
+      it 'should #authenticate_impersonate if passed user_email' do
+        Aptible::Auth::Token.any_instance.should_receive(
+          :authenticate_impersonate
+        ).with('foo@com', 'aptible:user:email', {})
+        described_class.create(user_email: 'foo@com')
+      end
+
+      it 'should #authenticate_impersonate if passed user_token' do
+        Aptible::Auth::Token.any_instance.should_receive(
+          :authenticate_impersonate
+        ).with('tok tok tok', 'aptible:token', {})
+        described_class.create(user_token: 'tok tok tok')
+      end
+
       it 'should not alter the hash it receives' do
         options = { email: 'some email' }
         options_before = options.dup
@@ -140,7 +169,7 @@ describe Aptible::Auth::Token do
       end
     end
 
-    describe '#authenticate_impersonate' do
+    describe '#authenticate_impersonate (user email)' do
       let(:args) { ['foo@bar.com', 'aptible:user:email', {}] }
       before { oauth.stub_chain(:token_exchange, :get_token) { response } }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-auth
 version: !ruby/object:Gem::Version
-  version: 0.11.15
+  version: 0.12.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-billing
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby client for auth.aptible.com