thorsson_facebooker2 0.0.17 → 0.0.18

data/lib/facebooker2/rails/controller.rb

@@ -121,7 +121,7 @@ module Facebooker2
       def fb_signed_request_json(encoded)
         chars_to_add = 4-(encoded.size % 4)
         encoded += ("=" * chars_to_add)
-        Base64.decode64(encoded)
+        base64_url_decode(encoded)
       end
       
       def facebook_params
@@ -211,14 +211,10 @@ module Facebooker2
       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?
+        oauth2_fetch_client_and_user_from_session || oauth2_fetch_client_and_user_from_cookie
         @_fb_user_fetched = true
       end
 
@@ -227,12 +223,33 @@ module Facebooker2
         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)
+        authenticator = Mogli::Authenticator.new(Facebooker2.app_id, Facebooker2.secret, '')
         client = Mogli::Client.create_from_code_and_authenticator(data["code"], authenticator)
         user = Mogli::User.new(:id=>data["user_id"])
+        oauth2_store_client_and_user_in_session(client,user)
         fb_sign_in_user_and_client(user, client)
       end
 
+      def oauth2_store_client_and_user_in_session(client, user)
+        session[:facebooker2_access_token] = client.access_token
+        session[:facebooker2_expiration] = client.expiration
+        session[:facebooker2_user_id] = user.id
+      end
+
+      def oauth2_fetch_client_and_user_from_session
+        if session[:facebooker2_access_token]
+          client = Mogli::Client.new(session[:facebooker2_access_token],session[:facebooker2_expiration])
+          user = Mogli::User.new(:id=>session[:facebooker2_user_id])
+          fb_sign_in_user_and_client(user, client)
+        end
+      end
+
+      def fb_logout!
+        session[:facebooker2_access_token]=nil
+        session[:facebooker2_expiration]=nil
+        session[:facebooker2_user_id]=nil
+      end
+
 
       def base64_url_decode(encoded)
         chars_to_add = 4-(encoded.size % 4)
@@ -242,4 +259,4 @@ module Facebooker2
 
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thorsson_facebooker2
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mogli