openid-token-proxy 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5e9d9ee84423e1b89c8f781e4a3d5f292414ce1
-  data.tar.gz: 1669816ca639b9fab8a357167b8fc6fc686ba73d
+  metadata.gz: 52ad78b2ab59d7d79acc5ad4e5f1619fb97bb77e
+  data.tar.gz: 8b39777e46e9887f21482b10822648d1a0ddf274
 SHA512:
-  metadata.gz: eb1cd7c27884e7b6d1530dd1f0a54889fbb7272c420d2efd3c06e2dc894698acb30b240ff9376021bf48ae5d3b89ec8cb01c4410d8e2fdf9c999c9730fd5145d
-  data.tar.gz: 2c548204b87e52f31cd038d5a33045534c5a5d1fb75fcae3c48cef6e709a88db6d61e8544d9c7562801ff36a0844f3fcae920796a3251b5701732f9dcf89a071
+  metadata.gz: d7cb5fd53234fec4ae748b106f8ccff6d102c0a7f84bb85fc773cf05e526e8853f9c30ff8b4c75e9b2139c0cb0d6be057214f01ef2e9bb12359c9c8ca5a4e5d0
+  data.tar.gz: d19b04ccc60eb2febafb4421c39950b1448f684d3a0a7a05f8f18b3016c7829aa6f780ccde75fd967a767c010903410e95935f48ff932789cfb7d2e02e41fbef

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### v0.1.4 - June 29, 2015
+
+- Adds `Token#valid?`.
+- `Client#retrieve_token!` now supports retrieving token via username/password.
+
+
 ### v0.1.3 - May 21, 2015
 
 - Temporary workaround for OpenSSL error queue corruption.

data/config/initializers/inflections.rb

@@ -1,3 +1,5 @@
+require 'active_support/inflector'
+
 ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym 'OpenID'
 end

data/lib/openid_token_proxy/client.rb

@@ -20,18 +20,36 @@ module OpenIDTokenProxy
     # Raised when refresh token could not be exchanged
     class RefreshTokenError < Error; end
 
-    # Retrieves a token for given authorization code or refresh token
+    # Raised when token could not be retrieved for given credentials
+    class CredentialsError < Error; end
+
+    # Retrieves a token for given auth code, refresh token or username/password
     def retrieve_token!(params)
       client = new_client
-      client.authorization_code = params[:auth_code] if params[:auth_code]
-      client.refresh_token = params[:refresh_token] if params[:refresh_token]
-      response = client.access_token!(:query_string)
+
+      if auth_code = params.delete(:auth_code)
+        client.authorization_code = auth_code
+      end
+
+      if refresh_token = params.delete(:refresh_token)
+        client.refresh_token = refresh_token
+      end
+
+      if username = params.delete(:username)
+        client.resource_owner_credentials = [
+          username,
+          params.delete(:password)
+        ]
+      end
+
+      response = client.access_token!(:query_string, params)
       token = Token.decode!(response.access_token)
       token.refresh_token = response.refresh_token
       token
     rescue Rack::OAuth2::Client::Error => e
-      raise AuthCodeError.new(e.message) if params[:auth_code]
-      raise RefreshTokenError.new(e.message) if params[:refresh_token]
+      raise AuthCodeError.new(e.message) if auth_code
+      raise RefreshTokenError.new(e.message) if refresh_token
+      raise CredentialsError.new(e.message) if username
     end
 
     def new_client

data/lib/openid_token_proxy/engine.rb

@@ -1,3 +1,5 @@
+require 'rails'
+
 module OpenIDTokenProxy
   class Engine < ::Rails::Engine
     isolate_namespace OpenIDTokenProxy

data/lib/openid_token_proxy/token.rb

@@ -52,6 +52,13 @@ module OpenIDTokenProxy
       true
     end
 
+    # Whether this token is valid
+    def valid?(assertions = {})
+      validate!(assertions)
+    rescue OpenIDTokenProxy::Error
+      false
+    end
+
     def expiry_time
       Time.at(id_token.exp.to_i).utc
     end

