authlogic_oauth2 1.1.0 → 1.1.2

data/README.rdoc

@@ -1,6 +1,6 @@
 = Authlogic OAuth2
 
-This plugin works very much like jrallison's authlogic_oauth gem (http://github.com/jrallison/authlogic_oauth), and much of the code is repurposed from his work. If you have used authlogic_oauth before, then you should have no problem using authlogic_oauth2.
+Disclaimer: This plugin CANNOT be used alongside other Authlogic extensions like authlogic_oauth and authlogic_openid due to an unfortunate bug caused by all these plugins overriding the ActiveRecord save method to avoid a DoubleRenderError.
 
 == Install and use
 
@@ -45,8 +45,10 @@ Here's an example for Facebook:
     oauth2_client_id      "APPLICATION_ID"
     oauth2_client_secret  "APPLICATION_SECRET"
     oauth2_site           "https://graph.facebook.com"
-    oauth2_scope          "email,user_birthday"
+    oauth2_scope          "offline_access,email,user_birthday"
   end
+
+It's important to note here that if you don't request offline_access permissions from your OAuth2 provider the access token will expire either at a specific time or upon logout from the provider itself. Some providers allow refresh tokens to be issued, but some (Facebook, for example) does not. Refresh token handling hasn't been implemented in authlogic_oauth2 yet, so make sure you request offline_access.
   
 === 5. Make sure you save your objects properly
 

data/authlogic_oauth2.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{authlogic_oauth2}
-  s.version = "1.1.0"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Hite"]
-  s.date = %q{2010-06-14}
+  s.date = %q{2010-06-20}
   s.description = %q{Authlogic OAuth2 is an extension of the Authlogic library to add OAuth2 support. OAuth2 can be used to allow users to login with their Facebook credentials.}
   s.email = %q{andrew@andrew-hite.com}
   s.extra_rdoc_files = ["README.rdoc", "lib/authlogic_oauth2.rb", "lib/authlogic_oauth2/acts_as_authentic.rb", "lib/authlogic_oauth2/helper.rb", "lib/authlogic_oauth2/oauth2_process.rb", "lib/authlogic_oauth2/session.rb", "lib/authlogic_oauth2/version.rb", "lib/oauth2_callback_filter.rb"]

data/init.rb

@@ -1 +1 @@
-File.dirname(__FILE__) + "/rails/init.rb"
+require File.dirname(__FILE__) + "/rails/init.rb"

data/lib/authlogic_oauth2.rb

@@ -11,15 +11,7 @@ ActionController::Base.helper AuthlogicOauth2::Helper
 
 # Throw callback rack app into the middleware stack
 if defined?(ActionController::Metal)
-  # Rails >= 3.0
-  require 'oauth2_callback_filter'
-  if Rails.application.instance_variable_get('@app')
-    Rails.application.instance_variable_set('@app', Oauth2CallbackFilter.new(Rails.application.app))
-  else
-    Rails.configuration.middleware.use(Oauth2CallbackFilter)
-  end
-elsif defined?(ActionController::Dispatcher) && defined?(ActionController::Dispatcher.middleware)
-  # Rails >= 2.3
-  require 'oauth2_callback_filter'
-  ActionController::Dispatcher.middleware.use(Oauth2CallbackFilter)
+  Rails.configuration.middleware.use(Oauth2CallbackFilter) # Rails >= 3.0
+else
+  ActionController::Dispatcher.middleware.use(Oauth2CallbackFilter) # Rails < 3.0
 end

data/lib/authlogic_oauth2/acts_as_authentic.rb

@@ -1,3 +1,5 @@
+require 'authlogic'
+
 module AuthlogicOauth2
   module ActsAsAuthentic
     def self.included(klass)
@@ -87,7 +89,7 @@ module AuthlogicOauth2
       def authenticate_with_oauth2
         # Restore any attributes which were saved before redirecting to the oauth2 server
         self.attributes = session_class.controller.session.delete(:authlogic_oauth2_attributes)
-        self.oauth2_token = generate_access_token.token
+        self.oauth2_token = generate_oauth2_access_token.token
         
         # Execute callback if it's defined in the user model
         self.after_oauth2_authentication if self.respond_to?(:after_oauth2_authentication)

data/lib/authlogic_oauth2/oauth2_process.rb

@@ -18,7 +18,7 @@ module AuthlogicOauth2
     end
 
     def redirect_to_oauth2
-      authorize_url = oauth2_client.web_server.authorize_url(:redirect_uri => build_callback_url, :scope => oauth2_scope)
+      authorize_url = oauth2_client.web_server.authorize_url(:redirect_uri => build_oauth2_callback_url, :scope => oauth2_scope)
 
       # Store the class which is redirecting, so we can ensure other classes
       # don't get confused and attempt to use the response
@@ -30,12 +30,12 @@ module AuthlogicOauth2
       oauth2_controller.redirect_to authorize_url
     end
 
-    def build_callback_url
+    def build_oauth2_callback_url
       oauth2_controller.url_for :controller => oauth2_controller.controller_name, :action => oauth2_controller.action_name
     end
 
-    def generate_access_token
-      oauth2_client.web_server.get_access_token(oauth2_controller.params[:code], :redirect_uri => build_callback_url)
+    def generate_oauth2_access_token
+      oauth2_client.web_server.get_access_token(oauth2_controller.params[:code], :redirect_uri => build_oauth2_callback_url)
     end
 
     def oauth2_response

data/lib/authlogic_oauth2/session.rb

@@ -77,6 +77,7 @@ module AuthlogicOauth2
     private
 
       def authenticating_with_oauth2?
+        return false if authenticating_with_unauthorized_record?
         # Initial request when user presses one of the button helpers
         (controller.params && !controller.params[:login_with_oauth2].blank?) ||
         # When the oauth2 provider responds and we made the initial request
@@ -87,7 +88,7 @@ module AuthlogicOauth2
         if @record
           self.attempted_record = record
         else
-          self.attempted_record = search_for_record(find_by_oauth2_method, generate_access_token.token)
+          self.attempted_record = search_for_record(find_by_oauth2_method, generate_oauth2_access_token.token)
         end
 
         if !attempted_record

data/lib/authlogic_oauth2/version.rb

@@ -41,7 +41,7 @@ module AuthlogicOauth2
 
     MAJOR = 1
     MINOR = 1
-    TINY  = 0
+    TINY  = 2
 
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic_oauth2
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Andrew Hite
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-14 00:00:00 -05:00
+date: 2010-06-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency