rails_jwt_auth 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc1754797f099cba50a36044a69225fbeffee8e01120b9aa394209761d30eaf4
-  data.tar.gz: da443b714e8d7af7fb687a66e46fc6f3a46feb8837239debd1d16c76c34a49dc
+  metadata.gz: b624ce7e99bced2abcbe29c05955af2fa4ccf7b6d9badc74e5effdd2b98ac4e9
+  data.tar.gz: 427995dd79006f041e27de387ce9affa2294d2eedcefcf02eaf502c3f9d60630
 SHA512:
-  metadata.gz: f72dd3b12df746bd2d95291090b5e5f4dce0c0cdcba429b4de5ac2290c811e55637790cbbbb93209bf8184ae9a827986b1000b3d8c9fb834f2151e9b610ba993
-  data.tar.gz: 68a3963c17ef09d9225550a79f3989572e5edb8b4c7023d40fca80b647c06c1cdd2848a0bbe76d0d11a339ffc88801d80f7f131ab829ddbb3ef60dabf6a2168a
+  metadata.gz: ffda5aa2b329f926133837ba6fa254643c0637eaef292b3f63ec4305dedd34f3e1d238fa52033bfbbe4e9407d916af6ff4fefcee2f58923d08a1e906b7991be9
+  data.tar.gz: d0a639b9e6345feaaa3d28095cbed507e549fa8a1d61c4f125cb79a7ee895ba937c1bdd13324d4742e5f6b7594bd6d4dee146b314301bc4b026b721b0bd6ad07

data/app/models/concerns/rails_jwt_auth/confirmable.rb

@@ -33,14 +33,14 @@ module RailsJwtAuth
 
             self.confirmation_token = SecureRandom.base58(24)
             self.confirmation_sent_at = Time.current
-
-            RailsJwtAuth.send_email(:confirmation_instructions, self)
-
-            if RailsJwtAuth.send_email_changed_notification
-              RailsJwtAuth.send_email(:email_changed, self)
-            end
           end
         end
+
+        if defined?(ActiveRecord) && ancestors.include?(ActiveRecord::Base)
+          after_commit :deliver_email_changed_emails, if: :saved_change_to_unconfirmed_email?
+        elsif defined?(Mongoid) && ancestors.include?(Mongoid::Document)
+          after_update :deliver_email_changed_emails, if: :unconfirmed_email_changed?
+        end
       end
     end
 
@@ -76,7 +76,7 @@ module RailsJwtAuth
 
         # supports email confirmation attr_accessor validation
         if respond_to?("#{email_field}_confirmation")
-          self.instance_variable_set("@#{email_field}_confirmation", self[email_field])
+          instance_variable_set("@#{email_field}_confirmation", self[email_field])
         end
       end
 
@@ -92,6 +92,7 @@ module RailsJwtAuth
 
     def validate_confirmation
       return true unless confirmed_at
+
       email_field = RailsJwtAuth.email_field_name!
 
       if confirmed_at_was && !public_send("#{email_field}_changed?")
@@ -101,5 +102,15 @@ module RailsJwtAuth
         errors.add(:confirmation_token, :expired)
       end
     end
+
+    def deliver_email_changed_emails
+      # send confirmation to new email
+      RailsJwtAuth.send_email(:confirmation_instructions, self)
+
+      # send notify to old email
+      if RailsJwtAuth.send_email_changed_notification
+        RailsJwtAuth.send_email(:email_changed, self)
+      end
+    end
   end
 end

data/lib/rails_jwt_auth/version.rb

@@ -1,3 +1,3 @@
 module RailsJwtAuth
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_jwt_auth
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - rjurado
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-15 00:00:00.000000000 Z
+date: 2020-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt