doorkeeper 1.4.2 → 2.0.0.alpha1

data/spec/dummy/app/controllers/full_protected_resources_controller.rb

@@ -1,6 +1,6 @@
 class FullProtectedResourcesController < ApplicationController
-  doorkeeper_for :index
-  doorkeeper_for :show, scopes: [:admin]
+  before_filter -> { doorkeeper_authorize! :admin }, only: :show
+  before_filter :doorkeeper_authorize!, only: :index
 
   def index
     render text: 'index'

data/spec/dummy/app/controllers/metal_controller.rb

@@ -1,9 +1,9 @@
 class MetalController < ActionController::Metal
   include AbstractController::Callbacks
   include ActionController::Head
-  include Doorkeeper::Helpers::Filter
+  include Doorkeeper::Rails::Helpers
 
-  doorkeeper_for :all
+  before_filter :doorkeeper_authorize!
 
   def index
     self.response_body = { ok: true }.to_json

data/spec/dummy/app/controllers/semi_protected_resources_controller.rb

@@ -1,11 +1,11 @@
 class SemiProtectedResourcesController < ApplicationController
-  doorkeeper_for :index
+  before_filter :doorkeeper_authorize!, only: :index
 
   def index
     render text: 'protected index'
   end
 
   def show
-    render text: 'protected show'
+    render text: 'non protected show'
   end
 end

data/spec/dummy/config/application.rb

@@ -50,5 +50,7 @@ module Dummy
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+
+    I18n.enforce_available_locales = false
   end
 end

data/spec/lib/config_spec.rb

@@ -14,6 +14,22 @@ describe Doorkeeper, 'configuration' do
     end
   end
 
+  describe 'enable_orm' do
+    it 'adds specific error message to NameError exception' do
+      expect do
+        Doorkeeper.configure { orm 'hibernate' }
+      end.to raise_error(NameError, /ORM adapter not found \(hibernate\)/)
+    end
+
+    it 'does not change other exceptions' do
+      String.any_instance.stub(:classify) { raise NoMethodError }
+
+      expect do
+        Doorkeeper.configure { orm 'hibernate' }
+      end.to raise_error(NoMethodError, 'NoMethodError')
+    end
+  end
+
   describe 'admin_authenticator' do
     it 'sets the block that is accessible via authenticate_admin' do
       block = proc {}
@@ -264,16 +280,6 @@ describe Doorkeeper, 'configuration' do
     end
   end
 
-  describe 'test_redirect_uri' do
-    it 'can change the native_redirect_uri value' do
-      Doorkeeper.configure do
-        orm DOORKEEPER_ORM
-        test_redirect_uri 'foo'
-      end
-      expect(subject.native_redirect_uri).to eq('foo')
-    end
-  end
-
   it 'raises an exception when configuration is not set' do
     old_config = Doorkeeper.configuration
     Doorkeeper.module_eval do

data/spec/lib/models/expirable_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'timecop'
 require 'active_support/time'
-require 'doorkeeper/models/expirable'
+require 'doorkeeper/models/concerns/expirable'
 
 describe 'Expirable' do
   subject do

data/spec/lib/models/revocable_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'active_support/core_ext/object/blank'
-require 'doorkeeper/models/revocable'
+require 'doorkeeper/models/concerns/revocable'
 
 describe 'Revocable' do
   subject do
@@ -18,11 +18,16 @@ describe 'Revocable' do
   end
 
   describe :revoked? do
-    it 'is revoked if :revoked_at is set' do
-      allow(subject).to receive(:revoked_at).and_return(double)
+    it 'is revoked if :revoked_at has passed' do
+      allow(subject).to receive(:revoked_at).and_return(DateTime.now - 1000)
       expect(subject).to be_revoked
     end
 
+    it 'is not revoked if :revoked_at has not passed' do
+      allow(subject).to receive(:revoked_at).and_return(DateTime.now + 1000)
+      expect(subject).not_to be_revoked
+    end
+
     it 'is not revoked if :revoked_at is not set' do
       allow(subject).to receive(:revoked_at).and_return(nil)
       expect(subject).not_to be_revoked

data/spec/lib/models/scopes_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/blank'
 require 'doorkeeper/oauth/scopes'
-require 'doorkeeper/models/scopes'
+require 'doorkeeper/models/concerns/scopes'
 
 describe 'Doorkeeper::Models::Scopes' do
   subject do
@@ -33,11 +33,11 @@ describe 'Doorkeeper::Models::Scopes' do
 
   describe :includes_scope? do
     it 'should return true if at least one scope is included' do
-      expect(subject.includes_scope?(['public', 'private'])).to be true
+      expect(subject.includes_scope?('public', 'private')).to be true
     end
 
     it 'should return false if no scopes are included' do
-      expect(subject.includes_scope?(['teacher', 'student'])).to be false
+      expect(subject.includes_scope?('teacher', 'student')).to be false
     end
   end
 end

data/spec/lib/oauth/password_access_token_request_spec.rb

@@ -36,7 +36,7 @@ module Doorkeeper::OAuth
     it 'requires the owner' do
       subject.resource_owner = nil
       subject.validate
-      expect(subject.error).to eq(:invalid_resource_owner)
+      expect(subject.error).to eq(:invalid_grant)
     end
 
     it 'optionally accepts the client' do

data/spec/lib/oauth/token_request_spec.rb

@@ -8,7 +8,7 @@ module Doorkeeper::OAuth
         client: double(:application, id: 9990),
         redirect_uri: 'http://tst.com/cb',
         state: nil,
-        scopes: nil,
+        scopes: Scopes.from_string('public'),
         error: nil,
         authorizable?: true
       )
@@ -43,5 +43,32 @@ module Doorkeeper::OAuth
       allow(pre_auth).to receive(:authorizable?).and_return(false)
       expect(subject.authorize).to be_a(ErrorResponse)
     end
+
+    context 'token reuse' do
+      it 'creates a new token if there are no matching tokens' do
+        Doorkeeper.configuration.stub(:reuse_access_token).and_return(true)
+        expect do
+          subject.authorize
+        end.to change { Doorkeeper::AccessToken.count }.by(1)
+      end
+
+      it 'creates a new token if scopes do not match' do
+        Doorkeeper.configuration.stub(:reuse_access_token).and_return(true)
+        FactoryGirl.create(:access_token, application_id: pre_auth.client.id,
+                           resource_owner_id: owner.id, scopes: '')
+        expect do
+          subject.authorize
+        end.to change { Doorkeeper::AccessToken.count }.by(1)
+      end
+
+      it 'skips token creation if there is a matching one' do
+        Doorkeeper.configuration.stub(:reuse_access_token).and_return(true)
+        FactoryGirl.create(:access_token, application_id: pre_auth.client.id,
+                           resource_owner_id: owner.id, scopes: 'public')
+        expect do
+          subject.authorize
+        end.to_not change { Doorkeeper::AccessToken.count }
+      end
+    end
   end
 end

data/spec/lib/oauth/token_spec.rb

@@ -88,7 +88,7 @@ module Doorkeeper
 
         it 'calls the finder if token was found' do
           token = ->(r) { 'token' }
-          expect(AccessToken).to receive(:authenticate).with('token')
+          expect(AccessToken).to receive(:by_token).with('token')
           Token.authenticate double, token
         end
       end

data/spec/models/doorkeeper/application_spec.rb

@@ -169,7 +169,7 @@ module Doorkeeper
     describe :authenticate do
       it 'finds the application via uid/secret' do
         app = FactoryGirl.create :application
-        authenticated = Application.authenticate(app.uid, app.secret)
+        authenticated = Application.by_uid_and_secret(app.uid, app.secret)
         expect(authenticated).to eq(app)
       end
     end

data/spec/requests/applications/applications_request_spec.rb

@@ -7,8 +7,8 @@ feature 'Adding applications' do
     end
 
     scenario 'adding a valid app' do
-      fill_in 'application_name', with: 'My Application'
-      fill_in 'application_redirect_uri', with: 'http://example.com'
+      fill_in 'doorkeeper_application[name]', with: 'My Application'
+      fill_in 'doorkeeper_application[redirect_uri]', with: 'http://example.com'
       click_button 'Submit'
       i_should_see 'Application created'
       i_should_see 'My Application'
@@ -55,7 +55,7 @@ feature 'Edit application' do
   end
 
   scenario 'updating a valid app' do
-    fill_in 'application[name]', with: 'Serious app'
+    fill_in 'doorkeeper_application[name]', with: 'Serious app'
     click_button 'Submit'
     i_should_see 'Application updated'
     i_should_see 'Serious app'
@@ -63,7 +63,7 @@ feature 'Edit application' do
   end
 
   scenario 'updating an invalid app' do
-    fill_in 'application[name]', with: ''
+    fill_in 'doorkeeper_application[name]', with: ''
     click_button 'Submit'
     i_should_see 'Whoops! Check your form for possible errors'
   end

data/spec/requests/endpoints/authorization_spec.rb

@@ -51,27 +51,4 @@ feature 'Authorization endpoint' do
       i_should_see_translated_error_message :unsupported_response_type
     end
   end
-
-  context 'forgery protection enabled' do
-    before do
-      ActionController::Base.allow_forgery_protection = true
-    end
-
-    after do
-      ActionController::Base.allow_forgery_protection = false
-    end
-
-    background do
-      create_resource_owner
-      sign_in
-    end
-
-    scenario 'raises exception on forged requests' do
-      ActionController::Base.any_instance.should_receive(:handle_unverified_request)
-      post "/oauth/authorize",
-        client_id:      @client.uid,
-        redirect_uri:   @client.redirect_uri,
-        response_type:  'code'
-    end
-  end
 end

data/spec/requests/flows/implicit_grant_spec.rb

@@ -16,4 +16,36 @@ feature 'Implicit Grant Flow' do
 
     i_should_be_on_client_callback @client
   end
+
+  context 'token reuse' do
+    scenario 'should return a new token each request' do
+      Doorkeeper.configuration.stub(:reuse_access_token).and_return(false)
+
+      token = client_is_authorized(@client, @resource_owner)
+
+      post "/oauth/authorize",
+           client_id: @client.uid,
+           state: '',
+           redirect_uri: @client.redirect_uri,
+           response_type: 'token',
+           commit: 'Authorize'
+
+      expect(response.location).not_to include(token.token)
+    end
+
+    scenario 'should return the same token if it is still accessible' do
+      Doorkeeper.configuration.stub(:reuse_access_token).and_return(true)
+
+      token = client_is_authorized(@client, @resource_owner)
+
+      post "/oauth/authorize",
+           client_id: @client.uid,
+           state: '',
+           redirect_uri: @client.redirect_uri,
+           response_type: 'token',
+           commit: 'Authorize'
+
+      expect(response.location).to include(token.token)
+    end
+  end
 end

data/spec/support/shared/controllers_shared_context.rb

@@ -8,7 +8,7 @@ shared_context 'valid token', token: :valid do
   end
 
   before :each do
-    allow(Doorkeeper::AccessToken).to receive(:authenticate).with(token_string).and_return(token)
+    allow(Doorkeeper::AccessToken).to receive(:by_token).with(token_string).and_return(token)
   end
 end
 
@@ -22,7 +22,7 @@ shared_context 'invalid token', token: :invalid do
   end
 
   before :each do
-    allow(Doorkeeper::AccessToken).to receive(:authenticate).with(token_string).and_return(token)
+    allow(Doorkeeper::AccessToken).to receive(:by_token).with(token_string).and_return(token)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 2.0.0.alpha1
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2014-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -191,7 +191,7 @@ files:
 - app/controllers/doorkeeper/authorized_applications_controller.rb
 - app/controllers/doorkeeper/token_info_controller.rb
 - app/controllers/doorkeeper/tokens_controller.rb
-- app/helpers/doorkeeper/form_errors_helper.rb
+- app/helpers/doorkeeper/dashboard_helper.rb
 - app/validators/redirect_uri_validator.rb
 - app/views/doorkeeper/applications/_delete_form.html.erb
 - app/views/doorkeeper/applications/_form.html.erb
@@ -210,33 +210,19 @@ files:
 - doorkeeper.gemspec
 - lib/doorkeeper.rb
 - lib/doorkeeper/config.rb
-- lib/doorkeeper/doorkeeper_for.rb
 - lib/doorkeeper/engine.rb
 - lib/doorkeeper/errors.rb
+- lib/doorkeeper/generators/doorkeeper/mongo_mapper/indexes_generator.rb
+- lib/doorkeeper/generators/doorkeeper/mongo_mapper/templates/indexes.rb
 - lib/doorkeeper/helpers/controller.rb
