rails_jwt_auth 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f62382c4d00178ccea3aa3a95e9fce5a2ce51909
-  data.tar.gz: 88608b4d059215392fb2c2c5b9a22478ca3ce915
+  metadata.gz: 3f935bf415eb61e8c8d04a0ee5701e35225a1f68
+  data.tar.gz: 5f97e07f1f1ff4de288872d717f6b632a6132417
 SHA512:
-  metadata.gz: 6c9483c6c630e56a44880cd19e5efa76f6ab055ac64a577802dea27d8ccac3c6c926b5f3299cb2217911a1849695aae3e8abdb2c5820205597719e1ab6c21661
-  data.tar.gz: a179d9f7eb6d28b360c5ecaba632f4124b755cb95d5bc6698aee80db6e401144a47ac74a63e5be1a5445c017bb218a0af3794a2685db1b4331f852934bfcceed
+  metadata.gz: 0a8976264bfcf1fae83bf32d8c3f2930141b162614a0af7b9782ca90725ba4af8173508eb7c1fa7c8094624e0f477faad6337ca6a2e99376bbc84c7be5b75594
+  data.tar.gz: 297a00da37aff4ece4ba9580e0e2d59bd1351f9dfe234373e00ac8de9f917094b814de50ca501305465eaf1551158a0129102d59fd25f62ef80e72c87721d59f

data/app/controllers/concerns/rails_jwt_auth/params_helper.rb

@@ -29,7 +29,9 @@ module RailsJwtAuth
     end
 
     def invitation_update_params
-      params.require(:accept_invitation).permit(:invitation_token, :password, :password_confirmation)
+      params.require(:accept_invitation).permit(:invitation_token,
+                                                :password,
+                                                :password_confirmation)
     end
   end
 end

data/app/controllers/rails_jwt_auth/invitations_controller.rb

@@ -16,12 +16,9 @@ module RailsJwtAuth
       user.assign_attributes attr_hash
       user.accept_invitation!
 
-      if user.errors.empty? && user.save
-        return render_204
-      else
-        user.update_attribute :invitation_token, token
-        return render_422(user.errors)
-      end
+      return render_204 if user.errors.empty? && user.save
+
+      render_422(user.errors)
     end
   end
 end

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

@@ -51,7 +51,7 @@ module RailsJwtAuth
     def self.included(base)
       base.extend(ClassMethods)
 
-      base.class_eval do 
+      base.class_eval do
         if defined?(Mongoid) && ancestors.include?(Mongoid::Document)
           field RailsJwtAuth.auth_field_name, type: String
           field :password_digest,             type: String

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

@@ -25,6 +25,7 @@ module RailsJwtAuth
 
       if unconfirmed_email
         self.email = unconfirmed_email
+        self.email_confirmation = unconfirmed_email if respond_to?(:email_confirmation)
         self.unconfirmed_email = nil
       end
 
@@ -53,11 +54,13 @@ module RailsJwtAuth
         validate :validate_confirmation, if: :confirmed_at_changed?
 
         after_create do
-          send_confirmation_instructions unless confirmed_at || confirmation_sent_at
+          unless confirmed_at || confirmation_sent_at || self['invitation_token']
+            send_confirmation_instructions
+          end
         end
 
         before_update do
-          if email_changed? && email_was && !confirmed_at_changed?
+          if email_changed? && email_was && !confirmed_at_changed? && !self['invitation_token']
             self.unconfirmed_email = email
             self.email = email_was
 

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

@@ -33,6 +33,7 @@ module RailsJwtAuth
       #
       # @return [user] The user created or found by email.
 
+      # rubocop:disable Metrics/AbcSize
       def invite!(attributes={})
         attrs = ActiveSupport::HashWithIndifferentAccess.new(attributes.to_h)
         auth_field = RailsJwtAuth.auth_field_name
@@ -52,13 +53,20 @@ module RailsJwtAuth
 
         record.valid?
 
+        # Users that are registered and were not invited are not reinvitable
         if !record.new_record? && !record.invited?
           record.errors.add(RailsJwtAuth.auth_field_name, :taken)
         end
 
+        # Users that have already accepted an invitation are not reinvitable
+        if !record.new_record? && record.invited? && record.invitation_accepted_at.present?
+          record.errors.add(RailsJwtAuth.auth_field_name, :taken)
+        end
+
         record.invite! if record.errors.empty?
         record
       end
+      # rubocop:enable Metrics/AbcSize
     end
 
     # Accept an invitation by clearing token and setting invitation_accepted_at
@@ -71,8 +79,7 @@ module RailsJwtAuth
       return unless invited?
       if valid_invitation?
         accept_invitation
-        # Override confirmable
-        self.confirmed_at = invitation_accepted_at if respond_to? :confirmed_at
+        self.confirmed_at = Time.now.utc if respond_to? :confirmed_at
       else
         errors.add(:invitation_token, :invalid)
       end
@@ -80,28 +87,32 @@ module RailsJwtAuth
 
     def invite!
       generate_invitation_token if invitation_token.nil?
-      self.invitation_created_at = Time.now.utc
+      self.invitation_sent_at = Time.now.utc
 
-      deliver_invitation if save(validate: false)
+      send_invitation_mail if save(validate: false)
     end
 
     def invited?
       (persisted? && invitation_token.present?)
     end
 
-    protected
+    def generate_invitation_token!
+      generate_invitation_token && save(validate: false)
+    end
 
-    def deliver_invitation
-      mailer = Mailer.send_invitation(self)
-      RailsJwtAuth.deliver_later ? mailer.deliver_later : mailer.deliver
+    def valid_invitation?
+      invited? && invitation_period_valid?
     end
 
+    protected
+
     def generate_invitation_token
       self.invitation_token = SecureRandom.base58(128)
     end
 
-    def valid_invitation?
-      invited? && invitation_period_valid?
+    def send_invitation_mail
+      mailer = Mailer.send_invitation(self)
+      RailsJwtAuth.deliver_later ? mailer.deliver_later : mailer.deliver
     end
 
     def invitation_period_valid?

data/lib/rails_jwt_auth/version.rb

@@ -1,3 +1,3 @@
 module RailsJwtAuth
-  VERSION = '0.18.0'
+  VERSION = '0.18.1'
 end

metadata

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