doorkeeper 3.1.0 → 4.4.3

data/spec/validators/redirect_uri_validator_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper_integration'
 
 describe RedirectUriValidator do
   subject do
-    FactoryGirl.create(:application)
+    FactoryBot.create(:application)
   end
 
   it 'is valid when the uri is a uri' do
@@ -10,6 +10,21 @@ describe RedirectUriValidator do
     expect(subject).to be_valid
   end
 
+  # Most mobile and desktop operating systems allow apps to register a custom URL
+  # scheme that will launch the app when a URL with that scheme is visited from
+  # the system browser.
+  #
+  # @see https://www.oauth.com/oauth2-servers/redirect-uris/redirect-uris-native-apps/
+  it 'is valid when the uri is custom native URI' do
+    subject.redirect_uri = 'myapp://callback'
+    expect(subject).to be_valid
+  end
+
+  it 'is valid when the uri has a query parameter' do
+    subject.redirect_uri = 'https://example.com/abcd?xyz=123'
+    expect(subject).to be_valid
+  end
+
   it 'accepts native redirect uri' do
     subject.redirect_uri = 'urn:ietf:wg:oauth:2.0:oob'
     expect(subject).to be_valid
@@ -39,11 +54,6 @@ describe RedirectUriValidator do
     expect(subject.errors[:redirect_uri].first).to eq('cannot contain a fragment.')
   end
 
-  it 'is invalid when the uri has a query parameter' do
-    subject.redirect_uri = 'https://example.com/abcd?xyz=123'
-    expect(subject).to be_valid
-  end
-
   context 'force secured uri' do
     it 'accepts an valid uri' do
       subject.redirect_uri = 'https://example.com/callback'
@@ -68,6 +78,34 @@ describe RedirectUriValidator do
       expect(subject).to be_valid
     end
 
+    it 'accepts a non secured protocol when conditional option defined' do
+      Doorkeeper.configure do
+        orm DOORKEEPER_ORM
+        force_ssl_in_redirect_uri { |uri| uri.host != 'localhost' }
+      end
+
+      application = FactoryBot.build(:application, redirect_uri: 'http://localhost/callback')
+      expect(application).to be_valid
+
+      application = FactoryBot.build(:application, redirect_uri: 'http://localhost2/callback')
+      expect(application).not_to be_valid
+    end
+
+    it 'forbids redirect uri if required' do
+      subject.redirect_uri = 'javascript://document.cookie'
+
+      Doorkeeper.configure do
+        orm DOORKEEPER_ORM
+        forbid_redirect_uri { |uri| uri.scheme == 'javascript' }
+      end
+
+      expect(subject).to be_invalid
+      expect(subject.errors[:redirect_uri].first).to eq('is forbidden by the server.')
+
+      subject.redirect_uri = 'https://localhost/callback'
+      expect(subject).to be_valid
+    end
+
     it 'invalidates the uri when the uri does not use a secure protocol' do
       subject.redirect_uri = 'http://example.com/callback'
       expect(subject).not_to be_valid
@@ -75,4 +113,11 @@ describe RedirectUriValidator do
       expect(error).to eq('must be an HTTPS/SSL URI.')
     end
   end
+
+  context 'multiple redirect uri' do
+    it 'invalidates the second uri when the first uri is native uri' do
+      subject.redirect_uri = "urn:ietf:wg:oauth:2.0:oob\nexample.com/callback"
+      expect(subject).to be_invalid
+    end
+  end
 end

data/spec/version/version_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper_integration'
+
+describe 'Doorkeeper version' do
+  context '#gem_version' do
+    it 'returns Gem::Version instance' do
+      expect(Doorkeeper.gem_version).to be_an_instance_of(Gem::Version)
+    end
+  end
+
+  context 'VERSION' do
+    it 'returns gem version string' do
+      expect(Doorkeeper::VERSION::STRING).to match(/^\d+\.\d+\.\d+[.\w]?$/)
+    end
+  end
+end

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.4.3
 platform: ruby
 authors:
 - Felipe Elias Philipp
 - Tute Costa
+- Jon Moss
+- Nikita Bulai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -17,109 +19,143 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: generator_spec
+  name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '4.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '4.8'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.9.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 11.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 11.3.0
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Doorkeeper is an OAuth 2 provider for Rails and Grape.
 email:
-- tutecosta@gmail.com
+- bulaj.nikita@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
+- Appraisals
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - MIT-LICENSE
@@ -127,6 +163,7 @@ files:
 - README.md
 - RELEASING.md
 - Rakefile
+- SECURITY.md
 - app/assets/stylesheets/doorkeeper/admin/application.css
 - app/assets/stylesheets/doorkeeper/application.css
 - app/controllers/doorkeeper/application_controller.rb
@@ -153,6 +190,11 @@ files:
 - app/views/layouts/doorkeeper/application.html.erb
 - config/locales/en.yml
 - doorkeeper.gemspec
+- gemfiles/rails_4_2.gemfile
+- gemfiles/rails_5_0.gemfile
+- gemfiles/rails_5_1.gemfile
+- gemfiles/rails_5_2.gemfile
+- gemfiles/rails_master.gemfile
 - lib/doorkeeper.rb
 - lib/doorkeeper/config.rb
 - lib/doorkeeper/engine.rb
@@ -165,6 +207,7 @@ files:
 - lib/doorkeeper/models/application_mixin.rb
 - lib/doorkeeper/models/concerns/accessible.rb
 - lib/doorkeeper/models/concerns/expirable.rb
+- lib/doorkeeper/models/concerns/orderable.rb
 - lib/doorkeeper/models/concerns/ownership.rb
 - lib/doorkeeper/models/concerns/revocable.rb
 - lib/doorkeeper/models/concerns/scopes.rb
@@ -172,9 +215,10 @@ files:
 - lib/doorkeeper/oauth/authorization/token.rb
 - lib/doorkeeper/oauth/authorization/uri_builder.rb
 - lib/doorkeeper/oauth/authorization_code_request.rb
+- lib/doorkeeper/oauth/base_request.rb
+- lib/doorkeeper/oauth/base_response.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/validation.rb
@@ -191,9 +235,9 @@ files:
 - lib/doorkeeper/oauth/password_access_token_request.rb
 - lib/doorkeeper/oauth/pre_authorization.rb
 - lib/doorkeeper/oauth/refresh_token_request.rb
-- lib/doorkeeper/oauth/request_concern.rb
 - lib/doorkeeper/oauth/scopes.rb
 - lib/doorkeeper/oauth/token.rb
+- lib/doorkeeper/oauth/token_introspection.rb
 - lib/doorkeeper/oauth/token_request.rb
 - lib/doorkeeper/oauth/token_response.rb
 - lib/doorkeeper/orm/active_record.rb
@@ -215,16 +259,19 @@ files:
 - lib/doorkeeper/server.rb
 - lib/doorkeeper/validations.rb
 - lib/doorkeeper/version.rb
+- lib/generators/doorkeeper/add_client_confidentiality_generator.rb
 - lib/generators/doorkeeper/application_owner_generator.rb
-- lib/generators/doorkeeper/application_scopes_generator.rb
 - lib/generators/doorkeeper/install_generator.rb
 - lib/generators/doorkeeper/migration_generator.rb
+- lib/generators/doorkeeper/previous_refresh_token_generator.rb
 - lib/generators/doorkeeper/templates/README
-- lib/generators/doorkeeper/templates/add_owner_to_application_migration.rb
-- lib/generators/doorkeeper/templates/add_scopes_to_oauth_applications.rb
+- lib/generators/doorkeeper/templates/add_confidential_to_application_migration.rb.erb
+- lib/generators/doorkeeper/templates/add_owner_to_application_migration.rb.erb
+- lib/generators/doorkeeper/templates/add_previous_refresh_token_to_access_tokens.rb.erb
 - lib/generators/doorkeeper/templates/initializer.rb
-- lib/generators/doorkeeper/templates/migration.rb
+- lib/generators/doorkeeper/templates/migration.rb.erb
 - lib/generators/doorkeeper/views_generator.rb
+- spec/controllers/application_metal_controller.rb
 - spec/controllers/applications_controller_spec.rb
 - spec/controllers/authorizations_controller_spec.rb
 - spec/controllers/protected_resources_controller_spec.rb
@@ -251,6 +298,7 @@ files:
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/doorkeeper.rb
+- spec/dummy/config/initializers/new_framework_defaults.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
@@ -258,9 +306,10 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20111122132257_create_users.rb
 - spec/dummy/db/migrate/20120312140401_add_password_to_users.rb
-- spec/dummy/db/migrate/20130902165751_create_doorkeeper_tables.rb
-- spec/dummy/db/migrate/20130902175349_add_owner_to_application.rb
-- spec/dummy/db/migrate/20141209001746_add_scopes_to_oauth_applications.rb
+- spec/dummy/db/migrate/20151223192035_create_doorkeeper_tables.rb
+- spec/dummy/db/migrate/20151223200000_add_owner_to_application.rb
+- spec/dummy/db/migrate/20160320211015_add_previous_refresh_token_to_access_tokens.rb
+- spec/dummy/db/migrate/20180210183654_add_confidential_to_application.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -271,8 +320,10 @@ files:
 - spec/generators/application_owner_generator_spec.rb
 - spec/generators/install_generator_spec.rb
 - spec/generators/migration_generator_spec.rb
+- spec/generators/previous_refresh_token_generator_spec.rb
 - spec/generators/templates/routes.rb
 - spec/generators/views_generator_spec.rb
+- spec/grape/grape_integration_spec.rb
 - spec/helpers/doorkeeper/dashboard_helper_spec.rb
 - spec/lib/config_spec.rb
 - spec/lib/doorkeeper_spec.rb
@@ -281,8 +332,9 @@ files:
 - spec/lib/models/scopes_spec.rb
 - spec/lib/oauth/authorization/uri_builder_spec.rb
 - spec/lib/oauth/authorization_code_request_spec.rb
+- spec/lib/oauth/base_request_spec.rb
+- spec/lib/oauth/base_response_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/validation_spec.rb
@@ -290,6 +342,7 @@ files:
 - spec/lib/oauth/client_credentials_request_spec.rb
 - spec/lib/oauth/client_spec.rb
 - spec/lib/oauth/code_request_spec.rb
+- spec/lib/oauth/code_response_spec.rb
 - spec/lib/oauth/error_response_spec.rb
 - spec/lib/oauth/error_spec.rb
 - spec/lib/oauth/forbidden_token_response_spec.rb
@@ -336,16 +389,36 @@ files:
 - spec/support/helpers/model_helper.rb
 - spec/support/helpers/request_spec_helper.rb
 - spec/support/helpers/url_helper.rb
+- spec/support/http_method_shim.rb
 - spec/support/orm/active_record.rb
 - spec/support/shared/controllers_shared_context.rb
 - spec/support/shared/models_shared_examples.rb
 - spec/validators/redirect_uri_validator_spec.rb
+- spec/version/version_spec.rb
 - vendor/assets/stylesheets/doorkeeper/bootstrap.min.css
 homepage: https://github.com/doorkeeper-gem/doorkeeper
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |2+
+
+
+    WARNING: This is a security release that addresses token revocation not working for public apps (CVE-2018-1000211)
+
+    There is no breaking change in this release, however to take advantage of the security fix you must:
+
+      1. Run `rails generate doorkeeper:add_client_confidentiality` for the migration
+      2. Review your OAuth apps and determine which ones exclusively use public grant flows (eg implicit)
+      3. Update their `confidential` column to `false` for those public apps
+
+    This is a backported security release.
+
+    For more information:
+
+      * https://github.com/doorkeeper-gem/doorkeeper/pull/1119
+      * https://github.com/doorkeeper-gem/doorkeeper/issues/891
+
+
 rdoc_options: []
 require_paths:
 - lib
@@ -353,7 +426,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -361,11 +434,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: OAuth 2 provider for Rails and Grape
 test_files:
+- spec/controllers/application_metal_controller.rb
 - spec/controllers/applications_controller_spec.rb
 - spec/controllers/authorizations_controller_spec.rb
 - spec/controllers/protected_resources_controller_spec.rb
@@ -392,6 +466,7 @@ test_files:
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/doorkeeper.rb
+- spec/dummy/config/initializers/new_framework_defaults.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
@@ -399,9 +474,10 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20111122132257_create_users.rb
 - spec/dummy/db/migrate/20120312140401_add_password_to_users.rb
-- spec/dummy/db/migrate/20130902165751_create_doorkeeper_tables.rb
-- spec/dummy/db/migrate/20130902175349_add_owner_to_application.rb
-- spec/dummy/db/migrate/20141209001746_add_scopes_to_oauth_applications.rb
+- spec/dummy/db/migrate/20151223192035_create_doorkeeper_tables.rb
+- spec/dummy/db/migrate/20151223200000_add_owner_to_application.rb
+- spec/dummy/db/migrate/20160320211015_add_previous_refresh_token_to_access_tokens.rb
+- spec/dummy/db/migrate/20180210183654_add_confidential_to_application.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -412,8 +488,10 @@ test_files:
 - spec/generators/application_owner_generator_spec.rb
 - spec/generators/install_generator_spec.rb
 - spec/generators/migration_generator_spec.rb
+- spec/generators/previous_refresh_token_generator_spec.rb
 - spec/generators/templates/routes.rb
 - spec/generators/views_generator_spec.rb
+- spec/grape/grape_integration_spec.rb
 - spec/helpers/doorkeeper/dashboard_helper_spec.rb
 - spec/lib/config_spec.rb
 - spec/lib/doorkeeper_spec.rb
@@ -422,8 +500,9 @@ test_files:
 - spec/lib/models/scopes_spec.rb
 - spec/lib/oauth/authorization/uri_builder_spec.rb
 - spec/lib/oauth/authorization_code_request_spec.rb
+- spec/lib/oauth/base_request_spec.rb
+- spec/lib/oauth/base_response_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/validation_spec.rb
@@ -431,6 +510,7 @@ test_files:
 - spec/lib/oauth/client_credentials_request_spec.rb
 - spec/lib/oauth/client_spec.rb
 - spec/lib/oauth/code_request_spec.rb
+- spec/lib/oauth/code_response_spec.rb
 - spec/lib/oauth/error_response_spec.rb
 - spec/lib/oauth/error_spec.rb
 - spec/lib/oauth/forbidden_token_response_spec.rb
@@ -477,7 +557,9 @@ test_files:
 - spec/support/helpers/model_helper.rb
 - spec/support/helpers/request_spec_helper.rb
 - spec/support/helpers/url_helper.rb
+- spec/support/http_method_shim.rb
 - spec/support/orm/active_record.rb
 - spec/support/shared/controllers_shared_context.rb
 - spec/support/shared/models_shared_examples.rb
 - spec/validators/redirect_uri_validator_spec.rb
+- spec/version/version_spec.rb

data/lib/doorkeeper/oauth/client/methods.rb

@@ -1,18 +0,0 @@
-module Doorkeeper
-  module OAuth
-    class Client
-      module Methods
-        def from_params(request)
-          request.parameters.values_at(:client_id, :client_secret)
-        end
-
-        def from_basic(request)
-          authorization = request.authorization
-          if authorization.present? && authorization =~ /^Basic (.*)/m
-            Base64.decode64($1).split(/:/, 2)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/generators/doorkeeper/application_scopes_generator.rb

@@ -1,34 +0,0 @@
-require 'rails/generators/active_record'
-
-class Doorkeeper::ApplicationScopesGenerator < Rails::Generators::Base
-  include Rails::Generators::Migration
-  source_root File.expand_path('../templates', __FILE__)
-  desc 'Copies ActiveRecord migrations to handle upgrade to doorkeeper 2'
-
-  def self.next_migration_number(path)
-    ActiveRecord::Generators::Base.next_migration_number(path)
-  end
-
-  def application_scopes
-    if oauth_applications_exists? && !scopes_column_exists?
-      migration_template(
-        'add_scopes_to_oauth_applications.rb',
-        'db/migrate/add_scopes_to_oauth_applications.rb'
-      )
-    end
-  end
-
-  private
-
-  def scopes_column_exists?
-    ActiveRecord::Base.connection.column_exists?(
-      :oauth_applications,
-      :scopes
-    )
-  end
-
-  # Might be running this before install
-  def oauth_applications_exists?
-    ActiveRecord::Base.connection.table_exists? :oauth_applications
-  end
-end

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

@@ -1,5 +0,0 @@
-class AddScopesToOauthApplications < ActiveRecord::Migration
-  def change
-    add_column :oauth_applications, :scopes, :string, null: false, default: ''
-  end
-end

data/spec/dummy/db/migrate/20130902165751_create_doorkeeper_tables.rb

@@ -1,41 +0,0 @@
-class CreateDoorkeeperTables < ActiveRecord::Migration
-  def change
-    create_table :oauth_applications do |t|
-      t.string  :name,         null: false
-      t.string  :uid,          null: false
-      t.string  :secret,       null: false
-      t.string  :redirect_uri, null: false, limit: 2048
-      t.timestamps
-    end
-
-    add_index :oauth_applications, :uid, unique: true
-
-    create_table :oauth_access_grants do |t|
-      t.integer  :resource_owner_id, null: false
-      t.integer  :application_id,    null: false
-      t.string   :token,             null: false
-      t.integer  :expires_in,        null: false
-      t.string   :redirect_uri,      null: false, limit: 2048
-      t.datetime :created_at,        null: false
-      t.datetime :revoked_at
-      t.string   :scopes
-    end
-
-    add_index :oauth_access_grants, :token, unique: true
-
-    create_table :oauth_access_tokens do |t|
-      t.integer  :resource_owner_id
-      t.integer  :application_id
-      t.string   :token,             null: false
-      t.string   :refresh_token
-      t.integer  :expires_in
-      t.datetime :revoked_at
-      t.datetime :created_at,        null: false
-      t.string   :scopes
-    end
-
-    add_index :oauth_access_tokens, :token, unique: true
-    add_index :oauth_access_tokens, :resource_owner_id
-    add_index :oauth_access_tokens, :refresh_token, unique: true
-  end
-end

data/spec/dummy/db/migrate/20141209001746_add_scopes_to_oauth_applications.rb

@@ -1,5 +0,0 @@
-class AddScopesToOauthApplications < ActiveRecord::Migration
-  def change
-    add_column :oauth_applications, :scopes, :string, null: false, default: ''
-  end
-end