devise_oauth2_providable 0.2.2 → 0.2.3

data/lib/devise_oauth2_providable/strategy.rb

@@ -8,7 +8,8 @@ module Devise
         @req.oauth2?
       end
       def authenticate!
-        token = AccessToken.valid.find_by_token access_token
+        @req.setup!
+        token = AccessToken.valid.find_by_token @req.access_token
         resource = token ? token.user : nil
         if validate(resource)
           success! resource
@@ -18,11 +19,6 @@ module Devise
       end
 
       private
-      def access_token
-        tokens = [@req.access_token_in_header, @req.access_token_in_payload].compact
-        raise 'invalid request: access token exists in header and payload' if tokens.size > 1
-        tokens.first
-      end
       # 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)

data/lib/devise_oauth2_providable/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Oauth2Providable
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

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

@@ -7,9 +7,26 @@ describe ProtectedController 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 }
+    context 'with valid bearer token in header' do
+      before do
+        @request.env['HTTP_AUTHORIZATION'] = "Bearer #{@token.token}"
+        get :index, :format => 'json'
+      end
+      it { should respond_with :ok }
+    end
+    context 'with invalid bearer token in query param' do
+      before do
+        get :index, :bearer_token => 'invalid', :format => 'json'
+      end
+      it { should respond_with :unauthorized }
+    end
+    context 'with valid bearer token in header and query string' do
+      before do
+        @request.env['HTTP_AUTHORIZATION'] = "Bearer #{@token.token}"
+        get :index, :bearer_token => @token.token, :format => 'json'
+      end
+      it { should respond_with :unauthorized }
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_oauth2_providable
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 Z
+date: 2011-05-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails