doorkeeper 0.5.0 → 0.6.0.rc1

data/spec/support/orm/mongoid.rb

@@ -2,7 +2,7 @@ DatabaseCleaner[:mongoid].strategy = :truncation
 DatabaseCleaner[:mongoid].clean_with :truncation
 
 RSpec.configure do |config|
-  config.before :suite do
+  config.before do
     Doorkeeper::Application.create_indexes
     Doorkeeper::AccessGrant.create_indexes
     Doorkeeper::AccessToken.create_indexes
@@ -13,7 +13,12 @@ module Doorkeeper
   class PlaceholderApplicationOwner
     include Mongoid::Document
 
-    self.store_in :placeholder_application_owners
+    if ::Mongoid::VERSION >= "3"
+      self.store_in :collection => :placeholder_application_owners
+    else
+      self.store_in :placeholder_application_owners
+    end
+
     has_many :applications
 
   end

data/spec/validators/redirect_uri_validator_spec.rb

@@ -1,7 +1,3 @@
-require 'spec_helper'
-require 'active_model'
-require 'validators/redirect_uri_validator'
-
 require 'spec_helper_integration'
 
 describe RedirectUriValidator do
@@ -14,6 +10,17 @@ describe RedirectUriValidator do
     subject.should be_valid
   end
 
+  it 'accepts test redirect uri' do
+    subject.redirect_uri = 'urn:ietf:wg:oauth:2.0:oob'
+    subject.should be_valid
+  end
+
+  it 'rejects if test uri is disabled' do
+    RedirectUriValidator.stub :test_redirect_uri => nil
+    subject.redirect_uri = "urn:some:test"
+    subject.should_not be_valid
+  end
+
   it 'is invalid when the uri is not a uri' do
     subject.redirect_uri = ']'
     subject.should_not be_valid

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.6.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-20 00:00:00.000000000 Z
+date: 2012-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70141743363880 !ruby/object:Gem::Requirement
+  requirement: &70365762857000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70141743363880
+  version_requirements: *70365762857000
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70141743362900 !ruby/object:Gem::Requirement
+  requirement: &70365762854800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,21 +33,21 @@ dependencies:
         version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *70141743362900
+  version_requirements: *70365762854800
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70141743361840 !ruby/object:Gem::Requirement
+  requirement: &70365762875900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.11.4
   type: :development
   prerelease: false
-  version_requirements: *70141743361840
+  version_requirements: *70365762875900
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70141743395920 !ruby/object:Gem::Requirement
+  requirement: &70365762873160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70141743395920
+  version_requirements: *70365762873160
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &70141743395180 !ruby/object:Gem::Requirement
+  requirement: &70365762869900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.8.5
   type: :development
   prerelease: false
-  version_requirements: *70141743395180
+  version_requirements: *70365762869900
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70141743394460 !ruby/object:Gem::Requirement
+  requirement: &70365762883120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,32 +77,32 @@ dependencies:
         version: 2.6.4
   type: :development
   prerelease: false
-  version_requirements: *70141743394460
+  version_requirements: *70365762883120
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70141743393440 !ruby/object:Gem::Requirement
+  requirement: &70365762880300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.2
   type: :development
   prerelease: false
-  version_requirements: *70141743393440
+  version_requirements: *70365762880300
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70141743392060 !ruby/object:Gem::Requirement
+  requirement: &70365762903440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.1
   type: :development
   prerelease: false
-  version_requirements: *70141743392060
+  version_requirements: *70365762903440
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70141743390940 !ruby/object:Gem::Requirement
+  requirement: &70365762898500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *70141743390940
+  version_requirements: *70365762898500
 description: Doorkeeper is an OAuth 2 provider for Rails.
 email:
 - felipe@applicake.com
@@ -144,17 +144,17 @@ files:
 - app/views/doorkeeper/applications/show.html.erb
 - app/views/doorkeeper/authorizations/error.html.erb
 - app/views/doorkeeper/authorizations/new.html.erb
+- app/views/doorkeeper/authorizations/show.html.erb
 - app/views/doorkeeper/authorized_applications/index.html.erb
 - app/views/layouts/doorkeeper/application.html.erb
 - config/initializers/form_errors.rb
 - config/locales/en.yml
 - doorkeeper.gemspec
-- gemfiles/gemfile.rails-3.1.x
-- gemfiles/gemfile.rails-3.2.x
 - lib/doorkeeper.rb
 - lib/doorkeeper/config.rb
 - lib/doorkeeper/doorkeeper_for.rb
 - lib/doorkeeper/engine.rb
+- lib/doorkeeper/errors.rb
 - lib/doorkeeper/helpers/controller.rb
 - lib/doorkeeper/helpers/filter.rb
 - lib/doorkeeper/models/access_grant.rb
@@ -165,46 +165,67 @@ files:
 - lib/doorkeeper/models/active_record/application.rb
 - lib/doorkeeper/models/application.rb
 - lib/doorkeeper/models/expirable.rb
-- lib/doorkeeper/models/mongoid/access_grant.rb
-- lib/doorkeeper/models/mongoid/access_token.rb
-- lib/doorkeeper/models/mongoid/application.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/mongo_mapper/revocable.rb
 - lib/doorkeeper/models/mongoid/revocable.rb
 - lib/doorkeeper/models/mongoid/scopes.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/access_grant.rb
+- lib/doorkeeper/models/mongoid3/access_token.rb
+- lib/doorkeeper/models/mongoid3/application.rb
 - lib/doorkeeper/models/ownership.rb
 - lib/doorkeeper/models/revocable.rb
 - lib/doorkeeper/models/scopes.rb
-- lib/doorkeeper/oauth/access_token_request.rb
 - lib/doorkeeper/oauth/authorization.rb
 - lib/doorkeeper/oauth/authorization/code.rb
 - lib/doorkeeper/oauth/authorization/token.rb
 - lib/doorkeeper/oauth/authorization/uri_builder.rb
-- lib/doorkeeper/oauth/authorization_request.rb
+- lib/doorkeeper/oauth/authorization_code_request.rb
 - lib/doorkeeper/oauth/client.rb
 - lib/doorkeeper/oauth/client/credentials.rb
 - lib/doorkeeper/oauth/client/methods.rb
 - lib/doorkeeper/oauth/client_credentials/creator.rb
 - lib/doorkeeper/oauth/client_credentials/issuer.rb
-- lib/doorkeeper/oauth/client_credentials/response.rb
 - lib/doorkeeper/oauth/client_credentials/validation.rb
 - lib/doorkeeper/oauth/client_credentials_request.rb
+- lib/doorkeeper/oauth/code_request.rb
+- lib/doorkeeper/oauth/code_response.rb
 - lib/doorkeeper/oauth/error.rb
 - lib/doorkeeper/oauth/error_response.rb
 - lib/doorkeeper/oauth/helpers/scope_checker.rb
 - lib/doorkeeper/oauth/helpers/unique_token.rb
 - lib/doorkeeper/oauth/helpers/uri_checker.rb
 - lib/doorkeeper/oauth/password_access_token_request.rb
+- lib/doorkeeper/oauth/pre_authorization.rb
+- lib/doorkeeper/oauth/refresh_token_request.rb
 - lib/doorkeeper/oauth/scopes.rb
 - lib/doorkeeper/oauth/token.rb
+- lib/doorkeeper/oauth/token_request.rb
+- lib/doorkeeper/oauth/token_response.rb
 - lib/doorkeeper/rails/routes.rb
 - lib/doorkeeper/rails/routes/mapper.rb
 - lib/doorkeeper/rails/routes/mapping.rb
+- lib/doorkeeper/request.rb
+- lib/doorkeeper/request/authorization_code.rb
+- lib/doorkeeper/request/client_credentials.rb
+- lib/doorkeeper/request/code.rb
+- lib/doorkeeper/request/password.rb
+- lib/doorkeeper/request/refresh_token.rb
+- lib/doorkeeper/request/token.rb
+- lib/doorkeeper/server.rb
 - lib/doorkeeper/validations.rb
 - lib/doorkeeper/version.rb
 - 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
@@ -242,7 +263,9 @@ files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/doorkeeper.en.yml
-- spec/dummy/config/mongoid.yml
+- spec/dummy/config/mongo.yml
+- spec/dummy/config/mongoid2.yml
+- spec/dummy/config/mongoid3.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20111122132257_create_users.rb
 - spec/dummy/db/migrate/20120312140401_add_password_to_users.rb
@@ -265,26 +288,30 @@ files:
 - spec/lib/models/expirable_spec.rb
 - spec/lib/models/revocable_spec.rb
 - spec/lib/models/scopes_spec.rb
-- spec/lib/oauth/access_token_request_spec.rb
 - spec/lib/oauth/authorization/uri_builder_spec.rb
-- spec/lib/oauth/authorization_request_spec.rb
+- spec/lib/oauth/authorization_code_request_spec.rb
 - spec/lib/oauth/client/credentials_spec.rb
 - spec/lib/oauth/client/methods_spec.rb
 - spec/lib/oauth/client_credentials/creator_spec.rb
 - spec/lib/oauth/client_credentials/issuer_spec.rb
-- spec/lib/oauth/client_credentials/response_spec.rb
 - spec/lib/oauth/client_credentials/validation_spec.rb
 - spec/lib/oauth/client_credentials_integration_spec.rb
 - spec/lib/oauth/client_credentials_request_spec.rb
 - spec/lib/oauth/client_spec.rb
+- spec/lib/oauth/code_request_spec.rb
 - spec/lib/oauth/error_response_spec.rb
 - spec/lib/oauth/error_spec.rb
 - spec/lib/oauth/helpers/scope_checker_spec.rb
 - spec/lib/oauth/helpers/unique_token_spec.rb
 - spec/lib/oauth/helpers/uri_checker_spec.rb
 - spec/lib/oauth/password_access_token_request_spec.rb
+- spec/lib/oauth/pre_authorization_spec.rb
+- spec/lib/oauth/refresh_token_request_spec.rb
 - spec/lib/oauth/scopes_spec.rb
+- spec/lib/oauth/token_request_spec.rb
+- spec/lib/oauth/token_response_spec.rb
 - spec/lib/oauth/token_spec.rb
+- spec/lib/server_spec.rb
 - spec/models/doorkeeper/access_grant_spec.rb
 - spec/models/doorkeeper/access_token_spec.rb
 - spec/models/doorkeeper/application_spec.rb
@@ -314,6 +341,7 @@ files:
 - spec/support/helpers/request_spec_helper.rb
 - spec/support/helpers/url_helper.rb
 - spec/support/orm/active_record.rb
+- spec/support/orm/mongo_mapper.rb
 - spec/support/orm/mongoid.rb
 - spec/support/shared/controllers_shared_context.rb
 - spec/support/shared/models_shared_examples.rb
@@ -332,16 +360,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1887190500184471372
+      hash: -115319410489160264
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1887190500184471372
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.12

data/gemfiles/gemfile.rails-3.1.x

@@ -1,17 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'rails', '~> 3.1.0'
-gem 'jquery-rails'
-
-group :mongoid do
-  gem 'mongoid', '~> 2.4'
-  gem 'bson_ext', '~> 1.6.0'
-end
-
-group :active_record do
-  gem 'activerecord', '~> 3.1'
-end
-
-gem 'doorkeeper', :path => '../'
-
-gemspec :path => '../'

data/gemfiles/gemfile.rails-3.2.x

@@ -1,17 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'rails', '~> 3.2.0'
-gem 'jquery-rails'
-
-group :mongoid do
-  gem 'mongoid', '~> 2.4'
-  gem 'bson_ext', '~> 1.6.0'
-end
-
-group :active_record do
-  gem 'activerecord', '~> 3.1'
-end
-
-gem 'doorkeeper', :path => '../'
-
-gemspec :path => '../'

data/lib/doorkeeper/oauth/access_token_request.rb

@@ -1,139 +0,0 @@
-module Doorkeeper::OAuth
-  class AccessTokenRequest
-    include Doorkeeper::Validations
-
-    ATTRIBUTES = [
-      :grant_type,
-      :code,
-      :redirect_uri,
-      :refresh_token
-    ]
-
-    validate :attributes,   :error => :invalid_request
-    validate :grant_type,   :error => :unsupported_grant_type
-    validate :client,       :error => :invalid_client
-    validate :grant,        :error => :invalid_grant
-    validate :redirect_uri, :error => :invalid_grant
-
-    attr_accessor *ATTRIBUTES
-    attr_accessor :client
-
-    def initialize(client, attributes = {})
-      ATTRIBUTES.each { |attr| instance_variable_set("@#{attr}", attributes[attr]) }
-      @client = client
-      validate
-    end
-
-    def authorize
-      if valid?
-        revoke_base_token
-        find_or_create_access_token
-      end
-    end
-
-    def authorization
-      auth = {
-        'access_token' => access_token.token,
-        'token_type'   => access_token.token_type,
-        'expires_in'   => access_token.expires_in,
-      }
-      auth.merge!({'refresh_token' => access_token.refresh_token}) if refresh_token_enabled?
-      auth
-    end
-
-    def valid?
-      self.error.nil?
-    end
-
-    def access_token
-      @access_token ||= Doorkeeper::AccessToken.matching_token_for client, base_token.resource_owner_id, base_token.scopes
-    end
-
-    def token_type
-      "bearer"
-    end
-
-    def error_response
-      Doorkeeper::OAuth::ErrorResponse.from_request(self)
-    end
-
-    private
-
-    def find_or_create_access_token
-      if access_token
-        access_token.expired? ? revoke_and_create_access_token : access_token
-      else
-        create_access_token
-      end
-    end
-
-    def revoke_and_create_access_token
-      access_token.revoke
-      create_access_token
-    end
-
-    def revoke_base_token
-      base_token.revoke
-    end
-
-    def base_token
-      @base_token ||= refresh_token? ? token_via_refresh_token : token_via_authorization_code
-    end
-
-    def token_via_authorization_code
-      Doorkeeper::AccessGrant.authenticate(code)
-    end
-
-    def token_via_refresh_token
-      Doorkeeper::AccessToken.by_refresh_token(refresh_token)
-    end
-
-    def create_access_token
-      @access_token = Doorkeeper::AccessToken.create!({
-        :application_id    => client.id,
-        :resource_owner_id => base_token.resource_owner_id,
-        :scopes            => base_token.scopes_string,
-        :expires_in        => configuration.access_token_expires_in,
-        :use_refresh_token => refresh_token_enabled?
-      })
-    end
-
-    def validate_attributes
-      return false unless grant_type.present?
-      if refresh_token_enabled? && refresh_token?
-        refresh_token.present?
-      else
-        code.present? && redirect_uri.present?
-      end
-    end
-
-    def refresh_token_enabled?
-      configuration.refresh_token_enabled?
-    end
-
-    def refresh_token?
-      grant_type == "refresh_token"
-    end
-
-    def validate_client
-      !!client
-    end
-
-    def validate_grant
-      return false unless base_token && base_token.application_id == client.id
-      refresh_token? ? !base_token.revoked? : base_token.accessible?
-    end
-
-    def validate_redirect_uri
-      refresh_token? ? true : base_token.redirect_uri == redirect_uri
-    end
-
-    def validate_grant_type
-      %w(authorization_code refresh_token).include? grant_type
-    end
-
-    def configuration
-      Doorkeeper.configuration
-    end
-  end
-end