Latest changes to support custom models

doorkeeper-gem · Mar 25, 2020 · 621f5a1 · 621f5a1
1 parent 5ec6c2c
commit 621f5a1
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 22 deletions.
diff --git a/lib/doorkeeper-mongodb/mixins/mongoid/access_grant_mixin.rb b/lib/doorkeeper-mongodb/mixins/mongoid/access_grant_mixin.rb
@@ -21,14 +21,13 @@ module AccessGrantMixin
             inverse_of: :access_grants,
           }
 
+          # Doorkeeper 5.3 has custom classes for defining OAuth roles
           if DoorkeeperMongodb.doorkeeper_version?(5, 3)
             belongs_to_opts[:class_name] = Doorkeeper.config.application_class
           end
 
           # optional associations added in Mongoid 6
-          if ::Mongoid::VERSION[0].to_i >= 6
-            belongs_to_opts[:optional] = true
-          end
+          belongs_to_opts[:optional] = true if ::Mongoid::VERSION[0].to_i >= 6
 
           belongs_to :application, belongs_to_opts
 

diff --git a/lib/doorkeeper-mongodb/mixins/mongoid/access_token_mixin.rb b/lib/doorkeeper-mongodb/mixins/mongoid/access_token_mixin.rb
@@ -22,23 +22,20 @@ module AccessTokenMixin
             inverse_of: :access_tokens,
           }
 
+          # Doorkeeper 5.3 has custom classes for defining OAuth roles
           if DoorkeeperMongodb.doorkeeper_version?(5, 3)
             belongs_to_opts[:class_name] = Doorkeeper.config.application_class
           end
 
           # optional associations added in Mongoid 6
-          if ::Mongoid::VERSION[0].to_i >= 6
-            belongs_to_opts[:optional] = true
-          end
+          belongs_to_opts[:optional] = true if ::Mongoid::VERSION[0].to_i >= 6
 
           belongs_to :application, belongs_to_opts
 
           if Doorkeeper::VERSION::MINOR > 3 && Doorkeeper.config.polymorphic_resource_owner?
             opts = { polymorphic: true }
 
-            if ::Mongoid::VERSION[0].to_i >= 6
-              opts[:optional] = true
-            end
+            opts[:optional] = true if ::Mongoid::VERSION[0].to_i >= 6
 
             belongs_to :resource_owner, opts
           end

diff --git a/lib/doorkeeper-mongodb/mixins/mongoid/application_mixin.rb b/lib/doorkeeper-mongodb/mixins/mongoid/application_mixin.rb
@@ -14,19 +14,38 @@ module ApplicationMixin
         included do
           has_many_options = {
             dependent: :delete,
+
           }
 
           # Mongoid7 dropped :delete option
-          if ::Mongoid::VERSION[0].to_i >= 7
-            has_many_options[:dependent] = :delete_all
-          end
+          has_many_options[:dependent] = :delete_all if ::Mongoid::VERSION[0].to_i >= 7
+
+          # Doorkeeper 5.3 has custom classes for defining OAuth roles
+          access_grants_class_name = if DoorkeeperMongodb.doorkeeper_version?(5, 3)
+                                       Doorkeeper.config.access_grant_class
+                                     else
+                                       "Doorkeeper::AccessGrant"
+                                     end
+
+          access_tokens_class_name = if DoorkeeperMongodb.doorkeeper_version?(5, 3)
+                                       Doorkeeper.config.access_token_class
+                                     else
+                                       "Doorkeeper::AccessToken"
+                                     end
 
-          has_many :access_grants, has_many_options.merge(class_name: "Doorkeeper::AccessGrant")
-          has_many :access_tokens, has_many_options.merge(class_name: "Doorkeeper::AccessToken")
+          has_many :access_grants, has_many_options.merge(class_name: access_grants_class_name)
+          has_many :access_tokens, has_many_options.merge(class_name: access_tokens_class_name)
 
           validates :name, :secret, :uid, presence: true
           validates :uid, uniqueness: true
-          validates :redirect_uri, "doorkeeper/redirect_uri": true
+
+          # Before Doorkeeper 5.2.3
+          if defined?(::RedirectUriValidator)
+            validates :redirect_uri, redirect_uri: true
+          else
+            validates :redirect_uri, "doorkeeper/redirect_uri": true
+          end
+
           validates :confidential, inclusion: { in: [true, false] }
 
           validate :scopes_match_configured, if: :enforce_scopes?

diff --git a/lib/doorkeeper/orm/concerns/mongoid/ownership.rb b/lib/doorkeeper/orm/concerns/mongoid/ownership.rb
@@ -10,9 +10,7 @@ module Ownership
           included do
             belongs_to_options = { polymorphic: true }
 
-            if ::Mongoid::VERSION[0].to_i >= 6
-              belongs_to_options[:optional] = true
-            end
+            belongs_to_options[:optional] = true if ::Mongoid::VERSION[0].to_i >= 6
 
             belongs_to :owner, belongs_to_options
             validates :owner, presence: true, if: :validate_owner?

diff --git a/lib/doorkeeper/orm/mongoid4/application.rb b/lib/doorkeeper/orm/mongoid4/application.rb
@@ -24,6 +24,7 @@ class Application
       class_name: "Doorkeeper::AccessToken",
     }
 
+    # Doorkeeper 5.3 has custom classes for defining OAuth roles
     if DoorkeeperMongodb.doorkeeper_version?(5, 3)
       has_many_opts[:class_name] = Doorkeeper.config.access_token_class
     end

diff --git a/lib/doorkeeper/orm/mongoid5/application.rb b/lib/doorkeeper/orm/mongoid5/application.rb
@@ -24,6 +24,7 @@ class Application
       class_name: "Doorkeeper::AccessToken",
     }
 
+    # Doorkeeper 5.3 has custom classes for defining OAuth roles
     if DoorkeeperMongodb.doorkeeper_version?(5, 3)
       has_many_opts[:class_name] = Doorkeeper.config.access_token_class
     end

diff --git a/lib/doorkeeper/orm/mongoid6/application.rb b/lib/doorkeeper/orm/mongoid6/application.rb
@@ -24,6 +24,7 @@ class Application
       class_name: "Doorkeeper::AccessToken",
     }
 
+    # Doorkeeper 5.3 has custom classes for defining OAuth roles
     if DoorkeeperMongodb.doorkeeper_version?(5, 3)
       has_many_opts[:class_name] = Doorkeeper.config.access_token_class
     end

diff --git a/lib/doorkeeper/orm/mongoid7/application.rb b/lib/doorkeeper/orm/mongoid7/application.rb
@@ -24,6 +24,7 @@ class Application
       class_name: "Doorkeeper::AccessToken",
     }
 
+    # Doorkeeper 5.3 has custom classes for defining OAuth roles
     if DoorkeeperMongodb.doorkeeper_version?(5, 3)
       has_many_opts[:class_name] = Doorkeeper.config.access_token_class
     end

diff --git a/spec/dummy/app/models/user.rb b/spec/dummy/app/models/user.rb
@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-# [NOTE] MongoMapper support was dropped
+# [NOTE] MongoMapper support was dropped, so now only Mongoid
 class User
   include Mongoid::Document
   include Mongoid::Timestamps
 
   field :name, type: String
   field :password, type: String
 
-  if ::Rails.version.to_i < 4 || defined?(::ProtectedAttributes)
-    attr_accessible :name, :password
-  end
+  attr_accessible :name, :password if defined?(::ProtectedAttributes)
 
   def self.authenticate!(name, password)
     User.where(name: name, password: password).first