Skip to content

Commit 7873173

Browse files
Merge pull request #245 from jpmermoz/mongoid
Fix Mongoid Support
2 parents 92e696f + 1d44331 commit 7873173

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

lib/graphql_devise/concerns/additional_model_methods.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ module AdditionalModelMethods
66

77
class_methods do
88
def reconfirmable
9-
devise_modules.include?(:confirmable) && column_names.include?('unconfirmed_email')
9+
column_attributes = try(:column_names) || []
10+
fields_attributes = try(:fields)&.keys || []
11+
has_unconfirmed_email_attr = column_attributes.include?('unconfirmed_email') || fields_attributes.include?('unconfirmed_email')
12+
devise_modules.include?(:confirmable) && has_unconfirmed_email_attr
1013
end
1114
end
1215

lib/graphql_devise/concerns/controller_methods.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def generate_auth_headers(resource)
8585
end
8686

8787
def find_resource(field, value)
88-
if resource_class.connection.adapter_name.downcase.include?('mysql')
88+
if resource_class.respond_to?(:connection) && resource_class.connection.adapter_name.downcase.include?('mysql')
8989
# fix for mysql default case insensitivity
9090
resource_class.where("BINARY #{field} = ? AND provider= ?", value, provider).first
9191
elsif Gem::Version.new(DeviseTokenAuth::VERSION) < Gem::Version.new('1.1.0')

0 commit comments

Comments
 (0)