easy_auth-oauth2 0.1.0 → 0.1.1

data/README.md

@@ -14,17 +14,13 @@ In your Gemfile add the following:
 gem 'easy_auth-oauth2'
 ```
 
-After running Bundler you'll need to install the migrations
-
-```ruby
-rake easy_auth-oauth2:install:migrations
-```
-
-Then run your migrations.
+Then follow the general installation instructions for
+[EasyAuth](https://github.com/dockyard/easy_auth#installation)
 
 ## Authors ##
 
 [Brian Cardarella](http://twitter.com/bcardarella)
+[Dan McClain](http://twitter.com/_danmcclain)
 
 ## Versioning ##
 

data/lib/easy_auth/models/identities/oauth2/base.rb

@@ -9,21 +9,23 @@ module EasyAuth::Models::Identities::Oauth2::Base
 
   module ClassMethods
     def authenticate(controller)
-      callback_url   = controller.oauth2_callback_url(:provider => provider)
-      code           = controller.params[:code]
-      token          = client.auth_code.get_token(code, token_options(callback_url))
-      user_info      = get_user_info(token)
-      identity       = self.find_or_initialize_by_username user_info['id'].to_s
-      identity.token = token.token
-      account        = controller.current_account
-
-      if identity.new_record?
-        account = EasyAuth.account_model.create(EasyAuth.account_model.identity_username_attribute => identity.username) if account.nil?
-        identity.account = account
+      if controller.params[:code].present? && controller.params[:error].blank?
+        callback_url   = controller.oauth2_callback_url(:provider => provider)
+        code           = controller.params[:code]
+        token          = client.auth_code.get_token(code, token_options(callback_url))
+        user_info      = get_user_info(token)
+        identity       = self.find_or_initialize_by_username user_info['id'].to_s
+        identity.token = token.token
+        account        = controller.current_account
+
+        if identity.new_record?
+          account = EasyAuth.account_model.create(EasyAuth.account_model.identity_username_attribute => identity.username) if account.nil?
+          identity.account = account
+        end
+
+        identity.save!
+        identity
       end
-
-      identity.save!
-      identity
     end
 
     def new_session(controller)

data/lib/easy_auth/oauth2/version.rb

@@ -1,5 +1,5 @@
 module EasyAuth
   module Oauth2
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_auth-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_auth
@@ -177,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3784856238616428420
+      hash: -1473449787249200133
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3784856238616428420
+      hash: -1473449787249200133
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23