facebooker2 0.0.8 → 0.0.9

data/lib/facebooker2/rails/controller.rb

@@ -156,10 +156,22 @@ module Facebooker2
         #default values for the cookie
         value = 'deleted'
         expires = Time.now.utc - 3600 unless expires != nil
+
+        # If the expires value is set to some large value in the future, then the 'offline access' permission has been
+        # granted.  In the Facebook JS SDK, this causes a value of 0 to be set for the expires parameter.  This value 
+        # needs to be correct otherwise the request signing fails, so if the expires parameter retrieved from the graph
+        # api is more than a year in the future, then we set expires to 0 to match the JS SDK.
+        expires = 0 if expires > Time.now + 1.year
         
         if access_token
+          # Retrieve the existing cookie data
           data = fb_cookie_hash || {}
-          data.merge!('access_token' => access_token, 'uid' => uid, 'sig' => sig, "expires" => expires.to_i.to_s)
+          # Remove the deleted value if this has previously been set, as we don't want to include it as part of the 
+          # request signing parameters
+          data.delete('deleted') if data.key?('deleted')
+          # Keep existing cookie data that could have been set by FB JS SDK
+          data.merge!('access_token' => access_token, 'uid' => uid, 'sig' => sig, 'expires' => expires.to_i.to_s)
+          # Create string to store in cookie
           value = '"'
           data.each do |k,v|
             value += "#{k.to_s}=#{v.to_s}&"
@@ -169,7 +181,7 @@ module Facebooker2
         end
   
         # if an existing cookie is not set, we dont need to delete it
-        if (value == 'deleted' && cookies[fb_cookie_name] == "" ) 
+        if (value == 'deleted' && (!fb_cookie? || fb_cookie == "" ))
           return;
         end
         

data/lib/facebooker2/rails/helpers/javascript.rb

@@ -16,6 +16,7 @@ module Facebooker2
           cookie = opts[:cookie]
           status = opts[:status]
           xfbml = opts[:xfbml]
+          channel_url = opts[:channel_url]
           extra_js = capture(&proc) if block_given?
           js = <<-JAVASCRIPT
           <script>
@@ -24,6 +25,7 @@ module Facebooker2
                 appId  : '#{app_id}',
                 status : #{status}, // check login status
                 cookie : #{cookie}, // enable cookies to allow the server to access the session
+                #{"channelUrl : '#{channel_url}', // add channelURL to avoid IE redirect problems" unless channel_url.blank?}
                 xfbml  : #{xfbml}  // parse XFBML
               });
               #{extra_js}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: facebooker2
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Mike Mangino
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 -05:00
+date: 2011-03-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency