svenfuchs-devise_oauth2_authenticatable 0.1.3 → 0.1.4

data/devise_oauth2_authenticatable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{svenfuchs-devise_oauth2_authenticatable}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["bhbryant"]

data/lib/devise_oauth2_authenticatable/strategy.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 require 'devise/strategies/base'
 
-
 module Devise #:nodoc:
   module Oauth2Authenticatable #:nodoc:
     module Strategies #:nodoc:
@@ -10,15 +9,10 @@ module Devise #:nodoc:
       # Redirects to sign_in page if it's not authenticated
       #
       class Oauth2Authenticatable < ::Devise::Strategies::Base
-
-
-
         # Without a oauth session authentication cannot proceed.
         #
         def valid?
-
          valid_controller? && valid_params? && mapping.to.respond_to?('authenticate_with_oauth2')
-
         end
 
         # Authenticate user with OAuth2
@@ -29,8 +23,8 @@ module Devise #:nodoc:
 
             # Verify User Auth code and get access token from auth server: will error on failue
             access_token = Devise::oauth2_client.web_server.get_access_token(
-                    params[:code], :redirect_uri => Devise::session_sign_in_url(request,mapping)
-                  )
+              params[:code], :redirect_uri => Devise::session_sign_in_url(request,mapping)
+            )
 
             # retrieve user attributes
 
@@ -48,33 +42,21 @@ module Devise #:nodoc:
             if user.present?
               user.on_after_oauth2_connect(oauth2_user_attributes)
               success!(user)
-            else
-              if klass.oauth2_auto_create_account?
-
-
-
-                user = returning(klass.new) do |u|
-                  u.store_oauth2_credentials!(
-                      :token => access_token.token,
-                      :uid => oauth2_user_attributes['id']
-                    )
-                  u.on_before_oauth2_auto_create(oauth2_user_attributes)
-                end
-
-                begin
-
-
-                  user.save(true)
-                  user.on_after_oauth2_connect(oauth2_user_attributes)
-
+            elsif klass.oauth2_auto_create_account?
+              user = klass.new.tap do |u|
+                u.store_oauth2_credentials!(:token => access_token.token, :uid => oauth2_uid)
+                u.on_before_oauth2_auto_create(oauth2_user_attributes)
+              end
 
-                  success!(user)
-                rescue
-                  fail!(:oauth2_invalid)
-                end
-              else
+              begin
+                user.save(true)
+                user.on_after_oauth2_connect(oauth2_user_attributes)
+                success!(user)
+              rescue
                 fail!(:oauth2_invalid)
               end
+            else
+              fail!(:oauth2_invalid)
             end
 
           rescue => e
@@ -82,10 +64,8 @@ module Devise #:nodoc:
           end
         end
 
-
-
-
         protected
+
           def valid_controller?
             # params[:controller] == 'sessions'
             mapping.controllers[:sessions] == params[:controller]
@@ -94,10 +74,10 @@ module Devise #:nodoc:
           def valid_params?
             params[:code].present?
           end
-
       end
     end
   end
 end
 
 Warden::Strategies.add(:oauth2_authenticatable, Devise::Oauth2Authenticatable::Strategies::Oauth2Authenticatable)
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: svenfuchs-devise_oauth2_authenticatable
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - bhbryant