data/lib/openid_token_proxy/version.rb

@@ -1,3 +1,3 @@
 module OpenIDTokenProxy
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/openid-token-proxy.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'openid_connect', '~> 0.8.3'
+  spec.add_dependency 'rack-oauth2', '~> 1.2.0'
   spec.add_dependency 'rails', '~> 4.0'
 
   spec.add_development_dependency 'bundler', '~> 1.6'

data/spec/lib/openid_token_proxy/client_spec.rb

@@ -81,7 +81,8 @@ RSpec.describe OpenIDTokenProxy::Client do
     let(:client) {
       double(
         'authorization_code=' => nil,
-        'refresh_token=' => nil
+        'refresh_token=' => nil,
+        'resource_owner_credentials=' => nil
       )
     }
     let(:access_token) { 'access token' }
@@ -116,7 +117,9 @@ RSpec.describe OpenIDTokenProxy::Client do
 
       context 'when auth code is valid' do
         it 'returns token instance' do
-          expect(client).to receive(:access_token!).and_return response
+          expect(client).to receive(:access_token!).with(
+            :query_string, {}
+          ).and_return response
           token = subject.retrieve_token! auth_code: 'valid auth code'
           expect(token.access_token).to eq access_token
           expect(token.id_token).to eq id_token
@@ -138,7 +141,9 @@ RSpec.describe OpenIDTokenProxy::Client do
 
       context 'when refresh token is valid' do
         it 'returns token instance' do
-          expect(client).to receive(:access_token!).and_return response
+          expect(client).to receive(:access_token!).with(
+            :query_string, {}
+          ).and_return response
           token = subject.retrieve_token! refresh_token: 'valid refresh token'
           expect(token.access_token).to eq access_token
           expect(token.id_token).to eq id_token
@@ -146,5 +151,38 @@ RSpec.describe OpenIDTokenProxy::Client do
         end
       end
     end
+
+    context 'using username and password' do
+      context 'when credentials are invalid' do
+        it 'raises' do
+          error = Rack::OAuth2::Client::Error.new 400, {}
+          expect(client).to receive(:access_token!).and_raise error
+          expect do
+            token = subject.retrieve_token! username: 'foo', password: 'bar'
+          end.to raise_error OpenIDTokenProxy::Client::CredentialsError
+        end
+      end
+
+      context 'when credentials are valid' do
+        it 'returns token instance' do
+          expect(client).to receive(:access_token!).with(
+            :query_string, {}
+          ).and_return response
+          token = subject.retrieve_token! username: 'foo', password: 'bar'
+          expect(token.access_token).to eq access_token
+          expect(token.id_token).to eq id_token
+          expect(token.refresh_token).to eq refresh_token
+        end
+      end
+    end
+
+    context 'when given options' do
+      it 'passes these through' do
+        expect(client).to receive(:access_token!).with(
+          :query_string, resource: 'x'
+        ).and_return response
+        subject.retrieve_token! auth_code: 'valid auth code', resource: 'x'
+      end
+    end
   end
 end

data/spec/lib/openid_token_proxy/token_spec.rb

@@ -78,6 +78,22 @@ RSpec.describe OpenIDTokenProxy::Token do
     end
   end
 
+  describe '#valid?' do
+    context 'when token is invalid' do
+      it 'returns false' do
+        allow(subject).to receive(:validate!).and_raise OpenIDTokenProxy::Token::Expired
+        expect(subject).not_to be_valid
+      end
+    end
+
+    context 'when token is valid' do
+      it 'returns true' do
+        allow(subject).to receive(:validate!).and_return true
+        expect(subject).to be_valid
+      end
+    end
+  end
+
   describe '#expiry_time' do
     it 'returns expiry time' do
       expect(subject.expiry_time.to_i).to eq expiry_time.to_i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openid-token-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Tim Kurvers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openid_connect
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
+- !ruby/object:Gem::Dependency
+  name: rack-oauth2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement