facebooker2 0.0.11 → 0.0.12

data/lib/facebooker2.rb

@@ -1,9 +1,13 @@
 # Facebooker2
 require "mogli"
 module Facebooker2
+
+  @oauth2 = false
+  @cookie_prefix = 'fbs_'
+
   class NotConfigured < Exception; end
   class << self
-    attr_accessor :api_key, :secret, :app_id
+    attr_accessor :api_key, :secret, :app_id, :cookie_prefix, :oauth2
   end
     
   def self.secret
@@ -13,7 +17,7 @@ module Facebooker2
   def self.app_id
     @app_id || raise_unconfigured_exception
   end
-  
+
   def self.raise_unconfigured_exception
     raise NotConfigured.new("No configuration provided for Facebooker2. Either set the app_id and secret or call Facebooker2.load_facebooker_yaml in an initializer")
   end
@@ -22,10 +26,12 @@ module Facebooker2
     self.api_key = hash[:api_key]
     self.secret = hash[:secret]
     self.app_id = hash[:app_id]
+    self.cookie_prefix = 'fbsr_' unless hash[:oauth2].blank?
+    self.oauth2 = hash[:oauth2].blank? ? false : true
   end
   
   def self.load_facebooker_yaml
-    config = YAML.load(ERB.new(File.read(File.join(::Rails.root,"config","facebooker.yml"))).result)[::Rails.env]
+    config = (YAML.load(ERB.new(File.read(File.join(::Rails.root,"config","facebooker.yml"))).result)[::Rails.env])
     raise NotConfigured.new("Unable to load configuration for #{::Rails.env} from facebooker.yml. Is it set up?") if config.nil?
     self.configuration = config.with_indifferent_access
   end

data/lib/facebooker2/rails/controller.rb

@@ -12,12 +12,20 @@ module Facebooker2
       end
       
       def current_facebook_user
-        fetch_client_and_user
+        if (Facebooker2.oauth2)
+          oauth2_fetch_client_and_user
+        else
+          fetch_client_and_user
+        end
         @_current_facebook_user
       end
       
       def current_facebook_client
-        fetch_client_and_user
+        if (Facebooker2.oauth2)
+          oauth2_fetch_client_and_user
+        else
+          fetch_client_and_user
+        end
         @_current_facebook_client
       end
       
@@ -84,7 +92,7 @@ module Facebooker2
       end
       
       def fb_cookie_name
-        return "fbs_#{Facebooker2.app_id}"
+        return "#{Facebooker2.cookie_prefix + Facebooker2.app_id.to_s}"
       end
       
       # check if the expected signature matches the one from facebook
@@ -201,7 +209,37 @@ module Facebooker2
       def set_p3p_header_for_third_party_cookies
         response.headers['P3P'] = 'CP="IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT"'
       end
-      
+
+      ### Oauth2
+      def oauth2_current_facebook_user
+        oauth2_fetch_client_and_user
+        @_current_facebook_user
+      end
+
+      def oauth2_fetch_client_and_user
+        return if @_fb_user_fetched
+        sig = oauth2_fetch_client_and_user_from_cookie if @_current_facebook_client.nil?
+        @_fb_user_fetched = true
+      end
+
+      def oauth2_fetch_client_and_user_from_cookie
+        return unless fb_cookie?
+        sig,payload = fb_cookie.split('.')
+        return unless fb_signed_request_sig_valid?(sig, payload)
+        data = JSON.parse(base64_url_decode(payload))
+        authenticator = Mogli::Authenticator.new(Facebooker2.app_id, Facebooker2.secret, nil)
+        client = Mogli::Client.create_from_code_and_authenticator(data["code"], authenticator)
+        user = Mogli::User.new(:id=>data["user_id"])
+        fb_sign_in_user_and_client(user, client)
+      end
+
+
+      def base64_url_decode(encoded)
+        chars_to_add = 4-(encoded.size % 4)
+        encoded += ("=" * chars_to_add)
+        Base64.decode64(encoded.tr("-_", "+/"))
+      end
+
     end
   end
 end

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

@@ -12,13 +12,16 @@ module Facebooker2
         end
         
         def fb_connect_async_js(app_id=Facebooker2.app_id,options={},&proc)
-          opts = Hash.new(true).merge!(options)
-          cookie = opts[:cookie]
-          status = opts[:status]
-          xfbml = opts[:xfbml]
+          opts = Hash.new.merge!(options)
+          cookie = opts[:cookie].nil? ? true : opts[:cookie]
+          status = opts[:status].nil? ? true : opts[:status]
+          xfbml = opts[:xfbml].nil?   ? true : opts[:xfbml]
+          oauth2 = Facebooker2.oauth2 ? true : false
           channel_url = opts[:channel_url]
+          lang = opts[:locale] || 'en_US'
           extra_js = capture(&proc) if block_given?
           js = <<-JAVASCRIPT
+          <div id="fb-root"></div>
           <script>
             window.fbAsyncInit = function() {
               FB.init({
@@ -26,19 +29,16 @@ module Facebooker2
                 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?}
+                #{"oauth : true,"  if oauth2}
                 xfbml  : #{xfbml}  // parse XFBML
               });
               #{extra_js}
             };
 
             (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;
-              s.appendChild(e);
+              var e = document.createElement('script'); e.async = true;
+              e.src = document.location.protocol + '//connect.facebook.net/#{lang}/all.js';
+              document.getElementById('fb-root').appendChild(e);
             }());
           </script>
           JAVASCRIPT

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: facebooker2
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Mike Mangino
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 -04:00
+date: 2011-08-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency