devise_token_auth_multitenancy 1.1.3.1 → 1.1.3.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9f940e116f3fdd07602f3d7003fc16fe58b0094d5ef82409bd8f573df191704a
4
- data.tar.gz: 201a15e02f827171b3e82cfe2c919df345b40e78c8b9f43fa420f66344e2f7d8
3
+ metadata.gz: eeec93c01e0fd1a542c9c27be7c8cae3fe5ffb8ab8f11bb832bb8b5492d50fa4
4
+ data.tar.gz: 65d0ebc48b166479e96996e6e2a9641af70b929d7f2c21f48841829092ced725
5
5
  SHA512:
6
- metadata.gz: b27b3d4fa8873b5f8aa6a19ec4dc324206fa4813888162c7f35357340d8af21ee704c025c8fb78fe263b70813ada624b9e32d9bd09e2e4e8ca6b5b73ab3b4b39
7
- data.tar.gz: 2e18d3a5cd4bdf14a6022772284b85505949a97b204924652b2d6fa7bd9eeba000dddb8164ecb251a7b9073c936d09987f1ef9ed0178f3334ebedd0ae2a8c647
6
+ metadata.gz: 2b8ec5790866da6e83daa3cb9b8dc93fa479dddbcbc04471f933a69ad2365a7e03076eb00d270b9cfba844a2d7c0d38dd9dc10b3c110d7fe53adac0c1551180e
7
+ data.tar.gz: 607c775c653ba95bdf5f95d87818023c5ffce60394fb61a0b7ce8b0ce6b044562bebeada86d3275082589898b1977183308b29e717dc1fa931b09e228877d4af
@@ -4,12 +4,14 @@ module DeviseTokenAuth::Concerns::UserOmniauthCallbacks
4
4
  extend ActiveSupport::Concern
5
5
 
6
6
  included do
7
- validates :email, presence: true,if: :email_provider?
8
- validates :email, :devise_token_auth_email => true, allow_nil: true, allow_blank: true, if: :email_provider?
7
+ validates self.authentication_keys.first, presence: true,if: :email_provider?
8
+ if self.authentication_keys.first == :email
9
+ validates self.authentication_keys.first, :devise_token_auth_email => true, allow_nil: true, allow_blank: true, if: :email_provider?
10
+ end
9
11
  validates_presence_of :uid, unless: :email_provider?
10
12
 
11
13
  # only validate unique emails among email registration users
12
- validates :email, uniqueness: { case_sensitive: false, scope: [ :provider ] + DeviseTokenAuth.multitenancy_scope_fields }, on: :create, if: :email_provider?
14
+ validates self.authentication_keys.first, uniqueness: { case_sensitive: false, scope: [ :provider ] + DeviseTokenAuth.multitenancy_scope_fields }, on: :create, if: :email_provider?
13
15
 
14
16
  # keep uid in sync with email
15
17
  before_save :sync_uid
@@ -23,6 +25,6 @@ module DeviseTokenAuth::Concerns::UserOmniauthCallbacks
23
25
  end
24
26
 
25
27
  def sync_uid
26
- self.uid = email if email_provider?
28
+ self.uid = self.send(self.class.authentication_keys.first.to_sym) if email_provider?
27
29
  end
28
30
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module DeviseTokenAuth
4
- VERSION = '1.1.3.1'.freeze
4
+ VERSION = '1.1.3.2'.freeze
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: devise_token_auth_multitenancy
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.3.1
4
+ version: 1.1.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Lynn Hurley
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2020-05-19 00:00:00.000000000 Z
12
+ date: 2020-05-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails