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

Replace references to windowslive with microsoft_graph

Browse source
This commit is contained in:
Milan Cvetkovic 2023-08-14 08:42:14 +00:00
parent 7428da74c2
commit 568bf4939d
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

0
app/assets/images/windowslive.svg → app/assets/images/microsoft_graph.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" 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", "windowslive" when "google", "facebook", "microsoft_graph"
true true
else else
false false

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

@ -36,7 +36,7 @@
<li><%= auth_button "facebook", "facebook" %></li> <li><%= auth_button "facebook", "facebook" %></li>
<% end -%> <% end -%>
<% if Settings.key?(:microsoft_graph_auth_id) -%> <% if Settings.key?(:microsoft_graph_auth_id) -%>
<li><%= auth_button "windowslive", "windowslive" %></li> <li><%= auth_button "microsoft_graph", "microsoft_graph" %></li>
<% end -%> <% end -%>
<% if Settings.key?(:github_auth_id) -%> <% if Settings.key?(:github_auth_id) -%>
<li><%= auth_button "github", "github" %></li> <li><%= auth_button "github", "github" %></li>

2
config/initializers/omniauth.rb
View file

@ -24,7 +24,7 @@ end
openid_options = { :name => "openid", :store => openid_store } openid_options = { :name => "openid", :store => openid_store }
google_options = { :name => "google", :scope => "email", :access_type => "online" } 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" } } 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 => "windowslive", :scope => "openid User.Read" } microsoft_graph_options = { :name => "microsoft_graph", :scope => "openid User.Read" }
github_options = { :name => "github", :scope => "user:email" } github_options = { :name => "github", :scope => "user:email" }
wikipedia_options = { :name => "wikipedia", :client_options => { :site => "https://meta.wikimedia.org" } } wikipedia_options = { :name => "wikipedia", :client_options => { :site => "https://meta.wikimedia.org" } }

4
config/locales/en.yml
View file

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

2
lib/auth.rb
View file

@ -8,7 +8,7 @@ module Auth
}.tap do |providers| }.tap do |providers|
providers[I18n.t("auth.providers.google")] = "google" if Settings.key?(:google_auth_id) 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.facebook")] = "facebook" if Settings.key?(:facebook_auth_id)
providers[I18n.t("auth.providers.windowslive")] = "windowslive" if Settings.key?(:microsoft_graph_auth_id) providers[I18n.t("auth.providers.microsoft_graph")] = "microsoft_graph" if Settings.key?(:microsoft_graph_auth_id)
providers[I18n.t("auth.providers.github")] = "github" if Settings.key?(:github_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) providers[I18n.t("auth.providers.wikipedia")] = "wikipedia" if Settings.key?(:wikipedia_auth_id)
end.freeze end.freeze