omniauth-multiprovider 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f91a138b2a60e02e2c38acc950045cae88281922
-  data.tar.gz: b4743f78480676b0de284cd11e212009ead3258e
+  metadata.gz: 34da0ba445043816e1e3dd4f72f3c3551007c645
+  data.tar.gz: c533befeb3ee48612087b4420ece8865f4941c8c
 SHA512:
-  metadata.gz: 3035045753961d2bb672c5ab90b0593a1845ea92f4572b610df5b4858fde5bb5825ae644ea083b2a2737b12999a2e3a7442275c21a5db5fe104a0895c08fece3
-  data.tar.gz: f752d7732163ab562d2020120c2c190dfb7cdfb2f6b77361b85537431fbc6924ef2a7256254c99b75586322c2a583d3a0de82f3649ee4e76e711428c8e209137
+  metadata.gz: 0607783b50c1c221f17eda643f2ef9b49f2b26b320b27c3fea0686f680c69bc7ceddeb6a162a90c6698776e364774980270e66ddf480794989b666e6c58279df
+  data.tar.gz: 39a34d6b61b6aec6a071e11b7e715747662d75928475b9e2ff8aced3100338da182b8b60ba638763c6fb590681e1f56102058722ff812a24e6a7230d4bfcb29b

data/lib/omniauth/multiprovider/models/authentication.rb

@@ -9,6 +9,7 @@ class Authentication < ActiveRecord::Base
     authentication = self.find_or_create(auth)
     authentication.access_token = auth.credentials.token
     authentication.resource = resource
+    resource.save(validate: false)
     authentication.save
     authentication
   end

data/lib/omniauth/multiprovider/models/email_mockups.rb

@@ -8,7 +8,7 @@ module OmniAuth
       end
 
       def mocked_email?
-        email.match /.*@from\-.*\.com$/
+        email.match(/.*@from\-.*\.com$/) != nil
       end
 
       def current_email
@@ -23,4 +23,4 @@ module OmniAuth
     end
 
   end
-end
+end

data/lib/omniauth/multiprovider/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module MultiProvider
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
-end
+end

data/lib/omniauth/provider/abstract.rb

@@ -12,6 +12,8 @@ module OmniAuth
         access_token = auth.credentials.token
         authentication = MultiProvider.authentication_klass.find_by(provider: provider_name, uid: auth.uid)
 
+        resource = nil
+
         if authentication
           if signed_in_resource
             if authentication.resource == signed_in_resource
@@ -20,8 +22,9 @@ module OmniAuth
               raise MultiProvider::Error.new 'already connected with other user'
             end
           end
-          authentication.resource
-        else
+          resource = authentication.resource
+        end
+        unless resource
           if auth.info[:email].blank?
             auth.info[:email] = MultiProvider::resource_klass.mock_email(provider_name, auth.uid)
           end
@@ -29,15 +32,15 @@ module OmniAuth
 
           raise MultiProvider::Error.new 'email_already_registered' if MultiProvider::resource_klass.find_by(email: email)
 
-          resource = signed_in_resource || MultiProvider::resource_klass.create(
+          resource = signed_in_resource || MultiProvider::resource_klass.new(
                                          email: email,
                                          password: Devise.friendly_token[0,20]
                                          )
 
           MultiProvider.authentication_klass.from(auth, resource)
 
-          resource
         end
+        resource
       end
 
       def self.authenticate_from_oauth(provider_name, omniauth_data)

data/lib/omniauth/provider/generic.rb

@@ -5,12 +5,13 @@ module OmniAuth
       def self.init(provider_name)
         klass = self
         OmniAuth::MultiProvider::CallbacksController.add_callback(provider_name) do
-          resource = klass.find_from_oauth(provider_name, request.env['omniauth.auth'], send(OmniAuth::MultiProvider::current_resource))
+          auth = request.env['omniauth.auth']
+          resource = klass.find_from_oauth(provider_name, auth, send(OmniAuth::MultiProvider::current_resource))
           if resource.persisted?
             sign_in_and_redirect resource, event: :authentication #this will throw if resource is not activated
             set_flash_message(:notice, :success, kind: provider_name.to_s.camelize) if is_navigational_format?
           else
-            session["devise.#{provider_name}_data"] = auth
+            session["devise.#{provider_name}_data"] = auth.except('extra')
             redirect_to send("new_#{OmniAuth::MultiProvider::resource_mapping}_registration_url")
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-multiprovider
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - German Del Zotto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise