about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorGhislain Loaec <gloaec@cadoles.com>2018-02-23 01:16:17 +0100
committerEugen Rochko <eugen@zeonfederated.com>2018-02-23 01:16:17 +0100
commite668180044560e28bdc5eef94744c210013efcda (patch)
treebbf1f61814a0d12ebfa8ae0d7519e87d65071148 /app/models
parent8fa924e37282081946b2abfca91688e382713a2d (diff)
New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540)
Diffstat (limited to 'app/models')
-rw-r--r--app/models/concerns/omniauthable.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb
index 7a396e301..87d93c1fd 100644
--- a/app/models/concerns/omniauthable.rb
+++ b/app/models/concerns/omniauthable.rb
@@ -53,7 +53,8 @@ module Omniauthable
     private
 
     def user_params_from_auth(auth)
-      assume_verified   = Devise.omniauth_configs[:saml].strategy.security.assume_email_is_verified
+      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