Replace references to windowslive with microsoft_graph

diff --git a/app/assets/images/windowslive.svg b/app/assets/images/microsoft_graph.svg
similarity index 100%
rename from app/assets/images/windowslive.svg
rename to app/assets/images/microsoft_graph.svg

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index dbc621fabe259243fb0e930f02776dbf2d192248..769f3d411d73008dc0261c3bf0e99bf87089d0c6 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -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

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 80537bad54808c10fbffb71eab7ee67ab98475a4..5ea638e2f741e9b6334771f3b5ec34ab75338f1b 100644 (file)
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -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>

diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 81d4747e94899670072e3620718341721e75ce0f..ee5be2abd885fe76b9f5008017b1b94197250598 100644 (file)
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -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" } }
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e14c5806ccfb3df5955041d517a2ec10244d5fe9..8b11f639964c252381e9b61e5e1a19bc8d36aef5 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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:

diff --git a/lib/auth.rb b/lib/auth.rb
index 0ed00729ffcbf197d2ca0ec832ea8ab45bab1cec..4d1356e2b25ec50b00b2883c0c8704343e75c798 100644 (file)
--- a/lib/auth.rb
+++ b/lib/auth.rb
@@ -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