rails_jwt_auth 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c6772ee2532e40320c9a3e280cba9859723e84ab19fe6d3748df8daa50d92bf
-  data.tar.gz: 9d83ec3a94635c68b4b950531065f8cb2224f76d083084ee9c89781c2b1b5fbc
+  metadata.gz: 13d131a5b5ed0505ee136c556dbfd2dc84b18618f71b15de4367f0de98f13f66
+  data.tar.gz: cace9cd679f40aaee7a15392fb37d13c9b4df774e3f16887671283894ebc2a6e
 SHA512:
-  metadata.gz: 4d5b91931b1ab430156a08d7121c894488441db7ac861dc6897fb35aaaf83232f98e1432fdcf1068e5d53f7759cf60a7981c2389acde84e832eecc6901b838c1
-  data.tar.gz: ac901ae661940323e02901ed7719cf248d2e120c10ccb873dc85973ea4c34c3817949a6971a9c7bee8d6d530f0670983846c0eb2e8f11839808feeb319f0e408
+  metadata.gz: 7a04bb9ca933fb3077e780a91cf942e4f984a8a38439ebc9d44f603ab23eb2e6e4b4ad293f20ad2f058db14bb9baf9f0f07dca39b28ef9d631b107f921f6de0c
+  data.tar.gz: e20b567941176b0d42ad7da9dff27c3b78ef75a04e9a2dbbdd215b8a87c9af76763e5b2a963089bbd73f3391db4c9ef44df961131b4b09e6bfbc88cd7b9deac1

data/README.md

@@ -73,7 +73,7 @@ You can edit configuration options into `config/initializers/rails_jwt_auth.rb`
 | jwt_expiration_time                       | `7.days`                   | Tokens expiration time                                                 |
 | jwt_issuer                                | `'RailsJwtAuth'`           | The "iss" (issuer) claim identifies the principal that issued the JWT  |
 | simultaneous_sessions                     | `2`                        | Number of simultaneous sessions for an user. Set 0 to disable sessions |
-| mailer_name                               | `'RailsJwtAuth::Mailer'`   | Authentication model name                                              |
+| mailer_name                               | `'RailsJwtAuth::Mailer'`   | Mailer class name (allow customize mailer)                             |
 | mailer_sender                             | `...@example.com`          | E-mail address which will be shown in RailsJwtAuth::Mailer             |
 | send_email_change_requested_notification  | `true`                     | Notify original email when change is requested (unconfirmed)           |
 | send_password_changed_notification        | `true`                     | Notify email when password changes                                     |

data/app/controllers/rails_jwt_auth/invitations_controller.rb

@@ -1,5 +1,6 @@
 module RailsJwtAuth
   class InvitationsController < ApplicationController
+    include AuthenticableHelper
     include ParamsHelper
     include RenderHelper
 

data/app/controllers/rails_jwt_auth/profiles_controller.rb

@@ -1,5 +1,6 @@
 module RailsJwtAuth
   class ProfilesController < ApplicationController
+    include AuthenticableHelper
     include ParamsHelper
     include RenderHelper
 

data/app/controllers/rails_jwt_auth/sessions_controller.rb

@@ -1,5 +1,6 @@
 module RailsJwtAuth
   class SessionsController < ApplicationController
+    include AuthenticableHelper
     include ParamsHelper
     include RenderHelper
 
@@ -14,7 +15,7 @@ module RailsJwtAuth
     end
 
     def destroy
-      return render_404 unless RailsJwtAuth.simultaneous_sessions > 0
+      return render_404 unless RailsJwtAuth.simultaneous_sessions.positive?
 
       authenticate!
       current_user.destroy_auth_token @jwt_payload['auth_token']

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

@@ -31,7 +31,7 @@ module RailsJwtAuth
         return false
       end
 
-      self.confirmation_token = SecureRandom.base58(24)
+      self.confirmation_token = generate_confirmation_token
       self.confirmation_sent_at = Time.current
       return false unless save
 
@@ -79,7 +79,7 @@ module RailsJwtAuth
                        end
 
       self.email = params[email_field]
-      self.confirmation_token = SecureRandom.base58(24)
+      self.confirmation_token = generate_confirmation_token
       self.confirmation_sent_at = Time.current
 
       valid? # validates first other fields
@@ -101,6 +101,13 @@ module RailsJwtAuth
 
     protected
 
+    def generate_confirmation_token
+      loop do
+        token = RailsJwtAuth.friendly_token
+        return token unless self.class.where(confirmation_token: token).exists?
+      end
+    end
+
     def validate_confirmation
       return true unless confirmed_at
 

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

@@ -39,7 +39,7 @@ module RailsJwtAuth
       end
 
       @inviting = true
-      self.invitation_token = RailsJwtAuth.friendly_token
+      self.invitation_token = generate_invitation_token
       self.invitation_sent_at = Time.current
 
       return false unless save_without_password
@@ -86,5 +86,14 @@ module RailsJwtAuth
 
       invitation_sent_at && invitation_sent_at < expiration_time.ago
     end
+
+    protected
+
+    def generate_invitation_token
+      loop do
+        token = RailsJwtAuth.friendly_token
+        return token unless self.class.where(invitation_token: token).exists?
+      end
+    end
   end
 end

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

@@ -54,7 +54,7 @@ module RailsJwtAuth
     protected
 
     def send_unlock_instructions
-      self.unlock_token = SecureRandom.base58(24)
+      self.unlock_token = generate_unlock_token
       save(validate: false)
 
       RailsJwtAuth.send_email(:unlock_instructions, self)
@@ -85,6 +85,15 @@ module RailsJwtAuth
       first_failed_attempt_at && first_failed_attempt_at < RailsJwtAuth.reset_attempts_in.ago
     end
 
+    protected
+
+    def generate_unlock_token
+      loop do
+        token = RailsJwtAuth.friendly_token
+        return token unless self.class.where(unlock_token: token).exists?
+      end
+    end
+
     def lock_strategy_enabled?(strategy)
       RailsJwtAuth.lock_strategy == strategy
     end

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

@@ -27,7 +27,7 @@ module RailsJwtAuth
         return false
       end
 
-      self.reset_password_token = RailsJwtAuth.friendly_token
+      self.reset_password_token = generate_reset_password_token
       self.reset_password_sent_at = Time.current
       return false unless save
 
@@ -59,5 +59,14 @@ module RailsJwtAuth
       self.reset_password_sent_at = nil
       self.reset_password_token = nil
     end
+
+    protected
+
+    def generate_reset_password_token
+      loop do
+        token = RailsJwtAuth.friendly_token
+        return token unless self.class.where(reset_password_token: token).exists?
+      end
+    end
   end
 end

data/lib/rails_jwt_auth.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/integer/time'
 require 'bcrypt'
 
 require 'rails_jwt_auth/engine'

data/lib/rails_jwt_auth/session.rb

@@ -100,10 +100,6 @@ module RailsJwtAuth
       add_error(field_error(:password), :invalid) unless @user.authenticate(@password)
     end
 
-    def validate_custom
-      # allow add custom validation overwriting this method
-    end
-
     def validate_user_is_confirmed
       add_error(RailsJwtAuth.email_field_name, :unconfirmed) unless @user.confirmed?
     end

data/lib/rails_jwt_auth/version.rb

@@ -1,3 +1,3 @@
 module RailsJwtAuth
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_jwt_auth
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - rjurado
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt