rails_jwt_auth 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36b16ddc288defd93e036c0de0ceb3c84c024541a8112fd647403ec9afe65149
-  data.tar.gz: 9f2e7eaebf26f06d7c91eafcac4d5784b589aaaf00e14f4de160110e31bfb6f2
+  metadata.gz: c1cf5f9e135d2a39af71b620311285fdc6101de29a3e6481f54ca78551ca1a23
+  data.tar.gz: 45c733d715e884419e4d1174c83ea64d9f706e0449c7e652a18a3e57718b2967
 SHA512:
-  metadata.gz: d1beb3b5f74b2ba099b9f1a373090bfd19114ae262f6013a3252c66935982dfb2171ac8807d7d559af0fcfe851992848dd0585b612c9c3c7bdf96fc2f2c5a3a8
-  data.tar.gz: 9423c311c2e7e2ee99cfc1d26f2d03ea00c8309062a750a31c36e52504368d7a43d3e0bbd0ec0357b12c3c61f6d4a9e43afdad4e938ee8bf46aac918906e25fc
+  metadata.gz: af13c3b614e7263432c61eda040d619ace560a87fc409caa74a1d8c396bf6747790bc855ba5ce6b3167e0d84fef48692340f3b71f6eb78859e0012c657e3a977
+  data.tar.gz: 8017970563305ab55b8cd59c151f35093fac4c49d92bf60e51ddb794d3d695dd3f6a188811078942ca74c9689d3faf30b8af5d85fbe421c4c5aade60279f3c10

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

@@ -40,19 +40,20 @@ module RailsJwtAuth
     end
 
     def update_with_password(params)
-      if (current_password = params.delete(:current_password)).blank?
-        errors.add(:current_password, 'blank')
-      elsif !authenticate(current_password)
-        errors.add(:current_password, 'invalid')
-      end
+      current_password_error = if (current_password = params.delete(:current_password)).blank?
+                                 'blank'
+                               elsif !authenticate(current_password)
+                                 'invalid'
+                               end
 
-      if params[:password].blank?
-        errors.add(:password, 'blank')
-      end
+      # abort reset password if exists to allow save
+      self.reset_password_token = self.reset_password_sent_at = nil if reset_password_token
 
-      params.merge!(reset_password_token: nil, reset_password_sent_at: nil) if reset_password_token
+      assign_attributes(params)
+      valid? # validates first other fields
+      errors.add(:current_password, current_password_error) if current_password_error
 
-      errors.empty? ? update_attributes(params) : false
+      errors.empty? ? save : false
     end
 
     def to_token_payload(_request=nil)

data/lib/rails_jwt_auth/version.rb

@@ -1,3 +1,3 @@
 module RailsJwtAuth
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_jwt_auth
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - rjurado
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt