aptible-auth 0.11.11 → 0.11.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a46fc820170e968fed7bda5028543fe70d93aae
-  data.tar.gz: ed1d0a86e9fa637cffcdd5df05bb8f95f9d924c4
+  metadata.gz: 055298f347d9ec42f8dd2dac1ca8169b5bb7b772
+  data.tar.gz: 34204507b8e90bff7726e801a29b934a80a3f711
 SHA512:
-  metadata.gz: 3a07ee68833764f1d97db72028a129d088e6cdc9ec358a8ac3c7a918dd53c396ae4e7ad9bbb1a5aa42dd5f432240326d15bc301ac81e0588821676b8dd4c9c0f
-  data.tar.gz: 2c06047000a5f77582bf75820e834cbece173a7ca3d8889349de210f788848f58adbf1dd7a94fc1bf2942d3d9828f9eb97b5b609ad48ea0b5f7a980dcb3e213d
+  metadata.gz: adaf0f020213d97b37f6bad3a4b975c9e02fb2ba2cf9fd3b74d08e0265201f947e11dde16ca671a2243ef672b59b5fbc511d8481e77c0c88ee0a5f8d4102124e
+  data.tar.gz: ca1d7f97b8bf55a3268939c9b54a7df242986eb857347f71b38471441c03db681da21a571c449c94869c724e5f4c11d6fe3f5ff639476d295ad14ea8c80f14a8

data/aptible-auth.gemspec

@@ -20,8 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aptible-billing'
-  spec.add_dependency 'aptible-resource', '>= 0.3.1'
-  spec.add_dependency 'stripe', '>= 1.13.0'
+  spec.add_dependency 'aptible-resource', '~> 0.3.8'
   spec.add_dependency 'gem_config'
   spec.add_dependency 'oauth2-aptible', '~> 0.10.0'
 

data/lib/aptible/auth/organization.rb

@@ -1,4 +1,3 @@
-require 'stripe'
 require 'aptible/billing'
 
 module Aptible

data/lib/aptible/auth/token.rb

@@ -79,7 +79,15 @@ module Aptible
       end
 
       def oauth
-        options = { site: root_url, token_url: '/tokens' }
+        options = {
+          site: root_url,
+          token_url: '/tokens',
+          connection_opts: {
+            headers: {
+              'User-Agent' => Aptible::Resource.configuration.user_agent
+            }
+          }
+        }
         @oauth ||= OAuth2::Client.new(nil, nil, options)
       end
 

data/lib/aptible/auth/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Auth
-    VERSION = '0.11.11'.freeze
+    VERSION = '0.11.12'.freeze
   end
 end

data/spec/aptible/auth/token_spec.rb

@@ -1,180 +1,193 @@
 require 'spec_helper'
 
 describe Aptible::Auth::Token do
-  let(:oauth) { double OAuth2::Client }
-  let(:response) { double OAuth2::AccessToken }
-
-  before { subject.stub(:oauth) { oauth } }
-  let(:expires_at) { Time.now - Random.rand(1000) }
-  before do
-    response.stub(:to_hash) do
-      {
-        access_token: 'access_token',
-        refresh_token: nil,
-        expires_at: expires_at.to_i
-      }
-    end
-  end
-
-  describe '.create' do
-    it 'should call #authenticate_user if passed :email and :password' do
-      Aptible::Auth::Token.any_instance.should_receive(
-        :authenticate_user
-      ).with 'user@example.com', 'foobar', {}
-      described_class.create(email: 'user@example.com', password: 'foobar')
-    end
+  context 'with stubbed oauth client' do
+    let(:oauth) { double OAuth2::Client }
+    let(:response) { double OAuth2::AccessToken }
 
-    it 'should #authenticate_client if passed a client ID and secret' 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',
-        subject: 'user@example.com'
-      )
-    end
+    let(:expires_at) { Time.now - Random.rand(1000) }
 
-    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
+    before { subject.stub(:oauth) { oauth } }
 
-  describe '#initialize' do
-    it 'should not raise error if given no arguments' do
-      expect { described_class.new }.not_to raise_error
+    before do
+      response.stub(:to_hash) do
+        {
+          access_token: 'access_token',
+          refresh_token: nil,
+          expires_at: expires_at.to_i
+        }
+      end
     end
-  end
 
-  describe '#authenticate_user' do
-    let(:args) { %w(user@example.com foobar) }
+    describe '.create' do
+      it 'should call #authenticate_user if passed :email and :password' do
+        Aptible::Auth::Token.any_instance.should_receive(
+          :authenticate_user
+        ).with 'user@example.com', 'foobar', {}
+        described_class.create(email: 'user@example.com', password: 'foobar')
+      end
 
