rails_jwt_auth 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bca93333f4c37dbd3dd906f70c3342782407e3f4
-  data.tar.gz: e049172d67606c5cfad757e8f85ada512c1f185c
+  metadata.gz: 8a4b26a2187fcea5e112d830e6fe4c359b6c254e
+  data.tar.gz: c03420a5b617a85fcf3abe79029d12e1fc28d05d
 SHA512:
-  metadata.gz: 4ad3e2570b0c8c3948d1a38fffc011914bf52fecffa4d4ca2ec8a187c91d1dc5417aaba5de6cafdb3e9ef1d4f9c3bad09cb1d7d94c71ecfe030e4aaff13d847e
-  data.tar.gz: 73b4e8bac9ffc07b629c00108f9412d47f13a31df46cafbe8e2850de6def5553f2c96852ff9bf4370d87348fb3afe6d4bcca4b141f701e93b197c8f4b9277377
+  metadata.gz: 147277f3faf5e26b7df0d2ba902de62c3ab5ddc2cb11f9f851c058202612d2686a31e2adc8d89d34d84123a757d744e0d012df18569d1cbbfb9c82a726577195
+  data.tar.gz: 0d694343c935a6968417523c43853eabe68d521e15c09b0387b604bc6bf30a388659ea23c9a9ddd483738d19fb8321f3a5679c4277b4176c3dc14fc6861aab65

data/README.md

@@ -107,6 +107,8 @@ and create a migration to add confirmation fields to User model:
 ```ruby
 # example migration
 change_table :users do |t|
+  t.string :email # if it doesn't exist yet
+  t.string :unconfirmed_email
   t.string :confirmation_token
   t.datetime :confirmation_sent_at
   t.datetime :confimed_at
@@ -126,6 +128,8 @@ class User
 end
 ```
 
+This module needs that model has `email` field.
+
 ## Recoverable
 
 Resets the user password and sends reset instructions

data/app/mailers/rails_jwt_auth/mailer.rb

@@ -17,7 +17,7 @@ if defined?(ActionMailer)
       end
 
       subject = I18n.t('rails_jwt_auth.mailer.confirmation_instructions.subject')
-      mail(to: @user.email, subject: subject)
+      mail(to: @user.unconfirmed_email || @user.email, subject: subject)
     end
 
     def reset_password_instructions(user)

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

@@ -1,7 +1,7 @@
 module RailsJwtAuth
   module Confirmable
     def send_confirmation_instructions
-      if confirmed?
+      if confirmed? && !unconfirmed_email_changed?
         errors.add(:email, I18n.t('rails_jwt_auth.errors.already_confirmed'))
         return false
       end
@@ -18,6 +18,12 @@ module RailsJwtAuth
 
     def confirm!
       self.confirmed_at = Time.now.utc
+
+      if unconfirmed_email
+        self.email = unconfirmed_email
+        self.unconfirmed_email = nil
+      end
+
       save
     end
 
@@ -32,6 +38,8 @@ module RailsJwtAuth
 
     def self.included(base)
       if base.ancestors.include? Mongoid::Document
+        base.send(:field, :email,                type: String)
+        base.send(:field, :unconfirmed_email,    type: String)
         base.send(:field, :confirmation_token,   type: String)
         base.send(:field, :confirmation_sent_at, type: Time)
         base.send(:field, :confirmed_at,         type: Time)
@@ -42,12 +50,20 @@ module RailsJwtAuth
       base.send(:after_create) do
         send_confirmation_instructions unless confirmed_at || confirmation_sent_at
       end
+
+      base.send(:before_update) do
+        if email_changed? && email_was && !confirmed_at_changed?
+          self.unconfirmed_email = email
+          self.email = email_was
+          send_confirmation_instructions
+        end
+      end
     end
 
     private
 
     def validate_confirmation
-      return unless confirmed_at
+      return true if !confirmed_at || email_changed?
 
       if confirmed_at_was
         errors.add(:email, I18n.t('rails_jwt_auth.errors.already_confirmed'))

data/lib/rails_jwt_auth/version.rb

@@ -1,3 +1,3 @@
 module RailsJwtAuth
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_jwt_auth
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - rjurado
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails