diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-23 15:05:00 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-23 15:05:00 -0600 |
| commit | f53953d28a24fe65f1ca66d85a1416ba30dcda86 (patch) | |
| tree | 4e9e2214629b46ddc98fdce358abc812112f13fa /app/models/concerns/omniauthable.rb | |
| parent | 544543e40a723d9719f5571bd4c3455a6a69fccd (diff) | |
| parent | f2f19e1f8a3a048cf0a0041ae54d912acfea7742 (diff) | |
Merge pull request #369 from KnzkDev/merge-upstream
Merge with upstream @ e668180044560e28bdc5eef94744c210013efcda
Diffstat (limited to 'app/models/concerns/omniauthable.rb')
| -rw-r--r-- | app/models/concerns/omniauthable.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb index a3d55108d..87d93c1fd 100644 --- a/app/models/concerns/omniauthable.rb +++ b/app/models/concerns/omniauthable.rb @@ -53,8 +53,11 @@ module Omniauthable private def user_params_from_auth(auth) - email_is_verified = auth.info.email && (auth.info.verified || auth.info.verified_email) - email = auth.info.email if email_is_verified && !User.exists?(email: auth.info.email) + strategy = Devise.omniauth_configs[auth.provider.to_sym].strategy + assume_verified = strategy.try(:security).try(:assume_email_is_verified) + email_is_verified = auth.info.verified || auth.info.verified_email || assume_verified + email = auth.info.verified_email || auth.info.email + email = email_is_verified && !User.exists?(email: auth.info.email) && email { email: email ? email : "#{TEMP_EMAIL_PREFIX}-#{auth.uid}-#{auth.provider}.com", |