-    before { oauth.stub_chain(:password, :get_token) { response } }
+      it 'should #authenticate_client if passed a client ID and secret' 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',
+          subject: 'user@example.com'
+        )
+      end
 
-    it 'should use the password strategy' do
-      params = { scope: 'manage' }
-      expect(oauth.password).to receive(:get_token).with(*(args + [params]))
-      subject.authenticate_user(*args)
+      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
 
-    it 'should allow the token scope to be specified' do
-      args << { scope: 'read' }
-      expect(oauth.password).to receive(:get_token).with(*args)
-      subject.authenticate_user(*args)
+    describe '#initialize' do
+      it 'should not raise error if given no arguments' do
+        expect { described_class.new }.not_to raise_error
+      end
     end
 
-    it 'should set the access_token' do
-      subject.authenticate_user(*args)
-      expect(subject.access_token).to eq 'access_token'
-    end
+    describe '#authenticate_user' do
+      let(:args) { %w(user@example.com foobar) }
 
-    it 'should set the Authorization header' do
-      subject.authenticate_user(*args)
-      expect(subject.headers['Authorization']).to eq 'Bearer access_token'
-    end
+      before { oauth.stub_chain(:password, :get_token) { response } }
 
-    it 'should set the expires_at property' do
-      subject.authenticate_user(*args)
-      expect(subject.expires_at).to be_a Time
-      expect(subject.expires_at.to_i).to eq expires_at.to_i
-    end
-  end
+      it 'should use the password strategy' do
+        params = { scope: 'manage' }
+        expect(oauth.password).to receive(:get_token).with(*(args + [params]))
+        subject.authenticate_user(*args)
+      end
 
-  describe '#authenticate_client' do
-    let(:args) { %w(id secret user@example.com) }
+      it 'should allow the token scope to be specified' do
+        args << { scope: 'read' }
+        expect(oauth.password).to receive(:get_token).with(*args)
+        subject.authenticate_user(*args)
+      end
 
-    before do
-      subject.stub(:signing_params_from_secret) { { algorithm: 'foobar' } }
-    end
-    before { oauth.stub_chain(:assertion, :get_token) { response } }
-
-    it 'should use the assertion strategy' do
-      expect(oauth.assertion).to receive(:get_token).with(
-        iss: 'id',
-        sub: 'user@example.com',
-        algorithm: 'foobar',
-        scope: 'manage'
-      )
-      subject.authenticate_client(*args)
-    end
+      it 'should set the access_token' do
+        subject.authenticate_user(*args)
+        expect(subject.access_token).to eq 'access_token'
+      end
+
+      it 'should set the Authorization header' do
+        subject.authenticate_user(*args)
+        expect(subject.headers['Authorization']).to eq 'Bearer access_token'
+      end
 
-    it 'should allow the token scope to be specified' do
-      args << { scope: 'read' }
-      expect(oauth.assertion).to receive(:get_token).with(
-        iss: 'id',
-        sub: 'user@example.com',
-        algorithm: 'foobar',
-        scope: 'read'
-      )
-      subject.authenticate_client(*args)
+      it 'should set the expires_at property' do
+        subject.authenticate_user(*args)
+        expect(subject.expires_at).to be_a Time
+        expect(subject.expires_at.to_i).to eq expires_at.to_i
+      end
     end
 
-    it 'should replace expires_in in exp' do
-      args << { expires_in: 1800 }
-      Timecop.freeze do
+    describe '#authenticate_client' do
+      let(:args) { %w(id secret user@example.com) }
+
+      before do
+        subject.stub(:signing_params_from_secret) { { algorithm: 'foobar' } }
+      end
+      before { oauth.stub_chain(:assertion, :get_token) { response } }
+
+      it 'should use the assertion strategy' do
         expect(oauth.assertion).to receive(:get_token).with(
           iss: 'id',
           sub: 'user@example.com',
-          exp: Time.now.to_i + 1800,
           algorithm: 'foobar',
           scope: 'manage'
         )
         subject.authenticate_client(*args)
       end
-    end
 
-    it 'should set the access_token' do
-      subject.authenticate_client(*args)
-      expect(subject.access_token).to eq 'access_token'
-    end
+      it 'should allow the token scope to be specified' do
+        args << { scope: 'read' }
+        expect(oauth.assertion).to receive(:get_token).with(
+          iss: 'id',
+          sub: 'user@example.com',
+          algorithm: 'foobar',
+          scope: 'read'
+        )
+        subject.authenticate_client(*args)
+      end
 
