doorkeeper 4.0.0.rc3 → 4.0.0.rc4

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

@@ -7,7 +7,8 @@ module Doorkeeper
         attr_accessor :token, :validation, :error
 
         def initialize(server, validation)
-          @server, @validation = server, validation
+          @server = server
+          @validation = validation
         end
 
         def create(client, scopes, creator = Creator.new)

data/lib/doorkeeper/oauth/client_credentials_request.rb

@@ -12,7 +12,7 @@ module Doorkeeper
       attr_reader :response
       attr_writer :issuer
 
-      alias :error_response :response
+      alias_method :error_response, :response
 
       delegate :error, to: :issuer
 
@@ -21,8 +21,9 @@ module Doorkeeper
       end
 
       def initialize(server, client, parameters = {})
-        @client, @server = client, server
-        @response        = nil
+        @client = client
+        @server = server
+        @response = nil
         @original_scopes = parameters[:scope]
       end
 

data/lib/doorkeeper/oauth/code_response.rb

@@ -7,7 +7,8 @@ module Doorkeeper
       attr_accessor :pre_auth, :auth, :response_on_fragment
 
       def initialize(pre_auth, auth, options = {})
-        @pre_auth, @auth      = pre_auth, auth
+        @pre_auth = pre_auth
+        @auth = auth
         @response_on_fragment = options[:response_on_fragment]
       end
 
@@ -18,20 +19,18 @@ module Doorkeeper
       def redirect_uri
         if URIChecker.native_uri? pre_auth.redirect_uri
           auth.native_redirect
+        elsif response_on_fragment
+          uri_with_fragment(
+            pre_auth.redirect_uri,
+            access_token: auth.token.token,
+            token_type: auth.token.token_type,
+            expires_in: auth.token.expires_in_seconds,
+            state: pre_auth.state
+          )
         else
-          if response_on_fragment
-            uri_with_fragment(
-              pre_auth.redirect_uri,
-              access_token: auth.token.token,
-              token_type: auth.token.token_type,
-              expires_in: auth.token.expires_in_seconds,
-              state: pre_auth.state
-            )
-          else
-            uri_with_query pre_auth.redirect_uri,
-                           code: auth.token.token,
-                           state: pre_auth.state
-          end
+          uri_with_query pre_auth.redirect_uri,
+                         code: auth.token.token,
+                         state: pre_auth.state
         end
       end
     end

data/lib/doorkeeper/oauth/helpers/uri_checker.rb

@@ -10,7 +10,8 @@ module Doorkeeper
         end
 
         def self.matches?(url, client_url)
-          url, client_url = as_uri(url), as_uri(client_url)
+          url = as_uri(url)
+          client_url = as_uri(client_url)
           url.query = nil
           url == client_url
         end

data/lib/doorkeeper/oauth/password_access_token_request.rb

@@ -9,19 +9,15 @@ module Doorkeeper
       validate :resource_owner, error: :invalid_resource_owner
       validate :scopes,         error: :invalid_scope
 
-      attr_accessor :server, :resource_owner, :credentials, :access_token
-      attr_accessor :client
+      attr_accessor :server, :client, :resource_owner, :parameters,
+                    :access_token
 
-      def initialize(server, credentials, resource_owner, parameters = {})
+      def initialize(server, client, resource_owner, parameters = {})
         @server          = server
         @resource_owner  = resource_owner
-        @credentials     = credentials
+        @client          = client
+        @parameters      = parameters
         @original_scopes = parameters[:scope]
-
-        if credentials
-          @client = Application.by_uid_and_secret credentials.uid,
-                                                  credentials.secret
-        end
       end
 
       private
@@ -40,7 +36,7 @@ module Doorkeeper
       end
 
       def validate_client
-        !credentials || !!client
+        !parameters[:client_id] || !!client
       end
     end
   end

data/lib/doorkeeper/oauth/refresh_token_request.rb

@@ -42,7 +42,7 @@ module Doorkeeper
       end
 
       def refresh_token_revoked_on_use?
-        server.refresh_token_revoked_on_use?
+        Doorkeeper::AccessToken.refresh_token_revoked_on_use?
       end
 
       def default_scopes

data/lib/doorkeeper/oauth/scopes.rb

@@ -46,14 +46,14 @@ module Doorkeeper
 
       def +(other)
         if other.is_a? Scopes
-          self.class.from_array(self.all + other.all)
+          self.class.from_array(all + other.all)
         else
           super(other)
         end
       end
 
       def <=>(other)
-        self.map(&:to_s).sort <=> other.map(&:to_s).sort
+        map(&:to_s).sort <=> other.map(&:to_s).sort
       end
 
       def &(other)

data/lib/doorkeeper/oauth/token.rb

@@ -26,12 +26,11 @@ module Doorkeeper
 
         def token_from_basic_header(header, pattern)
           encoded_header = token_from_header(header, pattern)
-          token, _ = decode_basic_credentials(encoded_header)
-          token
+          decode_basic_credentials_token(encoded_header)
         end
 
-        def decode_basic_credentials(encoded_header)
-          Base64.decode64(encoded_header).split(/:/, 2)
+        def decode_basic_credentials_token(encoded_header)
+          Base64.decode64(encoded_header).split(/:/, 2).first
         end
 
         def token_from_header(header, pattern)

data/lib/doorkeeper/oauth/token_response.rb

@@ -14,7 +14,7 @@ module Doorkeeper
           'expires_in'    => token.expires_in_seconds,
           'refresh_token' => token.refresh_token,
           'scope'         => token.scopes_string,
-          'created_at'    => token.created_at.to_i,
+          'created_at'    => token.created_at.to_i
         }.reject { |_, value| value.blank? }
       end
 

data/lib/doorkeeper/orm/active_record.rb

@@ -18,22 +18,6 @@ module Doorkeeper
 
         Doorkeeper::Application.send :include, Doorkeeper::Models::Ownership
       end
-
-      def self.check_requirements!(_config)
-        if ::ActiveRecord::Base.connected? &&
-           ::ActiveRecord::Base.connection.table_exists?(
-             Doorkeeper::Application.table_name
-           )
-          unless Doorkeeper::Application.new.attributes.include?("scopes")
-            migration_path = '../../../generators/doorkeeper/templates/add_scopes_to_oauth_applications.rb'
-            puts <<-MSG.squish
-[doorkeeper] Missing column: `oauth_applications.scopes`.
-Create the following migration and run `rake db:migrate`.
-            MSG
-            puts File.read(File.expand_path(migration_path, __FILE__))
-          end
-        end
-      end
     end
   end
 end

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

@@ -10,10 +10,18 @@ module Doorkeeper
     end
     private_class_method :delete_all_for
 
+    def self.active_for(resource_owner)
+      where(resource_owner_id: resource_owner.id, revoked_at: nil)
+    end
+
     def self.order_method
       :order
     end
 
+    def self.refresh_token_revoked_on_use?
+      column_names.include?('previous_refresh_token')
+    end
+
     def self.created_at_desc
       'created_at desc'
     end

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

@@ -11,14 +11,9 @@ module Doorkeeper
     end
     has_many :authorized_applications, through: :authorized_tokens, source: :application
 
-    def self.column_names_with_table
-      self.column_names.map { |c| "#{table_name}.#{c}" }
-    end
-
     def self.authorized_for(resource_owner)
-      joins(:authorized_applications).
-        where(AccessToken.table_name => { resource_owner_id: resource_owner.id, revoked_at: nil }).
-        group(column_names_with_table.join(','))
+      resource_access_tokens = AccessToken.active_for(resource_owner)
+      where(id: resource_access_tokens.select(:application_id).distinct)
     end
   end
 end

data/lib/doorkeeper/rails/helpers.rb

@@ -6,7 +6,7 @@ module Doorkeeper
       def doorkeeper_authorize!(*scopes)
         @_doorkeeper_scopes = scopes.presence || Doorkeeper.configuration.default_scopes
 
-        if !valid_doorkeeper_token?
+        unless valid_doorkeeper_token?
           doorkeeper_render_error
         end
       end

data/lib/doorkeeper/rails/routes.rb

@@ -18,7 +18,8 @@ module Doorkeeper
       attr_accessor :routes
 
       def initialize(routes, &block)
-        @routes, @block = routes, block
+        @routes = routes
+        @block = block
       end
 
       def generate_routes!(options)

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

@@ -7,7 +7,7 @@ module Doorkeeper
         end
 
         def map(&block)
-          self.instance_eval(&block) if block
+          instance_eval(&block) if block
           @mapping
         end
 

data/lib/doorkeeper/request/password.rb

@@ -8,11 +8,21 @@ module Doorkeeper
       def request
         @request ||= OAuth::PasswordAccessTokenRequest.new(
           Doorkeeper.configuration,
-          credentials,
+          client,
           resource_owner,
           parameters
         )
       end
+
+      private
+
+      def client
+        if credentials
+          server.client
+        elsif parameters[:client_id]
+          server.client_via_uid
+        end
+      end
     end
   end
 end

data/lib/doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module Doorkeeper
-  VERSION = "4.0.0.rc3"
+  VERSION = "4.0.0.rc4".freeze
 end

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

