doorkeeper 4.2.0 → 4.2.5

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

@@ -1,6 +1,6 @@
 module Doorkeeper
   module OAuth
-    class ClientCredentialsRequest
+    class ClientCredentialsRequest < BaseRequest
       class Creator
         def call(client, scopes, attributes = {})
           AccessToken.find_or_create_for(

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

@@ -2,7 +2,7 @@ require 'doorkeeper/oauth/client_credentials/validation'
 
 module Doorkeeper
   module OAuth
-    class ClientCredentialsRequest
+    class ClientCredentialsRequest < BaseRequest
       class Issuer
         attr_accessor :token, :validation, :error
 

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

@@ -4,7 +4,7 @@ require 'doorkeeper/oauth/helpers/scope_checker'
 
 module Doorkeeper
   module OAuth
-    class ClientCredentialsRequest
+    class ClientCredentialsRequest < BaseRequest
       class Validation
         include Validations
         include OAuth::Helpers

data/lib/doorkeeper/oauth/client_credentials_request.rb

@@ -4,10 +4,7 @@ require 'doorkeeper/oauth/client_credentials/validation'
 
 module Doorkeeper
   module OAuth
-    class ClientCredentialsRequest
-      include Validations
-      include OAuth::RequestConcern
-
+    class ClientCredentialsRequest < BaseRequest
       attr_accessor :server, :client, :original_scopes
       attr_reader :response
       attr_writer :issuer

data/lib/doorkeeper/oauth/code_response.rb

@@ -1,7 +1,6 @@
 module Doorkeeper
   module OAuth
-    class CodeResponse
-      include OAuth::Authorization::URIBuilder
+    class CodeResponse < BaseResponse
       include OAuth::Helpers
 
       attr_accessor :pre_auth, :auth, :response_on_fragment
@@ -20,7 +19,7 @@ module Doorkeeper
         if URIChecker.native_uri? pre_auth.redirect_uri
           auth.native_redirect
         elsif response_on_fragment
-          uri_with_fragment(
+          Authorization::URIBuilder.uri_with_fragment(
             pre_auth.redirect_uri,
             access_token: auth.token.token,
             token_type: auth.token.token_type,
@@ -28,9 +27,11 @@ module Doorkeeper
             state: pre_auth.state
           )
         else
-          uri_with_query pre_auth.redirect_uri,
-                         code: auth.token.token,
-                         state: pre_auth.state
+          Authorization::URIBuilder.uri_with_query(
+            pre_auth.redirect_uri,
+            code: auth.token.token,
+            state: pre_auth.state
+          )
         end
       end
     end

data/lib/doorkeeper/oauth/error_response.rb

@@ -1,7 +1,6 @@
 module Doorkeeper
   module OAuth
-    class ErrorResponse
-      include OAuth::Authorization::URIBuilder
+    class ErrorResponse < BaseResponse
       include OAuth::Helpers
 
       def self.from_request(request, attributes = {})
@@ -36,16 +35,12 @@ module Doorkeeper
 
       def redirect_uri
         if @response_on_fragment
-          uri_with_fragment @redirect_uri, body
+          Authorization::URIBuilder.uri_with_fragment @redirect_uri, body
         else
-          uri_with_query @redirect_uri, body
+          Authorization::URIBuilder.uri_with_query @redirect_uri, body
         end
       end
 
-      def authenticate_info
-        %(Bearer realm="#{realm}", error="#{name}", error_description="#{description}")
-      end
-
       def headers
         { 'Cache-Control' => 'no-store',
           'Pragma' => 'no-cache',
@@ -60,6 +55,12 @@ module Doorkeeper
       def configuration
         Doorkeeper.configuration
       end
+
+      private
+
+      def authenticate_info
+        %(Bearer realm="#{realm}", error="#{name}", error_description="#{description}")
+      end
     end
   end
 end

data/lib/doorkeeper/oauth/invalid_token_response.rb

@@ -1,6 +1,8 @@
 module Doorkeeper
   module OAuth
     class InvalidTokenResponse < ErrorResponse
+      attr_reader :reason
+
       def self.from_access_token(access_token, attributes = {})
         reason = case
                  when access_token.try(:revoked?)

data/lib/doorkeeper/oauth/password_access_token_request.rb

@@ -1,8 +1,6 @@
 module Doorkeeper
   module OAuth
-    class PasswordAccessTokenRequest
-      include Validations
-      include OAuth::RequestConcern
+    class PasswordAccessTokenRequest < BaseRequest
       include OAuth::Helpers
 
       validate :client,         error: :invalid_client

data/lib/doorkeeper/oauth/refresh_token_request.rb

@@ -1,8 +1,6 @@
 module Doorkeeper
   module OAuth
-    class RefreshTokenRequest
-      include Validations
-      include OAuth::RequestConcern
+    class RefreshTokenRequest < BaseRequest
       include OAuth::Helpers
 
       validate :token_presence, error: :invalid_request
@@ -12,9 +10,7 @@ module Doorkeeper
       validate :scope,        error: :invalid_scope
 
       attr_accessor :access_token, :client, :credentials, :refresh_token,
-                    :server, :refresh_token_parameter
-
-      private :refresh_token_parameter, :refresh_token_parameter=
+                    :server
 
       def initialize(server, refresh_token, credentials, parameters = {})
         @server          = server
@@ -72,7 +68,7 @@ module Doorkeeper
       end
 
       def validate_token_presence
-        refresh_token.present? || refresh_token_parameter.present?
+        refresh_token.present? || @refresh_token_parameter.present?
       end
 
       def validate_token

data/lib/doorkeeper/oauth/token.rb

@@ -1,7 +1,23 @@
 module Doorkeeper
   module OAuth
     class Token
-      module Methods
+      class << self
+        def from_request(request, *methods)
+          methods.inject(nil) do |credentials, method|
+            method = self.method(method) if method.is_a?(Symbol)
+            credentials = method.call(request)
+            break credentials unless credentials.blank?
+          end
+        end
+
+        def authenticate(request, *methods)
+          if token = from_request(request, *methods)
+            access_token = AccessToken.by_token(token)
+            access_token.revoke_previous_refresh_token! if access_token
+            access_token
+          end
+        end
+
         def from_access_token_param(request)
           request.parameters[:access_token]
         end
@@ -41,24 +57,6 @@ module Doorkeeper
           header && header.match(pattern)
         end
       end
-
-      extend Methods
-
-      def self.from_request(request, *methods)
-        methods.inject(nil) do |credentials, method|
-          method = self.method(method) if method.is_a?(Symbol)
-          credentials = method.call(request)
-          break credentials unless credentials.blank?
-        end
-      end
-
-      def self.authenticate(request, *methods)
-        if token = from_request(request, *methods)
-          access_token = AccessToken.by_token(token)
-          access_token.revoke_previous_refresh_token! if access_token
-          access_token
-        end
-      end
     end
   end
 end

data/lib/doorkeeper/oauth/token_request.rb

@@ -1,11 +1,10 @@
 module Doorkeeper
   module OAuth
     class TokenRequest
-      attr_accessor :pre_auth, :resource_owner, :client
+      attr_accessor :pre_auth, :resource_owner
 
       def initialize(pre_auth, resource_owner)
         @pre_auth       = pre_auth
-        @client         = pre_auth.client
         @resource_owner = resource_owner
       end
 

data/lib/doorkeeper/orm/active_record/access_token.rb

@@ -4,16 +4,32 @@ module Doorkeeper
 
     include AccessTokenMixin
 
+    # Deletes all the Access Tokens created for the specific
+    # Application and Resource Owner.
+    #
+    # @param application_id [Integer] Application ID
+    # @param resource_owner [ActiveRecord::Base] Resource Owner model instance
+    #
     def self.delete_all_for(application_id, resource_owner)
       where(application_id: application_id,
             resource_owner_id: resource_owner.id).delete_all
     end
     private_class_method :delete_all_for
 
+    # Searches for not revoked Access Tokens associated with the
+    # specific Resource Owner.
+    #
+    # @param resource_owner [ActiveRecord::Base]
+    #   Resource Owner model instance
+    #
+    # @return [ActiveRecord::Relation]
+    #   active Access Tokens for Resource Owner
+    #
     def self.active_for(resource_owner)
       where(resource_owner_id: resource_owner.id, revoked_at: nil)
     end
 
+    # ORM-specific order method.
     def self.order_method
       :order
     end
@@ -22,6 +38,7 @@ module Doorkeeper
       column_names.include?('previous_refresh_token')
     end
 
+    # ORM-specific DESC order for `:created_at` column.
     def self.created_at_desc
       'created_at desc'
     end

data/lib/doorkeeper/orm/active_record/application.rb

@@ -4,13 +4,18 @@ module Doorkeeper
 
     include ApplicationMixin
 
-    if ActiveRecord::VERSION::MAJOR >= 4
-      has_many :authorized_tokens, -> { where(revoked_at: nil) }, class_name: 'AccessToken'
-    else
-      has_many :authorized_tokens, class_name: 'AccessToken', conditions: { revoked_at: nil }
-    end
+    has_many :authorized_tokens, -> { where(revoked_at: nil) }, class_name: 'AccessToken'
     has_many :authorized_applications, through: :authorized_tokens, source: :application
 
+    # Returns Applications associated with active (not revoked) Access Tokens
+    # that are owned by the specific Resource Owner.
+    #
+    # @param resource_owner [ActiveRecord::Base]
+    #   Resource Owner model instance
+    #
+    # @return [ActiveRecord::Relation]
+    #   Applications authorized for the Resource Owner
+    #
     def self.authorized_for(resource_owner)
       resource_access_tokens = AccessToken.active_for(resource_owner)
       where(id: resource_access_tokens.select(:application_id).distinct)

data/lib/doorkeeper/rails/helpers.rb

@@ -1,8 +1,6 @@
 module Doorkeeper
   module Rails
     module Helpers
-      extend ActiveSupport::Concern
-
       def doorkeeper_authorize!(*scopes)
         @_doorkeeper_scopes = scopes.presence || Doorkeeper.configuration.default_scopes
 

data/lib/doorkeeper/rails/routes.rb

@@ -3,7 +3,7 @@ require 'doorkeeper/rails/routes/mapper'
 
 module Doorkeeper
   module Rails
-    class Routes
+    class Routes # :nodoc:
       module Helper
         # TODO: options hash is not being used
         def use_doorkeeper(options = {}, &block)
@@ -15,15 +15,14 @@ module Doorkeeper
         ActionDispatch::Routing::Mapper.send :include, Doorkeeper::Rails::Routes::Helper
       end
 
-      attr_accessor :routes
+      attr_reader :routes
 
       def initialize(routes, &block)
         @routes = routes
-        @block = block
+        @mapping = Mapper.new.map(&block)
       end
 
       def generate_routes!(options)
-        @mapping = Mapper.new.map(&@block)
         routes.scope options[:scope] || 'oauth', as: 'oauth' do
           map_route(:authorizations, :authorization_routes)
           map_route(:tokens, :token_routes)

data/lib/doorkeeper/rails/routes/mapper.rb

@@ -1,9 +1,9 @@
 module Doorkeeper
   module Rails
-    class Routes
+    class Routes # :nodoc:
       class Mapper
-        def initialize(mapping = Mapping.new)
-          @mapping = mapping
+        def initialize
+          @mapping = Mapping.new
         end
 
         def map(&block)

data/lib/doorkeeper/rails/routes/mapping.rb

@@ -1,6 +1,6 @@
 module Doorkeeper
   module Rails
-    class Routes
+    class Routes # :nodoc:
       class Mapping
         attr_accessor :controllers, :as, :skips
 

data/lib/doorkeeper/request/authorization_code.rb

@@ -3,7 +3,7 @@ require 'doorkeeper/request/strategy'
 module Doorkeeper
   module Request
     class AuthorizationCode < Strategy
-      delegate :grant, :client, :parameters, to: :server
+      delegate :client, :parameters, to: :server
 
       def request
         @request ||= OAuth::AuthorizationCodeRequest.new(
@@ -13,6 +13,12 @@ module Doorkeeper
           parameters
         )
       end
+
+      private
+
+      def grant
+        AccessGrant.by_token(parameters[:code])
+      end
     end
   end
 end

data/lib/doorkeeper/request/refresh_token.rb

@@ -6,7 +6,7 @@ module Doorkeeper
       delegate :credentials, :parameters, to: :server
 
       def refresh_token
-        server.current_refresh_token
+        AccessToken.by_refresh_token(parameters[:refresh_token])
       end
 
       def request

data/lib/doorkeeper/server.rb

@@ -33,14 +33,6 @@ module Doorkeeper
       context.send :current_resource_owner
     end
 
-    def current_refresh_token
-      AccessToken.by_refresh_token(parameters[:refresh_token])
-    end
-
-    def grant
-      AccessGrant.by_token(parameters[:code])
-    end
-
     # TODO: Use configuration and evaluate proper context on block
     def resource_owner
       context.send :resource_owner_from_credentials

data/lib/doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module Doorkeeper
-  VERSION = "4.2.0".freeze
+  VERSION = "4.2.5".freeze
 end

data/spec/controllers/authorizations_controller_spec.rb

@@ -12,8 +12,9 @@ describe Doorkeeper::AuthorizationsController, 'implicit grant flow' do
     I18n.translate key, scope: [:doorkeeper, :errors, :messages]
   end
 
-  let(:client) { FactoryGirl.create :application }
-  let(:user)   { User.create!(name: 'Joe', password: 'sekret') }
+  let(:client)        { FactoryGirl.create :application }
+  let(:user)          { User.create!(name: 'Joe', password: 'sekret') }
+  let(:access_token)  { FactoryGirl.build :access_token, resource_owner_id: user.id, application_id: client.id }
 
   before do
     allow(Doorkeeper.configuration).to receive(:grant_flows).and_return(["implicit"])
@@ -86,7 +87,20 @@ describe Doorkeeper::AuthorizationsController, 'implicit grant flow' do
   end
 
   describe 'POST #create with application already authorized' do
-    it 'returns the existing access token in a fragment'
+    before do
+      allow(Doorkeeper.configuration).to receive(:reuse_access_token).and_return(true)
+
+      access_token.save!
+      post :create, client_id: client.uid, response_type: 'token', redirect_uri: client.redirect_uri
+    end
+
+    it 'returns the existing access token in a fragment' do
+      expect(fragments('access_token')).to eq(access_token.token)
+    end
+
+    it 'does not creates a new access token' do
+      expect(Doorkeeper::AccessToken.count).to eq(1)
+    end
   end
 
   describe 'GET #new token request with native url and skip_authorization true' do

data/spec/lib/doorkeeper_spec.rb

@@ -1,28 +1,150 @@
 require 'spec_helper_integration'
 
 describe Doorkeeper do
-  describe 'authenticate' do
-    let(:token) { double('Token') }
-    let(:request) { double('ActionDispatch::Request') }
+  describe "#authenticate" do
+    let(:request) { double }
+
+    it "calls OAuth::Token#authenticate" do
+      token_strategies = Doorkeeper.configuration.access_token_methods
+
+      expect(Doorkeeper::OAuth::Token).to receive(:authenticate).
+        with(request, *token_strategies)
+
+      Doorkeeper.authenticate(request)
+    end
+
+    it "accepts custom token strategies" do
+      token_strategies = [:first_way, :second_way]
+
+      expect(Doorkeeper::OAuth::Token).to receive(:authenticate).
+        with(request, *token_strategies)
+
+      Doorkeeper.authenticate(request, token_strategies)
+    end
+  end
+
+  describe "#configured?" do
+    after do
+      Doorkeeper.remove_instance_variable(:@config)
+    end
+
+    context "@config is set" do
+      it "returns true" do
+        Doorkeeper.instance_variable_set(:@config, "hi")
+
+        expect(Doorkeeper.configured?).to eq(true)
+      end
+    end
+
+    context "@config is not set" do
+      it "returns false" do
+        Doorkeeper.instance_variable_set(:@config, nil)
+
+        expect(Doorkeeper.configured?).to eq(false)
+      end
+    end
+
+    it "is deprecated" do
+      expect(ActiveSupport::Deprecation).to receive(:warn).
+        with("Method `Doorkeeper#configured?` has been deprecated without replacement.")
+
+      Doorkeeper.configured?
+    end
+  end
+
+  describe "#database_installed?" do
     before do
-      allow(Doorkeeper::OAuth::Token).to receive(:authenticate).
-        with(request, *token_strategies) { token }
+      ["AccessToken", "AccessGrant", "Application"].each do |klass|
+        @original_classes ||= {}
+        @original_classes[klass] = Doorkeeper.const_get(klass)
+        Doorkeeper.send(:remove_const, klass)
+      end
+    end
+
+    after do
+      ["AccessToken", "AccessGrant", "Application"].each do |klass|
+        Doorkeeper.send(:remove_const, klass)
+        Doorkeeper.const_set(klass, @original_classes[klass])
+      end
     end
 
-    context 'with specific access token strategies' do
-      let(:token_strategies) { [:first_way, :second_way] }
+    context "all tables exist" do
+      before do
+        klass = double table_exists?: true
+
+        Doorkeeper.const_set(:AccessToken, klass)
+        Doorkeeper.const_set(:AccessGrant, klass)
+        Doorkeeper.const_set(:Application, klass)
+      end
 
-      it 'authenticates the token from the request' do
-        expect(Doorkeeper.authenticate(request, token_strategies)).to eq(token)
+      it "returns true" do
+        expect(Doorkeeper.database_installed?).to eq(true)
+      end
+
+      it "is deprecated" do
+        expect(ActiveSupport::Deprecation).to receive(:warn).
+          with("Method `Doorkeeper#database_installed?` has been deprecated without replacement.")
+
+        Doorkeeper.database_installed?
       end
     end
 
-    context 'with default access token strategies' do
-      let(:token_strategies) { Doorkeeper.configuration.access_token_methods }
+    context "all tables do not exist" do
+      before do
+        klass = double table_exists?: false
+
+        Doorkeeper.const_set(:AccessToken, klass)
+        Doorkeeper.const_set(:AccessGrant, klass)
+        Doorkeeper.const_set(:Application, klass)
+      end
+
+      it "returns false" do
+        expect(Doorkeeper.database_installed?).to eq(false)
+      end
+
+      it "is deprecated" do
+        expect(ActiveSupport::Deprecation).to receive(:warn).
+          with("Method `Doorkeeper#database_installed?` has been deprecated without replacement.")
 
-      it 'authenticates the token from the request' do
-        expect(Doorkeeper.authenticate(request)).to eq(token)
+        Doorkeeper.database_installed?
       end
     end
   end
+
+  describe "#installed?" do
+    context "methods return true" do
+      before do
+        allow(Doorkeeper).to receive(:configured?).and_return(true).once
+        allow(Doorkeeper).to receive(:database_installed?).and_return(true).once
+      end
+
+      it "returns true" do
+        expect(Doorkeeper.installed?).to eq(true)
+      end
+    end
+
+    context "methods return false" do
+      before do
+        allow(Doorkeeper).to receive(:configured?).and_return(false).once
+        allow(Doorkeeper).to receive(:database_installed?).and_return(false).once
+      end
+
+      it "returns false" do
+        expect(Doorkeeper.installed?).to eq(false)
+      end
+    end
+
+    it "is deprecated" do
+      expect(ActiveSupport::Deprecation).to receive(:warn).
+        with("Method `Doorkeeper#configured?` has been deprecated without replacement.")
+
+      expect(ActiveSupport::Deprecation).to receive(:warn).
+        with("Method `Doorkeeper#database_installed?` has been deprecated without replacement.")
+
+      expect(ActiveSupport::Deprecation).to receive(:warn).
+        with("Method `Doorkeeper#installed?` has been deprecated without replacement.")
+
+      Doorkeeper.installed?
+    end
+  end
 end