config/facebooker.yml db/migrate/20091020213339_add_users_fb.rb public/javascripts/facebooker.js public/xd_receiver.html public/xd_receiver_ssl.html vendor/plugins/facebooker/.autotest vendor/plugins/facebooker/CHANGELOG.rdoc vendor/plugins/facebooker/COPYING.rdoc vendor/plugins/facebooker/Manifest.txt vendor/plugins/facebooker/README.rdoc vendor/plugins/facebooker/Rakefile vendor/plugins/facebooker/TODO.rdoc vendor/plugins/facebooker/examples/desktop_login.rb vendor/plugins/facebooker/facebooker.gemspec vendor/plugins/facebooker/generators/facebook/facebook_generator.rb vendor/plugins/facebooker/generators/facebook/templates/config/facebooker.yml vendor/plugins/facebooker/generators/facebook/templates/public/javascripts/facebooker.js vendor/plugins/facebooker/generators/facebook_controller/USAGE vendor/plugins/facebooker/generators/facebook_controller/facebook_controller_generator.rb vendor/plugins/facebooker/generators/facebook_controller/templates/controller.rb vendor/plugins/facebooker/generators/facebook_controller/templates/functional_test.rb vendor/plugins/facebooker/generators/facebook_controller/templates/helper.rb vendor/plugins/facebooker/generators/facebook_controller/templates/view.fbml.erb vendor/plugins/facebooker/generators/facebook_controller/templates/view.html.erb vendor/plugins/facebooker/generators/facebook_publisher/facebook_publisher_generator.rb vendor/plugins/facebooker/generators/facebook_publisher/templates/create_facebook_templates.rb vendor/plugins/facebooker/generators/facebook_publisher/templates/publisher.rb vendor/plugins/facebooker/generators/facebook_scaffold/USAGE vendor/plugins/facebooker/generators/facebook_scaffold/facebook_scaffold_generator.rb vendor/plugins/facebooker/generators/facebook_scaffold/templates/controller.rb vendor/plugins/facebooker/generators/facebook_scaffold/templates/facebook_style.css vendor/plugins/facebooker/generators/facebook_scaffold/templates/functional_test.rb vendor/plugins/facebooker/generators/facebook_scaffold/templates/helper.rb vendor/plugins/facebooker/generators/facebook_scaffold/templates/layout.fbml.erb vendor/plugins/facebooker/generators/facebook_scaffold/templates/layout.html.erb vendor/plugins/facebooker/generators/facebook_scaffold/templates/style.css vendor/plugins/facebooker/generators/facebook_scaffold/templates/view_edit.fbml.erb vendor/plugins/facebooker/generators/facebook_scaffold/templates/view_edit.html.erb vendor/plugins/facebooker/generators/facebook_scaffold/templates/view_index.fbml.erb vendor/plugins/facebooker/generators/facebook_scaffold/templates/view_index.html.erb vendor/plugins/facebooker/generators/facebook_scaffold/templates/view_new.fbml.erb vendor/plugins/facebooker/generators/facebook_scaffold/templates/view_new.html.erb vendor/plugins/facebooker/generators/facebook_scaffold/templates/view_show.fbml.erb vendor/plugins/facebooker/generators/facebook_scaffold/templates/view_show.html.erb vendor/plugins/facebooker/generators/publisher/publisher_generator.rb vendor/plugins/facebooker/generators/xd_receiver/templates/xd_receiver.html vendor/plugins/facebooker/generators/xd_receiver/templates/xd_receiver_ssl.html vendor/plugins/facebooker/generators/xd_receiver/xd_receiver_generator.rb vendor/plugins/facebooker/init.rb vendor/plugins/facebooker/install.rb vendor/plugins/facebooker/lib/facebooker.rb vendor/plugins/facebooker/lib/facebooker/adapters/adapter_base.rb vendor/plugins/facebooker/lib/facebooker/adapters/bebo_adapter.rb vendor/plugins/facebooker/lib/facebooker/adapters/facebook_adapter.rb vendor/plugins/facebooker/lib/facebooker/admin.rb vendor/plugins/facebooker/lib/facebooker/application.rb vendor/plugins/facebooker/lib/facebooker/batch_request.rb vendor/plugins/facebooker/lib/facebooker/data.rb vendor/plugins/facebooker/lib/facebooker/feed.rb vendor/plugins/facebooker/lib/facebooker/logging.rb vendor/plugins/facebooker/lib/facebooker/mobile.rb vendor/plugins/facebooker/lib/facebooker/mock/service.rb vendor/plugins/facebooker/lib/facebooker/mock/session.rb vendor/plugins/facebooker/lib/facebooker/model.rb vendor/plugins/facebooker/lib/facebooker/models/affiliation.rb vendor/plugins/facebooker/lib/facebooker/models/album.rb vendor/plugins/facebooker/lib/facebooker/models/applicationproperties.rb vendor/plugins/facebooker/lib/facebooker/models/applicationrestrictions.rb vendor/plugins/facebooker/lib/facebooker/models/cookie.rb vendor/plugins/facebooker/lib/facebooker/models/education_info.rb vendor/plugins/facebooker/lib/facebooker/models/event.rb vendor/plugins/facebooker/lib/facebooker/models/family_relative_info.rb vendor/plugins/facebooker/lib/facebooker/models/friend_list.rb vendor/plugins/facebooker/lib/facebooker/models/group.rb vendor/plugins/facebooker/lib/facebooker/models/info_item.rb vendor/plugins/facebooker/lib/facebooker/models/info_section.rb vendor/plugins/facebooker/lib/facebooker/models/location.rb vendor/plugins/facebooker/lib/facebooker/models/notifications.rb vendor/plugins/facebooker/lib/facebooker/models/page.rb vendor/plugins/facebooker/lib/facebooker/models/photo.rb vendor/plugins/facebooker/lib/facebooker/models/tag.rb vendor/plugins/facebooker/lib/facebooker/models/user.rb vendor/plugins/facebooker/lib/facebooker/models/video.rb vendor/plugins/facebooker/lib/facebooker/models/work_info.rb vendor/plugins/facebooker/lib/facebooker/parser.rb vendor/plugins/facebooker/lib/facebooker/rails/backwards_compatible_param_checks.rb vendor/plugins/facebooker/lib/facebooker/rails/controller.rb vendor/plugins/facebooker/lib/facebooker/rails/cucumber.rb vendor/plugins/facebooker/lib/facebooker/rails/cucumber/world.rb vendor/plugins/facebooker/lib/facebooker/rails/extensions/action_controller.rb vendor/plugins/facebooker/lib/facebooker/rails/extensions/action_view.rb vendor/plugins/facebooker/lib/facebooker/rails/extensions/rack_setup.rb vendor/plugins/facebooker/lib/facebooker/rails/extensions/routing.rb vendor/plugins/facebooker/lib/facebooker/rails/facebook_form_builder.rb vendor/plugins/facebooker/lib/facebooker/rails/facebook_pretty_errors.rb vendor/plugins/facebooker/lib/facebooker/rails/facebook_request_fix.rb vendor/plugins/facebooker/lib/facebooker/rails/facebook_request_fix_2-3.rb vendor/plugins/facebooker/lib/facebooker/rails/facebook_session_handling.rb vendor/plugins/facebooker/lib/facebooker/rails/facebook_url_helper.rb vendor/plugins/facebooker/lib/facebooker/rails/facebook_url_rewriting.rb vendor/plugins/facebooker/lib/facebooker/rails/helpers.rb vendor/plugins/facebooker/lib/facebooker/rails/helpers/fb_connect.rb vendor/plugins/facebooker/lib/facebooker/rails/integration_session.rb vendor/plugins/facebooker/lib/facebooker/rails/profile_publisher_extensions.rb vendor/plugins/facebooker/lib/facebooker/rails/publisher.rb vendor/plugins/facebooker/lib/facebooker/rails/routing.rb vendor/plugins/facebooker/lib/facebooker/rails/test_helpers.rb vendor/plugins/facebooker/lib/facebooker/rails/utilities.rb vendor/plugins/facebooker/lib/facebooker/server_cache.rb vendor/plugins/facebooker/lib/facebooker/service.rb vendor/plugins/facebooker/lib/facebooker/service/base_service.rb vendor/plugins/facebooker/lib/facebooker/service/curl_service.rb vendor/plugins/facebooker/lib/facebooker/service/net_http_service.rb vendor/plugins/facebooker/lib/facebooker/service/typhoeus_multi_service.rb vendor/plugins/facebooker/lib/facebooker/service/typhoeus_service.rb vendor/plugins/facebooker/lib/facebooker/session.rb vendor/plugins/facebooker/lib/facebooker/version.rb vendor/plugins/facebooker/lib/net/http_multipart_post.rb vendor/plugins/facebooker/lib/rack/facebook.rb vendor/plugins/facebooker/lib/tasks/facebooker.rake vendor/plugins/facebooker/lib/tasks/facebooker.rb vendor/plugins/facebooker/lib/tasks/tunnel.rake vendor/plugins/facebooker/rails/init.rb vendor/plugins/facebooker/setup.rb vendor/plugins/facebooker/templates/layout.erb vendor/plugins/facebooker/test/facebooker/adapters_test.rb vendor/plugins/facebooker/test/facebooker/admin_test.rb vendor/plugins/facebooker/test/facebooker/application_test.rb vendor/plugins/facebooker/test/facebooker/batch_request_test.rb vendor/plugins/facebooker/test/facebooker/data_test.rb vendor/plugins/facebooker/test/facebooker/logging_test.rb vendor/plugins/facebooker/test/facebooker/mobile_test.rb vendor/plugins/facebooker/test/facebooker/model_test.rb vendor/plugins/facebooker/test/facebooker/models/event_test.rb vendor/plugins/facebooker/test/facebooker/models/page_test.rb vendor/plugins/facebooker/test/facebooker/models/photo_test.rb vendor/plugins/facebooker/test/facebooker/models/user_test.rb vendor/plugins/facebooker/test/facebooker/rails/facebook_request_fix_2-3_test.rb vendor/plugins/facebooker/test/facebooker/rails/facebook_url_rewriting_test.rb vendor/plugins/facebooker/test/facebooker/rails/integration_session_test.rb vendor/plugins/facebooker/test/facebooker/rails/publisher_test.rb vendor/plugins/facebooker/test/facebooker/rails_integration_test.rb vendor/plugins/facebooker/test/facebooker/server_cache_test.rb vendor/plugins/facebooker/test/facebooker/service_test.rb vendor/plugins/facebooker/test/facebooker/session_test.rb vendor/plugins/facebooker/test/facebooker_test.rb vendor/plugins/facebooker/test/fixtures/multipart_post_body_with_only_parameters.txt vendor/plugins/facebooker/test/fixtures/multipart_post_body_with_single_file.txt vendor/plugins/facebooker/test/fixtures/multipart_post_body_with_single_file_that_has_nil_key.txt vendor/plugins/facebooker/test/net/http_multipart_post_test.rb vendor/plugins/facebooker/test/rack/facebook_test.rb vendor/plugins/facebooker/test/rails_test_helper.rb vendor/plugins/facebooker/test/test_helper.rb @@ -20,7 +20,10 @@ class ApplicationController < ActionController::Base META_DESCRIPTION = "Spot.Us enables the public to commission journalists to do investigations on important and perhaps overlooked stories. " + "We are an open source project, to pioneer \"community funded reporting.\"" META_KEYWORDS = "journalism, reporting, community, local, news, open source, media, donation, creative commons" - #protect_from_forgery + + before_filter :set_facebook_session + helper_method :facebook_session + def current_network subdomain = current_subdomain.downcase if current_subdomain app/controllers/application_controller.rb @@ -69,6 +69,20 @@ class UsersController < ApplicationController render :action => 'password' end end + + # facebook + def link_user_accounts + puts "flipper" + if self.current_user.nil? + #register with fb + User.create_from_fb_connect(facebook_session.user) + else + #connect accounts + self.current_user.link_fb_connect(facebook_session.user.id) unless self.current_user.fb_user_id == facebook_session.user.id + end + redirect_to '/' + end + end app/controllers/users_controller.rb @@ -106,6 +106,7 @@ class User < ActiveRecord::Base before_validation_on_create :generate_activation_code before_save :encrypt_password, :unless => lambda {|user| user.password.blank? } + after_create :register_user_to_fb has_attached_file :photo, :styles => { :thumb => '50x50#' }, @@ -149,6 +150,53 @@ class User < ActiveRecord::Base raise ArgumentError, "invalid subclass of #{inspect}" end end + +################### facebook ###################### + #find the user in the database, first by the facebook user id and if that fails through the email hash + def self.find_by_fb_user(fb_user) + User.find_by_fb_user_id(fb_user.uid) || User.find_by_email_hash(fb_user.email_hashes) + end + #Take the data returned from facebook and create a new user from it. + #We don't get the email from Facebook and because a facebooker can only login through Connect we just generate a unique login name for them. + #If you were using username to display to people you might want to get them to select one after registering through Facebook Connect + def self.create_from_fb_connect(fb_user) + new_facebooker = User.new(:name => fb_user.name, :login => "facebooker_#{fb_user.uid}", :password => "", :email => "") + new_facebooker.fb_user_id = fb_user.uid.to_i + #We need to save without validations + new_facebooker.save(false) + new_facebooker.register_user_to_fb + end + + #We are going to connect this user object with a facebook id. But only ever one account. + def link_fb_connect(fb_user_id) + unless fb_user_id.nil? + #check for existing account + existing_fb_user = User.find_by_fb_user_id(fb_user_id) + #unlink the existing account + unless existing_fb_user.nil? + existing_fb_user.fb_user_id = nil + existing_fb_user.save(false) + end + #link the new one + self.fb_user_id = fb_user_id + save(false) + end + end + + #The Facebook registers user method is going to send the users email hash and our account id to Facebook + #We need this so Facebook can find friends on our local application even if they have not connect through connect + #We hen use the email hash in the database to later identify a user from Facebook with a local user + def register_user_to_fb + users = {:email => email, :account_id => id} + Facebooker::User.register([users]) + self.email_hash = Facebooker::User.hash_email(email) + save(false) + end + def facebook_user? + return !fb_user_id.nil? && fb_user_id > 0 + end + +########### end facebook ############## def citizen? self.is_a? Citizen app/models/user.rb @@ -1,4 +1,4 @@ -%head +%head{:xmlns => "http://www.w3.org/1999/xhtml","xmlns:fb"=>"http://www.facebook.com/2008/fbml"} %meta{ :name => "description", :content => @meta_description }/ %meta{ :name => "keywords", :content => @meta_keywords }/ app/views/layouts/_head.html.haml @@ -1,18 +1,43 @@ -%ul.user-header-nav - #logged_in.hide - %li.no-pipe - Hello, - %span.current_user_full_name - %li#current_balance_line - %li - = link_to "My Spot", myspot_profile_path - %li.no-pipe - = link_to "Logout", destroy_session_path - #not_logged_in.hide - %li - = link_to "Register", new_session_path, :rel => 'facebox' - %li.no-pipe - = link_to "Login", new_session_path, :rel => 'facebox', :id => "sign_in" +/ %ul.user-header-nav +/ #logged_in.hide +/ %li.no-pipe +/ Hello, +/ %span.current_user_full_name +/ %li#current_balance_line +/ %li +/ = link_to "My Spot", myspot_profile_path +/ %li.no-pipe +/ = link_to "Logout", destroy_session_path +/ #not_logged_in.hide +/ %li +/ = link_to "Register", new_session_path, :rel => 'facebox' +/ %li.no-pipe +/ = link_to "Login", new_session_path, :rel => 'facebox', :id => "sign_in" +/ =# fb_login_button('window.location = "/users/link_user_accounts";') +- if logged_in? + %ul.user-header-nav + #logged_in + %li.no-pipe + Hello, + %span.current_user_full_name + %li#current_balance_line + %li + = link_to "My Spot", myspot_profile_path + %li.no-pipe + - if current_user.facebook_user? + %a{:href=>"#", :onclick=>'FB.Connect.logoutAndRedirect("/logout")'} + Logout + - else + = fb_login_button('window.location = "/users/link_user_accounts";') + = link_to 'Logout', destroy_session_path +- else + %ul.user-header-nav + #not_logged_in + %li + = link_to "Register", new_session_path, :rel => 'facebox' + %li.no-pipe + = link_to "Login", new_session_path, :rel => 'facebox', :id => "sign_in" + = fb_login_button('window.location = "/users/link_user_accounts";') .slogan %span.pink Community app/views/layouts/_user_header.html.haml @@ -2,6 +2,8 @@ %html = render :partial => 'layouts/head' %body{ :class => body_class } + = fb_connect_javascript_tag + = init_fb_connect "XFBML" #user-header = render :partial => 'layouts/user_header' .body-content app/views/layouts/application.html.haml @@ -10,7 +10,11 @@ ActionController::Routing::Routes.draw do |map| map.resources :pitches, :member => {:feature => :put, :unfeature => :put, :half_fund => :put, :fully_fund => :put, :show_support => :put, :apply_to_contribute => :get, :assign_fact_checker => :put, :blog_posts => :get}, :has_many => :comments do |pitch| pitch.resources :posts end - + + # facebook acct link + #map.resources :users, :collection => {:link_user_accounts => :get} + map.connect "users/link_user_accounts", :controller => "users", :action => "link_user_accounts" + # TODO: remove when done map.resources :ui config/routes.rb @@ -9,9 +9,18 @@ module AuthenticatedSystem # Accesses the current user from the session. # Future calls avoid the database because nil is not equal to false. def current_user - @current_user ||= (login_from_session || login_from_basic_auth || login_from_cookie) unless @current_user == false + #@current_user ||= (login_from_session || login_from_basic_auth || login_from_cookie) unless @current_user == false + # supporting facebooker/facebook connect + @current_user ||= (login_from_session || login_from_basic_auth || login_from_cookie || login_from_fb) unless @current_user == false end - + + # facebook login + def login_from_fb + if facebook_session + self.current_user = User.find_by_fb_user(facebook_session.user) + end + end + # Store the given user id in the session. def current_user=(new_user) session[:user_id] = new_user ? new_user.id : nil lib/authenticated_system.rb bbcef7ab750c0b4bed266ad124604ac60c07d898 Dan Newman dpnewman@gmail.com http://github.com/spot-us/spot-us/commit/579c6dc0c9fbb19082cf8477e5de08ee455bf38f 579c6dc0c9fbb19082cf8477e5de08ee455bf38f 2009-10-20T16:52:32-07:00 2009-10-20T16:52:32-07:00 Facebook Integrate 1c96f0aeaa918bf06b0164f259e6ac9e9bc21be6 Dan Newman dpnewman@gmail.com