svenfuchs-devise_oauth2_authenticatable 0.1.2 → 0.1.3

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.2"
+  s.version = "0.1.3"
 
   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

@@ -27,7 +27,6 @@ module Devise #:nodoc:
           klass = mapping.to
           begin
 
-
             # 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)
@@ -38,9 +37,13 @@ module Devise #:nodoc:
             # Get user details from OAuth2 Service
             oauth2_user_attributes = JSON.parse(access_token.get(OAUTH2_CONFIG['user_attributes_path']))
 
-            user = klass.authenticate_with_oauth2(oauth2_user_attributes['id'], access_token.token)
-
+            # find uid from user attributes
+            oauth2_uid_field = OAUTH2_CONFIG['user_attribute_uid_key'] || 'id'
+            oauth2_uid = oauth2_uid_field.split('/').inject(oauth2_user_attributes) do |attributes, key|
+              attributes[key] rescue {}
+            end || raise("can not find #{oauth2_uid_field.inspect} in #{oauth2_user_attributes.inspect}")
 
+            user = klass.authenticate_with_oauth2(oauth2_uid, access_token.token)
 
             if user.present?
               user.on_after_oauth2_connect(oauth2_user_attributes)

metadata

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