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

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"