authorizme 0.0.10 → 0.0.11

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.0.11
+
+### Features & Enhancements
+
+* Facebook provider update
+* Refacturing
+
 ## 0.0.10
 
 ### Features & Enhancements

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

@@ -1,44 +1,47 @@
 module Authorizme
   module Login
     class FacebookController < AuthorizmeController
-      
+      before_filter :set_facebook, :only => [:auth, :callback, :canvas]
+
       def auth
-        redirect_to client.authorization.authorize_url(:redirect_uri => redirect_uri("facebook"), 
-                                                      :scope => Authorizme::facebook_perms, 
-                                                      :display => "popup")
+        callback_url = params[:callback_url] || redirect_uri("facebook")
+        if params[:canvas]
+          @authorize_url = @facebook.get_dialog_authorize_url callback_url, Authorizme::facebook_perms
+        else
+          redirect_to @facebook.get_popup_authorize_url callback_url, Authorizme::facebook_perms
+        end
       end
 
       def callback
-        @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
+        if params[:signed_request]
+          @facebook.authorize_with_signed_request params[:signed_request]
+          authorize_user @facebook
+          redirect_to Authorizme::after_login_path
+        elsif params[:code]
+          @facebook.authorize_with_code params[:code], redirect_uri("facebook")
+          authorize_user @facebook
+          render_popup_view
+        else
+          redirect_to Authorizme::after_login_path
+        end
       end
       
       private
-      
-        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)
+
+        def set_facebook
+          options = {client_id: Authorizme::facebook_client_id, client_secret: Authorizme::facebook_client_secret}
+          @facebook = Authorizme::Provider::Facebook.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
+        def authorize_user facebook
+          fb_user = facebook.get_user
+          if fb_user[:email]
+            user = User.find_by_email(fb_user[:email])
+            if user
+              fb_user.delete(:email)
             end
           end
-          user = User.authenticate_with_facebook(user_json.id, attributes, access_token) 
+          user = User.authenticate_with_facebook(facebook.get_user_json.id, fb_user, facebook.get_access_token) 
           login user
           user
         end

data/app/views/authorizme/login/facebook/auth.html.erb

@@ -0,0 +1,4 @@
+<script>
+  var oauth_url = "<%= @authorize_url %>";
+  window.top.location = oauth_url.replace("&amp;","&");
+</script>

data/config/routes.rb

@@ -12,8 +12,6 @@ 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/draugiem.rb

@@ -19,8 +19,6 @@ module Authorizme
       end
 
       def login_url
-        puts "App key: #{@options[:draugiem_app_key]}"
-        puts "Redirect url: #{@options[:redirect_url]}"
         hash = Digest::MD5.hexdigest(@options[:draugiem_app_key] + @options[:redirect_url])
         "#{@options[:draugiem_api_authorize_path]}?app=#{@options[:draugiem_app_id]}&hash=#{hash}&redirect=#{@options[:redirect_url]}"
       end

data/lib/authorizme/provider/facebook.rb

@@ -7,22 +7,8 @@ module Authorizme
       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     
+        @options = options
+        init_client
       end
 
       def get_client
@@ -33,18 +19,58 @@ module Authorizme
         @access_token
       end
 
-      def get_facebook_user
-        user_json = get_facebook_user_json
+      def get_user_json
+        @user_json ||= @client.selection.me.info!
+      end
+
+      def get_user
+        user_json = get_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!
+      def get_signed_request_data
+        if @signed_request_data 
+          return @signed_request_data
+        else
+          return nil
+        end
+      end
+
+      def authorize_with_code code, redirect_uri
+        @access_token = @client.authorization.process_callback(code, :redirect_uri => redirect_uri)
+        return @access_token != nil
+      end
+
+      def authorize_with_signed_request signed_request
+        @signed_request_data = FBGraph::Canvas.parse_signed_request(@options[:client_secret], signed_request)
+        @access_token = @signed_request_data["oauth_token"] if @signed_request_data["oauth_token"]
+        @client.set_token @access_token if @client
+        return @access_token != nil
+      end
+
+      def get_popup_authorize_url callback_url, scope
+        @client.authorization.authorize_url(:redirect_uri => callback_url, 
+                                                      :scope => scope, 
+                                                      :display => "popup")
+      end
+
+      def get_dialog_authorize_url callback_url, scope
+        "https://www.facebook.com/dialog/oauth/?client_id=#{@options[:client_id]}&redirect_uri=#{CGI.escape(callback_url)}&scope=#{scope}"
       end
 
       private
 
+        def init_client
+          @client = nil
+          @access_token = nil
+          if @options[:client_id] && @options[:client_secret]
+            options = {client_id: @options[:client_id], secret_id: @options[:client_secret]}
+            @client = FBGraph::Client.new(options)
+          end
+          @client     
+        end
+
     end
   end
 end

data/lib/authorizme/version.rb

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

data/lib/generators/authorizme/templates/migrations/3_create_user_roles.rb

@@ -6,7 +6,13 @@ class CreateUserRoles < ActiveRecord::Migration
       t.timestamps
     end
     
-    Authorizme::UserRole.create!(:name => 'member')
+    member_role = Authorizme::UserRole.new
+    member_role.name = "member"
+    member_role.save!
+
+    admin_role = Authorizme::UserRole.new
+    admin_role.name = "admin"
+    admin_role.save!
   end
 
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authorizme
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &82723910 !ruby/object:Gem::Requirement
+  requirement: &73618960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82723910
+  version_requirements: *73618960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &82723200 !ruby/object:Gem::Requirement
+  requirement: &73617750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82723200
+  version_requirements: *73617750
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &82722570 !ruby/object:Gem::Requirement
+  requirement: &73616730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82722570
+  version_requirements: *73616730
 - !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &82722270 !ruby/object:Gem::Requirement
+  requirement: &73615080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82722270
+  version_requirements: *73615080
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &80394650 !ruby/object:Gem::Requirement
+  requirement: &73613250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80394650
+  version_requirements: *73613250
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &80394430 !ruby/object:Gem::Requirement
+  requirement: &73612250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80394430
+  version_requirements: *73612250
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &80394200 !ruby/object:Gem::Requirement
+  requirement: &73611560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80394200
+  version_requirements: *73611560
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &80393980 !ruby/object:Gem::Requirement
+  requirement: &73627140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80393980
+  version_requirements: *73627140
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &80393750 !ruby/object:Gem::Requirement
+  requirement: &73626440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80393750
+  version_requirements: *73626440
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &80393530 !ruby/object:Gem::Requirement
+  requirement: &73624260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80393530
+  version_requirements: *73624260
 - !ruby/object:Gem::Dependency
   name: twitter_oauth
-  requirement: &80393300 !ruby/object:Gem::Requirement
+  requirement: &73620970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80393300
+  version_requirements: *73620970
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &80393080 !ruby/object:Gem::Requirement
+  requirement: &73635230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80393080
+  version_requirements: *73635230
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &80392850 !ruby/object:Gem::Requirement
+  requirement: &73630450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80392850
+  version_requirements: *73630450
 - !ruby/object:Gem::Dependency
   name: fbgraph
-  requirement: &80392630 !ruby/object:Gem::Requirement
+  requirement: &73629500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80392630
+  version_requirements: *73629500
 description: Authorization that includes basic authorization and 3 social authorization
   with Latvia social network draugiem.lv, facebook.com and twitter.com.
 email:
@@ -196,6 +196,7 @@ files:
 - app/views/authorizme/authorizme/popup.html.erb
 - app/views/authorizme/layouts/authorizme.html.erb
 - app/views/authorizme/layouts/popup.html.erb
+- app/views/authorizme/login/facebook/auth.html.erb
 - app/views/authorizme/users/new.html.erb
 - authorizme.gemspec
 - config/routes.rb
@@ -238,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 657610419
+      hash: -176114737
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -247,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 657610419
+      hash: -176114737
 requirements: []
 rubyforge_project: authorizme
 rubygems_version: 1.8.15