-    it 'should set the Authorization header' do
-      subject.authenticate_client(*args)
-      expect(subject.headers['Authorization']).to eq 'Bearer access_token'
-    end
-  end
+      it 'should replace expires_in in exp' do
+        args << { expires_in: 1800 }
+        Timecop.freeze do
+          expect(oauth.assertion).to receive(:get_token).with(
+            iss: 'id',
+            sub: 'user@example.com',
+            exp: Time.now.to_i + 1800,
+            algorithm: 'foobar',
+            scope: 'manage'
+          )
+          subject.authenticate_client(*args)
+        end
+      end
 
-  describe '#authenticate_impersonate' do
-    let(:args) { ['foo@bar.com', 'aptible:user:email', {}] }
-    before { oauth.stub_chain(:token_exchange, :get_token) { response } }
+      it 'should set the access_token' do
+        subject.authenticate_client(*args)
+        expect(subject.access_token).to eq 'access_token'
+      end
 
-    it 'should set the access_token' do
-      subject.authenticate_impersonate(*args)
-      expect(subject.access_token).to eq 'access_token'
+      it 'should set the Authorization header' do
+        subject.authenticate_client(*args)
+        expect(subject.headers['Authorization']).to eq 'Bearer access_token'
+      end
     end
 
-    it 'should set the Authorization header' do
-      subject.authenticate_impersonate(*args)
-      expect(subject.headers['Authorization']).to eq 'Bearer access_token'
-    end
-  end
+    describe '#authenticate_impersonate' do
+      let(:args) { ['foo@bar.com', 'aptible:user:email', {}] }
+      before { oauth.stub_chain(:token_exchange, :get_token) { response } }
 
-  describe '#signing_params_from_secret' do
-    let(:private_key_string) { OpenSSL::PKey::RSA.new(512).to_s }
+      it 'should set the access_token' do
+        subject.authenticate_impersonate(*args)
+        expect(subject.access_token).to eq 'access_token'
+      end
 
-    subject do
-      lambda do |secret|
-        described_class.new.send(:signing_params_from_secret, secret)
+      it 'should set the Authorization header' do
+        subject.authenticate_impersonate(*args)
+        expect(subject.headers['Authorization']).to eq 'Bearer access_token'
       end
     end
 
-    it 'should return a correct :algorithm' do
-      params = subject.call(private_key_string)
-      expect(params[:algorithm]).to eq 'RS256'
-    end
+    describe '#signing_params_from_secret' do
+      let(:private_key_string) { OpenSSL::PKey::RSA.new(512).to_s }
+
+      subject do
+        lambda do |secret|
+          described_class.new.send(:signing_params_from_secret, secret)
+        end
+      end
 
-    it 'should return a correct :private_key for header/footer keys' do
-      params = subject.call(private_key_string)
-      expect(params[:private_key]).to be_a OpenSSL::PKey::RSA
+      it 'should return a correct :algorithm' do
+        params = subject.call(private_key_string)
+        expect(params[:algorithm]).to eq 'RS256'
+      end
+
+      it 'should return a correct :private_key for header/footer keys' do
+        params = subject.call(private_key_string)
+        expect(params[:private_key]).to be_a OpenSSL::PKey::RSA
+      end
+
+      it 'should return a correct :private_key for Base64-only keys' do
+        stripped_key = private_key_string.gsub(/^-.*-$/, '').delete("\n")
+        params = subject.call(stripped_key)
+        expect(params[:private_key]).to be_a OpenSSL::PKey::RSA
+      end
     end
+  end
+
+  describe '#oauth' do
+    subject { described_class.new }
 
-    it 'should return a correct :private_key for Base64-only keys' do
-      stripped_key = private_key_string.gsub(/^-.*-$/, '').delete("\n")
-      params = subject.call(stripped_key)
-      expect(params[:private_key]).to be_a OpenSSL::PKey::RSA
+    it 'creates and caches an OAuth2::Client' do
+      c = subject.send(:oauth)
+      expect(subject.send(:oauth)).to be(c)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-auth
 version: !ruby/object:Gem::Version
-  version: 0.11.11
+  version: 0.11.12
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-billing
@@ -28,30 +28,16 @@ dependencies:
   name: aptible-resource
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: stripe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 0.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: gem_config
   requirement: !ruby/object:Gem::Requirement