Merge pull request #1649 from JeremyC-za/custom_token_attribs_break_r…

…ails_commands

Fixed custom_access_token_attributes related errors

lib/doorkeeper/config/validations.rb

@@ -11,7 +11,6 @@ def validate!
         validate_reuse_access_token_value
         validate_token_reuse_limit
         validate_secret_strategies
-        validate_custom_access_token_attributes
       end
 
       private
@@ -49,20 +48,6 @@ def validate_token_reuse_limit
         )
         @token_reuse_limit = 100
       end
-
-      # Validate that the access_token and access_grant models
-      # both respond to all of the custom attributes
-      def validate_custom_access_token_attributes
-        return if custom_access_token_attributes.blank?
-
-        custom_access_token_attributes.each do |attribute_name|
-          [access_token_model, access_grant_model].each do |model|
-            next if model.has_attribute?(attribute_name)
-
-            raise Doorkeeper::Errors::ConfigError, "#{model} does not recognize custom attribute: #{attribute_name}."
-          end
-        end
-      end
     end
   end
 end

lib/doorkeeper/errors.rb

@@ -44,7 +44,6 @@ def initialize(response)
     UnableToGenerateToken = Class.new(DoorkeeperError)
     TokenGeneratorNotFound = Class.new(DoorkeeperError)
     NoOrmCleaner = Class.new(DoorkeeperError)
-    ConfigError = Class.new(DoorkeeperError)
 
     InvalidToken = Class.new(BaseResponseError)
     TokenExpired = Class.new(InvalidToken)

spec/lib/config_spec.rb

@@ -533,15 +533,6 @@ class ApplicationWithOwner < ActiveRecord::Base
       end
       expect(config.custom_access_token_attributes).to eq([:tenant_name])
     end
-
-    it "validates custom attributes to be present in the models" do
-      expect do
-        Doorkeeper.configure do
-          orm DOORKEEPER_ORM
-          custom_access_token_attributes [:none_existing_column]
-        end
-      end.to raise_error(Doorkeeper::Errors::ConfigError)
-    end
   end
 
   describe "application_secret_generator" do