updating for Facebook integration

Author: Nicholas Watson

app/controllers/entropi_social/user_registrations_controller.rb

@@ -10,11 +10,9 @@ def new
       # POST /resource/sign_up
       def create
         @user = User.new(params[:user])
-      
-        if @user.save
-          
+        
+        if @user.save  
           flash[:notice] = I18n.t("devise.registrations.signed_up")
-          
           sign_in_and_redirect(:user, @user)
         else
           clean_up_passwords(@user)

app/models/user.rb

@@ -17,28 +17,5 @@ class User < ActiveRecord::Base
   has_many :groups, :as => :groupable
 
   accepts_nested_attributes_for :profile
-
-=begin
-  class << self
-    
-    def find_for_facebook_oauth(access_token, signed_in_resource=nil)
-      data = access_token.extra.raw_info
-      if user = User.where(:email => data.email).first
-        user
-      else # Create a user with a stub password. 
-        User.create!(:email => data.email, :password => Devise.friendly_token[0,20]) 
-      end
-    end
-    
-    def new_with_session(params, session)
-      super.tap do |user|
-        if data = session["devise.facebook_data"] && session["devise.facebook_data"]["extra"]["raw_info"]
-          user.email = data["email"]
-        end
-      end
-    end
-    
-  end
-=end
 
 end

config/initializers/devise.rb

@@ -25,7 +25,7 @@
   # session. If you need permissions, you should implement that in a before filter.
   # You can also supply a hash where the value is a boolean determining whether
   # or not authentication should be aborted when the value is not present.
-  config.authentication_keys = [ :username ]
+  config.authentication_keys = [ :email ]
 
   # Configure parameters from the request object used for authentication. Each entry
   # given should be a request method and it will automatically be passed to the

db/migrate/20111118193950_setup_entropi_social.rb

@@ -1,7 +1,6 @@
 class SetupEntropiSocial < ActiveRecord::Migration
   def up
     create_table :users do |t|
-      t.string    :username
       t.integer   :invitation_limit,  :default => 0
       t.database_authenticatable :null => false
       t.invitable

lib/entropi_social.rb

@@ -1,9 +1,9 @@
 require "entropi_social/engine"
 require 'devise'
 require 'entropi_social/strategies/facebook'
-
 require 'entropi_social/authorize'
 require 'entropi_social/commentable'
+require 'entropi_social/models/user'
 
 module EntropiSocial
 end

lib/entropi_social/models/user.rb

@@ -2,14 +2,20 @@ module EntropiSocial
   module Models
     module User
 
-      def self.included(user_model)
-        user_model.extend ClassMethods
+      def self.included(base)
+        base.extend ClassMethods
+      end
+      
+      module InstanceMethods
+
       end
 
       module ClassMethods
-        
-        
+        #include EntropiSocial::Models::User::InstanceMethods
       end
+      
+
+      
     end
   end
 end

lib/entropi_social/strategies/facebook.rb

@@ -7,13 +7,16 @@ def self.included(user_model)
       end
 
       module ClassMethods
-        
         def find_for_facebook_oauth(access_token, signed_in_resource=nil)
           data = access_token.extra.raw_info
+          logger.info data
           if user = User.where(:email => data.email).first
             user
-          else # Create a user with a stub password. 
-            User.create!(:email => data.email, :password => Devise.friendly_token[0,20]) 
+          else # Create a user with a stub password.
+            User.create!(:email => data.email, :password => Devise.friendly_token[0,20], :profile => profile) 
+            profile = user.build_profile(:first_name => access_token.info.first_name, :last_name => access_token.info.first_name)
+            profile.save!
+            return user
           end
         end
 
@@ -26,6 +29,7 @@ def new_with_session(params, session)
         end
 
       end
+      
     end
   end
 end