rails_jwt_auth 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91e496764ccca7f97d93242efd60a3547aea74e1
-  data.tar.gz: 74e02d9360d60324fd7eaa595045f00ced0d3424
+  metadata.gz: 75dd02f2d7bbefd337d60459bceb0d7f2751e189
+  data.tar.gz: 14216f9267af36d472e9a88075a010d7932ddd9d
 SHA512:
-  metadata.gz: 5adc97101b64c29b798323a60b10f4c928076fe5d7114f39d5c8c02b0867137713b2093a840182e4118713507528b03071d6d79b81f3af377eef32101cc70496
-  data.tar.gz: d973ea8cd11fc8b674e0288679fe8e91ce2498b26d1ee1771e4c026470bbd72a07c81caa2d8de44fb0f1845b273c74470b432f9c0ff0a86caa7370a5ea270659
+  metadata.gz: 956f217d584980202458ca7cc8cde55ef7e93a3441440b66536e07698ebd510b8652cb2a8da986495fbca3b2d02c818bf3e14dd86bb1290f9ab98903cae19ec5
+  data.tar.gz: da16eb6bd31092531ded7fc48067548752f9074f89886118aac8a60be67909ff79a969bf554f1a853d3347d620abb9ea822654beedd40cf329b91cd38cb61ffd

data/app/controllers/rails_jwt_auth/passwords_controller.rb

@@ -18,7 +18,7 @@ module RailsJwtAuth
       end
 
       unless password_update_params[:password].present?
-        return render_422(password: [I18n.t('rails_jwt_auth.errors.invalid')])
+        return render_422(password: [I18n.t('rails_jwt_auth.errors.password.blank')])
       end
 
       user.update_attributes(password_update_params) ? render_204 : render_422(user.errors)

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

@@ -26,14 +26,16 @@ module RailsJwtAuth
 
     def update_with_password(params)
       if (current_password = params.delete(:current_password)).blank?
-        errors.add(:current_password, I18n.t('rails_jwt_auth.errors.blank'))
-        false
-      elsif authenticate(current_password)
-        update_attributes(params)
-      else
-        errors.add(:current_password, I18n.t('rails_jwt_auth.errors.invalid'))
-        false
+        errors.add(:current_password, I18n.t('rails_jwt_auth.errors.current_password.blank'))
+      elsif !authenticate(current_password)
+        errors.add(:current_password, I18n.t('rails_jwt_auth.errors.current_password.invalid'))
+      end
+
+      if params[:password].blank?
+        errors.add(:password, I18n.t('rails_jwt_auth.errors.password.blank'))
       end
+
+      errors.empty? ? update_attributes(params) : false
     end
 
     module ClassMethods

data/app/validators/email_validator.rb

@@ -1,7 +1,7 @@
 class EmailValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     unless value =~ /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
-      record.errors[attribute] << (options[:message] || I18n.t('rails_jwt_auth.errors.invalid_email'))
+      record.errors[attribute] << (options[:message] || I18n.t('rails_jwt_auth.errors.email.invalid'))
     end
   end
 end

data/config/locales/en.yml

@@ -13,4 +13,10 @@ en:
       invalid: "invalid"
       blank: "blank"
       not_found: "not found"
-      invalid_email: "is not an email"
+      email:
+        invlid: "is not an email"
+      current_password:
+        blank: "blank"
+        invalid: "invalid"
+      password:
+        blank: "blank"

data/lib/rails_jwt_auth/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_jwt_auth
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - rjurado