devise_token_auth_multitenancy 1.1.3.alpha1 → 1.1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2629c625678b6fe3183a4911f62928760efb42e3dbc8ba0d3d0ad683f16ed53
-  data.tar.gz: 11e0d389391f5e9b10c91f8ea40de6d1c47d522da183c7985772b1d7a802849f
+  metadata.gz: 9f940e116f3fdd07602f3d7003fc16fe58b0094d5ef82409bd8f573df191704a
+  data.tar.gz: 201a15e02f827171b3e82cfe2c919df345b40e78c8b9f43fa420f66344e2f7d8
 SHA512:
-  metadata.gz: 72539e4fb0909287d245e12c4eb969a5ab3c7d725d635e3aed294eb0e9aa5f3f16c9e8071cf35217b6fc00f243d028e49818b5c29d7fb629c61fb9237b856b6d
-  data.tar.gz: 5de4ac336c727ee7bcdd338b243526c2701ed50a6ecdd488bcfbce3012f62b4a6f80e54ba085faf7aa3097fb71ee06c4722ac92d78cb173788781deeda20a00b
+  metadata.gz: b27b3d4fa8873b5f8aa6a19ec4dc324206fa4813888162c7f35357340d8af21ee704c025c8fb78fe263b70813ada624b9e32d9bd09e2e4e8ca6b5b73ab3b4b39
+  data.tar.gz: 2e18d3a5cd4bdf14a6022772284b85505949a97b204924652b2d6fa7bd9eeba000dddb8164ecb251a7b9073c936d09987f1ef9ed0178f3334ebedd0ae2a8c647

data/app/controllers/devise_token_auth/concerns/resource_finder.rb

@@ -20,12 +20,8 @@ module DeviseTokenAuth::Concerns::ResourceFinder
   end
 
   def find_resource(field, value)
-    @resource = if resource_class.try(:connection_config).try(:[], :adapter).try(:include?, 'mysql')
-                  # fix for mysql default case insensitivity
-                  resource_class.where("BINARY #{field} = ? AND provider= ?", value, provider).first
-                else
-                  resource_class.dta_find_by(field => value, 'provider' => provider)
-                end
+    attrs = { field => value, 'provider' => provider }
+    @resource = resource_class.dta_find_by(attrs, self.instance_eval(&DeviseTokenAuth.multitenancy_finder_params))
   end
 
   def resource_class(m = nil)

data/app/controllers/devise_token_auth/concerns/set_user_by_token.rb

@@ -66,7 +66,7 @@ module DeviseTokenAuth::Concerns::SetUserByToken
     end
 
     # mitigate timing attacks by finding by uid instead of auth token
-    user = uid && rc.dta_find_by(uid: uid)
+    user = uid && rc.dta_find_by({uid: uid}, self.instance_eval(&DeviseTokenAuth.multitenancy_finder_params))
     scope = rc.to_s.underscore.to_sym
 
     if user && user.valid_token?(@token.token, @token.client)

data/app/controllers/devise_token_auth/confirmations_controller.rb

@@ -35,7 +35,7 @@ module DeviseTokenAuth
 
       @email = get_case_insensitive_field_from_resource_params(:email)
 
-      @resource = resource_class.dta_find_by(uid: @email, provider: provider)
+      @resource = resource_class.dta_find_by({uid: @email, provider: provider}, self.instance_eval(&DeviseTokenAuth.multitenancy_finder_params))
 
       return render_not_found_error unless @resource
 

data/app/models/devise_token_auth/concerns/user_omniauth_callbacks.rb

@@ -9,7 +9,7 @@ module DeviseTokenAuth::Concerns::UserOmniauthCallbacks
     validates_presence_of :uid, unless: :email_provider?
 
     # only validate unique emails among email registration users
-    validates :email, uniqueness: { case_sensitive: false, scope: :provider }, on: :create, if: :email_provider?
+    validates :email, uniqueness: { case_sensitive: false, scope: [ :provider ] + DeviseTokenAuth.multitenancy_scope_fields }, on: :create, if: :email_provider?
 
     # keep uid in sync with email
     before_save :sync_uid

data/lib/devise_token_auth/engine.rb

@@ -27,7 +27,9 @@ module DeviseTokenAuth
                  :headers_names,
                  :bypass_sign_in,
                  :send_confirmation_email,
-                 :require_client_password_reset_token
+                 :require_client_password_reset_token,
+                 :multitenancy_scope_fields,
+                 :multitenancy_finder_params
 
   self.change_headers_on_each_request       = true
   self.max_number_of_devices                = 10
@@ -50,6 +52,8 @@ module DeviseTokenAuth
   self.bypass_sign_in                       = true
   self.send_confirmation_email              = false
   self.require_client_password_reset_token  = false
+  self.multitenancy_scope_fields            = []
+  self.multitenancy_finder_params           = lambda { return {} }
 
   def self.setup(&block)
     yield self

data/lib/devise_token_auth/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeviseTokenAuth
-  VERSION = '1.1.3.alpha1'.freeze
+  VERSION = '1.1.3.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_token_auth_multitenancy
 version: !ruby/object:Gem::Version
-  version: 1.1.3.alpha1
+  version: 1.1.3.1
 platform: ruby
 authors:
 - Lynn Hurley
@@ -365,9 +365,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: