Add support for Twitter authentication

Gemfile

@@ -65,6 +65,7 @@ gem "omniauth-facebook"
 gem "omniauth-windowslive"
 gem "omniauth-github"
 gem "omniauth-mediawiki", ">= 0.0.3"
+gem "omniauth-twitter"
 
 # Markdown formatting support
 gem "redcarpet"

Gemfile.lock

@@ -190,6 +190,9 @@ GEM
     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
+    omniauth-twitter (1.2.1)
+      json (~> 1.3)
+      omniauth-oauth (~> 1.1)
     omniauth-windowslive (0.0.9.1)
       multi_json (>= 1.0.3)
       omniauth-oauth2 (~> 1.0)
@@ -344,6 +347,7 @@ DEPENDENCIES
   omniauth-google-oauth2 (>= 0.2.7)
   omniauth-mediawiki (>= 0.0.3)
   omniauth-openid
+  omniauth-twitter
   omniauth-windowslive
   paperclip (~> 4.0)
   pg

app/views/user/login.html.erb

@@ -49,6 +49,9 @@
           <% if defined?(GOOGLE_AUTH_ID) -%>
           <li><%= auth_button "google", "google" %></li>
           <% end -%>
+          <% if defined?(TWITTER_AUTH_ID) -%>
+          <li><%= auth_button "twitter", "twitter" %></li>
+          <% end -%>
           <% if defined?(FACEBOOK_AUTH_ID) -%>
           <li><%= auth_button "facebook", "facebook" %></li>
           <% end -%>

config/example.application.yml

@@ -109,6 +109,8 @@ defaults: &defaults
   #github_auth_secret: ""
   #wikipedia_auth_id: ""
   #wikipedia_auth_secret: ""
+  #twitter_auth_id: ""
+  #twitter_auth_secret: ""
   # MapQuest authentication details
   #mapquest_key: ""
   # Mapzen authentication details
@@ -136,3 +138,5 @@ test:
   github_auth_secret: "dummy"
   wikipedia_auth_id: "dummy"
   wikipedia_auth_secret: "dummy"
+  twitter_auth_id: "dummy"
+  twitter_auth_secret: "dummy"

config/initializers/omniauth.rb

@@ -25,6 +25,7 @@
 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" } }
+twitter_options = { :name => "twitter" }
 
 if defined?(GOOGLE_OPENID_REALM)
   google_options[:openid_realm] = GOOGLE_OPENID_REALM
@@ -37,6 +38,7 @@
   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)
+  provider :twitter, TWITTER_AUTH_ID, TWITTER_AUTH_SECRET, twitter_options if defined?(TWITTER_AUTH_ID)
 end
 
 # Pending fix for: https://github.com/intridea/omniauth/pull/795

config/locales/en.yml

@@ -1741,6 +1741,9 @@ en:
         wikipedia:
           title: Login with Wikipedia
           alt: Login with a Wikipedia Account
+        twitter:
+          title: Login with Twitter
+          alt: Login with a Twitter Account
         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID

lib/auth.rb

@@ -5,5 +5,6 @@ module Auth
     providers["Windows Live"] = "windowslive" if defined?(WINDOWSLIVE_AUTH_ID)
     providers["GitHub"] = "github" if defined?(GITHUB_AUTH_ID)
     providers["Wikipedia"] = "wikipedia" if defined?(WIKIPEDIA_AUTH_ID)
+    providers["Twitter"] = "twitter" if defined?(TWITTER_AUTH_ID)
   end.freeze
 end

test/controllers/user_controller_test.rb

@@ -1334,7 +1334,7 @@ def test_list_get_paginated
     get :list, :page => 3
     assert_response :success
     assert_template :list
-    assert_select "table#user_list tr", :count => 24
+    assert_select "table#user_list tr", :count => 25
   end
 
   def test_list_post_confirm

test/fixtures/users.yml

@@ -318,3 +318,17 @@ wikipedia_user:
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   languages: en
+
+twitter_user:
+  id: 24
+  email: twitter-user@example.com
+  status: active
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2008-05-01 01:23:45"
+  display_name: twitteruser
+  data_public: true
+  auth_provider: twitter
+  auth_uid: 123456789
+  terms_agreed: "2010-01-01 11:22:33"
+  terms_seen: true
+  languages: en

test/integration/user_creation_test.rb

@@ -18,6 +18,7 @@ def teardown
     OmniAuth.config.mock_auth[:windowslive] = nil
     OmniAuth.config.mock_auth[:github] = nil
     OmniAuth.config.mock_auth[:wikipedia] = nil
+    OmniAuth.config.mock_auth[:twitter] = nil
     OmniAuth.config.test_mode = false
   end
 
@@ -837,4 +838,117 @@ def test_user_create_wikipedia_redirect
     assert_response :success
     assert_template "site/welcome"
   end
+
+  def test_user_create_twitter_success
+    OmniAuth.config.add_mock(:twitter, :uid => "123454321")
+
+    new_email = "newtester-twitter@osm.org"
+    display_name = "new_tester-twitter"
+    password = "testtest"
+    assert_difference("User.count") do
+      assert_difference("ActionMailer::Base.deliveries.size", 1) do
+        post "/user/new",
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "twitter", :pass_crypt => "", :pass_crypt_confirmation => "" }
+        assert_response :redirect
+        assert_redirected_to auth_path(:provider => "twitter", :origin => "/user/new")
+        follow_redirect!
+        assert_response :redirect
+        assert_redirected_to auth_success_path(:provider => "twitter", :origin => "/user/new")
+        follow_redirect!
+        assert_response :redirect
+        assert_redirected_to "/user/terms"
+        post "/user/save",
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "twitter", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password }
+        assert_response :redirect
+        follow_redirect!
+      end
+    end
+
+    # Check the page
+    assert_response :success
+    assert_template "user/confirm"
+
+    ActionMailer::Base.deliveries.clear
+  end
+
+  def test_user_create_twitter_failure
+    OmniAuth.config.mock_auth[:twitter] = :connection_failed
+
+    new_email = "newtester-twitter2@osm.org"
+    display_name = "new_tester-twitter2"
+    assert_difference("User.count", 0) do
+      assert_difference("ActionMailer::Base.deliveries.size", 0) do
+        post "/user/new",
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "twitter", :pass_crypt => "", :pass_crypt_confirmation => "" }
+        assert_response :redirect
+        assert_redirected_to auth_path(:provider => "twitter", :origin => "/user/new")
+        follow_redirect!
+        assert_response :redirect
+        assert_redirected_to auth_success_path(:provider => "twitter", :origin => "/user/new")
+        follow_redirect!
+        assert_response :redirect
+        assert_redirected_to auth_failure_path(:strategy => "twitter", :message => "connection_failed", :origin => "/user/new")
+        follow_redirect!
+        assert_response :redirect
+        follow_redirect!
+        assert_response :success
+        assert_template "user/new"
+      end
+    end
+
+    ActionMailer::Base.deliveries.clear
+  end
+
+  def test_user_create_twitter_redirect
+    OmniAuth.config.add_mock(:twitter, :uid => "123454321")
+
+    new_email = "redirect_tester_twitter@osm.org"
+    display_name = "redirect_tester_twitter"
+    # nothing special about this page, just need a protected page to redirect back to.
+    referer = "/traces/mine"
+    assert_difference("User.count") do
+      assert_difference("ActionMailer::Base.deliveries.size", 1) do
+        post "/user/new",
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "twitter", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer
+        assert_response :redirect
+        assert_redirected_to auth_path(:provider => "twitter", :origin => "/user/new")
+        follow_redirect!
+        assert_response :redirect
+        assert_redirected_to auth_success_path(:provider => "twitter", :origin => "/user/new")
+        follow_redirect!
+        assert_response :redirect
+        assert_redirected_to "/user/terms"
+        post_via_redirect "/user/save",
+                          :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "twitter", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }
+      end
+    end
+
+    # Check the e-mail
+    register_email = ActionMailer::Base.deliveries.first
+
+    assert_equal register_email.to[0], new_email
+    # Check that the confirm account url is correct
+    confirm_regex = Regexp.new("/user/redirect_tester_twitter/confirm\\?confirm_string=([a-zA-Z0-9]*)")
+    register_email.parts.each do |part|
+      assert_match confirm_regex, part.body.to_s
+    end
+    confirm_string = register_email.parts[0].body.match(confirm_regex)[1]
+
+    # Check the page
+    assert_response :success
+    assert_template "user/confirm"
+
+    ActionMailer::Base.deliveries.clear
+
+    # Go to the confirmation page
+    get "/user/#{display_name}/confirm", :confirm_string => confirm_string
+    assert_response :success
+    assert_template "user/confirm"
+
+    post "/user/#{display_name}/confirm", :confirm_string => confirm_string
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "site/welcome"
+  end
 end

test/integration/user_login_test.rb

@@ -14,6 +14,7 @@ def teardown
     OmniAuth.config.mock_auth[:windowslive] = nil
     OmniAuth.config.mock_auth[:github] = nil
     OmniAuth.config.mock_auth[:wikipedia] = nil
+    OmniAuth.config.mock_auth[:twitter] = nil
     OmniAuth.config.test_mode = false
   end
 
@@ -907,6 +908,94 @@ def test_login_wikipedia_unknown
     assert_select "span.username", false
   end
 
+  def test_login_twitter_success
+    OmniAuth.config.add_mock(:twitter, :uid => "123456789")
+
+    get "/login", :referer => "/history"
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    follow_redirect!
+    assert_response :success
+    assert_template "user/login"
+    get auth_path(:provider => "twitter", :origin => "/login")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "twitter", :origin => "/login")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "changeset/history"
+    assert_select "span.username", "twitteruser"
+  end
+
+  def test_login_twitter_connection_failed
+    OmniAuth.config.mock_auth[:twitter] = :connection_failed
+
+    get "/login", :referer => "/history"
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    follow_redirect!
+    assert_response :success
+    assert_template "user/login"
+    get auth_path(:provider => "twitter", :origin => "/login")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "twitter", :origin => "/login")
+    follow_redirect!
+    assert_response :redirect
+    assert_redirected_to auth_failure_path(:strategy => "twitter", :message => "connection_failed", :origin => "/login")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "login"
+    assert_select "div.flash.error", "Connection to authentication provider failed"
+    assert_select "span.username", false
+  end
+
+  def test_login_twitter_invalid_credentials
+    OmniAuth.config.mock_auth[:twitter] = :invalid_credentials
+
+    get "/login", :referer => "/history"
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    follow_redirect!
+    assert_response :success
+    assert_template "user/login"
+    get auth_path(:provider => "twitter", :origin => "/login")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "twitter", :origin => "/login")
+    follow_redirect!
+    assert_response :redirect
+    assert_redirected_to auth_failure_path(:strategy => "twitter", :message => "invalid_credentials", :origin => "/login")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "login"
+    assert_select "div.flash.error", "Invalid authentication credentials"
+    assert_select "span.username", false
+  end
+
+  def test_login_twitter_unknown
+    OmniAuth.config.add_mock(:twitter, :uid => "987654321")
+
+    get "/login", :referer => "/history"
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true", "referer" => "/history"
+    follow_redirect!
+    assert_response :success
+    assert_template "user/login"
+    get auth_path(:provider => "twitter", :origin => "/login")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "twitter", :origin => "/login")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "user/new"
+    assert_select "span.username", false
+  end
+
   private
 
   def try_password_login(username, password, remember_me = nil)

test/models/user_test.rb

@@ -163,7 +163,7 @@ def test_user_preferred_editor
   end
 
   def test_visible
-    assert_equal 21, User.visible.count
+    assert_equal 22, User.visible.count
     assert_raise ActiveRecord::RecordNotFound do
       User.visible.find(users(:suspended_user).id)
     end
@@ -173,7 +173,7 @@ def test_visible
   end
 
   def test_active
-    assert_equal 20, User.active.count
+    assert_equal 21, User.active.count
     assert_raise ActiveRecord::RecordNotFound do
       User.active.find(users(:inactive_user).id)
     end
@@ -186,7 +186,7 @@ def test_active
   end
 
   def test_identifiable
-    assert_equal 22, User.identifiable.count
+    assert_equal 23, User.identifiable.count
     assert_raise ActiveRecord::RecordNotFound do
       User.identifiable.find(users(:normal_user).id)
     end