Add support for Wikimedia authentication

Closes #1146
This commit is contained in:
Tom Hughes 2016-06-17 16:47:03 +01:00
parent 12964ae1e4
commit 69b967c9ff
13 changed files with 242 additions and 4 deletions

View file

@ -107,6 +107,8 @@ defaults: &defaults
#windowslive_auth_secret: ""
#github_auth_id: ""
#github_auth_secret: ""
#wikipedia_auth_id: ""
#wikipedia_auth_secret: ""
# MapQuest authentication details
#mapquest_key: ""
# Mapzen authentication details
@ -134,3 +136,5 @@ test:
windowslive_auth_secret: "dummy"
github_auth_id: "dummy"
github_auth_secret: "dummy"
wikipedia_auth_id: "dummy"
wikipedia_auth_secret: "dummy"

View file

@ -24,6 +24,7 @@ google_options = { :name => "google", :scope => "email", :access_type => "online
facebook_options = { :name => "facebook", :scope => "email" }
windowslive_options = { :name => "windowslive", :scope => "wl.signin,wl.emails" }
github_options = { :name => "github", :scope => "user:email" }
wikipedia_options = { :name => "wikipedia", :client_options => { :site => "https://commons.wikimedia.org" } }
if defined?(GOOGLE_OPENID_REALM)
google_options[:openid_realm] = GOOGLE_OPENID_REALM
@ -35,6 +36,7 @@ Rails.application.config.middleware.use OmniAuth::Builder do
provider :facebook, FACEBOOK_AUTH_ID, FACEBOOK_AUTH_SECRET, facebook_options if defined?(FACEBOOK_AUTH_ID)
provider :windowslive, WINDOWSLIVE_AUTH_ID, WINDOWSLIVE_AUTH_SECRET, windowslive_options if defined?(WINDOWSLIVE_AUTH_ID)
provider :github, GITHUB_AUTH_ID, GITHUB_AUTH_SECRET, github_options if defined?(GITHUB_AUTH_ID)
provider :mediawiki, WIKIPEDIA_AUTH_ID, WIKIPEDIA_AUTH_SECRET, wikipedia_options if defined?(WIKIPEDIA_AUTH_ID)
end
# Pending fix for: https://github.com/intridea/omniauth/pull/795

View file

@ -1746,6 +1746,9 @@ en:
github:
title: Login with GitHub
alt: Login with a GitHub Account
wikipedia:
title: Login with Wikipedia
alt: Login with a Wikipedia Account
yahoo:
title: Login with Yahoo
alt: Login with a Yahoo OpenID