mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2025-12-24 01:57:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use member.kpt in auth

Browse Source
This commit is contained in:
Brenda Wallace
2020-08-02 14:45:45 +12:00
committed by Brenda Wallace
parent cebec27e80
commit 63caea1a6a
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -112,7 +112,7 @@ gem 'rake', '>= 10.0.0'
gem "responders"
# allows soft delete. Used for members.
gem 'discard', '~> 1.0'
gem 'discard', '~> 1.2'
gem 'xmlrpc' # fixes rake error - can be removed if not needed later

2
Gemfile.lock
View File

@@ -644,7 +644,7 @@ DEPENDENCIES
dalli
database_cleaner
devise
discard (~> 1.0)
discard (~> 1.2)
dotenv-rails
elasticsearch (< 7.0.0)
factory_bot_rails

2
lib/actions/oauth_signup_action.rb
View File

@@ -11,7 +11,7 @@ class Growstuff::OauthSignupAction
# variable
#
def find_or_create_from_authorization(auth)
member ||= Member.where(email: auth.info.email).first_or_create do |m|
member ||= Member.kept.where(email: auth.info.email).first_or_create do |m|
m.email = auth.info.email
m.password = Devise.friendly_token[0, 20]