domp 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e0cc4c0b72f28d1c2077b228266add9aef14fc1
-  data.tar.gz: d7df9bc7823e0536036182fe4b41ee5304177311
+  metadata.gz: e5dc37459724ce51326b40bdebe5775dfb9d6710
+  data.tar.gz: 72d3bc330f729b65cddc7483f4175d52e06259a1
 SHA512:
-  metadata.gz: 1cfe4bf21b99ac110ecf565aede34d11d5157651a66dec5a0a56b34c87504740383d58c2f1d600a574f02516593da2f8b42f38069bee343405e328ce280ea03b
-  data.tar.gz: d554b797d8a39e0bdc8beefcf4a0596512e4dfcfd58d897b06be054cd417fa9e82c20ff7dd718a477925fe8577bbc6f576ffb75ef368c313c573f5da9780754d
+  metadata.gz: 5cdb376e0e1f145b42b6ca1a0173a2ab279aefb7473a3f610cf9848be2ddb8137f55cdfb5b5187094f531ece0e64cc1bf5173b440da26982e5152fc6b98b3bdc
+  data.tar.gz: 1f19f524a2750e5da35afc1a41718ff87630b43afeeba23fe10f0d9fc91f459f84445f80dca8884ab54de606ffe14ff969e317c749ebf56a8f7ff8440667649b

data/lib/domp/version.rb

@@ -1,3 +1,3 @@
 module Domp
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/generators/domp/templates/omniauth_callbacks_controller.rb

@@ -12,12 +12,13 @@ class <%= class_name.pluralize %>::OmniauthCallbacksController < Devise::Omniaut
     def create
       auth_params = request.env["omniauth.auth"]
       provider = AuthenticationProvider.where(name: auth_params.provider).first
-
       authentication = provider.<%= class_name.downcase %>_authentications.where(uid: auth_params.uid).first
+      existing_<%= class_name.downcase %> = current_<%= class_name.downcase %> || <%= class_name %>.where('email = ?', auth_params['info']['email']).first
+
       if authentication
         sign_in_with_existing_authentication(authentication)
-      elsif <%= class_name.downcase %>_signed_in?
-        create_authentication_and_sign_in(auth_params, current_<%= class_name.downcase %>, provider)
+      elsif existing_<%= class_name.downcase %>
+        create_authentication_and_sign_in(auth_params, existing_<%= class_name.downcase %>, provider)
       else
         create_<%= class_name.downcase %>_and_authentication_and_sign_in(auth_params, provider)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domp
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Alexander Zaytsev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies: []
 description: Devise Omniauth Multiple Providers
 email: