cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Treat github and wikipedia provided emails as confirmed

Browse source 
Fixes #4270
This commit is contained in:
Tom Hughes 2024-02-25 10:04:18 +00:00
parent 746bfd0a48
commit 1b5200b797
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/users_controller.rb
View file

@ -247,7 +247,7 @@ class UsersController < ApplicationController
when "openid" when "openid"
uid.match(%r{https://www.google.com/accounts/o8/id?(.*)}) || uid.match(%r{https://www.google.com/accounts/o8/id?(.*)}) ||
uid.match(%r{https://me.yahoo.com/(.*)}) uid.match(%r{https://me.yahoo.com/(.*)})
when "google", "facebook", "microsoft" when "google", "facebook", "microsoft", "github", "wikipedia"
true true
else else
false false

12
test/integration/user_creation_test.rb
View file

@ -852,7 +852,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
OmniAuth.config.add_mock(:github, :uid => "123454321", :info => { "email" => new_email }) OmniAuth.config.add_mock(:github, :uid => "123454321", :info => { "email" => new_email })
assert_difference("User.count") do assert_difference("User.count") do
assert_difference("ActionMailer::Base.deliveries.size", 1) do assert_no_difference("ActionMailer::Base.deliveries.size") do
perform_enqueued_jobs do perform_enqueued_jobs do
post "/user/new", post "/user/new",
:params => { :user => { :email => new_email, :params => { :user => { :email => new_email,
@ -880,7 +880,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:read_ct => 1, :read_ct => 1,
:read_tou => 1 } :read_tou => 1 }
assert_response :redirect assert_response :redirect
assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name assert_redirected_to welcome_path
follow_redirect! follow_redirect!
end end
end end
@ -888,7 +888,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
# Check the page # Check the page
assert_response :success assert_response :success
assert_template "confirmations/confirm" assert_template "site/welcome"
ActionMailer::Base.deliveries.clear ActionMailer::Base.deliveries.clear
end end
@ -1006,7 +1006,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
OmniAuth.config.add_mock(:wikipedia, :uid => "123454321", :info => { "email" => new_email }) OmniAuth.config.add_mock(:wikipedia, :uid => "123454321", :info => { "email" => new_email })
assert_difference("User.count") do assert_difference("User.count") do
assert_difference("ActionMailer::Base.deliveries.size", 1) do assert_no_difference("ActionMailer::Base.deliveries.size") do
perform_enqueued_jobs do perform_enqueued_jobs do
post "/user/new", post "/user/new",
:params => { :user => { :email => new_email, :params => { :user => { :email => new_email,
@ -1034,7 +1034,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:read_ct => 1, :read_ct => 1,
:read_tou => 1 } :read_tou => 1 }
assert_response :redirect assert_response :redirect
assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name assert_redirected_to welcome_path
follow_redirect! follow_redirect!
end end
end end
@ -1042,7 +1042,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
# Check the page # Check the page
assert_response :success assert_response :success
assert_template "confirmations/confirm" assert_template "site/welcome"
ActionMailer::Base.deliveries.clear ActionMailer::Base.deliveries.clear
end end