fbdoorman 0.8.0.6 → 0.8.0.7

data/Rakefile

@@ -18,7 +18,7 @@ Jeweler::Tasks.new do |gem|
   gem.summary     = "Rails authentication with facebook single sign-on OR email & password."
   gem.description = "Painless user registration and sign-in using Facebook single sign-on with JS. Typical email login still works too."
   gem.email       = "pelaez89@gmail.com"
-  gem.version     = "0.8.0.6"
+  gem.version     = "0.8.0.7"
   gem.homepage    = "http://github.com/davidpelaez/minifb-clearance"
   gem.authors     = ["Fbdoorman: David Pelaez","MiniFB: Appoxy","Clearance: Thoughtbot"]
   gem.files       = FileList["[A-Z]*", "{app,config,generators,lib,shoulda_macros,rails}/**/*"]

data/app/controllers/clearance/facebook_controller.rb

@@ -6,9 +6,7 @@ class Clearance::FacebookController < ApplicationController
         redirect_to LOGGED_PATH #Evita multiples logins y hace que solo tenga sentido llamar el metodo con un nuevo cookie
     else #If there's no signed in user
         #The code arrives here
-        #Validate the token in the cookie
-        @fbcookie = parse_fb_cookie
-        if authenticated_fbu?(params[:token]) then
+        if token_user(params[:token]) != nil then
           @user = find_fbuser(fbu.id) #The one from the DB
           #If the user exists
           if @user then

data/lib/clearance/authentication.rb

@@ -70,7 +70,7 @@ module Clearance
             :value   => user.remember_token,
             :expires => 1.year.from_now.utc
           }
-          if user_from_fb? then
+          if !user.fbid.blank?  then
             cookies[:fb_token] = {
               :value   => fb_token,
               :expires => token_expiration

data/lib/facebook_helpers.rb

@@ -12,16 +12,20 @@ def user_from_fb?
 end
 
 #Si da false entonces el usuario se le deniega el acceso
-def authenticated_fbu?(token=nil)
-  if token.nil? then  token = cookies[:fb_token] end
-  if @fbcookie.nil? then return false end
+def authenticated_fbu?
+  token = cookies[:fb_token]
+  if token.nil? then return false end
+  if token_user(token) == current_user.fbid then return true else return false end 
+  #The user is authenticated if the UID than own the token is the same as the one in current user
+end
+
+def token_user(token)
   begin
     @uid = MiniFB.rest(token, "users.getLoggedInUser", {})
-    if @uid.to_hash["response"] == current_user.fbid then return true else return false end 
+    return @uid.to_hash["response"]
   rescue MiniFB::FaceBookError #Is this error happen the token expired
-    return false
+    return nil
   end
-  #The user is authenticated if the UID than own the token is the same as the one in current user
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbdoorman
 version: !ruby/object:Gem::Version
-  version: 0.8.0.6
+  version: 0.8.0.7
   prerelease: 
 platform: ruby
 authors: