fbauth 0.9.8 → 0.9.9

data/app/controllers/facebook_auth_functions.rb

@@ -61,9 +61,15 @@ private
   end
 
   def parse_parms
-    unless params[:session].nil?
-      logger.warn "###### URL parms found - #{params[:session].inspect}"
+    if params[:session].present?
       parms = JSON.parse(params[:session])
+      logger.warn("Parsed facebook params from session parameter (deprecated)")
+    elsif params[:signed_request].present?
+      sig, b64udata = params[:signed_request].split('.')
+      json = b64udata.tr('+/', '-_').unpack('m')[0]
+      json += "}" unless json =~ /\}$/ # Hack to fix missing } bug
+      parms = JSON.parse(json)
+      logger.warn("Parsed facebook params from signed_request parameter")
     end
     parms
   end

data/lib/facebook_auth.rb

@@ -5,9 +5,16 @@ class FacebookAuth
 
   def self.create parms
     auth = self.new
-    auth.access_token = parms['access_token']
-    auth.uid = parms['uid']
-    auth.expires_epoch = parms['expires'].to_i unless parms['expires'].nil?
+    # Sense old-style FB auth structure, or new-style
+    if parms.has_key?('access_token')
+      auth.access_token = parms['access_token']
+      auth.uid = parms['uid']
+      auth.expires_epoch = parms['expires'].to_i unless parms['expires'].nil?
+    elsif parms.has_key?('oauth_token')
+      auth.access_token = parms['oauth_token']
+      auth.uid = parms['user_id']
+      auth.expires_epoch = parms['expires'].to_i if parms.has_key?('expires')
+    end
     auth
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 8
-  version: 0.9.8
+  - 9
+  version: 0.9.9
 platform: ruby
 authors: 
 - Three Wise Men Inc.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -05:00
+date: 2011-02-02 00:00:00 -05:00
 default_executable: 
 dependencies: []