devise_facebook_connectable 0.1.1 → 0.1.2

data/lib/devise_facebook_connectable.rb

@@ -22,22 +22,22 @@ require 'devise_facebook_connectable/routes'
 require 'devise_facebook_connectable/view_helpers'
 
 module Devise
-  module FacebookConnectable
-    
-    extend self
-    
-    mattr_accessor  :verbose
-    
-    # Logging helper: Internal debug-logging for the plugin.
-    #
-    def log(message, level = :info)
-      return unless @@verbose
-      level = :info if level.blank?
-      @@logger ||= ::Logger.new(::STDOUT)
-      @@logger.send(level.to_sym, "[devise/facebook_connectable:]  #{level.to_s.upcase}  #{message}")
-    end
-    
-  end
+  # Specifies the name of the database column name used for storing
+  # the user Facebook UID. Useful if this info should be saved in a
+  # generic column if different authentication solutions are used.
+  mattr_accessor :facebook_uid_field
+  @@facebook_uid_field = :facebook_uid
+  
+  # Specifies the name of the database column name used for storing
+  # the user Facebook session key. Useful if this info should be saved in a
+  # generic column if different authentication solutions are used.
+  mattr_accessor :facebook_session_key_field
+  @@facebook_session_key_field = :facebook_session_key
+  
+  # Specifies if account should be created if no account exists for
+  # a specified Facebook UID or not.
+  mattr_accessor :facebook_skip_create
+  @@facebook_skip_create = false
 end
 
 # Load core I18n locales: en
