X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9778714046ce226e076e2075a826a81f5ea983af..7d46f5db6004f1e0555150c3f97c82185d76b837:/app/controllers/users_controller.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index e3d5173a7..42ac6ac11 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -277,15 +277,15 @@ class UsersController < ApplicationController name = auth_info[:info][:name] email = auth_info[:info][:email] - case provider - when "openid" - email_verified = uid.match(%r{https://www.google.com/accounts/o8/id?(.*)}) || + email_verified = case provider + when "openid" + uid.match(%r{https://www.google.com/accounts/o8/id?(.*)}) || uid.match(%r{https://me.yahoo.com/(.*)}) - when "google", "facebook" - email_verified = true - else - email_verified = false - end + when "google", "facebook" + true + else + false + end if settings = session.delete(:new_user_settings) current_user.auth_provider = provider