Add support for Facebook authentication

diff --git a/Gemfile b/Gemfile
index 7c916b01189a8763f817d4222d3d291248855d62..09fa2d89bafcb9f58ac6832b04f9ff64c6d227d5 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -58,6 +58,7 @@ gem "actionpack-page_caching"
 gem "omniauth"
 gem "omniauth-openid"
 gem "openstreetmap-omniauth-google-oauth2", ">= 0.2.6.1", :require => "omniauth-google-oauth2"
 gem "omniauth"
 gem "omniauth-openid"
 gem "openstreetmap-omniauth-google-oauth2", ">= 0.2.6.1", :require => "omniauth-google-oauth2"

+gem "omniauth-facebook"

 
 # Markdown formatting support
 gem "redcarpet"
 
 # Markdown formatting support
 gem "redcarpet"

diff --git a/Gemfile.lock b/Gemfile.lock
index eb37df0660a7bc33f469b2675e04b277208608ff..05b873399e74598af5868dc2287d647edb914ab1 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -150,6 +150,8 @@ GEM
     omniauth (1.2.2)
       hashie (>= 1.2, < 4)
       rack (~> 1.0)
     omniauth (1.2.2)
       hashie (>= 1.2, < 4)
       rack (~> 1.0)

+    omniauth-facebook (2.0.1)
+      omniauth-oauth2 (~> 1.2)

     omniauth-oauth2 (1.3.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
     omniauth-oauth2 (1.3.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)


@@ -311,6 +313,7 @@ DEPENDENCIES
   minitest (~> 5.1)
   oauth-plugin (>= 0.5.1)
   omniauth
   minitest (~> 5.1)
   oauth-plugin (>= 0.5.1)
   omniauth

+  omniauth-facebook

   omniauth-openid
   openstreetmap-i18n-js (>= 3.0.0.rc5.3)
   openstreetmap-omniauth-google-oauth2 (>= 0.2.6.1)
   omniauth-openid
   openstreetmap-i18n-js (>= 3.0.0.rc5.3)
   openstreetmap-omniauth-google-oauth2 (>= 0.2.6.1)

diff --git a/app/assets/images/facebook.png b/app/assets/images/facebook.png
new file mode 100644 (file)
index 0000000..8a9efc9
Binary files /dev/null and b/app/assets/images/facebook.png differ

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 99d7c0c347e645707f195d2cadb1e01a372b5a78..2e4daf3a3834fc3a352ff70bf9c0a7d0a61eeea4 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -45,6 +45,9 @@
           <% if defined?(GOOGLE_AUTH_ID) -%>
           <li><%= auth_button "google", "google" %></li>
           <% end -%>
           <% if defined?(GOOGLE_AUTH_ID) -%>
           <li><%= auth_button "google", "google" %></li>
           <% end -%>

+          <% if defined?(FACEBOOK_AUTH_ID) -%>
+          <li><%= auth_button "facebook", "facebook" %></li>
+          <% end -%>

           <li><%= auth_button "yahoo", "openid", :openid_url => "yahoo.com" %></li>
           <li><%= auth_button "wordpress", "openid", :openid_url => "wordpress.com" %></li>
           <li><%= auth_button "aol", "openid", :openid_url => "aol.com" %></li>
           <li><%= auth_button "yahoo", "openid", :openid_url => "yahoo.com" %></li>
           <li><%= auth_button "wordpress", "openid", :openid_url => "wordpress.com" %></li>
           <li><%= auth_button "aol", "openid", :openid_url => "aol.com" %></li>

diff --git a/config/example.application.yml b/config/example.application.yml
index 34db9d76643b70d6cb77feda284055b85f9d4e7a..dd2a174e9cb66019f19aa6e3458b8a6c7ab9588b 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -92,6 +92,8 @@ defaults: &defaults
   #google_auth_id: ""
   #google_auth_secret: ""
   #google_openid_realm: ""
   #google_auth_id: ""
   #google_auth_secret: ""
   #google_openid_realm: ""

+  #facebook_auth_id: ""
+  #facebook_auth_secret: ""

 
 development:
   <<: *defaults
 
 development:
   <<: *defaults


@@ -107,3 +109,5 @@ test:
   google_auth_id: "dummy"
   google_auth_secret: "dummy"
   google_openid_realm: "https://www.openstreetmap.org"
   google_auth_id: "dummy"
   google_auth_secret: "dummy"
   google_openid_realm: "https://www.openstreetmap.org"

+  facebook_auth_id: "dummy"
+  facebook_auth_secret: "dummy"

diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 6de63f6ee73430f8ff997261a9c8b26883d63cf4..508d326d6570c60839939a5e56a20863f7ac205b 100644 (file)
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -21,6 +21,7 @@ end
 
 openid_options = { :name => "openid", :store => openid_store }
 google_options = { :name => "google", :scope => "email", :access_type => "online" }
 
 openid_options = { :name => "openid", :store => openid_store }
 google_options = { :name => "google", :scope => "email", :access_type => "online" }

+facebook_options = { :name => "facebook", :scope => "email" }

 
 if defined?(GOOGLE_OPENID_REALM)
   google_options[:openid_realm] = GOOGLE_OPENID_REALM
 
 if defined?(GOOGLE_OPENID_REALM)
   google_options[:openid_realm] = GOOGLE_OPENID_REALM


@@ -29,6 +30,7 @@ end
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider :openid, openid_options
   provider :google_oauth2, GOOGLE_AUTH_ID, GOOGLE_AUTH_SECRET, google_options if defined?(GOOGLE_AUTH_ID)
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider :openid, openid_options
   provider :google_oauth2, GOOGLE_AUTH_ID, GOOGLE_AUTH_SECRET, google_options if defined?(GOOGLE_AUTH_ID)

+  provider :facebook, FACEBOOK_AUTH_ID, FACEBOOK_AUTH_SECRET, facebook_options if defined?(FACEBOOK_AUTH_ID)

 end
 
 # Pending fix for: https://github.com/intridea/omniauth/pull/795
 end
 
 # Pending fix for: https://github.com/intridea/omniauth/pull/795

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d426faabe537d84026492c2f6519ff76085d42c6..e554832f8650c762c160594cb5795955f2ee2eb4 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1720,6 +1720,9 @@ en:
         google:
           title: Login with Google
           alt: Login with a Google OpenID
         google:
           title: Login with Google
           alt: Login with a Google OpenID

+        facebook:
+          title: Login with Facebook
+          alt: Login with a Facebook Account

         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID
         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID


@@ -1991,6 +1994,8 @@ en:
     auth_failure:
       connection_failed: Connection to authentication provider failed
       invalid_credentials: Invalid authentication credentials
     auth_failure:
       connection_failed: Connection to authentication provider failed
       invalid_credentials: Invalid authentication credentials

+      no_authorization_code: No authorization code
+      unknown_signature_algorithm: Unknown signature algorithm

   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."

diff --git a/lib/auth.rb b/lib/auth.rb
index edd98e4ffb6c15f4109717c66535abbeb8b53499..b5ac0d2ebb58c8b64cda6f580faf8c61b0c4f30d 100644 (file)
--- a/lib/auth.rb
+++ b/lib/auth.rb
@@ -1,4 +1,5 @@
 module Auth
   PROVIDERS = { "None" => "", "OpenID" => "openid" }
   PROVIDERS["Google"] = "google" if defined?(GOOGLE_AUTH_ID)
 module Auth
   PROVIDERS = { "None" => "", "OpenID" => "openid" }
   PROVIDERS["Google"] = "google" if defined?(GOOGLE_AUTH_ID)

+  PROVIDERS["Facebook"] = "facebook" if defined?(FACEBOOK_AUTH_ID)

 end
 end

diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb
index 7a1310d6e9c75bbfb087002d2b9e120857fdfd94..0f08ced7c096fea913ebcbbbe09d74aec5ae2ab0 100644 (file)
--- a/test/controllers/user_controller_test.rb
+++ b/test/controllers/user_controller_test.rb
@@ -1321,7 +1321,7 @@ class UserControllerTest < ActionController::TestCase
     get :list, :page => 3
     assert_response :success
     assert_template :list
     get :list, :page => 3
     assert_response :success
     assert_template :list

-    assert_select "table#user_list tr", :count => 20
+    assert_select "table#user_list tr", :count => 21

   end
 
   def test_list_post_confirm
   end
 
   def test_list_post_confirm

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 9c5499b6ed14cde8d2cef70a55dcd2240acee0f9..30b27c7bd20aec49d141d04498fb436aa40f7e71 100644 (file)
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -262,3 +262,17 @@ google_user:
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   languages: en
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   languages: en

+
+facebook_user:
+  id: 20
+  email: facebook-user@example.com
+  status: active
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2008-05-01 01:23:45"
+  display_name: facebookuser
+  data_public: true
+  auth_provider: facebook
+  auth_uid: 123456789
+  terms_agreed: "2010-01-01 11:22:33"
+  terms_seen: true
+  languages: en

diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index 1a09e67182e8ae46e8ee716de1db21cb63fbc71b..15fcaf2369211b4b87b2533f78f09f007a898c19 100644 (file)
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -14,6 +14,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     OmniAuth.config.mock_auth[:openid] = nil
     OmniAuth.config.mock_auth[:google] = nil
 
     OmniAuth.config.mock_auth[:openid] = nil
     OmniAuth.config.mock_auth[:google] = nil

+    OmniAuth.config.mock_auth[:facebook] = nil

     OmniAuth.config.test_mode = false
   end
 
     OmniAuth.config.test_mode = false
   end
 


@@ -381,4 +382,121 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "site/welcome"
   end
     assert_response :success
     assert_template "site/welcome"
   end

+
+  def test_user_create_facebook_success
+    OmniAuth.config.add_mock(:facebook, :uid => "123454321", :extra => {
+                               :id_info => { "openid_id" => "http://localhost:1123/new.tester" }
+                             })
+
+    new_email = "newtester-facebook@osm.org"
+    display_name = "new_tester-facebook"
+    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 => "facebook", :pass_crypt => "", :pass_crypt_confirmation => "" }
+        assert_response :redirect
+        assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")
+        follow_redirect!
+        assert_response :redirect
+        assert_redirected_to auth_success_path(:provider => "facebook")
+        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 => "facebook", :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_facebook_failure
+    OmniAuth.config.mock_auth[:facebook] = :connection_failed
+
+    new_email = "newtester-facebook2@osm.org"
+    display_name = "new_tester-facebook2"
+    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 => "facebook", :pass_crypt => "", :pass_crypt_confirmation => "" }
+        assert_response :redirect
+        assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")
+        follow_redirect!
+        assert_response :redirect
+        assert_redirected_to auth_success_path(:provider => "facebook")
+        follow_redirect!
+        assert_response :redirect
+        assert_redirected_to auth_failure_path(:strategy => "facebook", :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_facebook_redirect
+    OmniAuth.config.add_mock(:facebook, :uid => "123454321", :extra => {
+                               :id_info => { "openid_id" => "http://localhost:1123/new.tester" }
+                             })
+
+    new_email = "redirect_tester_facebook@osm.org"
+    display_name = "redirect_tester_facebook"
+    # 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 => "facebook", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer
+        assert_response :redirect
+        assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")
+        follow_redirect!
+        assert_response :redirect
+        assert_redirected_to auth_success_path(:provider => "facebook")
+        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 => "facebook", :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_facebook/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
 end

diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb
index 258dd5e52daafddfed182742ea6fe57f48a5c6af..9cab196f2901d36eb83291f649895da787c32656 100644 (file)
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -10,6 +10,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
   def teardown
     OmniAuth.config.mock_auth[:openid] = nil
     OmniAuth.config.mock_auth[:google] = nil
   def teardown
     OmniAuth.config.mock_auth[:openid] = nil
     OmniAuth.config.mock_auth[:google] = nil

+    OmniAuth.config.mock_auth[:facebook] = nil

     OmniAuth.config.test_mode = false
   end
 
     OmniAuth.config.test_mode = false
   end
 


@@ -968,4 +969,96 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_equal "google", user.auth_provider
     assert_equal "987654321", user.auth_uid
   end
     assert_equal "google", user.auth_provider
     assert_equal "987654321", user.auth_uid
   end

+
+  def test_login_facebook_success
+    OmniAuth.config.add_mock(:facebook, :uid => "123456789", :extra => {
+                               :id_info => { "openid_id" => "http://localhost:1123/fred.bloggs" }
+                             })
+
+    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 => "facebook", :origin => "/login")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "facebook")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "changeset/history"
+    assert_select "span.username", "facebookuser"
+  end
+
+  def test_login_facebook_connection_failed
+    OmniAuth.config.mock_auth[:facebook] = :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 => "facebook", :origin => "/login")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "facebook")
+    follow_redirect!
+    assert_response :redirect
+    assert_redirected_to auth_failure_path(:strategy => "facebook", :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_facebook_invalid_credentials
+    OmniAuth.config.mock_auth[:facebook] = :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 => "facebook", :origin => "/login")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "facebook")
+    follow_redirect!
+    assert_response :redirect
+    assert_redirected_to auth_failure_path(:strategy => "facebook", :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_facebook_unknown
+    OmniAuth.config.add_mock(:facebook, :uid => "987654321", :extra => {
+                               :id_info => { "openid_id" => "http://localhost:1123/fred.bloggs" }
+                             })
+
+    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 => "facebook", :origin => "/login")
+    assert_response :redirect
+    assert_redirected_to auth_success_path(:provider => "facebook")
+    follow_redirect!
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "user/new"
+    assert_select "span.username", false
+  end

 end
 end

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 605eb73b91f1556e7e95352fdb848eb89f22c1dd..14e00cc991ffe8f5efc79cf879187db826ec3808 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -163,7 +163,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_visible
   end
 
   def test_visible

-    assert_equal 17, User.visible.count
+    assert_equal 18, User.visible.count

     assert_raise ActiveRecord::RecordNotFound do
       User.visible.find(users(:suspended_user).id)
     end
     assert_raise ActiveRecord::RecordNotFound do
       User.visible.find(users(:suspended_user).id)
     end


@@ -173,7 +173,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_active
   end
 
   def test_active

-    assert_equal 16, User.active.count
+    assert_equal 17, User.active.count

     assert_raise ActiveRecord::RecordNotFound do
       User.active.find(users(:inactive_user).id)
     end
     assert_raise ActiveRecord::RecordNotFound do
       User.active.find(users(:inactive_user).id)
     end


@@ -186,7 +186,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_identifiable
   end
 
   def test_identifiable

-    assert_equal 18, User.identifiable.count
+    assert_equal 19, User.identifiable.count

     assert_raise ActiveRecord::RecordNotFound do
       User.identifiable.find(users(:normal_user).id)
     end
     assert_raise ActiveRecord::RecordNotFound do
       User.identifiable.find(users(:normal_user).id)
     end