@@ -4,4 +4,4 @@ class AddOwnerToApplication < ActiveRecord::Migration
     add_column :oauth_applications, :owner_type, :string, null: true
     add_index :oauth_applications, [:owner_id, :owner_type]
   end
-end
+end

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

@@ -26,7 +26,7 @@ class CreateDoorkeeperTables < ActiveRecord::Migration
     add_foreign_key(
       :oauth_access_grants,
       :oauth_applications,
-      column: :application_id,
+      column: :application_id
     )
 
     create_table :oauth_access_tokens do |t|
@@ -62,7 +62,7 @@ class CreateDoorkeeperTables < ActiveRecord::Migration
     add_foreign_key(
       :oauth_access_tokens,
       :oauth_applications,
-      column: :application_id,
+      column: :application_id
     )
   end
 end

data/spec/controllers/protected_resources_controller_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper_integration'
 
 module ControllerActions
   def index
-    render text: 'index'
+    render plain: 'index'
   end
 
   def show
-    render text: 'show'
+    render plain: 'show'
   end
 
   def doorkeeper_unauthorized_render_options(*)
@@ -22,7 +22,7 @@ describe 'doorkeeper authorize filter' do
       before_action :doorkeeper_authorize!
 
       def index
-        render text: 'index'
+        render plain: 'index'
       end
     end
 
@@ -100,7 +100,7 @@ describe 'doorkeeper authorize filter' do
 
   context 'defined with scopes' do
     controller do
-      before_filter -> { doorkeeper_authorize! :write }
+      before_action -> { doorkeeper_authorize! :write }
 
       include ControllerActions
     end
@@ -137,7 +137,7 @@ describe 'doorkeeper authorize filter' do
 
   context 'when custom unauthorized render options are configured' do
     controller do
-      before_filter :doorkeeper_authorize!
+      before_action :doorkeeper_authorize!
 
       include ControllerActions
     end
@@ -175,7 +175,7 @@ describe 'doorkeeper authorize filter' do
         module ControllerActions
           remove_method :doorkeeper_unauthorized_render_options
           def doorkeeper_unauthorized_render_options(error: nil)
-            { text: 'Unauthorized' }
+            { plain: 'Unauthorized' }
           end
         end
       end
@@ -190,7 +190,7 @@ describe 'doorkeeper authorize filter' do
       it 'it renders a custom text response', token: :invalid do
         get :index, access_token: token_string
         expect(response.status).to eq 401
-        expect(response.content_type).to eq('text/html')
+        expect(response.content_type).to eq('text/plain')
         expect(response.header['WWW-Authenticate']).to match(/^Bearer/)
         expect(response.body).to eq('Unauthorized')
       end
@@ -212,7 +212,7 @@ describe 'doorkeeper authorize filter' do
     end
 
     controller do
-      before_filter -> { doorkeeper_authorize! :write }
+      before_action -> { doorkeeper_authorize! :write }
 
       include ControllerActions
     end
@@ -268,7 +268,7 @@ describe 'doorkeeper authorize filter' do
         module ControllerActions
           remove_method :doorkeeper_forbidden_render_options
           def doorkeeper_forbidden_render_options(*)
-            { text: 'Forbidden' }
+            { plain: 'Forbidden' }
           end
         end
       end
@@ -286,7 +286,7 @@ describe 'doorkeeper authorize filter' do
         module ControllerActions
           remove_method :doorkeeper_forbidden_render_options
           def doorkeeper_forbidden_render_options(*)
-            { respond_not_found_when_forbidden: true, text: 'Not Found' }
+            { respond_not_found_when_forbidden: true, plain: 'Not Found' }
           end
         end
       end

data/spec/dummy/app/controllers/full_protected_resources_controller.rb

@@ -3,10 +3,10 @@ class FullProtectedResourcesController < ApplicationController
   before_action :doorkeeper_authorize!, only: :index
 
   def index
-    render text: 'index'
+    render plain: 'index'
   end
 
   def show
-    render text: 'show'
+    render plain: 'show'
   end
 end

data/spec/dummy/app/controllers/home_controller.rb

@@ -12,6 +12,6 @@ class HomeController < ApplicationController
   end
 
   def callback
-    render text: 'ok'
+    render plain: 'ok'
   end
 end

data/spec/dummy/app/controllers/semi_protected_resources_controller.rb

@@ -2,10 +2,10 @@ class SemiProtectedResourcesController < ApplicationController
   before_action :doorkeeper_authorize!, only: :index
 
   def index
-    render text: 'protected index'
+    render plain: 'protected index'
   end
 
   def show
-    render text: 'non protected show'
+    render plain: 'non protected show'
   end
 end