rails_jwt_auth 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44a233123ae5f2a0f6b39250ba799f8e31b2eea7
-  data.tar.gz: e0ed55e3d8c7f7912fca191a9232d9d961765f36
+  metadata.gz: 91e496764ccca7f97d93242efd60a3547aea74e1
+  data.tar.gz: 74e02d9360d60324fd7eaa595045f00ced0d3424
 SHA512:
-  metadata.gz: f6ab7cb0cd8afc764a7e4afa8d2924b12b11de19764ac6138047a2488214ab84fc98d982f67e5efe634f06d041473ed5b18cee11504a335e37117750bc4ca220
-  data.tar.gz: e358f3a9332e4a2a2a75cb0d2e04677008e962e7feefac5a0f60a141bda4818841885b0b04a9d29c44ff902c0004a855266c17e03a71f7b507f2ef9dfd78b459
+  metadata.gz: 5adc97101b64c29b798323a60b10f4c928076fe5d7114f39d5c8c02b0867137713b2093a840182e4118713507528b03071d6d79b81f3af377eef32101cc70496
+  data.tar.gz: d973ea8cd11fc8b674e0288679fe8e91ce2498b26d1ee1771e4c026470bbd72a07c81caa2d8de44fb0f1845b273c74470b432f9c0ff0a86caa7370a5ea270659

data/app/mailers/rails_jwt_auth/mailer.rb

@@ -3,7 +3,6 @@ if defined?(ActionMailer)
     default from: RailsJwtAuth.mailer_sender
 
     def confirmation_instructions(user)
-      return unless user.confirmation_in_progress?
       @user = user
 
       if RailsJwtAuth.confirmation_url
@@ -21,7 +20,6 @@ if defined?(ActionMailer)
     end
 
     def reset_password_instructions(user)
-      return unless user.reset_password_in_progress?
       @user = user
 
       if RailsJwtAuth.reset_password_url

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

@@ -1,17 +1,17 @@
 module RailsJwtAuth
   module Confirmable
     def send_confirmation_instructions
-      if confirmed? && !unconfirmed_email_changed?
+      if confirmed? && !unconfirmed_email
         errors.add(:email, I18n.t('rails_jwt_auth.errors.already_confirmed'))
         return false
       end
 
       self.confirmation_token = SecureRandom.base58(24)
       self.confirmation_sent_at = Time.now
-      return false unless save
 
       mailer = Mailer.confirmation_instructions(self)
       RailsJwtAuth.deliver_later ? mailer.deliver_later : mailer.deliver
+      save
     end
 
     def confirmed?
@@ -20,6 +20,7 @@ module RailsJwtAuth
 
     def confirm!
       self.confirmed_at = Time.now.utc
+      self.confirmation_token = nil
 
       if unconfirmed_email
         self.email = unconfirmed_email
@@ -31,11 +32,7 @@ module RailsJwtAuth
 
     def skip_confirmation!
       self.confirmed_at = Time.now.utc
-    end
-
-    def confirmation_in_progress?
-      !confirmed_at && confirmation_token && confirmation_sent_at &&
-        (Time.now < (confirmation_sent_at + RailsJwtAuth.confirmation_expiration_time))
+      self.confirmation_token = nil
     end
 
     def self.included(base)

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

@@ -14,11 +14,6 @@ module RailsJwtAuth
       RailsJwtAuth.deliver_later ? mailer.deliver_later : mailer.deliver
     end
 
-    def reset_password_in_progress?
-      reset_password_token && reset_password_sent_at &&
-        (Time.now < (reset_password_sent_at + RailsJwtAuth.reset_password_expiration_time))
-    end
-
     def self.included(base)
       if base.ancestors.include? Mongoid::Document
         # include GlobalID::Identification to use deliver_later method

data/lib/rails_jwt_auth/version.rb

@@ -1,3 +1,3 @@
 module RailsJwtAuth
-  VERSION = '0.15.0'
+  VERSION = '0.15.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_jwt_auth
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - rjurado
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,8 +125,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Rails jwt authentication.
 test_files: []
+has_rdoc: