doorkeeper 3.1.0 → 4.2.6

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.2.6
 platform: ruby
 authors:
 - Felipe Elias Philipp
 - Tute Costa
+- Jon Moss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -17,109 +18,125 @@ 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: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        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: 1.3.0
+        version: '0'
 description: Doorkeeper is an OAuth 2 provider for Rails and Grape.
 email:
-- tutecosta@gmail.com
+- me@jonathanmoss.me
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - CONTRIBUTING.md
 - Gemfile
 - MIT-LICENSE
@@ -153,6 +170,9 @@ 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
 - lib/doorkeeper.rb
 - lib/doorkeeper/config.rb
 - lib/doorkeeper/engine.rb
@@ -172,9 +192,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,7 +212,6 @@ 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_request.rb
@@ -216,15 +236,16 @@ files:
 - lib/doorkeeper/validations.rb
 - lib/doorkeeper/version.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_previous_refresh_token_to_access_tokens.rb
 - lib/generators/doorkeeper/templates/initializer.rb
 - lib/generators/doorkeeper/templates/migration.rb
 - 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
@@ -249,6 +270,7 @@ files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/active_record_belongs_to_required_by_default.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/doorkeeper.rb
 - spec/dummy/config/initializers/secret_token.rb
@@ -258,9 +280,9 @@ 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/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -281,8 +303,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 +313,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,6 +360,7 @@ 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
@@ -353,7 +378,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 +386,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
@@ -390,6 +416,7 @@ test_files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/active_record_belongs_to_required_by_default.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/doorkeeper.rb
 - spec/dummy/config/initializers/secret_token.rb
@@ -399,9 +426,9 @@ 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/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -422,8 +449,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 +459,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,6 +506,7 @@ 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

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/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

data/spec/lib/oauth/client/methods_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-require 'active_support/core_ext/string'
-require 'doorkeeper/oauth/client'
-
-class Doorkeeper::OAuth::Client
-  describe 'Methods' do
-    let(:client_id) { 'some-uid' }
-    let(:client_secret) { 'some-secret' }
-
-    subject do
-      Class.new do
-        include Methods
-      end.new
-    end
-
-    describe :from_params do
-      it 'returns credentials from parameters when Authorization header is not available' do
-        request     = double parameters: { client_id: client_id, client_secret: client_secret }
-        uid, secret = subject.from_params(request)
-
-        expect(uid).to    eq('some-uid')
-        expect(secret).to eq('some-secret')
-      end
-
-      it 'is blank when there are no credentials' do
-        request     = double parameters: {}
-        uid, secret = subject.from_params(request)
-
-        expect(uid).to    be_blank
-        expect(secret).to be_blank
-      end
-    end
-
-    describe :from_basic do
-      let(:credentials) { Base64.encode64("#{client_id}:#{client_secret}") }
-
-      it 'decodes the credentials' do
-        request     = double authorization: "Basic #{credentials}"
-        uid, secret = subject.from_basic(request)
-
-        expect(uid).to    eq('some-uid')
-        expect(secret).to eq('some-secret')
-      end
-
-      it 'is blank if Authorization is not Basic' do
-        request     = double authorization: "#{credentials}"
-        uid, secret = subject.from_basic(request)
-
-        expect(uid).to    be_blank
-        expect(secret).to be_blank
-      end
-    end
-  end
-end