oauth2_facebook_grantable 0.5.0 → 0.6.0

data/.gitignore

@@ -3,3 +3,9 @@
 .bundle
 Gemfile.lock
 pkg/*
+
+*.sqlite3-journal
+*.sqlite3
+*.log
+
+/tests/tmp

data/Gemfile

@@ -3,6 +3,6 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in oauth2_providable_facebook.gemspec
 gemspec
 
-gem 'rspec'
-gem 'devise_oauth2_providable', '~> 1.1.0'
-gem 'koala', '~> 1.4.1'
+#gem 'rspec'
+#gem 'devise_oauth2_providable', '~> 1.1.0'
+#gem 'koala', '~> 1.4.1'

data/lib/devise/oauth2_facebook_grantable/models/oauth2_facebook_grantable.rb

@@ -3,9 +3,7 @@ module Devise
     module Oauth2FacebookGrantable
       extend ActiveSupport::Concern
       def valid_facebook_access_token?(token)
-        begin
-          @graph = Koala::Facebook::API.new(token)
-          fb_user = @graph.get_object("me")
+          fb_user = Devise::Oauth2ProvidableFacebook.facebook_user_for_token(token)
           if(fb_user && fb_user["id"])
             Devise::Oauth2ProvidableFacebook.logger.debug("Oauth2FacebookGrantable => User with facebook identifier \"#{fb_user["id"]}\" was authenticated successfully by Facebook")
             return (fb_user["id"].to_s == self.facebook_identifier.to_s)
@@ -13,10 +11,6 @@ module Devise
             Devise::Oauth2ProvidableFacebook.logger.debug("Oauth2FacebookGrantable => Could not authenticate user against Facebook (#{fb_user})")
             return false
           end
-        rescue => e
-          Devise::Oauth2ProvidableFacebook.logger.error("Oauth2FacebookGrantable => Could not authenticate user: #{e}")
-          return false
-        end
       end
     end
   end

data/lib/devise/oauth2_facebook_grantable/strategies/facebook_grant_type.rb

@@ -9,13 +9,34 @@ module Devise
       def authenticate_grant_type(client)
         Devise::Oauth2ProvidableFacebook.logger.debug("Oauth2FacebookGrantTypeStrategy => Searching for user with facebook identifier:\"#{params[:facebook_identifier]}\"")
         resource = mapping.to.find_for_authentication(:facebook_identifier => params[:facebook_identifier])
+
+        # If the app could not be found
+        if(!resource)
+          Devise::Oauth2ProvidableFacebook.logger.debug("Oauth2FacebookGrantTypeStrategy => Could not find user with facebook identifer:\"#{params[:facebook_identifier]}\"")
+          fb_user = Devise::Oauth2ProvidableFacebook.facebook_user_for_token(params[:facebook_access_token])
+          if(fb_user && fb_user["email"])
+             Devise::Oauth2ProvidableFacebook.logger.debug("Oauth2FacebookGrantTypeStrategy => Falling back to email:\"#{fb_user["email"]}\"")
+             resource = mapping.to.find_for_authentication(:email => fb_user["email"].to_s)
+             if(resource)
+               Devise::Oauth2ProvidableFacebook.logger.debug("Oauth2FacebookGrantTypeStrategy => Found user with email:\"#{fb_user["email"]}\" saving facebook_idenfier: #{fb_user["id"]}")
+               resource.facebook_identifier = fb_user["id"].to_s
+               resource.save
+             end
+           end
+        end
+
         Devise::Oauth2ProvidableFacebook.logger.debug("Oauth2FacebookGrantTypeStrategy => Validating access token for user with facebook identifier:\"#{params[:facebook_identifier]}\"")
-        if validate(resource) { resource.valid_facebook_access_token?(params[:facebook_access_token]) }
-          Devise::Oauth2ProvidableFacebook.logger.debug("Oauth2FacebookGrantTypeStrategy => Token is valid")
-          success! resource
-        elsif !halted?
-          Devise::Oauth2ProvidableFacebook.logger.debug("Oauth2FacebookGrantTypeStrategy => Token is not valid")
-          oauth_error! :invalid_grant, 'could not authenticate to facebook'
+        if(resource)
+          if(validate(resource) { resource.valid_facebook_access_token?(params[:facebook_access_token]) })
+            Devise::Oauth2ProvidableFacebook.logger.debug("Oauth2FacebookGrantTypeStrategy => Token is valid")
+            success!(resource)
+          elsif(!halted?)
+            Devise::Oauth2ProvidableFacebook.logger.debug("Oauth2FacebookGrantTypeStrategy => Token is not valid")
+            oauth_error! :invalid_grant, 'could not authenticate to facebook'
+          end
+        else
+          Devise::Oauth2ProvidableFacebook.logger.debug("Oauth2FacebookGrantTypeStrategy => User not found")
+          oauth_error! :invalid_grant, 'could not authenticate'
         end
       end
     end

data/lib/devise/oauth2_facebook_grantable/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module OAuth2FacebookGrantable
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/lib/oauth2_facebook_grantable.rb

@@ -21,6 +21,18 @@ module Devise
       @@debugging = boolean
     end
 
+    def self.facebook_user_for_token(token)
+      begin
+        @@logger.error("Oauth2FacebookGrantable => Getting information from user token: #{token}")
+        @graph = Koala::Facebook::API.new(token)
+        return @graph.get_object("me")
+      rescue => e
+        @@logger.error("Oauth2FacebookGrantable => Could not authenticate with token: #{e}")
+        return false
+      end
+
+    end
+
     class Railties < ::Rails::Railtie
       initializer 'Rails logger' do
         Devise::Oauth2ProvidableFacebook.logger = Rails.logger
@@ -34,10 +46,10 @@ module Devise
         app.config.filter_parameters << :facebook_access_token
       end
     end
-    
+
   end
 end
 
 Devise.add_module(:oauth2_facebook_grantable,
-  :strategy => true,
-  :model => "devise/oauth2_facebook_grantable/models/oauth2_facebook_grantable")
+                  :strategy => true,
+                  :model => "devise/oauth2_facebook_grantable/models/oauth2_facebook_grantable")

data/oauth2_facebook_grantable.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "oauth2_facebook_grantable"
 
   # specify any dependencies here; for example:
-  s.add_runtime_dependency "koala", "~> 1.4.1"
+  s.add_runtime_dependency "koala", "~> 1.6.0"
   s.add_runtime_dependency "devise_oauth2_providable", "~> 1.1.0"
   s.files         = `git ls-files`.split("\n")
 

data/tests/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.2'
+gem 'rails', '3.2.9'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'

data/tests/README.md

@@ -0,0 +1,17 @@
+# oauth2_facebook_grantable Test Rails App
+
+## Before running the tests
+
+If it's the first time you're running the test you need to install dependancies.
+
+```
+bundle install
+```
+
+## Running tests
+
+Simple, just:
+
+```
+rake test:integration
+```

data/tests/config/environments/test.rb

@@ -34,4 +34,7 @@ Fbgrantable::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  # Disable SSL verification in test environment
+  OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
 end

data/tests/config/initializers/devise.rb

@@ -9,9 +9,6 @@ Devise.setup do |config|
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"
 
-  # Automatically apply schema changes in tableless databases
-  config.apply_schema = false
-
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and
   # :mongoid (bson_ext recommended) by default. Other ORMs may be
@@ -111,10 +108,6 @@ Devise.setup do |config|
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
-  # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
-
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.
   # config.cookie_options = {}

data/tests/test/fixtures/users.yml

@@ -24,3 +24,6 @@ disabled:
 
 facebook:
   email: "facebookuser@fb.com"
+
+email_user:
+  email: "replaced@in.tests"

data/tests/test/integration/facebook_oauth_test.rb

@@ -12,6 +12,7 @@ class FacebookOauthTest < ActionDispatch::IntegrationTest
 
     # Setup a default user
     @user = users(:user)
+    @email_user = users(:email_user)
 
     # Get facebook application credentials
     fb_key = Yetting.facebook_api_key
@@ -21,10 +22,17 @@ class FacebookOauthTest < ActionDispatch::IntegrationTest
     @test_users = Koala::Facebook::TestUsers.new(:app_id => fb_key, :secret => fb_secret)
     @fb_user = @test_users.create(true, "read_stream")
     @other_fb_user = @test_users.create(true, "read_stream")
+    @email_fb_user = @test_users.create(true, "read_stream,email")
+
 
     # Associate the facebook user with the default user
     @user.facebook_identifier = @fb_user["id"]
     @user.save
+
+    # Associate the facebook email with the email user
+    @email_user.email = @email_fb_user["email"]
+    @email_user.save
+
   end
 
   def teardown
@@ -52,7 +60,7 @@ class FacebookOauthTest < ActionDispatch::IntegrationTest
       :grant_type => "facebook",
       :client_secret => @client.secret,
       :client_id => @client.identifier)
-    assert_response :bad_request
+    assert_response :unauthorized
   end
 
   test "Authenticate with valid token but invalid id" do
@@ -66,4 +74,17 @@ class FacebookOauthTest < ActionDispatch::IntegrationTest
     assert_response :bad_request
   end
 
+  test "Authenticate with with valid email fallback and token" do
+    post_via_redirect("/oauth/token",
+      :format => :json,
+      :facebook_identifier => @email_fb_user["id"],
+      :facebook_access_token => @email_fb_user["access_token"],
+      :grant_type => "facebook",
+      :client_secret => @client.secret,
+      :client_id => @client.identifier)
+    assert_response :ok
+    user = User.where(:facebook_identifier => @email_fb_user["id"]).first
+    assert(user, "User was not updated with valide facebook identifier")
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oauth2_facebook_grantable
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: koala
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: devise_oauth2_providable
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ files:
 - spec/spec_helper.rb
 - tests/.gitignore
 - tests/Gemfile
-- tests/README.rdoc
+- tests/README.md
 - tests/Rakefile
 - tests/app/assets/images/rails.png
 - tests/app/assets/javascripts/application.js
@@ -147,14 +147,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oauth2_facebook_grantable
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Facebook grant type for OAuth2 authentication
 test_files:
 - spec/spec_helper.rb
 - tests/Gemfile
-- tests/README.rdoc
+- tests/README.md
 - tests/Rakefile
 - tests/app/assets/images/rails.png
 - tests/app/assets/javascripts/application.js

data/tests/README.rdoc

@@ -1,261 +0,0 @@
-== Welcome to Rails
-
-Rails is a web-application framework that includes everything needed to create
-database-backed web applications according to the Model-View-Control pattern.
-
-This pattern splits the view (also called the presentation) into "dumb"
-templates that are primarily responsible for inserting pre-built data in between
-HTML tags. The model contains the "smart" domain objects (such as Account,
-Product, Person, Post) that holds all the business logic and knows how to
-persist themselves to a database. The controller handles the incoming requests
-(such as Save New Account, Update Product, Show Post) by manipulating the model
-and directing data to the view.
-
-In Rails, the model is handled by what's called an object-relational mapping
-layer entitled Active Record. This layer allows you to present the data from
-database rows as objects and embellish these data objects with business logic
-methods. You can read more about Active Record in
-link:files/vendor/rails/activerecord/README.html.
-
-The controller and view are handled by the Action Pack, which handles both
-layers by its two parts: Action View and Action Controller. These two layers
-are bundled in a single package due to their heavy interdependence. This is
-unlike the relationship between the Active Record and Action Pack that is much
-more separate. Each of these packages can be used independently outside of
-Rails. You can read more about Action Pack in
-link:files/vendor/rails/actionpack/README.html.
-
-
-== Getting Started
-
-1. At the command prompt, create a new Rails application:
-       <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
-
-2. Change directory to <tt>myapp</tt> and start the web server:
-       <tt>cd myapp; rails server</tt> (run with --help for options)
-
-3. Go to http://localhost:3000/ and you'll see:
-       "Welcome aboard: You're riding Ruby on Rails!"
-
-4. Follow the guidelines to start developing your application. You can find
-the following resources handy:
-
-* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
-* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
-
-
-== Debugging Rails
-
-Sometimes your application goes wrong. Fortunately there are a lot of tools that
-will help you debug it and get it back on the rails.
-
-First area to check is the application log files. Have "tail -f" commands
-running on the server.log and development.log. Rails will automatically display
-debugging and runtime information to these files. Debugging info will also be
-shown in the browser on requests from 127.0.0.1.
-
-You can also log your own messages directly into the log file from your code
-using the Ruby logger class from inside your controllers. Example:
-
-  class WeblogController < ActionController::Base
-    def destroy
-      @weblog = Weblog.find(params[:id])
-      @weblog.destroy
-      logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
-    end
-  end
-
-The result will be a message in your log file along the lines of:
-
-  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
-
-More information on how to use the logger is at http://www.ruby-doc.org/core/
-
-Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
-several books available online as well:
-
-* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
-* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
-
-These two books will bring you up to speed on the Ruby language and also on
-programming in general.
-
-
-== Debugger
-
-Debugger support is available through the debugger command when you start your
-Mongrel or WEBrick server with --debugger. This means that you can break out of
-execution at any point in the code, investigate and change the model, and then,
-resume execution! You need to install ruby-debug to run the server in debugging
-mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
-
-  class WeblogController < ActionController::Base
-    def index
-      @posts = Post.all
-      debugger
-    end
-  end
-
-So the controller will accept the action, run the first line, then present you
-with a IRB prompt in the server window. Here you can do things like:
-
-  >> @posts.inspect
-  => "[#<Post:0x14a6be8
-          @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
-       #<Post:0x14a6620
-          @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
-  >> @posts.first.title = "hello from a debugger"
-  => "hello from a debugger"
-
-...and even better, you can examine how your runtime objects actually work:
-
-  >> f = @posts.first
-  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
-  >> f.
-  Display all 152 possibilities? (y or n)
-
-Finally, when you're ready to resume execution, you can enter "cont".
-
-
-== Console
-
-The console is a Ruby shell, which allows you to interact with your
-application's domain model. Here you'll have all parts of the application
-configured, just like it is when the application is running. You can inspect
-domain models, change values, and save to the database. Starting the script
-without arguments will launch it in the development environment.
-
-To start the console, run <tt>rails console</tt> from the application
-directory.
-
-Options:
-
-* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
-  made to the database.
-* Passing an environment name as an argument will load the corresponding
-  environment. Example: <tt>rails console production</tt>.
-
-To reload your controllers and models after launching the console run
-<tt>reload!</tt>
-
-More information about irb can be found at:
-link:http://www.rubycentral.org/pickaxe/irb.html
-
-
-== dbconsole
-
-You can go to the command line of your database directly through <tt>rails
-dbconsole</tt>. You would be connected to the database with the credentials
-defined in database.yml. Starting the script without arguments will connect you
-to the development database. Passing an argument will connect you to a different
-database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
-PostgreSQL and SQLite 3.
-
-== Description of Contents
-
-The default directory structure of a generated Ruby on Rails application:
-
-  |-- app
-  |   |-- assets
-  |       |-- images
-  |       |-- javascripts
-  |       `-- stylesheets
-  |   |-- controllers
-  |   |-- helpers
-  |   |-- mailers
-  |   |-- models
-  |   `-- views
-  |       `-- layouts
-  |-- config
-  |   |-- environments
-  |   |-- initializers
-  |   `-- locales
-  |-- db
-  |-- doc
-  |-- lib
-  |   `-- tasks
-  |-- log
-  |-- public
-  |-- script
-  |-- test
-  |   |-- fixtures
-  |   |-- functional
-  |   |-- integration
-  |   |-- performance
-  |   `-- unit
-  |-- tmp
-  |   |-- cache
-  |   |-- pids
-  |   |-- sessions
-  |   `-- sockets
-  `-- vendor
-      |-- assets
-          `-- stylesheets
-      `-- plugins
-
-app
-  Holds all the code that's specific to this particular application.
-
-app/assets
-  Contains subdirectories for images, stylesheets, and JavaScript files.
-
-app/controllers
-  Holds controllers that should be named like weblogs_controller.rb for
-  automated URL mapping. All controllers should descend from
-  ApplicationController which itself descends from ActionController::Base.
-
-app/models
-  Holds models that should be named like post.rb. Models descend from
-  ActiveRecord::Base by default.
-
-app/views
-  Holds the template files for the view that should be named like
-  weblogs/index.html.erb for the WeblogsController#index action. All views use
-  eRuby syntax by default.
-
-app/views/layouts
-  Holds the template files for layouts to be used with views. This models the
-  common header/footer method of wrapping views. In your views, define a layout
-  using the <tt>layout :default</tt> and create a file named default.html.erb.
-  Inside default.html.erb, call <% yield %> to render the view using this
-  layout.
-
-app/helpers
-  Holds view helpers that should be named like weblogs_helper.rb. These are
-  generated for you automatically when using generators for controllers.
-  Helpers can be used to wrap functionality for your views into methods.
-
-config
-  Configuration files for the Rails environment, the routing map, the database,
-  and other dependencies.
-
-db
-  Contains the database schema in schema.rb. db/migrate contains all the
-  sequence of Migrations for your schema.
-
-doc
-  This directory is where your application documentation will be stored when
-  generated using <tt>rake doc:app</tt>
-
-lib
-  Application specific libraries. Basically, any kind of custom code that
-  doesn't belong under controllers, models, or helpers. This directory is in
-  the load path.
-
-public
-  The directory available for the web server. Also contains the dispatchers and the
-  default HTML files. This should be set as the DOCUMENT_ROOT of your web
-  server.
-
-script
-  Helper scripts for automation and generation.
-
-test
-  Unit and functional tests along with fixtures. When using the rails generate
-  command, template test files will be generated for you and placed in this
-  directory.
-
-vendor
-  External libraries that the application depends on. Also includes the plugins
-  subdirectory. If the app has frozen rails, those gems also go here, under
-  vendor/rails/. This directory is in the load path.