Skip to content

Commit

Permalink
Merge pull request #245 from jpmermoz/mongoid
Browse files Browse the repository at this point in the history
Fix Mongoid Support
  • Loading branch information
mcelicalderon committed Oct 20, 2022
2 parents 92e696f + 1d44331 commit 7873173
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion lib/graphql_devise/concerns/additional_model_methods.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion lib/graphql_devise/concerns/controller_methods.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down

0 comments on commit 7873173

Please sign in to comment.