doorkeeper-mongodb 5.4.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43ffb322969c5c4a6eac7e397e0198423fecfda21d73fa7c239f04bab34650c2
-  data.tar.gz: 7cc3e393c6192a4bd7fd7ba5c7d64061b1163b5c5f4d9468587b2f03d7bdfc2a
+  metadata.gz: 31397e2cb87670cde0c3c5eb8bd487a864e14c11dfcedc868c5fd1e2b4683e87
+  data.tar.gz: 534a2ce1dd42bc361839b31e96a54491b2142b1366a46590a719ee071b835b36
 SHA512:
-  metadata.gz: 68e449f5f8746d4537e81ddf4848b8c87d0dc610e9fe89f0a44a12718b7c26e057a7322929b8a053f5d8fce4e41e234ecc7c73d501e692c47acef99668892f74
-  data.tar.gz: 591b86f5d37eb1474d42d4efe14fc2ff03082724c18893eb2133d8764e57f25b734ea17dce636271311cffa87022147d52a96c0f869e499bbd5e83707dfb71ea
+  metadata.gz: 2debfbe47ca1743bae09ae241245438a56454b4850cf6d833c337fe8e1e79a21e396fbaaafd52ec7eb14c49a7342c573f45d4e2feac4ca8ebdb2cddb285dfadb
+  data.tar.gz: 5a74a5c8666980b4af1c88427ab692d2aecb049fe918605558223eee48a3b9df1403ab13a3b3448c8645804ec46c67966f0e07e0925bb99ce92fb9ca1cf4830d

data/README.md

@@ -38,7 +38,7 @@ Set the ORM configuration:
 
 ```ruby
 Doorkeeper.configure do
-  orm :mongoid8 # or any other version of mongoid
+  orm :mongoid9 # or any other version of mongoid
 end
 ```
 

