challah-facebook 0.1.1 → 0.1.2

data/lib/challah/facebook/interfaces/base.rb

@@ -2,41 +2,33 @@ module Challah
   module Facebook
     module Interfaces
       class Base
-        attr_reader :app_id, :app_secret
+        attr_reader :app_id, :app_secret, :permissions
 
-        def self.app_id
-          ENV['FACEBOOK_APP_ID']
+        def initialize(options = {})
+          @app_id       = options.fetch(:app_id)
+          @app_secret   = options.fetch(:app_secret)
+          @permissions  = options.fetch(:permissions)
         end
 
-        def self.app_secret
-          ENV['FACEBOOK_SECRET']
-        end
-
-        def self.permissions
-          ENV['FACEBOOK_PERMISSIONS'].to_s.split(',')
-        end
-
-        def self.user_fields
-          %w( first_name last_name email )
-        end
-
-        def initialize(app_id, app_secret)
-          @app_id = app_id
-          @app_secret = app_secret
-        end
+        # These methods should be implemented by the specific
+        # interface that inherits from Base
 
         def self.get_access_token_for_oauth_code(code, callback_uri)
           raise 'Not implemented: get_access_token_for_oauth_code'
         end
 
-        def self.get_access_token_from_cookies(cookies_hash)
-          raise 'Not implemented: get_access_token_from_cookies'
+        def self.get_extended_token(access_token)
+          raise 'Not implemented: get_extended_token'
         end
 
         def self.get_facebook_uid_from_access_token(access_token)
           raise 'Not implemented: get_facebook_uid_from_access_token'
         end
 
+        def self.get_user_info_from_access_token(access_token)
+          raise 'Not implemented: get_user_info_from_access_token'
+        end
+
         def self.get_authorization_url(callback_uri, permissions = nil)
           raise 'Not implemented: get_authorization_url'
         end

data/lib/challah/facebook/interfaces/fb_graph.rb

@@ -7,13 +7,13 @@ module Challah
         end
 
         def self.get_access_token_for_oauth_code(code, callback_uri)
-          client = new(app_id, app_secret).auth(callback_uri).client
+          client = new(Facebook.options).auth(callback_uri).client
           client.authorization_code = code
           client.access_token!(:client_auth_body).to_s
         end
 
         def self.get_access_token_from_cookies(cookies_hash)
-          fb_auth = new(app_id, app_secret).auth
+          fb_auth = new(Facebook.options).auth
           fb_auth.from_cookie(cookies_hash)
           fb_auth.access_token.to_s
         rescue
@@ -21,13 +21,13 @@ module Challah
         end
 
         def self.get_extended_token(access_token)
-          fb_auth = new(app_id, app_secret).auth
+          fb_auth = new(Facebook.options).auth
           fb_auth.exchange_token!(access_token)
           fb_auth.access_token.to_s
         end
 
         def self.get_facebook_uid_from_access_token(access_token)
-          fb_user = ::FbGraph::User.me(access_token).fetch
+          fb_user = get_user_object_from_access_token(access_token)
 
           if fb_user
             return fb_user.identifier.to_s
@@ -41,18 +41,26 @@ module Challah
         def self.get_user_info_from_access_token(access_token)
           result = {}
 
-          fb_user = ::FbGraph::User.me(access_token).fetch
+          fb_user = get_user_object_from_access_token(access_token)
 
-          self.user_fields.each do |field|
-            result[field] = fb_user.send(field)
+          Facebook.user_fields.each do |field|
+            if fb_user.respond_to?(field)
+              result[field] = fb_user.send(field)
+            else
+              result[field] = nil
+            end
           end
 
           result
         end
 
+        def self.get_user_object_from_access_token(access_token)
+          ::FbGraph::User.me(access_token).fetch
+        end
+
         def self.get_authorization_url(callback_uri, permissions = nil)
-          scope = self.permissions if scope.nil?
-          client = new(app_id, app_secret).auth(callback_uri).client
+          scope = Facebook.permissions if permissions.nil?
+          client = new(Facebook.options).auth(callback_uri).client
           client.authorization_uri(scope: scope)
         end
 

data/lib/challah/facebook/provider.rb

@@ -37,11 +37,11 @@ module Challah
 
           begin
             # Get extended token
-            extended_token = Interface.get_extended_token(token)
+            extended_token = Facebook.interface.get_extended_token(token)
             user.facebook_provider[:token] = extended_token
 
             # Verify UID
-            test_uid = Interface.get_facebook_uid_from_access_token(extended_token)
+            test_uid = Facebook.interface.get_facebook_uid_from_access_token(extended_token)
 
             # If the uid's match up, this is a valid token
             return test_uid == uid

data/lib/challah/facebook/technique.rb

@@ -4,18 +4,25 @@ module Challah
       def initialize(session)
         @provider = session.provider? ? session.provider : nil
         @token = session.token? ? session.token : nil
-        @uid = session.uid? ? session.uid : nil
+        @uid = session.uid? ? session.uid.to_s.strip : nil
       end
 
       def authenticate
         return nil unless @provider == 'facebook'
         return nil unless @token
 
-        token = Interface.get_extended_token(@token)
-        auth = ::Authorization.where(provider: 'facebook', token: token, uid: @uid).first
+        auth = ::Authorization.where(provider: 'facebook', uid: @uid).first
 
         if auth
-          return auth.user
+          token = Facebook.interface.get_extended_token(@token)
+          test_uid = Facebook.interface.get_facebook_uid_from_access_token(token).to_s.strip
+
+          # If the uid from the given token matches the provided uid, update the token
+          # and allow access
+          if test_uid and @uid == test_uid
+            auth.update_attribute(:token, token)
+            return auth.user
+          end
         end
 
         nil

data/lib/challah/facebook/version.rb

@@ -1,5 +1,5 @@
 module Challah
   module Facebook
-    VERSION = "0.1.1" unless defined?(::Challah::Facebook::VERSION)
+    VERSION = "0.1.2" unless defined?(::Challah::Facebook::VERSION)
   end
 end

data/lib/challah/facebook.rb

@@ -5,5 +5,35 @@ module Challah
     autoload :Interface,        'challah/facebook/interface'
     autoload :Provider,         'challah/facebook/provider'
     autoload :Technique,        'challah/facebook/technique'
+
+    def self.options
+      @options ||= {
+        app_id:       ENV['FACEBOOK_APP_ID'],
+        app_secret:   ENV['FACEBOOK_SECRET'],
+        permissions:  ENV['FACEBOOK_PERMISSIONS'].to_s.split(','),
+        user_fields:  %w( first_name last_name email )
+      }
+    end
+
+    %w( app_id app_secret permissions user_fields ).each do |m|
+      class_eval "def self.#{m}; self.options[:#{m}]; end"
+    end
+
+    # The interface to use for all Facebook commands.
+    #
+    # Override this as needed. The Facebook interface should respond
+    # to all methods in Interfaces::Base
+    def self.interface
+      @interface ||= Interface
+    end
+
+    def self.interface=(klass)
+      @interface = klass
+    end
+
+    # Delegate all other methods to Challah::Facebook to the interface
+    def self.method_missing(method, *args)
+      self.interface.send(method, *args)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: challah-facebook
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: challah
@@ -104,3 +104,4 @@ signing_key:
 specification_version: 3
 summary: Facebook authentication interface for Challah.
 test_files: []
+has_rdoc: