facebooker2 0.0.7 → 0.0.8

data/lib/facebooker2/rails/controller.rb

@@ -21,25 +21,40 @@ module Facebooker2
         @_current_facebook_client
       end
       
+      # This mimics the getSession logic from the php facebook SDK
+      # https://github.com/facebook/php-sdk/blob/master/src/facebook.php#L333
+      #
       def fetch_client_and_user
         return if @_fb_user_fetched
-        fetch_client_and_user_from_cookie
-        fetch_client_and_user_from_signed_request unless @_current_facebook_client
+        # Try to authenticate from the signed request first
+        sig = fetch_client_and_user_from_signed_request
+        sig = fetch_client_and_user_from_cookie unless @_current_facebook_client
+        
+        #write the authentication params to a new cookie
+        if !@_current_facebook_client.nil? 
+          #we may have generated the signature based on the params in @facebook_params, and the expiration here is different
+          
+          set_fb_cookie(@_current_facebook_client.access_token, @_current_facebook_client.expiration, @_current_facebook_user.id, sig)
+        else
+          # if we do not have a client, delete the cookie
+          set_fb_cookie(nil,nil,nil,nil)
+        end
+        
         @_fb_user_fetched = true
       end
       
       def fetch_client_and_user_from_cookie
-        app_id = Facebooker2.app_id
-        if (hash_data = fb_cookie_hash_for_app_id(app_id)) and
-          fb_cookie_signature_correct?(fb_cookie_hash_for_app_id(app_id),Facebooker2.secret)
+        if (hash_data = fb_cookie_hash) and
+          fb_cookie_signature_correct?(fb_cookie_hash,Facebooker2.secret)
           fb_create_user_and_client(hash_data["access_token"],hash_data["expires"],hash_data["uid"])
+          return fb_cookie_hash["sig"]
         end
       end
       
       def fb_create_user_and_client(token,expires,userid)
         client = Mogli::Client.new(token,expires.to_i)
         user = Mogli::User.new(:id=>userid)
-        fb_sign_in_user_and_client(user,client)        
+        fb_sign_in_user_and_client(user,client)
       end
             
       def fb_sign_in_user_and_client(user,client)
@@ -49,10 +64,10 @@ module Facebooker2
         @_fb_user_fetched = true
       end
       
-      def fb_cookie_hash_for_app_id(app_id)
-        return nil unless fb_cookie_for_app_id?(app_id)
+      def fb_cookie_hash
+        return nil unless fb_cookie?
         hash={}
-        data = fb_cookie_for_app_id(app_id).gsub(/"/,"")
+        data = fb_cookie.gsub(/"/,"")
         data.split("&").each do |str|
           parts = str.split("=")
           hash[parts.first] = parts.last
@@ -60,22 +75,33 @@ module Facebooker2
         hash
       end
       
-      def fb_cookie_for_app_id?(app_id)
-        !fb_cookie_for_app_id(app_id).nil?
+      def fb_cookie?
+        !fb_cookie.nil?
+      end
+      
+      def fb_cookie
+        cookies[fb_cookie_name]
       end
       
-      def fb_cookie_for_app_id(app_id)
-        cookies["fbs_#{app_id}"]
+      def fb_cookie_name
+        return "fbs_#{Facebooker2.app_id}"
       end
       
+      # check if the expected signature matches the one from facebook
       def fb_cookie_signature_correct?(hash,secret)
+        generate_signature(hash,secret) == hash["sig"]
+      end
+      
+      # compute the md5 sig based on access_token,expires,uid, and the app secret
+      def generate_signature(hash,secret)
         sorted_keys = hash.keys.reject {|k| k=="sig"}.sort
         test_string = ""
         sorted_keys.each do |key|
           test_string += "#{key}=#{hash[key]}"
         end
         test_string += secret
-        Digest::MD5.hexdigest(test_string) == hash["sig"]
+        sig = Digest::MD5.hexdigest(test_string)
+        return sig
       end
       
       def fb_signed_request_json(encoded)
@@ -105,7 +131,50 @@ module Facebooker2
       def fetch_client_and_user_from_signed_request
         if facebook_params[:oauth_token]
           fb_create_user_and_client(facebook_params[:oauth_token],facebook_params[:expires],facebook_params[:user_id])
+          
+          if @_current_facebook_client
+            #compute a signature so we can store it in the cookie
+            sig_hash = Hash["uid"=>facebook_params[:user_id],"access_token"=>facebook_params[:oauth_token],"expires"=>facebook_params[:expires]]
+            return generate_signature(sig_hash, Facebooker2.secret)
+          end
+        end
+      end
+      
+      
+      # /**
+      #   This method was shamelessly stolen from the php facebook SDK:
+      #   https://github.com/facebook/php-sdk/blob/master/src/facebook.php
+      #   
+      #    Set a JS Cookie based on the _passed in_ session. It does not use the
+      #    currently stored session -- you need to explicitly pass it in.
+      #   
+      #   If a nil access_token is passed in this method will actually delete the fbs_ cookie
+      #
+      #   */
+      def set_fb_cookie(access_token,expires,uid,sig) 
+        
+        #default values for the cookie
+        value = 'deleted'
+        expires = Time.now.utc - 3600 unless expires != nil
+        
+        if access_token
+          data = fb_cookie_hash || {}
+          data.merge!('access_token' => access_token, 'uid' => uid, 'sig' => sig, "expires" => expires.to_i.to_s)
+          value = '"'
+          data.each do |k,v|
+            value += "#{k.to_s}=#{v.to_s}&"
+          end
+          value.chop!
+          value+='"'
+        end
+  
+        # if an existing cookie is not set, we dont need to delete it
+        if (value == 'deleted' && cookies[fb_cookie_name] == "" ) 
+          return;
         end
+        
+        #My browser doesn't seem to save the cookie if I set expires
+        cookies[fb_cookie_name] = { :value=>value }#, :expires=>expires}
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: facebooker2
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Mike Mangino
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 -05:00
+date: 2011-02-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,86 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 3
+        - 10
+        version: 2.3.10
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :development
+  version_requirements: *id007
 description: Facebook Connect integration library for ruby and rails
 email: mmangino@elevatedrails.com
 executables: []