domp 0.0.5 → 0.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/domp/version.rb +1 -1
  3. data/lib/generators/domp/templates/omniauth_callbacks_controller.rb +4 -3
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9e0cc4c0b72f28d1c2077b228266add9aef14fc1
4
- data.tar.gz: d7df9bc7823e0536036182fe4b41ee5304177311
3
+ metadata.gz: e5dc37459724ce51326b40bdebe5775dfb9d6710
4
+ data.tar.gz: 72d3bc330f729b65cddc7483f4175d52e06259a1
5
5
  SHA512:
6
- metadata.gz: 1cfe4bf21b99ac110ecf565aede34d11d5157651a66dec5a0a56b34c87504740383d58c2f1d600a574f02516593da2f8b42f38069bee343405e328ce280ea03b
7
- data.tar.gz: d554b797d8a39e0bdc8beefcf4a0596512e4dfcfd58d897b06be054cd417fa9e82c20ff7dd718a477925fe8577bbc6f576ffb75ef368c313c573f5da9780754d
6
+ metadata.gz: 5cdb376e0e1f145b42b6ca1a0173a2ab279aefb7473a3f610cf9848be2ddb8137f55cdfb5b5187094f531ece0e64cc1bf5173b440da26982e5152fc6b98b3bdc
7
+ data.tar.gz: 1f19f524a2750e5da35afc1a41718ff87630b43afeeba23fe10f0d9fc91f459f84445f80dca8884ab54de606ffe14ff969e317c749ebf56a8f7ff8440667649b
data/lib/domp/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Domp
2
- VERSION = '0.0.5'
2
+ VERSION = '0.0.6'
3
3
  end
data/lib/generators/domp/templates/omniauth_callbacks_controller.rb CHANGED
@@ -12,12 +12,13 @@ class <%= class_name.pluralize %>::OmniauthCallbacksController < Devise::Omniaut
12
12
  def create
13
13
  auth_params = request.env["omniauth.auth"]
14
14
  provider = AuthenticationProvider.where(name: auth_params.provider).first
15
-
16
15
  authentication = provider.<%= class_name.downcase %>_authentications.where(uid: auth_params.uid).first
16
+ existing_<%= class_name.downcase %> = current_<%= class_name.downcase %> || <%= class_name %>.where('email = ?', auth_params['info']['email']).first
17
+
17
18
  if authentication
18
19
  sign_in_with_existing_authentication(authentication)
19
- elsif <%= class_name.downcase %>_signed_in?
20
- create_authentication_and_sign_in(auth_params, current_<%= class_name.downcase %>, provider)
20
+ elsif existing_<%= class_name.downcase %>
21
+ create_authentication_and_sign_in(auth_params, existing_<%= class_name.downcase %>, provider)
21
22
  else
22
23
  create_<%= class_name.downcase %>_and_authentication_and_sign_in(auth_params, provider)
23
24
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: domp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.5
4
+ version: 0.0.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alexander Zaytsev
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-12-08 00:00:00.000000000 Z
11
+ date: 2014-05-09 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Devise Omniauth Multiple Providers
14
14
  email: