doorkeeper 5.0.0.rc2 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9a6bf0cb64c84923dedcc19d31136a03cb7fab0
-  data.tar.gz: ee93150982920fc8fb654b2e447d755e42191d9c
+  metadata.gz: db3333346ca1b82cd7aa332bb1e43f8d979534c0
+  data.tar.gz: 12511ea5d14b0bba28fef47893cc925c9e45ebcd
 SHA512:
-  metadata.gz: d66636e7818c25feab19f577ee2d344f0fac658906253c18c33e884ff063bc75f0461aa0a2ddb6305404501d58b321916fc64d48be5da4917e0fe1bfb1f1c600
-  data.tar.gz: f439482a6a560f1e70453e0a69fd1b468c640f2287fe0d2e5a90fad315214eeef01731235931d57aba3ed29ac85eaed2165e6e072a8c9e5b3792f2c4b7cc4392
+  metadata.gz: a5265ed62b206c4f9f117c3cbc8e6d905840636297a342ea952e5dfced01f7ce4bd6b59fc7efd6a4f0e6558475c566bf59ba4a793ef3f87942cf8935dde061ba
+  data.tar.gz: 18d2b90ae8e5f2e6e80f518fe0a251c49ba3187fda34c9213f14c0152f301dfd149d11db14dcd94a69bb8048352f8a945107c572cfb3fa03aeabc6d6383b706c

data/NEWS.md

@@ -7,7 +7,11 @@ User-visible changes worth mentioning.
 
 ## master
 
-- [#] Add description here
+- [#PR ID] Add PR description.
+
+## 5.0.0
+
+- [#1127] Change the token_type initials of the Banner Token to uppercase to comply with the RFC6750 specification.
 
 ## 5.0.0.rc2
 
@@ -57,6 +61,15 @@ User-visible changes worth mentioning.
 - Fix bug with `force_ssl_in_redirect_uri` when it breaks existing applications with an
   SSL redirect_uri.
   
+## 4.4.2
+
+- [#1130] Backport fix for native redirect_uri from 5.x.
+  
+## 4.4.1
+
+- [#1127] Backport token type to comply with the RFC6750 specification.
+- [#1125] Backport Quote surround I18n yes/no keys
+  
 ## 4.4.0
   
 - [#1120] Backport security fix from 5.x for token revocation when using public clients

data/README.md

@@ -5,6 +5,7 @@
 [![Code Climate](https://codeclimate.com/github/doorkeeper-gem/doorkeeper.svg)](https://codeclimate.com/github/doorkeeper-gem/doorkeeper)
 [![Coverage Status](https://coveralls.io/repos/github/doorkeeper-gem/doorkeeper/badge.svg?branch=master)](https://coveralls.io/github/doorkeeper-gem/doorkeeper?branch=master)
 [![Security](https://hakiri.io/github/doorkeeper-gem/doorkeeper/master.svg)](https://hakiri.io/github/doorkeeper-gem/doorkeeper/master)
+[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
 
 Doorkeeper is a gem (Rails engine) that makes it easy to introduce OAuth 2 provider
 functionality to your Ruby on Rails or Grape application.
@@ -179,8 +180,7 @@ end
 ```
 
 Keep in mind, that in this mode you will not be able to access `Applications` or
-`Authorized Applications` controllers because they will be skipped. Also all the
-redirects will be returned as JSON response with corresponding locations.
+`Authorized Applications` controllers because they will be skipped. CSRF protections (which are otherwise enabled) will be skipped, and all the redirects will be returned as JSON response with corresponding locations.
 
 ### Routes
 

data/doorkeeper.gemspec

@@ -1,30 +1,30 @@
-$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 
-require "doorkeeper/version"
+require 'doorkeeper/version'
 
 Gem::Specification.new do |s|
-  s.name        = "doorkeeper"
+  s.name        = 'doorkeeper'
   s.version     = Doorkeeper.gem_version
-  s.authors     = ["Felipe Elias Philipp", "Tute Costa", "Jon Moss", "Nikita Bulai"]
+  s.authors     = ['Felipe Elias Philipp', 'Tute Costa', 'Jon Moss', 'Nikita Bulai']
   s.email       = %w(bulaj.nikita@gmail.com)
-  s.homepage    = "https://github.com/doorkeeper-gem/doorkeeper"
-  s.summary     = "OAuth 2 provider for Rails and Grape"
-  s.description = "Doorkeeper is an OAuth 2 provider for Rails and Grape."
+  s.homepage    = 'https://github.com/doorkeeper-gem/doorkeeper'
+  s.summary     = 'OAuth 2 provider for Rails and Grape'
+  s.description = 'Doorkeeper is an OAuth 2 provider for Rails and Grape.'
   s.license     = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.add_dependency "railties", ">= 4.2"
-  s.required_ruby_version = ">= 2.1"
+  s.add_dependency 'railties', '>= 4.2'
+  s.required_ruby_version = '>= 2.1'
 
-  s.add_development_dependency "capybara", '~> 2.18'
-  s.add_development_dependency "coveralls"
-  s.add_development_dependency "grape"
-  s.add_development_dependency "database_cleaner", "~> 1.6"
-  s.add_development_dependency "factory_bot", "~> 4.8"
-  s.add_development_dependency "generator_spec", "~> 0.9.3"
-  s.add_development_dependency "rake", ">= 11.3.0"
-  s.add_development_dependency "rspec-rails"
+  s.add_development_dependency 'capybara', '~> 2.18'
+  s.add_development_dependency 'coveralls'
+  s.add_development_dependency 'grape'
+  s.add_development_dependency 'database_cleaner', '~> 1.6'
+  s.add_development_dependency 'factory_bot', '~> 4.8'
+  s.add_development_dependency 'generator_spec', '~> 0.9.3'
+  s.add_development_dependency 'rake', '>= 11.3.0'
+  s.add_development_dependency 'rspec-rails'
 end

data/lib/doorkeeper/models/access_token_mixin.rb

@@ -173,7 +173,7 @@ module Doorkeeper
     #   The OAuth 2.0 Authorization Framework: Bearer Token Usage
     #
     def token_type
-      'bearer'
+      'Bearer'
     end
 
     def use_refresh_token?

data/lib/doorkeeper/oauth/authorization/token.rb

@@ -34,8 +34,6 @@ module Doorkeeper
               !!server.refresh_token_enabled?
             end
           end
-
-          private
         end
 
         def initialize(pre_auth, resource_owner)

data/lib/doorkeeper/oauth/client_credentials/creator.rb

@@ -5,7 +5,8 @@ module Doorkeeper
         def call(client, scopes, attributes = {})
           AccessToken.find_or_create_for(
             client, nil, scopes, attributes[:expires_in],
-            attributes[:use_refresh_token])
+            attributes[:use_refresh_token]
+          )
         end
       end
     end

data/lib/doorkeeper/rails/routes.rb

@@ -44,11 +44,11 @@ module Doorkeeper
       private
 
       def map_route(name, method)
-       unless @mapping.skipped?(name)
-         send(method, @mapping[name])
+        return if @mapping.skipped?(name)
 
-         mapping[name] = @mapping[name]
-       end
+        send(method, @mapping[name])
+
+        mapping[name] = @mapping[name]
       end
 
       def authorization_routes(mapping)

data/lib/doorkeeper/version.rb

@@ -8,7 +8,7 @@ module Doorkeeper
     MAJOR = 5
     MINOR = 0
     TINY = 0
-    PRE = 'rc2'
+    PRE = nil
 
     # Full version number
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/spec/controllers/authorizations_controller_spec.rb

@@ -57,7 +57,7 @@ describe Doorkeeper::AuthorizationsController, 'implicit grant flow' do
     end
 
     it 'includes token type in fragment' do
-      expect(response.query_params['token_type']).to eq('bearer')
+      expect(response.query_params['token_type']).to eq('Bearer')
     end
 
     it 'includes token expiration in fragment' do
@@ -95,7 +95,7 @@ describe Doorkeeper::AuthorizationsController, 'implicit grant flow' do
     end
 
     it "includes token type in fragment" do
-      expect(redirect_uri.match(/token_type=(\w+)&?/)[1]).to eq "bearer"
+      expect(redirect_uri.match(/token_type=(\w+)&?/)[1]).to eq "Bearer"
     end
 
     it "includes token expiration in fragment" do
@@ -293,7 +293,7 @@ describe Doorkeeper::AuthorizationsController, 'implicit grant flow' do
     end
 
     it 'includes token type in fragment' do
-      expect(response.query_params['token_type']).to eq('bearer')
+      expect(response.query_params['token_type']).to eq('Bearer')
     end
 
     it 'includes token expiration in fragment' do
@@ -355,7 +355,7 @@ describe Doorkeeper::AuthorizationsController, 'implicit grant flow' do
     it "sets redirect_uri to correct value" do
       redirect_uri = JSON.parse(response.body)["redirect_uri"]
       expect(redirect_uri).to_not be_nil
-      expect(redirect_uri.match(/token_type=(\w+)&?/)[1]).to eq "bearer"
+      expect(redirect_uri.match(/token_type=(\w+)&?/)[1]).to eq "Bearer"
       expect(redirect_uri.match(/expires_in=(\d+)&?/)[1].to_i).to eq 1234
       expect(
         redirect_uri.match(/access_token=([a-f0-9]+)&?/)[1]

data/spec/controllers/tokens_controller_spec.rb

@@ -33,7 +33,7 @@ describe Doorkeeper::TokensController do
       allow(I18n).to receive(:translate).
         with(
           custom_message,
-          hash_including(scope: %i[doorkeeper errors messages]),
+          hash_including(scope: %i[doorkeeper errors messages])
         ).
         and_return('Authorization custom message')
 

data/spec/requests/flows/authorization_code_spec.rb

@@ -54,7 +54,7 @@ feature 'Authorization Code Flow' do
     should_not_have_json 'error'
 
     should_have_json 'access_token', Doorkeeper::AccessToken.first.token
-    should_have_json 'token_type', 'bearer'
+    should_have_json 'token_type', 'Bearer'
     should_have_json_within 'expires_in', Doorkeeper::AccessToken.first.expires_in, 1
   end
 
@@ -107,7 +107,7 @@ feature 'Authorization Code Flow' do
         should_not_have_json 'error'
 
         should_have_json 'access_token', Doorkeeper::AccessToken.first.token
-        should_have_json 'token_type', 'bearer'
+        should_have_json 'token_type', 'Bearer'
         should_have_json_within 'expires_in', Doorkeeper::AccessToken.first.expires_in, 1
       end
 
@@ -150,7 +150,7 @@ feature 'Authorization Code Flow' do
         should_not_have_json 'error'
 
         should_have_json 'access_token', Doorkeeper::AccessToken.first.token
-        should_have_json 'token_type', 'bearer'
+        should_have_json 'token_type', 'Bearer'
         should_have_json_within 'expires_in', Doorkeeper::AccessToken.first.expires_in, 1
       end
 
@@ -185,7 +185,7 @@ feature 'Authorization Code Flow' do
         should_not_have_json 'error'
 
         should_have_json 'access_token', Doorkeeper::AccessToken.first.token
-        should_have_json 'token_type', 'bearer'
+        should_have_json 'token_type', 'Bearer'
         should_have_json_within 'expires_in', Doorkeeper::AccessToken.first.expires_in, 1
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc2
+  version: 5.0.0
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -427,9 +427,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11