facebooker2 0.0.4 → 0.0.5

data/lib/facebooker2/rails/controller.rb

@@ -1,4 +1,5 @@
 require "digest/md5"
+require "hmac-sha2"
 module Facebooker2
   module Rails
     module Controller
@@ -7,31 +8,40 @@ module Facebooker2
         controller.helper Facebooker2::Rails::Helpers
         controller.helper_method :current_facebook_user
         controller.helper_method :current_facebook_client
+        controller.helper_method :facebook_params
       end
       
       def current_facebook_user
-        fetch_client_and_user_from_cookie
+        fetch_client_and_user
         @_current_facebook_user
       end
       
       def current_facebook_client
-        fetch_client_and_user_from_cookie
+        fetch_client_and_user
         @_current_facebook_client
       end
       
-      def fetch_client_and_user_from_cookie
+      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
+        @_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)
-          client = Mogli::Client.new(hash_data["access_token"],hash_data["expires"].to_i)
-          user = Mogli::User.new(:id=>hash_data["uid"])
-          user.client = @_current_facebook_client
-          fb_sign_in_user_and_client(user,client)
+          fb_create_user_and_client(hash_data["access_token"],hash_data["expires"],hash_data["uid"])
         end
-        @_fb_user_fetched = true
       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)        
+      end
+            
       def fb_sign_in_user_and_client(user,client)
         user.client = client
         @_current_facebook_user = user
@@ -67,6 +77,36 @@ module Facebooker2
         test_string += secret
         Digest::MD5.hexdigest(test_string) == hash["sig"]
       end
+      
+      def fb_signed_request_json(encoded)
+        chars_to_add = 4-(encoded.size % 4)
+        encoded += ("=" * chars_to_add)
+        Base64.decode64(encoded)
+      end
+      
+      def facebook_params
+        @facebook_param ||= fb_load_facebook_params
+      end
+
+      def fb_load_facebook_params
+        return {} if params[:signed_request].blank?
+        sig,encoded_json = params[:signed_request].split(".")
+        return {} unless fb_signed_request_sig_valid?(sig,encoded_json)
+        ActiveSupport::JSON.decode(fb_signed_request_json(encoded_json)).with_indifferent_access
+      end  
+      
+      def fb_signed_request_sig_valid?(sig,encoded) 
+        base64 = Base64.encode64(HMAC::SHA256.digest(Facebooker2.secret,encoded))
+        #now make the url changes that facebook makes
+        url_escaped_base64 = base64.gsub(/=*\n?$/,"").tr("+/","-_")
+        sig ==  url_escaped_base64
+      end
+      
+      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])
+        end
+      end
     end
   end
 end

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

@@ -26,10 +26,10 @@ module Facebooker2
           content_tag("fb:login-button",text,options.merge(:onlogin=>js))
         end
         
-        def fb_login(url, options = {},&proc)
-           js = concat(&proc)
+        def fb_login(options = {},&proc)
+           js = capture(&proc)
            text = options.delete(:text)
-           content_tag("fb:login-button",text,options.merge(:onlogin=>js))
+           concat(content_tag("fb:login-button",text,options.merge(:onlogin=>js)))
         end
         
         #

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

@@ -2,6 +2,15 @@ module Facebooker2
   module Rails
     module Helpers
       module Javascript
+        
+        def fb_html_safe(str)
+          if str.respond_to?(:html_safe)
+            str.html_safe
+          else
+            str
+          end
+        end
+        
         def fb_connect_async_js(app_id=Facebooker2.app_id,options={},&proc)
           opts = Hash.new(true).merge!(options)
           cookie = opts[:cookie]
@@ -9,7 +18,6 @@ module Facebooker2
           xfbml = opts[:xfbml]
           extra_js = capture(&proc) if block_given?
           js = <<-JAVASCRIPT
-          <div id="fb-root"></div>
           <script>
             window.fbAsyncInit = function() {
               FB.init({
@@ -22,10 +30,13 @@ module Facebooker2
             };
 
             (function() {
+              var s = document.createElement('div'); 
+              s.setAttribute('id','fb-root'); 
+              document.documentElement.getElementsByTagName("body")[0].appendChild(s);
               var e = document.createElement('script');
               e.src = document.location.protocol + '//connect.facebook.net/en_US/all.js';
               e.async = true;
-              document.getElementById('fb-root').appendChild(e);
+              s.appendChild(e);
             }());
           </script>
         JAVASCRIPT
@@ -34,4 +45,4 @@ module Facebooker2
       end
     end
   end
-end
+end

data/lib/facebooker2.rb

@@ -1,6 +1,5 @@
 # Facebooker2
 require "mogli"
-
 module Facebooker2
   class NotConfigured < Exception; end
   class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: facebooker2
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Mike Mangino
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 -04:00
+date: 2010-08-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.4
+        version: 0.0.12
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: ruby-hmac
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
     version: 
 description: Facebook Connect integration library for ruby and rails
 email: mmangino@elevatedrails.com