devise_oauth2_providable 0.2.0 → 0.2.1

data/.rspec

@@ -1,3 +1,3 @@
 --colour
 --format documentation
-
+--backtrace

data/lib/devise_oauth2_providable/engine.rb

@@ -3,9 +3,6 @@ module Devise
     class Engine < Rails::Engine
       initializer "devise_oauth2_providable.initialize_application" do |app|
         app.config.filter_parameters << :client_secret
-        app.middleware.use Rack::OAuth2::Server::Resource::Bearer, 'OAuth2 Bearer Token Resources' do |req|
-          AccessToken.valid.find_by_token(req.access_token) || req.invalid_token!
-        end
       end
     end
   end

data/lib/devise_oauth2_providable/strategy.rb

@@ -4,13 +4,34 @@ module Devise
   module Strategies
     class Oauth2Providable < Base
       def valid?
-        env[Rack::OAuth2::Server::Resource::ACCESS_TOKEN].present?
+        @req = Rack::OAuth2::Server::Resource::Bearer::Request.new(env)
+        @req.oauth2?
       end
       def authenticate!
-        token = AccessToken.valid.find_by_token env[Rack::OAuth2::Server::Resource::ACCESS_TOKEN]
-        raise Rack::OAuth2::Server::Resource::Bearer::Unauthorized unless token
-        raise Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(:invalid_token, 'User token is required') unless token.user
-        success! token.user
+        token = [@req.access_token_in_header, @req.access_token_in_payload].compact
+        access_token = AccessToken.valid.find_by_token token
+        resource = access_token ? access_token.user : nil
+        if validate(resource)
+          success! resource
+        elsif !halted?
+          fail(:invalid_token)
+        end
+      end
+
+      private
+      # Simply invokes valid_for_authentication? with the given block and deal with the result.
+      def validate(resource, &block)
+        result = resource && resource.valid_for_authentication?(&block)
+
+        case result
+        when String, Symbol
+          fail!(result)
+          false
+        when TrueClass
+          true
+        else
+          result
+        end
       end
     end
   end

data/lib/devise_oauth2_providable/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Oauth2Providable
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/rails_app/.rspec

@@ -1 +1,2 @@
 --colour
+--backtrace

data/spec/rails_app/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'rails', '3.0.7'
-gem 'rspec-rails', '2.5.0'
+gem 'rspec-rails', '2.6.0'
 gem 'devise_oauth2_providable', :path => '../../'
 gem 'shoulda-matchers', '1.0.0.beta2'
 gem 'ruby-debug'

data/spec/rails_app/app/controllers/protected_controller.rb

@@ -0,0 +1,6 @@
+class ProtectedController < ApplicationController
+  before_filter :authenticate_user!
+  def index
+    render :nothing => true, :status => :ok
+  end
+end

data/spec/rails_app/config/routes.rb

@@ -1,5 +1,6 @@
 RailsApp::Application.routes.draw do
   devise_for :users
+  resources :protected
 
   # The priority is based upon order of creation:
   # first created -> highest priority.

data/spec/rails_app/spec/controllers/protected_controller_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe ProtectedController do
+
+  describe 'get :index' do
+    before do
+      client = Client.create! :name => 'test', :redirect_uri => 'http://localhost:3000', :website => 'http://localhost'
+      @user = User.create! :name => 'ryan sonnek', :email => 'foo@example.com'
+      @token = AccessToken.create! :client => client, :user => @user
+
+      get :index, {:bearer_token => @token.token}, {'HTTP_AUTHORIZATION' => "Bearer #{@token.token}"}
+    end
+    it { should respond_with :ok }
+  end
+end

data/spec/rails_app/spec/spec_helper.rb

@@ -8,6 +8,8 @@ require 'rspec/rails'
 Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
 RSpec.configure do |config|
+  config.include Devise::TestHelpers, :type => :controller
+
   # == Mock Framework
   #
   # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_oauth2_providable
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 Z
+date: 2011-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -123,6 +123,7 @@ files:
 - spec/rails_app/README
 - spec/rails_app/Rakefile
 - spec/rails_app/app/controllers/application_controller.rb
+- spec/rails_app/app/controllers/protected_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb
 - spec/rails_app/app/models/user.rb
 - spec/rails_app/app/views/layouts/application.html.erb
@@ -160,6 +161,7 @@ files:
 - spec/rails_app/public/robots.txt
 - spec/rails_app/public/stylesheets/.gitkeep
 - spec/rails_app/script/rails
+- spec/rails_app/spec/controllers/protected_controller_spec.rb
 - spec/rails_app/spec/integration/token_endpoint_spec.rb
 - spec/rails_app/spec/models/access_token_spec.rb
 - spec/rails_app/spec/models/client_spec.rb
@@ -210,6 +212,7 @@ test_files:
 - spec/rails_app/README
 - spec/rails_app/Rakefile
 - spec/rails_app/app/controllers/application_controller.rb
+- spec/rails_app/app/controllers/protected_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb
 - spec/rails_app/app/models/user.rb
 - spec/rails_app/app/views/layouts/application.html.erb
@@ -247,6 +250,7 @@ test_files:
 - spec/rails_app/public/robots.txt
 - spec/rails_app/public/stylesheets/.gitkeep
 - spec/rails_app/script/rails
+- spec/rails_app/spec/controllers/protected_controller_spec.rb
 - spec/rails_app/spec/integration/token_endpoint_spec.rb
 - spec/rails_app/spec/models/access_token_spec.rb
 - spec/rails_app/spec/models/client_spec.rb