Permalink
Browse files

changed facebook connect to work with new gems/oauth spec

  • Loading branch information...
1 parent 59502e2 commit 0089b8dbf199b4bcca9678f1cbb1f210c0f115bb @aross aross committed Dec 21, 2011
Showing with 20 additions and 10 deletions.
  1. +17 −7 Gemfile.lock
  2. +1 −1 app/views/account/login.html.haml
  3. +2 −2 app/views/layouts/_header.html.erb
View
@@ -87,7 +87,6 @@ GEM
childprocess (0.1.9)
ffi (~> 1.0.6)
closure-compiler (1.1.1)
- crack (0.1.8)
cucumber (0.8.5)
builder (~> 2.1.2)
diff-lcs (~> 1.1.2)
@@ -111,8 +110,8 @@ GEM
abstract (>= 1.0.0)
eventmachine (0.12.10)
excon (0.6.3)
- facebooker2 (0.0.11)
- mogli (>= 0.0.12)
+ facebooker2 (0.0.16)
+ mogli (>= 0.0.33)
ruby-hmac
fastercsv (1.5.4)
ffi (1.0.9)
@@ -145,14 +144,19 @@ GEM
activesupport (~> 3.0)
haml (~> 3.0)
railties (~> 3.0)
+ hashie (1.1.0)
highline (1.6.2)
hoptoad_notifier (2.4.11)
activesupport
builder
hpricot (0.8.4)
htmlentities (4.3.0)
- httparty (0.7.8)
- crack (= 0.1.8)
+ httmultiparty (0.3.6)
+ httparty (>= 0.7.3)
+ multipart-post
+ httparty (0.8.1)
+ multi_json
+ multi_xml
i18n (0.5.0)
jammit (0.6.3)
yui-compressor (>= 0.9.3)
@@ -174,8 +178,14 @@ GEM
memcache (1.2.13)
memcache-client (1.8.5)
mime-types (1.16)
- mogli (0.0.28)
+ mogli (0.0.36)
+ hashie (~> 1.1.0)
+ httmultiparty (>= 0.3.6)
httparty (>= 0.4.3)
+ multi_json (~> 1.0.3)
+ multi_json (1.0.4)
+ multi_xml (0.4.1)
+ multipart-post (1.1.4)
mysql (2.8.1)
net-http-digest_auth (1.1.1)
net-http-persistent (1.8.1)
@@ -188,7 +198,7 @@ GEM
net-ssh (>= 1.99.1)
newrelic_rpm (3.0.1)
nokogiri (1.5.0)
- oauth (0.4.4)
+ oauth (0.4.5)
okkez-open_id_authentication (1.0.1)
ruby-openid (>= 2.0.4)
open4 (1.0.1)
@@ -8,7 +8,7 @@
%div
%h3 Login with Facebook
= fb_connect_async_js
- = fb_login_and_redirect(request.url, :perms => 'email')
+ = fb_login_and_redirect(request.url, :scope => 'email')
#loginform.floatleft.form.clear{ :title => "Account login" }
%h3 Login with Your OpenCongress Account
@@ -24,14 +24,14 @@
<%= fb_logout_link("Logout", url_for(:controller => 'logout', :only_path => false)) %>
<% else %>
<%= link_to "Logout", logout_path %>
- <%= fb_login_and_redirect(request.url, {:text => 'Connect with Facebook', :perms => 'email'}) %>
+ <%= fb_login_and_redirect(request.url, {:text => 'Connect with Facebook', :scope => 'email'}) %>
<% end %>
<% else %>
<%= link_to_function "Search", "['login','login-link','search', 'search-toggle'].each(Element.toggle);", :id => "search-toggle", :style => "display:none;" %>
<%= link_to_function "Login with OC", "['login','login-link','search','search-toggle'].each(Element.toggle);", login_url, :id => "login-link" %> &nbsp;&nbsp;&nbsp;
<%= link_to "Register", :controller => 'account', :action => 'signup' %>
- <%= fb_login_and_redirect(request.url, {:text => 'Login with Facebook', :perms => 'email'}) %>
+ <%= fb_login_and_redirect(request.url, {:text => 'Login with Facebook', :scope => 'email'}) %>
<% end %>
</div>
</div>

0 comments on commit 0089b8d

Please sign in to comment.