authorizme 0.0.9 → 0.0.10

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.0.10
+
+### Features & Enhancements
+
+* Facebook libary
+* Canvas authorization option for facebook
+
 ## 0.0.9
 
 ### Features & Enhancements

data/app/controllers/authorizme/login/facebook_controller.rb

@@ -9,27 +9,40 @@ module Authorizme
       end
 
       def callback
-        access_token = client.authorization.process_callback(params[:code], :redirect_uri => redirect_uri("facebook"))
-        user_json = client.selection.me.info!
-        image_url = "https://graph.facebook.com/#{user_json.id}/picture?type=large"
-        attributes = {first_name: user_json.first_name, last_name: user_json.last_name, image_url: image_url}
-        if user_json.email
-          user = User.find_by_email(user_json.email)
-          unless user
-            attributes[:email] = user_json.email
-          end
-        end
-        user = User.authenticate_with_facebook(user_json.id, attributes, access_token) 
-        login user
+        @facebook = Authorizme::Provider::Facebook.new(code: params[:code], redirect_uri: redirect_uri("facebook"))
+        authorize_user @facebook.get_client, @facebook.get_access_token
         render_popup_view
       end
+
+      def canvas
+        @facebook = Authorizme::Provider::Facebook.new(signed_request: params[:signed_request])
+        user = authorize_user @facebook.get_client, @facebook.get_access_token
+        redirect_to Authorizme::after_login_path
+      end
       
       private
       
-        def client
-            @client ||= FBGraph::Client.new(:client_id => Authorizme::facebook_client_id,
-                                           :secret_id => Authorizme::facebook_client_secret)
+        def client token = nil
+          options = {client_id: Authorizme::facebook_client_id, secret_id: Authorizme::facebook_client_secret}
+          options[:token] =  token if token
+          @client ||= FBGraph::Client.new(options)
         end
+
+        def authorize_user client, access_token
+          user_json = client.selection.me.info!
+          image_url = "https://graph.facebook.com/#{user_json.id}/picture?type=large"
+          attributes = {first_name: user_json.first_name, last_name: user_json.last_name, image_url: image_url}
+          if user_json.email
+            user = User.find_by_email(user_json.email)
+            unless user
+              attributes[:email] = user_json.email
+            end
+          end
+          user = User.authenticate_with_facebook(user_json.id, attributes, access_token) 
+          login user
+          user
+        end
+
     end
   end
 end

data/config/routes.rb

@@ -12,6 +12,8 @@ Rails.application.routes.draw do
       get "/login/#{provider}" => "login/#{provider}#auth", :as => "#{provider}_login"
       get "/login/#{provider}/callback" => "login/#{provider}#callback", :as => "#{provider}_callback"
     end
+
+    post "/login/facebook/canvas" => "login/facebook#canvas", :as => "facebook_canvas"
     
     post '/login' => 'sessions#create', :as => 'login'
     get '/logout' => 'sessions#destroy', :as => 'logout'

data/lib/authorizme/provider/facebook.rb

@@ -0,0 +1,50 @@
+module Authorizme
+  module Provider
+    class Facebook
+
+      require "fb_graph"
+
+      attr_accessor :options
+
+      def initialize(options={})
+        @options = {client_id: Authorizme::facebook_client_id, secret_id: Authorizme::facebook_client_secret}.merge(options)
+        set_client
+      end
+
+      def set_client
+        options = {client_id: Authorizme::facebook_client_id, secret_id: Authorizme::facebook_client_secret}
+        @client ||= FBGraph::Client.new(options)
+        @access_token = nil
+        if @options[:code] && @options[:redirect_uri]
+          @access_token = @client.authorization.process_callback(@options[:code], :redirect_uri => @options[:redirect_uri])
+        elsif @options[:signed_request]
+          data = FBGraph::Canvas.parse_signed_request(@options[:secret_id], @options[:signed_request])
+          @access_token = data["oauth_token"]
+          @client.set_token @access_token
+        end
+        @client     
+      end
+
+      def get_client
+        @client
+      end  
+
+      def get_access_token
+        @access_token
+      end
+
+      def get_facebook_user
+        user_json = get_facebook_user_json
+        image_url = "https://graph.facebook.com/#{user_json.id}/picture?type=large"
+        attributes = {first_name: user_json.first_name, last_name: user_json.last_name, image_url: image_url, email: user_json.email}
+      end
+
+      def get_facebook_user_json
+        @user_json ||= @client.selection.me.info!
+      end
+
+      private
+
+    end
+  end
+end

data/lib/authorizme/provider.rb

@@ -1,5 +1,6 @@
 module Authorizme
   module Provider
     autoload :Draugiem, 'authorizme/provider/draugiem'
+    autoload :Facebook, 'authorizme/provider/facebook'
   end
 end

data/lib/authorizme/version.rb

@@ -1,3 +1,3 @@
 module Authorizme
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authorizme
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &83996210 !ruby/object:Gem::Requirement
+  requirement: &82723910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83996210
+  version_requirements: *82723910
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &83995860 !ruby/object:Gem::Requirement
+  requirement: &82723200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83995860
+  version_requirements: *82723200
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &83995630 !ruby/object:Gem::Requirement
+  requirement: &82722570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83995630
+  version_requirements: *82722570
 - !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &83995390 !ruby/object:Gem::Requirement
+  requirement: &82722270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83995390
+  version_requirements: *82722270
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &83994980 !ruby/object:Gem::Requirement
+  requirement: &80394650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83994980
+  version_requirements: *80394650
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &83994640 !ruby/object:Gem::Requirement
+  requirement: &80394430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83994640
+  version_requirements: *80394430
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &83994200 !ruby/object:Gem::Requirement
+  requirement: &80394200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83994200
+  version_requirements: *80394200
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &84019950 !ruby/object:Gem::Requirement
+  requirement: &80393980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84019950
+  version_requirements: *80393980
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &84019580 !ruby/object:Gem::Requirement
+  requirement: &80393750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84019580
+  version_requirements: *80393750
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &84019200 !ruby/object:Gem::Requirement
+  requirement: &80393530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84019200
+  version_requirements: *80393530
 - !ruby/object:Gem::Dependency
   name: twitter_oauth
-  requirement: &84018710 !ruby/object:Gem::Requirement
+  requirement: &80393300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84018710
+  version_requirements: *80393300
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &84018210 !ruby/object:Gem::Requirement
+  requirement: &80393080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84018210
+  version_requirements: *80393080
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &84017700 !ruby/object:Gem::Requirement
+  requirement: &80392850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84017700
+  version_requirements: *80392850
 - !ruby/object:Gem::Dependency
   name: fbgraph
-  requirement: &84017470 !ruby/object:Gem::Requirement
+  requirement: &80392630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84017470
+  version_requirements: *80392630
 description: Authorization that includes basic authorization and 3 social authorization
   with Latvia social network draugiem.lv, facebook.com and twitter.com.
 email:
@@ -207,6 +207,7 @@ files:
 - lib/authorizme/for_controllers.rb
 - lib/authorizme/provider.rb
 - lib/authorizme/provider/draugiem.rb
+- lib/authorizme/provider/facebook.rb
 - lib/authorizme/version.rb
 - lib/generators/.DS_Store
 - lib/generators/authorizme/.DS_Store
@@ -235,12 +236,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 657610419
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 657610419
 requirements: []
 rubyforge_project: authorizme
 rubygems_version: 1.8.15