data/lib/doorkeeper/orm/mongoid9/access_grant.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Doorkeeper
+  class AccessGrant
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    include DoorkeeperMongodb::Compatible
+
+    include DoorkeeperMongodb::Shared::Scopes
+    include DoorkeeperMongodb::Mixins::Mongoid::AccessGrantMixin
+
+    store_in collection: :oauth_access_grants
+
+    field :resource_owner_id, type: BSON::ObjectId
+    field :resource_owner_type, type: String
+    field :token, type: String
+    field :expires_in, type: Integer
+    field :redirect_uri, type: String
+    field :revoked_at, type: DateTime
+    field :code_challenge, type: String
+    field :code_challenge_method, type: String
+
+    index({ token: 1 }, unique: true)
+  end
+end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Doorkeeper
+  class AccessToken
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    include DoorkeeperMongodb::Compatible
+
+    include DoorkeeperMongodb::Shared::Scopes
+    include DoorkeeperMongodb::Mixins::Mongoid::AccessTokenMixin
+
+    store_in collection: :oauth_access_tokens
+
+    field :resource_owner_id, type: BSON::ObjectId
+    field :resource_owner_type, type: String
+    field :token, type: String
+    field :refresh_token, type: String
+    field :previous_refresh_token, type: String
+    field :expires_in, type: Integer
+    field :revoked_at, type: DateTime
+
+    index({ token: 1 }, unique: true)
+    index({ refresh_token: 1 }, unique: true, sparse: true)
+
+    def self.order_method
+      :order_by
+    end
+
+    def self.refresh_token_revoked_on_use?
+      fields.collect { |field| field[0] }.include?("previous_refresh_token")
+    end
+
+    def self.created_at_desc
+      %i[created_at desc]
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Doorkeeper
+  class Application
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    include DoorkeeperMongodb::Compatible
+
+    include DoorkeeperMongodb::Shared::Scopes
+    include DoorkeeperMongodb::Mixins::Mongoid::ApplicationMixin
+
+    store_in collection: :oauth_applications
+
+    field :name, type: String
+    field :uid, type: String
+    field :secret, type: String
+    field :redirect_uri, type: String
+    field :confidential, type: Boolean, default: true
+
+    index({ uid: 1 }, unique: true)
+
+    has_many_opts = {
+      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
+
+    has_many :authorized_tokens, has_many_opts
+
+    def self.authorized_for(resource_owner)
+      ids = AccessToken.where(
+        resource_owner_id: resource_owner.id,
+        revoked_at: nil,
+      ).map(&:application_id)
+
+      find(ids)
+    end
+  end
+end

data/lib/doorkeeper/orm/mongoid9/stale_records_cleaner.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Doorkeeper
+  module Orm
+    module Mongoid9
+      class StaleRecordsCleaner
+        include DoorkeeperMongodb::Mixins::Mongoid::StaleRecordsCleanerMixin
+      end
+    end
+  end
+end

data/lib/doorkeeper/orm/mongoid9.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "active_support/lazy_load_hooks"
+
+module Doorkeeper
+  module Orm
+    module Mongoid9
+      def self.run_hooks
+        lazy_load do
+          require "doorkeeper/orm/mongoid9/access_grant"
+          require "doorkeeper/orm/mongoid9/access_token"
+          require "doorkeeper/orm/mongoid9/application"
+          require "doorkeeper/orm/mongoid9/stale_records_cleaner"
+          require "doorkeeper/orm/concerns/mongoid/ownership"
+          Doorkeeper::Application.include Doorkeeper::Orm::Concerns::Mongoid::Ownership
+        end
+        @initialized_hooks = true
+      end
+
+      # @deprecated
+      def self.initialize_models!
+        return if @initialized_hooks
+
+        lazy_load do
+          require "doorkeeper/orm/mongoid9/access_grant"
+          require "doorkeeper/orm/mongoid9/access_token"
+          require "doorkeeper/orm/mongoid9/application"
+          require "doorkeeper/orm/mongoid9/stale_records_cleaner"
+        end
+      end
+
+      # @deprecated
+      def self.initialize_application_owner!
+        return if @initialized_hooks
+
+        lazy_load do
+          require "doorkeeper/orm/concerns/mongoid/ownership"
+
+          Doorkeeper::Application.include Doorkeeper::Orm::Concerns::Mongoid::Ownership
+        end
+      end
+
+      def self.check_requirements!(_config); end
+
+      def self.lazy_load(&block)
+        ActiveSupport.on_load(:mongoid, {}, &block)
+      end
+    end
+  end
+end

data/lib/doorkeeper-mongodb/mixins/mongoid/access_grant_mixin.rb

@@ -27,13 +27,17 @@ module DoorkeeperMongodb
             belongs_to_opts[:class_name] = Doorkeeper.config.application_class
           end
 
-          # optional associations added in Mongoid 6
+          # optional associations added in Mongoid 6+
           belongs_to_opts[:optional] = true if ::Mongoid::VERSION[0].to_i >= 6
 
           belongs_to :application, belongs_to_opts
 
           if Doorkeeper.configuration.try(:polymorphic_resource_owner?)
-            belongs_to :resource_owner, polymorphic: true
+            opts = { polymorphic: true }
+
+            opts[:optional] = true if ::Mongoid::VERSION[0].to_i >= 6
+
+            belongs_to :resource_owner, opts
           end
 
           validates_presence_of :resource_owner_id, :application_id, :token,

data/lib/doorkeeper-mongodb/mixins/mongoid/access_token_mixin.rb

@@ -28,7 +28,7 @@ module DoorkeeperMongodb
             belongs_to_opts[:class_name] = Doorkeeper.config.application_class
           end
 
-          # optional associations added in Mongoid 6
+          # optional associations added in Mongoid 6+
           belongs_to_opts[:optional] = true if ::Mongoid::VERSION[0].to_i >= 6
 
           belongs_to :application, belongs_to_opts

data/lib/doorkeeper-mongodb/mixins/mongoid/application_mixin.rb

@@ -14,10 +14,10 @@ module DoorkeeperMongodb
         included do
           has_many_options = {
             dependent: :delete,
-
+            inverse_of: :application,
           }
 
-          # Mongoid7 dropped :delete option
+          # Mongoid7+ uses :delete_all instead of :delete
           has_many_options[:dependent] = :delete_all if ::Mongoid::VERSION[0].to_i >= 7
 
           # Doorkeeper 5.3 has custom classes for defining OAuth roles

data/lib/doorkeeper-mongodb/version.rb

@@ -8,7 +8,7 @@ module DoorkeeperMongodb
   module VERSION
     # Semver
     MAJOR = 5
-    MINOR = 4
+    MINOR = 5
     TINY = 0
 
     # Full version number

data/lib/doorkeeper-mongodb.rb

@@ -29,6 +29,7 @@ require "doorkeeper/orm/mongoid5"
 require "doorkeeper/orm/mongoid6"
 require "doorkeeper/orm/mongoid7"
 require "doorkeeper/orm/mongoid8"
+require "doorkeeper/orm/mongoid9"
 
 module DoorkeeperMongodb
   def load_locales

data/spec/dummy/config/mongoid8.yml

@@ -11,7 +11,7 @@ development:
 test:
   clients:
     default:
-      database: doorkeeper-mongoid7-test
+      database: doorkeeper-mongoid8-test
       hosts:
         - localhost:27017
       options:

data/spec/dummy/config/mongoid9.yml

@@ -0,0 +1,19 @@
+development:
+  clients:
+    default:
+      database: doorkeeper-mongoid9-development
+      hosts:
+        - localhost:27017
+      options:
+        write:
+          w: 1
+
+test:
+  clients:
+    default:
+      database: doorkeeper-mongoid9-test
+      hosts:
+        - localhost:27017
+      options:
+        write:
+          w: 1

data/spec/support/orm/mongoid9.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require_relative "mongoid"
+
+Mongoid.logger.level = Logger::ERROR
+Mongo::Logger.logger.level = Logger::ERROR

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper-mongodb
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.5.0
 platform: ruby
 authors:
 - jasl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-27 00:00:00.000000000 Z
+date: 2025-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: doorkeeper
@@ -205,6 +205,11 @@ files:
 - lib/doorkeeper/orm/mongoid8/access_token.rb
 - lib/doorkeeper/orm/mongoid8/application.rb
 - lib/doorkeeper/orm/mongoid8/stale_records_cleaner.rb
+- lib/doorkeeper/orm/mongoid9.rb
+- lib/doorkeeper/orm/mongoid9/access_grant.rb
+- lib/doorkeeper/orm/mongoid9/access_token.rb
+- lib/doorkeeper/orm/mongoid9/application.rb
+- lib/doorkeeper/orm/mongoid9/stale_records_cleaner.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/controllers/application_controller.rb
@@ -237,6 +242,7 @@ files:
 - spec/dummy/config/mongoid6.yml
 - spec/dummy/config/mongoid7.yml
 - spec/dummy/config/mongoid8.yml
+- spec/dummy/config/mongoid9.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20111122132257_create_users.rb
 - spec/dummy/db/migrate/20120312140401_add_password_to_users.rb
@@ -288,6 +294,7 @@ files:
 - spec/support/orm/mongoid6.rb
 - spec/support/orm/mongoid7.rb
 - spec/support/orm/mongoid8.rb
+- spec/support/orm/mongoid9.rb
 - spec/support/render_with_matcher.rb
 homepage: http://github.com/doorkeeper-gem/doorkeeper-mongodb
 licenses:
@@ -352,6 +359,7 @@ test_files:
 - spec/dummy/config/mongo.yml
 - spec/dummy/config/mongoid6.yml
 - spec/dummy/config/boot.rb
+- spec/dummy/config/mongoid9.yml
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
@@ -394,6 +402,7 @@ test_files:
 - spec/support/orm/mongoid4.rb
 - spec/support/orm/mongoid8.rb
 - spec/support/orm/mongoid.rb
+- spec/support/orm/mongoid9.rb
 - spec/support/orm/mongoid5.rb
 - spec/support/doorkeeper_rspec.rb
 - spec/support/render_with_matcher.rb