Replace references to windowslive with microsoft_graph
This commit is contained in:
parent
7428da74c2
commit
568bf4939d
6 changed files with 6 additions and 6 deletions
Before Width: | Height: | Size: 494 B After Width: | Height: | Size: 494 B |
|
@ -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", "windowslive"
|
||||
when "google", "facebook", "microsoft_graph"
|
||||
true
|
||||
else
|
||||
false
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
<li><%= auth_button "facebook", "facebook" %></li>
|
||||
<% end -%>
|
||||
<% if Settings.key?(:microsoft_graph_auth_id) -%>
|
||||
<li><%= auth_button "windowslive", "windowslive" %></li>
|
||||
<li><%= auth_button "microsoft_graph", "microsoft_graph" %></li>
|
||||
<% end -%>
|
||||
<% if Settings.key?(:github_auth_id) -%>
|
||||
<li><%= auth_button "github", "github" %></li>
|
||||
|
|
|
@ -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 => "windowslive", :scope => "openid User.Read" }
|
||||
microsoft_graph_options = { :name => "microsoft_graph", :scope => "openid User.Read" }
|
||||
github_options = { :name => "github", :scope => "user:email" }
|
||||
wikipedia_options = { :name => "wikipedia", :client_options => { :site => "https://meta.wikimedia.org" } }
|
||||
|
||||
|
|
|
@ -212,7 +212,7 @@ en:
|
|||
openid: OpenID
|
||||
google: Google
|
||||
facebook: Facebook
|
||||
windowslive: Microsoft
|
||||
microsoft_graph: Microsoft
|
||||
github: GitHub
|
||||
wikipedia: Wikipedia
|
||||
api:
|
||||
|
@ -1785,7 +1785,7 @@ en:
|
|||
facebook:
|
||||
title: Login with Facebook
|
||||
alt: Login with a Facebook Account
|
||||
windowslive:
|
||||
microsoft_graph:
|
||||
title: Login with Microsoft
|
||||
alt: Login with a Microsoft Account
|
||||
github:
|
||||
|
|
|
@ -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.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.wikipedia")] = "wikipedia" if Settings.key?(:wikipedia_auth_id)
|
||||
end.freeze
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue