Merge pull request #245 from jpmermoz/mongoid

Fix Mongoid Support
graphql-devise · Oct 20, 2022 · 7873173 · 7873173
2 parents 92e696f + 1d44331
commit 7873173
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/graphql_devise/concerns/additional_model_methods.rb b/lib/graphql_devise/concerns/additional_model_methods.rb
@@ -6,7 +6,10 @@ module AdditionalModelMethods
 
     class_methods do
       def reconfirmable
-        devise_modules.include?(:confirmable) && column_names.include?('unconfirmed_email')
+        column_attributes = try(:column_names) || []
+        fields_attributes = try(:fields)&.keys || []
+        has_unconfirmed_email_attr = column_attributes.include?('unconfirmed_email') || fields_attributes.include?('unconfirmed_email')
+        devise_modules.include?(:confirmable) && has_unconfirmed_email_attr
       end
     end
 

diff --git a/lib/graphql_devise/concerns/controller_methods.rb b/lib/graphql_devise/concerns/controller_methods.rb
@@ -85,7 +85,7 @@ def generate_auth_headers(resource)
     end
 
     def find_resource(field, value)
-      if resource_class.connection.adapter_name.downcase.include?('mysql')
+      if resource_class.respond_to?(:connection) && resource_class.connection.adapter_name.downcase.include?('mysql')
         # fix for mysql default case insensitivity
         resource_class.where("BINARY #{field} = ? AND provider= ?", value, provider).first
       elsif Gem::Version.new(DeviseTokenAuth::VERSION) < Gem::Version.new('1.1.0')