@@ -46,20 +46,15 @@ I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), *%w[de
 
 # Add +:facebook_connectable+ serializers and strategies to defaults.
 #
-Devise.setup do |config|
-  config.warden do |manager|
-    manager.default_strategies.unshift :facebook_connectable
-    manager.default_serializers.unshift :facebook_connectable
-  end
-end
+Devise::STRATEGIES.unshift :facebook_connectable
+Devise::SERIALIZERS.unshift :facebook_connectable
+# Devise::CONTROLLERS.unshift :facebook_connectable # TODO: Wait for Devise 0.7.2 release.
 
 # Override to get Devise to get that SessionsController should be used for both
 # :facebook_connectable and :authenticatable. Controller-logic is the same.
 #
 Devise::Mapping.class_eval do
-
   def allows?(controller)
     (self.for & [Devise::CONTROLLERS[controller.to_sym], :facebook_connectable].flatten).present?
   end
-
 end

data/lib/devise_facebook_connectable/controller_filters.rb

@@ -8,17 +8,25 @@ module Devise
 
         def self.included(klass)
           klass.class_eval do
+            before_filter :expired_session_hack
             before_filter :set_facebook_session
-            helper_method :facebook_session # session[:facebook_session]
             rescue_from ::Facebooker::Session::SessionExpired, :with => :facebook_session_expired
-            
+
+            helper_method :facebook_session
+
+            # Required sprinkle of magic to avoid +Facebooker::Session::ExpiredSession+.
+            #
+            def expired_session_hack
+              clear_facebook_session_information
+            end
+
             # Handle expired Facebook sessions automatically.
             #
             def facebook_session_expired
-              clear_fb_cookies!
-              clear_facebook_session_information
-              redirect_to root_url # TODO: Maybe a bad assumption? Maybe just re-load current page?
+              reset_session
+              redirect_to root_url
             end
+
           end
         end
 
@@ -27,4 +35,4 @@ module Devise
   end
 end
 
-ActionController::Base.send :include, Devise::FacebookConnectable::Controllers::Filters
+ActionController::Base.send :include, Devise::FacebookConnectable::Controllers::Filters

data/lib/devise_facebook_connectable/model.rb

@@ -5,6 +5,7 @@ require 'devise_facebook_connectable/serializer'
 module Devise
   module FacebookConnectable
     module Model
+
       # Facebook Connectable Module, responsible for validating authenticity of a 
       # user and storing credentials while signing in using their Facebook account.
       #
@@ -27,27 +28,18 @@ module Devise
       #
       module FacebookConnectable
 
-        DEFAULT_FACEBOOK_UID_FIELD = :facebook_uid
-        DEFAULT_FACEBOOK_SESSION_KEY_FIELD = :facebook_session_key
-
         def self.included(base)
           base.class_eval do
             extend ClassMethods
             extend ::Devise::Models::SessionSerializer
-
-            cattr_accessor :facebook_uid_field, :facebook_session_key_field, :facebook_skip_create
           end
         end
 
         # Store Facebook Connect account/session credentials.
         #
         def store_facebook_credentials!(attributes = {})
-          # FIXME: Don't work...nil for some reason.
-          # self.send(:"#{self.class.facebook_uid_field}=", attributes[:uid])
-          # self.send(:"#{self.class.facebook_session_key_field}=", attributes[:session_key])
-
-          self.send(:"#{DEFAULT_FACEBOOK_UID_FIELD}=", attributes[:uid])
-          self.send(:"#{DEFAULT_FACEBOOK_SESSION_KEY_FIELD}=", attributes[:session_key])
+          self.send(:"#{self.class.facebook_uid_field}=", attributes[:uid])
+          self.send(:"#{self.class.facebook_session_key_field}=", attributes[:session_key])
 
           # Only populate +email+ field if it's available (say, if +authenticable+ module is used).
           self.email = attributes[:email] || '' if self.respond_to?(:email)
@@ -106,14 +98,15 @@ module Devise
         # For more info:
         #   http://facebooker.pjkh.com/user/populate
         #
-        def before_facebook_connect(facebook_session)
-          # Default: Do nothing.
+        def on_before_facebook_connect(fb_session)
+          self.send(:before_facebook_connect, fb_session) rescue nil
         end
-        alias :before_connect :before_facebook_connect
 
+        # Optional: Store session key.
+        #
         def store_session(using_session_key)
           if self.session_key != using_session_key
-            self.update_attribute(:facebook_session_key, using_session_key)
+            self.update_attribute(self.send(:"#{self.class.facebook_session_key_field}"), using_session_key)
           end
         end
 
@@ -121,7 +114,10 @@ module Devise
         #
         def new_facebook_session
           returning(::Facebooker::Session.create) do |new_session|
-            new_session.secure_with!(self.facebook_session_key, self.facebook_uid, 1.hour.from_now)
+            new_session.secure_with!(self.send(:"#{self.class.facebook_session_key_field}"),
+                self.send(:"#{self.class.facebook_uid_field}"),
+                1.hour.from_now
+              )
             ::Facebooker::Session.current = new_session
           end
         end
@@ -135,27 +131,28 @@ module Devise
 
         module ClassMethods
 
+          # Configuration params accessible within +Devise.setup+ procedure (in initalizer).
+          #
+          # Example:
+          #
+          #   Devise.setup do |config|
+          #     config.facebook_uid_field = :facebook_uid
+          #     config.facebook_session_key_field = :facebook_session_key
+          #     config.facebook_skip_create = false
+          #   end
+          #
+          ::Devise::Models.config(self,
+              :facebook_uid_field,
+              :facebook_session_key_field,
+              :facebook_skip_create
+            )
+
           # Alias don't work for some reason, so...a more Ruby-ish alias
           # for +facebook_skip_create+.
-          #
           def facebook_skip_create?
             self.facebook_skip_create
           end
 
-          # Specifies the name of the database column name used for storing
-          # the user Facebook UID.
-          #
-          def facebook_uid_field
-            @@facebook_uid_field ||= DEFAULT_FACEBOOK_UID_FIELD
-          end
-
-          # Specifies the name of the database column name used for storing
-          # the user Facebook session key.
-          #
-          def facebook_session_key_field
-            @@facebook_session_key_field ||= DEFAULT_FACEBOOK_SESSION_KEY_FIELD
-          end
-
           # Authenticate using a Facebook UID.
           #
           def facebook_connect(attributes = {})
@@ -188,14 +185,6 @@ module Devise
               true
             end
 
-          # Configuration params accessible within +Devise.setup+ procedure (in initalizer).
-          #
-          ::Devise::Models.config(self,
-              :facebook_uid_field,
-              :facebook_session_key_field,
-              :facebook_skip_create
-            )
-
         end
 
       end

data/lib/devise_facebook_connectable/schema.rb

@@ -6,10 +6,11 @@ module Devise
     module Schema
 
       # Creates facebook_uid and facebook_session_key (for Facebook Connect authentication/management).
+      #
       def facebook_connectable
-        # apply_schema ::Devise::Models::FacebookConnectable.facebook_uid_field, Integer, :limit => 8   # BIGINT unsigned / 64-bit int
-        apply_schema ::Devise::Models::FacebookConnectable.facebook_uid_field, String
-        apply_schema ::Devise::Models::FacebookConnectable.facebook_session_key_field, String
+        apply_schema ::Devise.facebook_uid_field, Integer, :limit => 8   # BIGINT unsigned / 64-bit int
+        # apply_schema ::Devise.facebook_uid_field, String
+        apply_schema ::Devise.facebook_session_key_field, String
       end
 
     end

data/lib/devise_facebook_connectable/strategy.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'facebooker'
 
 module Devise
   module Strategies
@@ -13,7 +14,7 @@ module Devise
       # Without a Facebook session authentication cannot proceed.
       #
       def valid?
-        session[:facebook_session].present?
+        ::Facebooker::Session.current.present?
       end
 
       # Authenticate user with Facebook Connect.
@@ -21,8 +22,10 @@ module Devise
       def authenticate!
         klass = mapping.to
         begin
-          facebook_session = session[:facebook_session]
-          user = klass.facebook_connect(:uid => facebook_session.user.uid)
+          facebook_session = ::Facebooker::Session.current # session[:facebook_session]
+          facebook_user = facebook_session.user
+
+          user = klass.facebook_connect(:uid => facebook_user.uid)
 
           if user.present?
             success!(user)
@@ -33,10 +36,9 @@ module Devise
               user = returning(klass.new) do |u|
                 u.store_facebook_credentials!(
                     :session_key => facebook_session.session_key,
-                    :uid => facebook_session.user.uid,
-                    :email => facebook_session.user.proxied_email
+                    :uid => facebook_user.uid
                   )
-                u.before_connect(facebook_session)
+                u.on_before_facebook_connect(facebook_session)
               end
 
               begin
@@ -47,9 +49,9 @@ module Devise
               end
             end
           end
-        # Now handled in the controller.
-        # rescue ::Facebooker::Session::SessionExpired
-          # fail!(:facebook_session_expired)
+        # NOTE: Handled in the controller.
+        rescue # ::Facebooker::Session::SessionExpired
+          fail!(:facebook_invalid)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise_facebook_connectable
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jonas Grimfelt