g5_authentication_client 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0feb9bbacf734abc8f82d494f5b2e0d19342e851
-  data.tar.gz: 1c671a19a12f098fdc271ef64fbe6f3ec62b3645
+  metadata.gz: c53ebcac18a16bd552178866980fafac5c8a0ae4
+  data.tar.gz: 17ca20696af027a5535bc29e4d3e8d7ef23b7ab6
 SHA512:
-  metadata.gz: b0a1a80419a069ebe94d04204fe1f3cf5f53a2454e4cd94ecdb6a86b7e8996dad81245758a1f856ff5517ca9f804b8288df2ec7eafedd8a27a4b11dbd6faa88d
-  data.tar.gz: b4450179fffa6f0bffa364bf5c28b02c6564c9be166efcc2f80c4e166506116a76fa84910ddedbeac68ba90c0203f303835bc9cb7276a70e74ac8371ed1273eb
+  metadata.gz: e8ec55c0c2826bcd192a1920ac3dc53d51df2edea1ef00464ef889b3a4e8cdb079f6e0ff391e19c679cefb1451e661755e64470b79cd0cf045b215288bef81f7
+  data.tar.gz: 088cf07f5d346f9b5de42d412a936fd1b676296d9f734e309f3536b166a43d660e034c70c033563aa9e4a402e5815e940a34d1b303752f2073c4651884c714e7

data/.ruby-version

@@ -1 +1 @@
-2.1.6
+2.2.2

data/lib/g5_authentication_client/auth_token_helper.rb

@@ -0,0 +1,16 @@
+module G5AuthenticationClient::AuthTokenHelper
+  # Return response to 'yield'
+  # Yield response should have a 'code' method for the http status code
+  def do_with_username_pw_access_token
+    response = yield cached_username_pw_access_token
+    if 401 == response.code.to_i
+      @cached_username_pw_access_token = nil
+      response                         = yield cached_username_pw_access_token
+    end
+    response
+  end
+
+  def cached_username_pw_access_token
+    @cached_username_pw_access_token ||= G5AuthenticationClient::Client.new.username_pw_access_token.token
+  end
+end

data/lib/g5_authentication_client/client.rb

@@ -184,6 +184,11 @@ module G5AuthenticationClient
       response.parsed.collect { |parsed_role| Role.new(parsed_role) }
     end
 
+    def username_pw_access_token
+      raise 'allow_password_credentials must be enabled for username/pw access' unless allow_password_credentials?
+      oauth_client.password.get_token(username, password)
+    end
+
     private
 
     def user_hash(h)
@@ -201,7 +206,7 @@ module G5AuthenticationClient
       elsif authorization_code
         oauth_client.auth_code.get_token(authorization_code, redirect_uri: redirect_uri)
       elsif allow_password_credentials?
-        oauth_client.password.get_token(username,password)
+        username_pw_access_token
       else
         raise "Insufficient credentials for access token.  Supply a username/password or authentication code"
       end

data/lib/g5_authentication_client/version.rb

@@ -1,3 +1,3 @@
 module G5AuthenticationClient
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/lib/g5_authentication_client.rb

@@ -4,6 +4,7 @@ require 'g5_authentication_client/configuration'
 require 'g5_authentication_client/user'
 require 'g5_authentication_client/token_info'
 require 'g5_authentication_client/role'
+require 'g5_authentication_client/auth_token_helper'
 
 module G5AuthenticationClient
   extend Configuration

data/spec/g5_authentication_client/auth_token_helper_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe G5AuthenticationClient::AuthTokenHelper do
+  class TestDummy
+    include G5AuthenticationClient::AuthTokenHelper
+  end
+  subject { TestDummy.new }
+  describe '#do_with_username_pw_access_token' do
+    let(:response) { double(:response, code: code) }
+    let(:token) { double(:token, token: 'asdf') }
+    before do
+      allow(G5AuthenticationClient::Client).to receive(:new).and_return(double(:client, username_pw_access_token: token))
+    end
+    let(:call) do
+      subject.do_with_username_pw_access_token do |token|
+        response
+      end
+    end
+
+    context '200' do
+      let(:code) { '200' }
+      it 'responds with the yielded response' do
+        expect(call).to eq(response)
+      end
+
+      context 'subsequent calls' do
+        before do
+          call
+          call
+        end
+        it 'responds with the yieleded response' do
+          expect(call).to eq(response)
+        end
+        it 'calls username_pw_access_token once' do
+          expect(G5AuthenticationClient::Client).to have_received(:new).once
+        end
+      end
+    end
+
+    context '401' do
+      let(:code) { '401' }
+      before do
+        allow(G5AuthenticationClient::Client).to receive(:new).and_return(double(:client, username_pw_access_token: token))
+        call
+      end
+      it 'responds with the yielded response' do
+        expect(call).to eq(response)
+      end
+      it 'calls username_pw_access_token once' do
+        expect(G5AuthenticationClient::Client).to have_received(:new).twice
+      end
+    end
+  end
+end

data/spec/g5_authentication_client/client_spec.rb

@@ -127,6 +127,10 @@ describe G5AuthenticationClient::Client do
     it 'should have default allow_password_credentials' do
       expect(client.allow_password_credentials).to eq('true')
     end
+
+    it 'username_pw_access_token raises error when password credentials not enabled' do
+      expect { client.username_pw_access_token }.to raise_error('allow_password_credentials must be enabled for username/pw access')
+    end
   end
 
   context 'with non-default configuration' do
@@ -518,4 +522,23 @@ describe G5AuthenticationClient::Client do
       it_should_behave_like 'an oauth protected resource', G5AuthenticationClient::Role
     end
   end
+
+  context 'stubbed get token' do
+    let(:token) {'asdf'}
+    before do
+      oauth_client = double(OAuth2::AccessToken, password: double(:pw, get_token: token))
+      allow(client).to receive(:oauth_client).and_return(oauth_client)
+    end
+
+    describe '#username_pw_access_token' do
+      let(:returned_token) { {access_token: 'asdf'} }
+      before do
+        client.allow_password_credentials = 'true'
+      end
+
+      it 'delegates token retrieval to oauth_client' do
+        expect(client.username_pw_access_token).to eq(token)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: g5_authentication_client
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Rob Revels
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: modelish
@@ -212,12 +212,14 @@ files:
 - Rakefile
 - g5_authentication_client.gemspec
 - lib/g5_authentication_client.rb
+- lib/g5_authentication_client/auth_token_helper.rb
 - lib/g5_authentication_client/client.rb
 - lib/g5_authentication_client/configuration.rb
 - lib/g5_authentication_client/role.rb
 - lib/g5_authentication_client/token_info.rb
 - lib/g5_authentication_client/user.rb
 - lib/g5_authentication_client/version.rb
+- spec/g5_authentication_client/auth_token_helper_spec.rb
 - spec/g5_authentication_client/client_spec.rb
 - spec/g5_authentication_client/configuration_spec.rb
 - spec/g5_authentication_client/role_spec.rb
@@ -246,11 +248,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: g5_authentication_client
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Client for the G5 Auth service
 test_files:
+- spec/g5_authentication_client/auth_token_helper_spec.rb
 - spec/g5_authentication_client/client_spec.rb
 - spec/g5_authentication_client/configuration_spec.rb
 - spec/g5_authentication_client/role_spec.rb