aptible-auth 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e402ddd5ca9cb30e1a4c52eab79ec6447a4f16b
-  data.tar.gz: fc28cb16dc80c9d45f4bd27bace7b5926345eed0
+  metadata.gz: 93d75943842f3e5ed625c2da64dc0c7ee83ffd69
+  data.tar.gz: 84e6d466d82a90fb85060294a5b93f1a9702925d
 SHA512:
-  metadata.gz: 01aa4ff7eb490715c1c0777cbc1aa967b6f4a365b72165ee1dfc2a0cb0e89b5e70230e63059fe6719f0e265bd64270894874aa8d96696480fb1c9e82ef637ca1
-  data.tar.gz: 39f2f647e6648ab8c349af53d690222a83b0dce107c212140d042a416033ce0f9c3aee0687154cc72df4f73fa09161c32c28edb8a1fb554d21e28f4cef4887c5
+  metadata.gz: 73d27eeac4954a579d97e8148f23f1a96316825e7b95c6641870db5296b6a5bdbf789e0ff12a587fc3e7cb0536c6a4d457ca2fb8a58b15f9e7950f47657a8a86
+  data.tar.gz: bd1bf9f3fd30a2d2196807507a754c9183d85a9fc0f6cdf424f465caf837b30958e13a6793fc7fcf94b5dc0fa28024fb98361e2f4ccac5b878624c6eb40a8412

data/lib/aptible/auth/token.rb

@@ -26,7 +26,7 @@ module Aptible
         parse_oauth_response(response)
       end
 
-      def authenticate_impersonate(user_href, options)
+      def authenticate_impersonate(subject_token, subject_token_type, options)
         # TODO: This duplicates aptible-resource, is it worth extracting?
         token = case token = options.delete(:token)
                 when Aptible::Resource::Base then token.access_token
@@ -39,7 +39,7 @@ module Aptible
         options[:scope] ||= 'manage'
         response = oauth.token_exchange.get_token(
           token, 'urn:ietf:params:oauth:token-type:jwt',
-          user_href, 'aptible:user:href', options)
+          subject_token, subject_token_type, options)
         parse_oauth_response(response)
       end
 
@@ -49,6 +49,7 @@ module Aptible
       end
 
       def process_options(options)
+        options = options.dup
         if (email = options.delete(:email)) &&
            (password = options.delete(:password))
           authenticate_user(email, password, options)
@@ -56,8 +57,12 @@ module Aptible
               (client_secret = options.delete(:client_secret)) &&
               (subject = options.delete(:subject))
           authenticate_client(client_id, client_secret, subject, options)
-        elsif (user_href = options.delete(:user_href))
-          authenticate_impersonate(user_href, options)
+        elsif (href = options.delete(:user_href))
+          authenticate_impersonate(href, 'aptible:user:href', options)
+        elsif (href = options.delete(:organization_href))
+          authenticate_impersonate(href, 'aptible:organization:href', options)
+        elsif (email = options.delete(:user_email))
+          authenticate_impersonate(email, 'aptible:user:email', options)
         else
           fail 'Unrecognized options'
         end

data/lib/aptible/auth/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Auth
-    VERSION = '0.11.2'
+    VERSION = '0.11.3'
   end
 end

data/spec/aptible/auth/token_spec.rb

@@ -27,6 +27,13 @@ describe Aptible::Auth::Token do
         subject: 'user@example.com'
       )
     end
+
+    it 'should not alter the hash it receives' do
+      options = { email: 'some email' }
+      options_before = options.dup
+      expect { described_class.create options }.to raise_error(/Unrecognized/)
+      expect(options).to eq(options_before)
+    end
   end
 
   describe '#initialize' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-auth
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-billing