-- lib/doorkeeper/helpers/filter.rb
-- lib/doorkeeper/models/access_grant.rb
-- lib/doorkeeper/models/access_token.rb
-- lib/doorkeeper/models/accessible.rb
-- lib/doorkeeper/models/active_record/access_grant.rb
-- lib/doorkeeper/models/active_record/access_token.rb
-- lib/doorkeeper/models/active_record/application.rb
-- lib/doorkeeper/models/application.rb
-- lib/doorkeeper/models/expirable.rb
-- lib/doorkeeper/models/mongo_mapper/access_grant.rb
-- lib/doorkeeper/models/mongo_mapper/access_token.rb
-- lib/doorkeeper/models/mongo_mapper/application.rb
-- lib/doorkeeper/models/mongoid/scopes.rb
-- lib/doorkeeper/models/mongoid/version.rb
-- lib/doorkeeper/models/mongoid2/access_grant.rb
-- lib/doorkeeper/models/mongoid2/access_token.rb
-- lib/doorkeeper/models/mongoid2/application.rb
-- lib/doorkeeper/models/mongoid3_4/access_grant.rb
-- lib/doorkeeper/models/mongoid3_4/access_token.rb
-- lib/doorkeeper/models/mongoid3_4/application.rb
-- lib/doorkeeper/models/ownership.rb
-- lib/doorkeeper/models/revocable.rb
-- lib/doorkeeper/models/scopes.rb
+- lib/doorkeeper/models/access_grant_mixin.rb
+- lib/doorkeeper/models/access_token_mixin.rb
+- lib/doorkeeper/models/application_mixin.rb
+- lib/doorkeeper/models/concerns/accessible.rb
+- lib/doorkeeper/models/concerns/expirable.rb
+- lib/doorkeeper/models/concerns/ownership.rb
+- lib/doorkeeper/models/concerns/revocable.rb
+- lib/doorkeeper/models/concerns/scopes.rb
 - lib/doorkeeper/oauth/authorization/code.rb
 - lib/doorkeeper/oauth/authorization/token.rb
 - lib/doorkeeper/oauth/authorization/uri_builder.rb
@@ -265,6 +251,30 @@ files:
 - lib/doorkeeper/oauth/token.rb
 - lib/doorkeeper/oauth/token_request.rb
 - lib/doorkeeper/oauth/token_response.rb
+- lib/doorkeeper/orm/active_record.rb
+- lib/doorkeeper/orm/active_record/access_grant.rb
+- lib/doorkeeper/orm/active_record/access_token.rb
+- lib/doorkeeper/orm/active_record/application.rb
+- lib/doorkeeper/orm/mongo_mapper.rb
+- lib/doorkeeper/orm/mongo_mapper/access_grant.rb
+- lib/doorkeeper/orm/mongo_mapper/access_token.rb
+- lib/doorkeeper/orm/mongo_mapper/application.rb
+- lib/doorkeeper/orm/mongoid2.rb
+- lib/doorkeeper/orm/mongoid2/access_grant.rb
+- lib/doorkeeper/orm/mongoid2/access_token.rb
+- lib/doorkeeper/orm/mongoid2/application.rb
+- lib/doorkeeper/orm/mongoid2/concerns/scopes.rb
+- lib/doorkeeper/orm/mongoid3.rb
+- lib/doorkeeper/orm/mongoid3/access_grant.rb
+- lib/doorkeeper/orm/mongoid3/access_token.rb
+- lib/doorkeeper/orm/mongoid3/application.rb
+- lib/doorkeeper/orm/mongoid3/concerns/scopes.rb
+- lib/doorkeeper/orm/mongoid4.rb
+- lib/doorkeeper/orm/mongoid4/access_grant.rb
+- lib/doorkeeper/orm/mongoid4/access_token.rb
+- lib/doorkeeper/orm/mongoid4/application.rb
+- lib/doorkeeper/orm/mongoid4/concerns/scopes.rb
+- lib/doorkeeper/rails/helpers.rb
 - lib/doorkeeper/rails/routes.rb
 - lib/doorkeeper/rails/routes/mapper.rb
 - lib/doorkeeper/rails/routes/mapping.rb
@@ -281,15 +291,11 @@ files:
 - lib/generators/doorkeeper/application_owner_generator.rb
 - lib/generators/doorkeeper/install_generator.rb
 - lib/generators/doorkeeper/migration_generator.rb
-- lib/generators/doorkeeper/mongo_mapper/indexes_generator.rb
 - lib/generators/doorkeeper/templates/README
 - lib/generators/doorkeeper/templates/add_owner_to_application_migration.rb
-- lib/generators/doorkeeper/templates/indexes.rb
 - lib/generators/doorkeeper/templates/initializer.rb
 - lib/generators/doorkeeper/templates/migration.rb
 - lib/generators/doorkeeper/views_generator.rb
-- script/rails
-- script/run_all
 - spec/controllers/applications_controller_spec.rb
 - spec/controllers/authorizations_controller_spec.rb
 - spec/controllers/protected_resources_controller_spec.rb
@@ -426,14 +432,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Doorkeeper is an OAuth 2 provider for Rails.
 test_files: []
-has_rdoc: