fbdoorman 0.8.0.4 → 0.8.0.5

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.4"
+  gem.version     = "0.8.0.5"
   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

@@ -3,29 +3,23 @@ class Clearance::FacebookController < ApplicationController
   #Js is informing that the cookie was created
   def index
     if signed_in? then 
-        redirect_to FB_LOGGED_PATH #Evita multiples logins y hace que solo tenga sentido llamar el metodo con un nuevo cookie
+        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
-        ##Works sometimes, others sends: JSON::ParserError Exception: source did not contain any JSON!  
-        #Bucle posiblemente infinito y chambon para lidiar con la excepcion mientras se soluciona  
-        incomplete = true
-        while incomplete do
-              begin  
-                incomplete = false #Intento salir del bucle
-                fbu = MiniFB::OAuthSession.new(@fbcookie["access_token"], 'es_ES').get "me" 
-              rescue JSON::ParserError
-                incomplete = true #Reingreso en el bucle
-              end
+        if authenticated_fbu? then
+          @user = find_fbuser(fbu.id) #The one from the DB
+          #If the user exists
+          if @user then
+            sign_in_fbu(@user, params[:token], params[:expiration])
+          else #If theres no user with that id
+            #Register this user
+            register_fbu(fbu)
+          end   
+        else #The token isn't valid
+          closed
         end
-        @user = find_fbuser(fbu.id) #The one from the DB
-        #If the user exists
-        if @user then
-          sign_in_fbu(@user)
-        else #If theres no user with that id
-          #Register this user
-          register_fbu(fbu)
-        end   
     end 
   end
   
@@ -37,7 +31,7 @@ class Clearance::FacebookController < ApplicationController
   
   def sign_in_fbu(myuser)
       sign_in(myuser)
-      redirect_to FB_LOGGED_PATH and return
+      redirect_to LOGGED_PATH and return
   end
   
   #Here I reply the create the new user, I changed te verifications so that fbid is unique and password is optional
@@ -48,9 +42,9 @@ class Clearance::FacebookController < ApplicationController
     @user.name = new_user.name
     @user.email2 = new_user.email 
     if @user.save
-      sign_in_fbu(@user)
+      sign_in_fbu(@user, params[:token], params[:expiration])
     else
-      render :text => "No se pudo registrar su usuario de FB"
+      render :text => "Please contact the administrator, the Facebook user couldn't be created."
     end    
   end
   

data/lib/clearance/authentication.rb

@@ -64,12 +64,18 @@ module Clearance
       #
       # @example
       #   sign_in(@user)
-      def sign_in(user)
+      def sign_in(user, fb_token = nil, token_expiration = nil)
         if user
           cookies[:remember_token] = {
             :value   => user.remember_token,
             :expires => 1.year.from_now.utc
           }
+          if user_from_fb? then
+            cookies[:fb_token] = {
+              :value   => fb_token,
+              :expires => token_expiration
+            } 
+          end
           self.current_user = user
         end
       end
@@ -81,8 +87,7 @@ module Clearance
       def sign_out
         current_user.reset_remember_token! if current_user
         cookies.delete(:remember_token)
-        #Remove FB cookie
-        delete_fb_cookie
+        cookies.delete(:fb_token)
         self.current_user = nil
       end
 
@@ -99,6 +104,7 @@ module Clearance
       def fb_deny_access(flash_message = nil)
         store_location
         flash[:failure] = flash_message if flash_message
+        
         redirect_to FB_CLOSED_URL
       end
 

data/lib/facebook_helpers.rb

@@ -24,9 +24,7 @@ def authenticated_fbu?
   #The user is authenticated if the UID than own the token is the same as the one in current user
 end
 
-def delete_fb_cookie
-  cookies.delete("fbs_#{FB_APP_ID}".to_sym)
-end
+
 
 
 def facebook_js

data/lib/fbdoorman.rb

@@ -1,5 +1,7 @@
 require 'mini_fb'
 require 'facebook_helpers'
+require 'request_parser'
+
 require 'clearance/extensions/errors'
 require 'clearance/extensions/rescue'
 require 'clearance/configuration'
@@ -21,8 +23,8 @@ FB_CALLBACK_URL = "#{FB[:base_url]}/facebook"
 #This routed will be name with clearance routes as /facebookclosed
 FB_CLOSED_URL = "#{FB[:base_url]}/fbclosed"
 
-FB_LOGGED_PATH = FB[:after_login_path]
-FB_REGISTERED_PATH = FB[:after_register_path]
+LOGGED_PATH = FB[:after_login_path]
+REGISTERED_PATH = FB[:after_register_path]
 
 URL_AFTER_CREATE = FB[:url_after_create]
 

metadata

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