fbdoorman 0.8.0.95 → 0.8.0.97

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.95"
+  gem.version     = "0.8.0.97"
   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

@@ -8,11 +8,12 @@ class Clearance::FacebookController < ApplicationController
         #The code arrives here
         user_id = token_user(params[:token])
         if user_id != nil then
+          @user = nil
           @user = find_fbuser(user_id) #The one from the DB
           #If the user exists
-          if @user then
+          if !@user.nil? then
             sign_in(@user, params[:token], params[:expiration])
-            redirect_to LOGGED_PATH and return
+            redirect_to LOGGED_PATH
           else #If theres no user with that id
             #Register this user
             register_fbu(params[:token])

data/app/views/facebook/_fbjs.html.erb

@@ -15,15 +15,12 @@ window.fbAsyncInit = function() {
 	    // the user's ID, a valid access token, a signed
 	    // request, and the time the access token 
 	    // and signed request each expire
-	    var accessToken = response.authResponse.accessToken;
+		<%= if !signed_in? then
+	    "var accessToken = response.authResponse.accessToken;
 		var expiration = response.authResponse.expiresIn;
-		window.location="<%=FB_CALLBACK_URL%>" + "?token=" + accessToken + "&expiration=" + expiration;
-	  } else if (response.status === 'not_authorized') {
-	    // the user is logged in to Facebook, 
-	    //but not connected to the app
-	  } else {
-	    // the user isn't even logged in to Facebook.
-	  }	
+		window.location='/facebook' + '?token=' + accessToken + '&expiration=' + expiration;"
+		end %>
+	  }
   };
 
   // run once with current status and whenever the status changes

data/lib/fbdoorman.rb

@@ -24,7 +24,6 @@ FB_CALLBACK_URL = "#{FB[:base_url]}/facebook"
 FB_CLOSED_URL = "#{FB[:base_url]}/fbclosed"
 
 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.95
+  version: 0.8.0.97
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-16 00:00:00.000000000Z
+date: 2011-12-17 00:00:00.000000000Z
 dependencies: []
 description: Painless user registration and sign-in using Facebook single sign-on
   with JS. Typical email login still works too.