adds support for Facebook OAuth
This commit is contained in:
2
Gemfile
2
Gemfile
@@ -23,7 +23,7 @@ gem 'devise'
|
|||||||
# gem 'bcrypt', '~> 3.1.7'
|
# gem 'bcrypt', '~> 3.1.7'
|
||||||
gem 'omniauth'
|
gem 'omniauth'
|
||||||
gem 'omniauth-twitter'
|
gem 'omniauth-twitter'
|
||||||
# gem 'omniauth-facebook'
|
gem 'omniauth-facebook'
|
||||||
# gem 'omniauth-google-oauth2'
|
# gem 'omniauth-google-oauth2'
|
||||||
|
|
||||||
gem 'kaminari'
|
gem 'kaminari'
|
||||||
|
|||||||
17
Gemfile.lock
17
Gemfile.lock
@@ -133,6 +133,8 @@ GEM
|
|||||||
factory_girl_rails (4.5.0)
|
factory_girl_rails (4.5.0)
|
||||||
factory_girl (~> 4.5.0)
|
factory_girl (~> 4.5.0)
|
||||||
railties (>= 3.0.0)
|
railties (>= 3.0.0)
|
||||||
|
faraday (0.9.1)
|
||||||
|
multipart-post (>= 1.2, < 3)
|
||||||
foundation-rails (5.5.2.1)
|
foundation-rails (5.5.2.1)
|
||||||
railties (>= 3.1.0)
|
railties (>= 3.1.0)
|
||||||
sass (>= 3.3.0, < 3.5)
|
sass (>= 3.3.0, < 3.5)
|
||||||
@@ -170,6 +172,7 @@ GEM
|
|||||||
railties (>= 4.2.0)
|
railties (>= 4.2.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
json (1.8.3)
|
json (1.8.3)
|
||||||
|
jwt (1.5.1)
|
||||||
kaminari (0.16.3)
|
kaminari (0.16.3)
|
||||||
actionpack (>= 3.0.0)
|
actionpack (>= 3.0.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
@@ -190,6 +193,8 @@ GEM
|
|||||||
mini_portile (0.6.2)
|
mini_portile (0.6.2)
|
||||||
minitest (5.8.0)
|
minitest (5.8.0)
|
||||||
multi_json (1.11.2)
|
multi_json (1.11.2)
|
||||||
|
multi_xml (0.5.5)
|
||||||
|
multipart-post (2.0.0)
|
||||||
net-scp (1.2.1)
|
net-scp (1.2.1)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
net-ssh (2.9.2)
|
net-ssh (2.9.2)
|
||||||
@@ -197,12 +202,23 @@ GEM
|
|||||||
nokogiri (1.6.6.2)
|
nokogiri (1.6.6.2)
|
||||||
mini_portile (~> 0.6.0)
|
mini_portile (~> 0.6.0)
|
||||||
oauth (0.4.7)
|
oauth (0.4.7)
|
||||||
|
oauth2 (1.0.0)
|
||||||
|
faraday (>= 0.8, < 0.10)
|
||||||
|
jwt (~> 1.0)
|
||||||
|
multi_json (~> 1.3)
|
||||||
|
multi_xml (~> 0.5)
|
||||||
|
rack (~> 1.2)
|
||||||
omniauth (1.2.2)
|
omniauth (1.2.2)
|
||||||
hashie (>= 1.2, < 4)
|
hashie (>= 1.2, < 4)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
|
omniauth-facebook (2.0.1)
|
||||||
|
omniauth-oauth2 (~> 1.2)
|
||||||
omniauth-oauth (1.1.0)
|
omniauth-oauth (1.1.0)
|
||||||
oauth
|
oauth
|
||||||
omniauth (~> 1.0)
|
omniauth (~> 1.0)
|
||||||
|
omniauth-oauth2 (1.3.1)
|
||||||
|
oauth2 (~> 1.0)
|
||||||
|
omniauth (~> 1.2)
|
||||||
omniauth-twitter (1.2.1)
|
omniauth-twitter (1.2.1)
|
||||||
json (~> 1.3)
|
json (~> 1.3)
|
||||||
omniauth-oauth (~> 1.1)
|
omniauth-oauth (~> 1.1)
|
||||||
@@ -374,6 +390,7 @@ DEPENDENCIES
|
|||||||
launchy
|
launchy
|
||||||
letter_opener_web (~> 1.3.0)
|
letter_opener_web (~> 1.3.0)
|
||||||
omniauth
|
omniauth
|
||||||
|
omniauth-facebook
|
||||||
omniauth-twitter
|
omniauth-twitter
|
||||||
paranoia
|
paranoia
|
||||||
pg
|
pg
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
|
|||||||
end
|
end
|
||||||
|
|
||||||
# [:twitter, :facebook, :google_oauth2].each do |provider|
|
# [:twitter, :facebook, :google_oauth2].each do |provider|
|
||||||
[:twitter].each do |provider|
|
[:twitter, :facebook].each do |provider|
|
||||||
provides_callback_for provider
|
provides_callback_for provider
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
<%= link_to t("omniauth.twitter.sign_in"), user_omniauth_authorize_path(:twitter), class: 'button radius expand' %>
|
<%= link_to t("omniauth.twitter.sign_in"), user_omniauth_authorize_path(:twitter), class: 'button radius expand' %>
|
||||||
|
<%= link_to t("omniauth.facebook.sign_in"), user_omniauth_authorize_path(:facebook), class: 'button radius expand' %>
|
||||||
|
|
||||||
<hr/>
|
<hr/>
|
||||||
|
|||||||
@@ -4,5 +4,6 @@
|
|||||||
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
|
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
|
||||||
twitter_key: <%= ENV["TWITTER_KEY"] %>
|
twitter_key: <%= ENV["TWITTER_KEY"] %>
|
||||||
twitter_secret: <%= ENV["TWITTER_SECRET"] %>
|
twitter_secret: <%= ENV["TWITTER_SECRET"] %>
|
||||||
|
facebook_key: <%= ENV["FACEBOOK_KEY"] %>
|
||||||
|
facebook_secret: <%= ENV["FACEBOOK_SECRET"] %>
|
||||||
server_name: <%= fetch(:server_name) %>
|
server_name: <%= fetch(:server_name) %>
|
||||||
|
|
||||||
|
|||||||
@@ -240,6 +240,7 @@ Devise.setup do |config|
|
|||||||
# up on your models and hooks.
|
# up on your models and hooks.
|
||||||
# config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
|
# config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
|
||||||
config.omniauth :twitter, Rails.application.secrets.twitter_key, Rails.application.secrets.twitter_secret
|
config.omniauth :twitter, Rails.application.secrets.twitter_key, Rails.application.secrets.twitter_secret
|
||||||
|
config.omniauth :facebook, Rails.application.secrets.facebook_key, Rails.application.secrets.facebook_secret
|
||||||
|
|
||||||
# ==> Warden configuration
|
# ==> Warden configuration
|
||||||
# If you want to use other strategies, that are not supported by Devise, or
|
# If you want to use other strategies, that are not supported by Devise, or
|
||||||
|
|||||||
@@ -153,3 +153,5 @@ en:
|
|||||||
title: Add Email
|
title: Add Email
|
||||||
twitter:
|
twitter:
|
||||||
sign_in: Sign in with Twitter
|
sign_in: Sign in with Twitter
|
||||||
|
facebook:
|
||||||
|
sign_in: Sign in with Facebook
|
||||||
|
|||||||
@@ -152,4 +152,6 @@ es:
|
|||||||
finish_signup:
|
finish_signup:
|
||||||
title: Añade tu email
|
title: Añade tu email
|
||||||
twitter:
|
twitter:
|
||||||
sign_in: Inicia sessión con Twitter
|
sign_in: Entra con Twitter
|
||||||
|
facebook:
|
||||||
|
sign_in: Entra con Facebook
|
||||||
|
|||||||
@@ -16,16 +16,22 @@ development:
|
|||||||
secret_key_base: 56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4
|
secret_key_base: 56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4
|
||||||
twitter_key: AAAA
|
twitter_key: AAAA
|
||||||
twitter_secret: BBBB
|
twitter_secret: BBBB
|
||||||
|
facebook_key: AAAA
|
||||||
|
facebook_secret: BBBB
|
||||||
<<: *default
|
<<: *default
|
||||||
|
|
||||||
test:
|
test:
|
||||||
secret_key_base: 4d5adf961ddd27aef19622d6c0b3234d555f9ee003f022b1f829c92bbe33aaee907be7feb67bd54c14a1a32512fa968565ad405971fbc41bd0797af73c26a796
|
secret_key_base: 4d5adf961ddd27aef19622d6c0b3234d555f9ee003f022b1f829c92bbe33aaee907be7feb67bd54c14a1a32512fa968565ad405971fbc41bd0797af73c26a796
|
||||||
twitter_key: AAAA
|
twitter_key: AAAA
|
||||||
twitter_secret: BBBB
|
twitter_secret: BBBB
|
||||||
|
facebook_key: AAAA
|
||||||
|
facebook_secret: BBBB
|
||||||
<<: *default
|
<<: *default
|
||||||
|
|
||||||
production:
|
production:
|
||||||
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
|
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
|
||||||
twitter_key: <%= ENV["TWITTER_KEY"] %>
|
twitter_key: <%= ENV["TWITTER_KEY"] %>
|
||||||
twitter_secret: <%= ENV["TWITTER_SECRET"] %>
|
twitter_secret: <%= ENV["TWITTER_SECRET"] %>
|
||||||
|
facebook_key: <%= ENV["FACEBOOK_KEY"] %>
|
||||||
|
facebook_secret: <%= ENV["FACEBOOK_SECRET"] %>
|
||||||
<<: *default
|
<<: *default
|
||||||
|
|||||||
Reference in New Issue
Block a user