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

Change provider name to "microsoft"

Browse source
This commit is contained in:
Milan Cvetkovic 2023-08-17 08:22:13 +00:00 • committed by Tom Hughes
parent ef6803416b
commit ad164d384e
11 changed files with 75 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

0
app/assets/images/microsoft_graph.svg → app/assets/images/microsoft.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 494 B

After

Width:  |  Height:  |  Size: 494 B

Before After
Before After

2
app/controllers/users_controller.rb
View file

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

4
app/views/sessions/new.html.erb
View file

@ -35,8 +35,8 @@
<% if Settings.key?(:facebook_auth_id) -%>
<li><%= auth_button "facebook", "facebook" %></li>
<% end -%>
<% if Settings.key?(:microsoft_graph_auth_id) -%>
<li><%= auth_button "microsoft_graph", "microsoft_graph" %></li>
<% if Settings.key?(:microsoft_auth_id) -%>
<li><%= auth_button "microsoft", "microsoft" %></li>
<% end -%>
<% if Settings.key?(:github_auth_id) -%>
<li><%= auth_button "github", "github" %></li>

4
config/initializers/omniauth.rb
View file

@ -24,7 +24,7 @@ end
openid_options = { :name => "openid", :store => openid_store }
google_options = { :name => "google", :scope => "email", :access_type => "online" }
facebook_options = { :name => "facebook", :scope => "email", :client_options => { :site => "https://graph.facebook.com/v4.0", :authorize_url => "https://www.facebook.com/v4.0/dialog/oauth" } }
microsoft_graph_options = { :name => "microsoft_graph", :scope => "openid User.Read" }
microsoft_options = { :name => "microsoft", :scope => "openid User.Read" }
github_options = { :name => "github", :scope => "user:email" }
wikipedia_options = { :name => "wikipedia", :client_options => { :site => "https://meta.wikimedia.org" } }
@ -34,7 +34,7 @@ Rails.application.config.middleware.use OmniAuth::Builder do
provider :openid, openid_options
provider :google_oauth2, Settings.google_auth_id, Settings.google_auth_secret, google_options if Settings.key?(:google_auth_id)
provider :facebook, Settings.facebook_auth_id, Settings.facebook_auth_secret, facebook_options if Settings.key?(:facebook_auth_id)
provider :microsoft_graph, Settings.microsoft_graph_auth_id, Settings.microsoft_graph_auth_secret, microsoft_graph_options if Settings.key?(:microsoft_graph_auth_id)
provider :microsoft_graph, Settings.microsoft_auth_id, Settings.microsoft_auth_secret, microsoft_options if Settings.key?(:microsoft_auth_id)
provider :github, Settings.github_auth_id, Settings.github_auth_secret, github_options if Settings.key?(:github_auth_id)
provider :mediawiki, Settings.wikipedia_auth_id, Settings.wikipedia_auth_secret, wikipedia_options if Settings.key?(:wikipedia_auth_id)
end

4
config/locales/en.yml
View file

@ -212,7 +212,7 @@ en:
openid: OpenID
google: Google
facebook: Facebook
microsoft_graph: Microsoft
microsoft: Microsoft
github: GitHub
wikipedia: Wikipedia
api:
@ -1785,7 +1785,7 @@ en:
facebook:
title: Login with Facebook
alt: Login with a Facebook Account
microsoft_graph:
microsoft:
title: Login with Microsoft
alt: Login with a Microsoft Account
github:

4
config/settings.yml
View file

@ -100,10 +100,10 @@ fossgis_valhalla_url: "https://valhalla1.openstreetmap.de/route"
#google_openid_realm: ""
#facebook_auth_id: ""
#facebook_auth_secret: ""
#microsoft_graph_auth_id: ""
#microsoft_graph_auth_secret: ""
#github_auth_id: ""
#github_auth_secret: ""
#microsoft_auth_id: ""
#microsoft_auth_secret: ""
#wikipedia_auth_id: ""
#wikipedia_auth_secret: ""
# Thunderforest authentication details

4
config/settings/test.yml
View file

@ -6,8 +6,8 @@ google_auth_secret: "dummy"
google_openid_realm: "https://www.openstreetmap.org"
facebook_auth_id: "dummy"
facebook_auth_secret: "dummy"
microsoft_graph_auth_id: "dummy"
microsoft_graph_auth_secret: "dummy"
microsoft_auth_id: "dummy"
microsoft_auth_secret: "dummy"
github_auth_id: "dummy"
github_auth_secret: "dummy"
wikipedia_auth_id: "dummy"

4
db/migrate/20230816135800_use_microsoft_graph.rb
View file

@ -1,9 +1,9 @@
class UseMicrosoftGraph < ActiveRecord::Migration[7.0]
def self.up
User.where(:auth_provider => 'windowslive').update_all(:auth_provider => 'microsoft_graph')
User.where(:auth_provider => "windowslive").update_all(:auth_provider => "microsoft")
end
def self.down
User.where(:auth_provider => 'microsoft_graph').update_all(:auth_provider => 'windowslive')
User.where(:auth_provider => "microsoft").update_all(:auth_provider => "windowslive")
end
end

2
lib/auth.rb
View file

@ -8,7 +8,7 @@ module Auth
}.tap do |providers|
providers[I18n.t("auth.providers.google")] = "google" if Settings.key?(:google_auth_id)
providers[I18n.t("auth.providers.facebook")] = "facebook" if Settings.key?(:facebook_auth_id)
providers[I18n.t("auth.providers.microsoft_graph")] = "microsoft_graph" if Settings.key?(:microsoft_graph_auth_id)
providers[I18n.t("auth.providers.microsoft")] = "microsoft" if Settings.key?(:microsoft_auth_id)
providers[I18n.t("auth.providers.github")] = "github" if Settings.key?(:github_auth_id)
providers[I18n.t("auth.providers.wikipedia")] = "wikipedia" if Settings.key?(:wikipedia_auth_id)
end.freeze

52
test/integration/user_creation_test.rb
View file

@ -11,7 +11,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
OmniAuth.config.mock_auth[:openid] = nil
OmniAuth.config.mock_auth[:google] = nil
OmniAuth.config.mock_auth[:facebook] = nil
OmniAuth.config.mock_auth[:microsoft_graph] = nil
OmniAuth.config.mock_auth[:microsoft] = nil
OmniAuth.config.mock_auth[:github] = nil
OmniAuth.config.mock_auth[:wikipedia] = nil
OmniAuth.config.test_mode = false
@ -689,12 +689,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest
assert_template "site/welcome"
end
def test_user_create_microsoft_graph_success
new_email = "newtester-microsoft_graph@osm.org"
display_name = "new_tester-microsoft_graph"
def test_user_create_microsoft_success
new_email = "newtester-microsoft@osm.org"
display_name = "new_tester-microsoft"
password = "testtest"
OmniAuth.config.add_mock(:microsoft_graph, :uid => "123454321", :info => { "email" => new_email })
OmniAuth.config.add_mock(:microsoft, :uid => "123454321", :info => { "email" => new_email })
assert_difference("User.count") do
assert_difference("ActionMailer::Base.deliveries.size", 0) do
@ -703,14 +703,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:params => { :user => { :email => new_email,
:email_confirmation => new_email,
:display_name => display_name,
:auth_provider => "microsoft_graph",
:auth_provider => "microsoft",
:pass_crypt => "",
:pass_crypt_confirmation => "" } }
assert_response :redirect
assert_redirected_to auth_path(:provider => "microsoft_graph", :origin => "/user/new")
assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new")
post response.location
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "microsoft_graph")
assert_redirected_to auth_success_path(:provider => "microsoft")
follow_redirect!
assert_response :redirect
assert_redirected_to "/user/terms"
@ -718,7 +718,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:params => { :user => { :email => new_email,
:email_confirmation => new_email,
:display_name => display_name,
:auth_provider => "microsoft_graph",
:auth_provider => "microsoft",
:auth_uid => "123454321",
:pass_crypt => password,
:pass_crypt_confirmation => password },
@ -737,11 +737,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
ActionMailer::Base.deliveries.clear
end
def test_user_create_microsoft_graph_failure
OmniAuth.config.mock_auth[:microsoft_graph] = :connection_failed
def test_user_create_microsoft_failure
OmniAuth.config.mock_auth[:microsoft] = :connection_failed
new_email = "newtester-microsoft_graph2@osm.org"
display_name = "new_tester-microsoft_graph2"
new_email = "newtester-microsoft2@osm.org"
display_name = "new_tester-microsoft2"
assert_difference("User.count", 0) do
assert_difference("ActionMailer::Base.deliveries.size", 0) do
perform_enqueued_jobs do
@ -749,17 +749,17 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:params => { :user => { :email => new_email,
:email_confirmation => new_email,
:display_name => display_name,
:auth_provider => "microsoft_graph",
:auth_provider => "microsoft",
:pass_crypt => "",
:pass_crypt_confirmation => "" } }
assert_response :redirect
assert_redirected_to auth_path(:provider => "microsoft_graph", :origin => "/user/new")
assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new")
post response.location
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "microsoft_graph")
assert_redirected_to auth_success_path(:provider => "microsoft")
follow_redirect!
assert_response :redirect
assert_redirected_to auth_failure_path(:strategy => "microsoft_graph", :message => "connection_failed", :origin => "/user/new")
assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "connection_failed", :origin => "/user/new")
follow_redirect!
assert_response :redirect
follow_redirect!
@ -772,11 +772,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
ActionMailer::Base.deliveries.clear
end
def test_user_create_microsoft_graph_redirect
OmniAuth.config.add_mock(:microsoft_graph, :uid => "123454321")
def test_user_create_microsoft_redirect
OmniAuth.config.add_mock(:microsoft, :uid => "123454321")
new_email = "redirect_tester_microsoft_graph@osm.org"
display_name = "redirect_tester_microsoft_graph"
new_email = "redirect_tester_microsoft@osm.org"
display_name = "redirect_tester_microsoft"
# nothing special about this page, just need a protected page to redirect back to.
referer = "/traces/mine"
assert_difference("User.count") do
@ -786,15 +786,15 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:params => { :user => { :email => new_email,
:email_confirmation => new_email,
:display_name => display_name,
:auth_provider => "microsoft_graph",
:auth_provider => "microsoft",
:pass_crypt => "",
:pass_crypt_confirmation => "" },
:referer => referer }
assert_response :redirect
assert_redirected_to auth_path(:provider => "microsoft_graph", :origin => "/user/new")
assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new")
post response.location
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "microsoft_graph")
assert_redirected_to auth_success_path(:provider => "microsoft")
follow_redirect!
assert_response :redirect
assert_redirected_to "/user/terms"
@ -802,7 +802,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:params => { :user => { :email => new_email,
:email_confirmation => new_email,
:display_name => display_name,
:auth_provider => "microsoft_graph",
:auth_provider => "microsoft",
:auth_uid => "http://localhost:1123/new.tester",
:pass_crypt => "testtest",
:pass_crypt_confirmation => "testtest" },
@ -817,7 +817,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
assert_equal register_email.to.first, new_email
# Check that the confirm account url is correct
confirm_regex = Regexp.new("/user/redirect_tester_microsoft_graph/confirm\\?confirm_string=([a-zA-Z0-9]*)")
confirm_regex = Regexp.new("/user/redirect_tester_microsoft/confirm\\?confirm_string=([a-zA-Z0-9]*)")
email_text_parts(register_email).each do |part|
assert_match confirm_regex, part.body.to_s
end

70
test/integration/user_login_test.rb
View file

@ -9,7 +9,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
OmniAuth.config.mock_auth[:openid] = nil
OmniAuth.config.mock_auth[:google] = nil
OmniAuth.config.mock_auth[:facebook] = nil
OmniAuth.config.mock_auth[:microsoft_graph] = nil
OmniAuth.config.mock_auth[:microsoft] = nil
OmniAuth.config.mock_auth[:github] = nil
OmniAuth.config.mock_auth[:wikipedia] = nil
OmniAuth.config.test_mode = false
@ -853,9 +853,9 @@ class UserLoginTest < ActionDispatch::IntegrationTest
assert_select "span.username", false
end
def test_login_microsoft_graph_success
user = create(:user, :auth_provider => "microsoft_graph", :auth_uid => "1234567890")
OmniAuth.config.add_mock(:microsoft_graph, :uid => user.auth_uid)
def test_login_microsoft_success
user = create(:user, :auth_provider => "microsoft", :auth_uid => "1234567890")
OmniAuth.config.add_mock(:microsoft, :uid => user.auth_uid)
get "/login", :params => { :referer => "/history" }
assert_response :redirect
@ -863,9 +863,9 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
assert_template "sessions/new"
post auth_path(:provider => "microsoft_graph", :origin => "/login?referer=%2Fhistory", :referer => "/history")
post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "microsoft_graph")
assert_redirected_to auth_success_path(:provider => "microsoft")
follow_redirect!
assert_response :redirect
follow_redirect!
@ -874,9 +874,9 @@ class UserLoginTest < ActionDispatch::IntegrationTest
assert_select "span.username", user.display_name
end
def test_login_microsoft_graph_pending
user = create(:user, :pending, :auth_provider => "microsoft_graph", :auth_uid => "1234567890")
OmniAuth.config.add_mock(:microsoft_graph, :uid => user.auth_uid)
def test_login_microsoft_pending
user = create(:user, :pending, :auth_provider => "microsoft", :auth_uid => "1234567890")
OmniAuth.config.add_mock(:microsoft, :uid => user.auth_uid)
get "/login", :params => { :referer => "/history" }
assert_response :redirect
@ -884,9 +884,9 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
assert_template "sessions/new"
post auth_path(:provider => "microsoft_graph", :origin => "/login?referer=%2Fhistory", :referer => "/history")
post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "microsoft_graph")
assert_redirected_to auth_success_path(:provider => "microsoft")
follow_redirect!
assert_response :redirect
follow_redirect!
@ -894,9 +894,9 @@ class UserLoginTest < ActionDispatch::IntegrationTest
assert_template "confirm"
end
def test_login_microsoft_graph_suspended
user = create(:user, :suspended, :auth_provider => "microsoft_graph", :auth_uid => "1234567890")
OmniAuth.config.add_mock(:microsoft_graph, :uid => user.auth_uid)
def test_login_microsoft_suspended
user = create(:user, :suspended, :auth_provider => "microsoft", :auth_uid => "1234567890")
OmniAuth.config.add_mock(:microsoft, :uid => user.auth_uid)
get "/login", :params => { :referer => "/history" }
assert_response :redirect
@ -904,9 +904,9 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
assert_template "sessions/new"
post auth_path(:provider => "microsoft_graph", :origin => "/login?referer=%2Fhistory", :referer => "/history")
post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "microsoft_graph")
assert_redirected_to auth_success_path(:provider => "microsoft")
follow_redirect!
assert_response :redirect
follow_redirect!
@ -918,10 +918,10 @@ class UserLoginTest < ActionDispatch::IntegrationTest
end
end
def test_login_microsoft_graph_blocked
user = create(:user, :auth_provider => "microsoft_graph", :auth_uid => "1234567890")
def test_login_microsoft_blocked
user = create(:user, :auth_provider => "microsoft", :auth_uid => "1234567890")
create(:user_block, :needs_view, :user => user)
OmniAuth.config.add_mock(:microsoft_graph, :uid => user.auth_uid)
OmniAuth.config.add_mock(:microsoft, :uid => user.auth_uid)
get "/login", :params => { :referer => "/history" }
assert_response :redirect
@ -929,9 +929,9 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
assert_template "sessions/new"
post auth_path(:provider => "microsoft_graph", :origin => "/login?referer=%2Fhistory", :referer => "/history")
post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "microsoft_graph")
assert_redirected_to auth_success_path(:provider => "microsoft")
follow_redirect!
assert_response :redirect
follow_redirect!
@ -940,8 +940,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
assert_select "span.username", user.display_name
end
def test_login_microsoft_graph_connection_failed
OmniAuth.config.mock_auth[:microsoft_graph] = :connection_failed
def test_login_microsoft_connection_failed
OmniAuth.config.mock_auth[:microsoft] = :connection_failed
get "/login", :params => { :referer => "/history" }
assert_response :redirect
@ -949,12 +949,12 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
assert_template "sessions/new"
post auth_path(:provider => "microsoft_graph", :origin => "/login?referer=%2Fhistory", :referer => "/history")
post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "microsoft_graph")
assert_redirected_to auth_success_path(:provider => "microsoft")
follow_redirect!
assert_response :redirect
assert_redirected_to auth_failure_path(:strategy => "microsoft_graph", :message => "connection_failed", :origin => "/login?referer=%2Fhistory")
assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "connection_failed", :origin => "/login?referer=%2Fhistory")
follow_redirect!
assert_response :redirect
follow_redirect!
@ -964,8 +964,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
assert_select "span.username", false
end
def test_login_microsoft_graph_invalid_credentials
OmniAuth.config.mock_auth[:microsoft_graph] = :invalid_credentials
def test_login_microsoft_invalid_credentials
OmniAuth.config.mock_auth[:microsoft] = :invalid_credentials
get "/login", :params => { :referer => "/history" }
assert_response :redirect
@ -973,12 +973,12 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
assert_template "sessions/new"
post auth_path(:provider => "microsoft_graph", :origin => "/login?referer=%2Fhistory", :referer => "/history")
post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "microsoft_graph")
assert_redirected_to auth_success_path(:provider => "microsoft")
follow_redirect!
assert_response :redirect
assert_redirected_to auth_failure_path(:strategy => "microsoft_graph", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory")
assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory")
follow_redirect!
assert_response :redirect
follow_redirect!
@ -988,8 +988,8 @@ class UserLoginTest < ActionDispatch::IntegrationTest
assert_select "span.username", false
end
def test_login_microsoft_graph_unknown
OmniAuth.config.add_mock(:microsoft_graph, :uid => "987654321")
def test_login_microsoft_unknown
OmniAuth.config.add_mock(:microsoft, :uid => "987654321")
get "/login", :params => { :referer => "/history" }
assert_response :redirect
@ -997,9 +997,9 @@ class UserLoginTest < ActionDispatch::IntegrationTest
follow_redirect!
assert_response :success
assert_template "sessions/new"
post auth_path(:provider => "microsoft_graph", :origin => "/login?referer=%2Fhistory", :referer => "/history")
post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "microsoft_graph")
assert_redirected_to auth_success_path(:provider => "microsoft")
follow_redirect!
assert_response :redirect
follow_redirect!