doorkeeper 0.6.2 → 0.6.3

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.6.3
+
+- bugfixes
+  - [#163] Error response content-type header should be application/json [@ggayan](https://github.com/ggayan)
+  - [#175] Make token.expires_in_seconds return nil when expires_in is nil [@miyagawa](https://github.com/miyagawa)
+- enhancements
+  - [#166, #172, #174] Behavior to automatically authorize based on a configured proc
+- internals
+  - [#168] Using expectation syntax for controller specs [@rdsoze](https://github.com/rdsoze)
+
 ## 0.6.2
 
 - bugfixes

data/README.md

@@ -32,7 +32,7 @@ For more information about the supported features, check out the related [page i
 Put this in your Gemfile:
 
 ``` ruby
-gem 'doorkeeper', '~> 0.6.2'
+gem 'doorkeeper', '~> 0.6.3'
 ```
 
 Run the installation generator with:

data/app/controllers/doorkeeper/authorizations_controller.rb

@@ -4,8 +4,7 @@ module Doorkeeper
 
     def new
       if pre_auth.authorizable?
-        # TODO: use configuration (like config.skip_authorization?)
-        if Doorkeeper::AccessToken.matching_token_for pre_auth.client, current_resource_owner.id, pre_auth.scopes
+        if Doorkeeper::AccessToken.matching_token_for(pre_auth.client, current_resource_owner.id, pre_auth.scopes) || skip_authorization?
           auth = authorization.authorize
           redirect_to auth.redirect_uri
         else

data/lib/doorkeeper/config.rb

@@ -142,11 +142,13 @@ module Doorkeeper
              warn(I18n.translate('doorkeeper.errors.messages.credential_flow_not_configured'))
              nil
            }
+    option :skip_authorization, :default => lambda{|routes|}
     option :access_token_expires_in,      :default => 7200
     option :authorization_code_expires_in,:default => 600
     option :orm, :default => :active_record
     option :test_redirect_uri, :default => 'urn:ietf:wg:oauth:2.0:oob'
 
+
     def refresh_token_enabled?
       !!@refresh_token_enabled
     end

data/lib/doorkeeper/helpers/controller.rb

@@ -6,7 +6,8 @@ module Doorkeeper
                   :authenticate_resource_owner!,
                   :authenticate_admin!,
                   :current_resource_owner,
-                  :resource_owner_from_credentials
+                  :resource_owner_from_credentials,
+                  :skip_authorization?
       end
 
       def authenticate_resource_owner!
@@ -48,6 +49,10 @@ module Doorkeeper
         self.response_body = error.body.to_json
         self.status        = error.status
       end
+
+      def skip_authorization?
+        !!instance_exec([@server.current_resource_owner, @pre_auth.client], &Doorkeeper.configuration.skip_authorization)
+      end
     end
   end
 end

data/lib/doorkeeper/models/expirable.rb

@@ -10,6 +10,7 @@ module Doorkeeper
       end
 
       def expires_in_seconds
+        return nil if expires_in.nil?
         expires = (created_at + expires_in.seconds) - Time.now
         expires_sec = expires.seconds.round(0)
         expires_sec > 0 ? expires_sec : 0  

data/lib/doorkeeper/oauth/client.rb

@@ -22,6 +22,8 @@ module Doorkeeper
       def initialize(application)
         @application = application
       end
+
+      attr_accessor :application
     end
   end
 end

data/lib/doorkeeper/oauth/error_response.rb

@@ -37,7 +37,7 @@ module Doorkeeper
       end
 
       def headers
-        { 'Cache-Control' => 'no-store', 'Pragma' => 'no-cache' }
+        { 'Cache-Control' => 'no-store', 'Pragma' => 'no-cache', 'Content-Type' => 'application/json; charset=utf-8' }
       end
     end
   end

data/lib/doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module Doorkeeper
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/lib/generators/doorkeeper/templates/initializer.rb

@@ -57,4 +57,11 @@ Doorkeeper.configure do
   # (Similar behaviour: https://developers.google.com/accounts/docs/OAuth2InstalledApp#choosingredirecturi)
   #
   # test_redirect_uri 'urn:ietf:wg:oauth:2.0:oob'
+
+  # Under some circumstances you might want to have applications auto-approved,
+  # so that the user skips the authorization step.
+  # For example if dealing with trusted a application.
+  # skip_authorization do |resource_owner, client|
+  #   client.superapp? or resource_owner.admin?
+  # end
 end

data/spec/controllers/applications_controller_spec.rb

@@ -11,7 +11,7 @@ module Doorkeeper
 
       it "redirects as set in Doorkeeper.authenticate_admin" do
         get :index
-        response.should redirect_to(controller.main_app.root_url)
+        expect(response).to redirect_to(controller.main_app.root_url)
       end
     end
   end

data/spec/controllers/authorizations_controller_spec.rb

@@ -25,31 +25,31 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
     end
 
     it "redirects after authorization" do
-      response.should be_redirect
+      expect(response).to be_redirect
     end
 
     it "redirects to client redirect uri" do
-      response.location.should =~ %r[^#{client.redirect_uri}]
+      expect(response.location).to match(%r[^#{client.redirect_uri}])
     end
 
     it "includes access token in fragment" do
-      fragments("access_token").should == Doorkeeper::AccessToken.first.token
+      expect(fragments("access_token")).to eq(Doorkeeper::AccessToken.first.token)
     end
 
     it "includes token type in fragment" do
-      fragments("token_type").should == "bearer"
+      expect(fragments("token_type")).to eq('bearer')
     end
 
     it "includes token expiration in fragment" do
-      fragments("expires_in").to_i.should == 2.hours.to_i
+      expect(fragments("expires_in").to_i).to eq(2.hours.to_i)
     end
 
     it "issues the token for the current client" do
-      Doorkeeper::AccessToken.first.application_id.should == client.id
+      expect(Doorkeeper::AccessToken.first.application_id).to eq(client.id)
     end
 
     it "issues the token for the current resource owner" do
-      Doorkeeper::AccessToken.first.resource_owner_id.should == user.id
+      expect(Doorkeeper::AccessToken.first.resource_owner_id).to eq(user.id)
     end
   end
 
@@ -60,27 +60,27 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
     end
 
     it "redirects after authorization" do
-      response.should be_redirect
+      expect(response).to be_redirect
     end
 
     it "redirects to client redirect uri" do
-      response.location.should =~ %r[^#{client.redirect_uri}]
+      expect(response.location).to match(%r[^#{client.redirect_uri}])
     end
 
     it "does not include access token in fragment" do
-      fragments("access_token").should be_nil
+      expect(fragments("access_token")).to be_nil
     end
 
     it "includes error in fragment" do
-      fragments("error").should == "invalid_scope"
+      expect(fragments("error")).to eq('invalid_scope')
     end
 
     it "includes error description in fragment" do
-      fragments("error_description").should == translated_error_message(:invalid_scope)
+      expect(fragments("error_description")).to eq(translated_error_message(:invalid_scope))
     end
 
     it "does not issue any access token" do
-      Doorkeeper::AccessToken.all.should be_empty
+      expect(Doorkeeper::AccessToken.all).to be_empty
     end
   end
 
@@ -94,7 +94,41 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
     end
 
     it 'renders new template' do
-      response.should render_template(:new)
+      expect(response).to render_template(:new)
+    end
+  end
+
+  describe "GET #new with skip_authorization true" do
+    before do
+      Doorkeeper.configuration.stub(:skip_authorization => proc do
+          true
+        end)
+      get :new, :client_id => client.uid, :response_type => "token", :redirect_uri => client.redirect_uri
+    end
+
+    it "should redirect immediately" do
+      response.should be_redirect
+      response.location.should =~ %r[^#{client.redirect_uri}]
+    end
+
+    it "should issue a token" do
+      Doorkeeper::AccessToken.count.should be 1
+    end
+
+    it "includes token type in fragment" do
+      fragments("token_type").should == "bearer"
+    end
+
+    it "includes token expiration in fragment" do
+      fragments("expires_in").to_i.should == 2.hours.to_i
+    end
+
+    it "issues the token for the current client" do
+      Doorkeeper::AccessToken.first.application_id.should == client.id
+    end
+
+    it "issues the token for the current resource owner" do
+      Doorkeeper::AccessToken.first.resource_owner_id.should == user.id
     end
   end
 
@@ -105,16 +139,16 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
     end
 
     it "does not redirect" do
-      response.should_not be_redirect
+      expect(response).to_not be_redirect
     end
 
     it 'renders error template' do
-      response.should render_template(:error)
+      expect(response).to render_template(:error)
     end
 
     it 'does not issue any token' do
-      Doorkeeper::AccessGrant.count.should be 0
-      Doorkeeper::AccessToken.count.should be 0
+      expect(Doorkeeper::AccessGrant.count).to eq 0
+      expect(Doorkeeper::AccessToken.count).to eq 0
     end
   end
 end

data/spec/controllers/protected_resources_controller_spec.rb

@@ -14,12 +14,12 @@ shared_examples "specified for particular actions" do
   context "with valid token", :token => :valid do
     it "allows into index action" do
       get :index, :access_token => token_string
-      response.should be_success
+      expect(response).to be_success
     end
 
     it "allows into show action" do
       get :show, :id => "3", :access_token => token_string
-      response.should be_success
+      expect(response).to be_success
     end
   end
 
@@ -28,12 +28,12 @@ shared_examples "specified for particular actions" do
 
     it "does not allow into index action" do
       get :index, :access_token => token_string
-      response.status.should == 401
+      expect(response.status).to eq 401
     end
 
     it "allows into show action" do
       get :show, :id => "5", :access_token => token_string
-      response.should be_success
+      expect(response).to be_success
     end
   end
 end
@@ -42,24 +42,24 @@ shared_examples "specified with except" do
   context "with valid token", :token => :valid do
     it "allows into index action" do
       get :index, :access_token => token_string
-      response.should be_success
+      expect(response).to be_success
     end
 
     it "allows into show action" do
       get :show, :id => "4", :access_token => token_string
-      response.should be_success
+      expect(response).to be_success
     end
   end
 
   context "with invalid token", :token => :invalid do
     it "allows into index action" do
       get :index, :access_token => token_string
-      response.should be_success
+      expect(response).to be_success
     end
 
     it "does not allow into show action" do
       get :show, :id => "14", :access_token => token_string
-      response.status.should == 401
+      expect(response.status).to eq 401
     end
   end
 end
@@ -74,9 +74,7 @@ describe "Doorkeeper_for helper" do
       end
     end
 
-    let :token_string do
-      "1A2BC3"
-    end
+    let(:token_string) { "1A2BC3" }
 
     it "access_token param" do
       Doorkeeper::AccessToken.should_receive(:authenticate).with(token_string)
@@ -118,24 +116,24 @@ describe "Doorkeeper_for helper" do
     context "with valid token", :token => :valid do
       it "allows into index action" do
         get :index, :access_token => token_string
-        response.should be_success
+        expect(response).to be_success
       end
 
       it "allows into show action" do
         get :show, :id => "4", :access_token => token_string
-        response.should be_success
+        expect(response).to be_success
       end
     end
 
     context "with invalid token", :token => :invalid do
       it "does not allow into index action" do
         get :index, :access_token => token_string
-        response.status.should == 401
+        expect(response.status).to eq 401
       end
 
       it "does not allow into show action" do
         get :show, :id => "4", :access_token => token_string
-        response.status.should == 401
+        expect(response.status).to eq 401
       end
     end
   end
@@ -166,22 +164,20 @@ describe "Doorkeeper_for helper" do
       include ControllerActions
     end
 
-    let :token_string do
-      "1A2DUWE"
-    end
+    let(:token_string) { "1A2DUWE" }
 
     it "allows if the token has particular scopes" do
       token = double(Doorkeeper::AccessToken, :accessible? => true, :scopes => [:write, :public])
       Doorkeeper::AccessToken.should_receive(:authenticate).with(token_string).and_return(token)
       get :index, :access_token => token_string
-      response.should be_success
+      expect(response).to be_success
     end
 
     it "does not allow if the token does not include given scope" do
       token = double(Doorkeeper::AccessToken, :accessible? => true, :scopes => [:public])
       Doorkeeper::AccessToken.should_receive(:authenticate).with(token_string).and_return(token)
       get :index, :access_token => token_string
-      response.status.should == 401
+      expect(response.status).to eq 401
     end
   end
 
@@ -199,11 +195,11 @@ describe "Doorkeeper_for helper" do
 
       it "it renders a custom JSON response", :token => :invalid do
         get :index, :access_token => token_string
-        response.status.should == 401
-        response.content_type.should == 'application/json'
+        expect(response.status).to eq 401
+        expect(response.content_type).to eq('application/json')
         parsed_body = JSON.parse(response.body)
-        parsed_body.should_not be_nil
-        parsed_body['error'].should == 'Unauthorized'
+        expect(parsed_body).not_to be_nil
+        expect(parsed_body['error']).to eq('Unauthorized')
       end
 
     end
@@ -215,9 +211,9 @@ describe "Doorkeeper_for helper" do
 
       it "it renders a custom JSON response", :token => :invalid do
         get :index, :access_token => token_string
-        response.status.should == 401
-        response.content_type.should == 'text/html'
-        response.body.should == 'Unauthorized'
+        expect(response.status).to eq 401
+        expect(response.content_type).to eq('text/html')
+        expect(response.body.should).to eq('Unauthorized')
       end
     end
   end
@@ -242,24 +238,24 @@ describe "Doorkeeper_for helper" do
     context "with valid token", :token => :valid do
       it "enables access if passed block evaluates to false" do
         get :index, :access_token => token_string
-        response.should be_success
+        expect(response).to be_success
       end
 
       it "enables access if passed block evaluates to true" do
         get :show, :id => 1, :access_token => token_string
-        response.should be_success
+        expect(response).to be_success
       end
     end
 
     context "with invalid token", :token => :invalid do
       it "enables access if passed block evaluates to false" do
         get :index, :access_token => token_string
-        response.should be_success
+        expect(response).to be_success
       end
 
       it "does not enable access if passed block evaluates to true" do
         get :show, :id => 3, :access_token => token_string
-        response.status.should == 401
+        expect(response.status).to eq 401
       end
     end
   end
@@ -285,12 +281,12 @@ describe "Doorkeeper_for helper" do
     context "with valid token", :token => :valid do
       it "allows access if passed block evaluates to false" do
         get :index, :access_token => token_string
-        response.should be_success
+        expect(response).to be_success
       end
 
       it "allows access if passed block evaluates to true" do
         get :show, :id => 1, :access_token => token_string
-        response.should be_success
+        expect(response).to be_success
       end
     end
 
@@ -301,7 +297,7 @@ describe "Doorkeeper_for helper" do
 
       it "allows access if passed block evaluates to true" do
         get :show, :id => 3, :access_token => token_string
-        response.should be_success
+        expect(response).to be_success
       end
     end
   end

data/spec/controllers/token_info_controller_spec.rb

@@ -18,12 +18,12 @@ describe Doorkeeper::TokenInfoController do
 
       it "responds with tokeninfo" do
         do_get
-        response.body.should eq doorkeeper_token.to_json
+        expect(response.body).to eq(doorkeeper_token.to_json)
       end
 
       it "responds with a 200 status" do
         do_get
-        response.status.should eq 200
+        expect(response.status).to eq 200
       end
     end
 
@@ -33,19 +33,19 @@ describe Doorkeeper::TokenInfoController do
       end
       it "responds with 401 when doorkeeper_token is not valid" do
         do_get
-        response.status.should eq 401
+        expect(response.status).to eq 401
       end
 
       it "responds with 401 when doorkeeper_token is invalid, expired or revoked" do
         controller.stub(:doorkeeper_token => doorkeeper_token)
         doorkeeper_token.stub(:accessible? => false)
         do_get
-        response.status.should eq 401
+        expect(response.status).to eq 401
       end
 
       it "responds body message for error" do
         do_get
-        response.body.should eq Doorkeeper::OAuth::ErrorResponse.new(:name => :invalid_request, :status => :unauthorized).body.to_json
+        expect(response.body).to eq(Doorkeeper::OAuth::ErrorResponse.new(:name => :invalid_request, :status => :unauthorized).body.to_json)
       end
     end
 

data/spec/controllers/tokens_controller_spec.rb

@@ -30,7 +30,7 @@ describe Doorkeeper::TokensController do
       pending 'verify need of these specs'
       token.stub(:error_response => stub(:to_json => [], :status => :unauthorized))
       post :create
-      response.status.should == 401
+      expect(response.status).to eq 401
     end
   end
 end

data/spec/lib/models/expirable_spec.rb

@@ -41,6 +41,11 @@ describe 'Expirable' do
       subject.stub :expires_in => 30.seconds
       subject.expires_in_seconds.should == 0 
     end
+
+    it "should return nil when expires_in is nil" do
+      subject.stub :expires_in => nil
+      subject.expires_in_seconds.should be_nil
+    end
     
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70248653033380 !ruby/object:Gem::Requirement
+  requirement: &70130193498340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70248653033380
+  version_requirements: *70130193498340
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70248653052440 !ruby/object:Gem::Requirement
+  requirement: &70130193497080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *70248653052440
+  version_requirements: *70130193497080
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70248653066860 !ruby/object:Gem::Requirement
+  requirement: &70130193496300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.11.4
   type: :development
   prerelease: false
-  version_requirements: *70248653066860
+  version_requirements: *70130193496300
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70248653063820 !ruby/object:Gem::Requirement
+  requirement: &70130193495160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70248653063820
+  version_requirements: *70130193495160
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &70248653085640 !ruby/object:Gem::Requirement
+  requirement: &70130193493840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.8.5
   type: :development
   prerelease: false
-  version_requirements: *70248653085640
+  version_requirements: *70130193493840
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70248653084480 !ruby/object:Gem::Requirement
+  requirement: &70130193493100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.4
   type: :development
   prerelease: false
-  version_requirements: *70248653084480
+  version_requirements: *70130193493100
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70248653083120 !ruby/object:Gem::Requirement
+  requirement: &70130193492640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.5.2
   type: :development
   prerelease: false
-  version_requirements: *70248653083120
+  version_requirements: *70130193492640
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70248653082380 !ruby/object:Gem::Requirement
+  requirement: &70130193492100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.9.1
   type: :development
   prerelease: false
-  version_requirements: *70248653082380
+  version_requirements: *70130193492100
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70248653081300 !ruby/object:Gem::Requirement
+  requirement: &70130193491140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *70248653081300
+  version_requirements: *70130193491140
 description: Doorkeeper is an OAuth 2 provider for Rails.
 email:
 - felipe@applicake.com
@@ -360,7 +360,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2088953197718339440
+      hash: -3038258782107133512
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -369,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2088953197718339440
+      hash: -3038258782107133512
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.12