devise_invitable 2.0.7 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2a7d1c4ae3cc61e2992fa9920ddd35e6626745dd32333a88e8231fb267e2cb0
-  data.tar.gz: ee68fbb505a629c391934bee8c644c0ade499333d5c7065745426fd6e419642a
+  metadata.gz: b8ff92d4a82378780e01c6d3cfe57ff0808b08d49a619e3a899e94a86e7ec46c
+  data.tar.gz: 174e7982212230032987ad9b6b1ed572b98fda73fc0652e095ae71c1b6282436
 SHA512:
-  metadata.gz: fd3ead62e8c2246f9246fbac3a2138ea6ff4f1abcf3c577faad920b339f1c1795b54497d03b34f4bc685be6131f62692d2497fbc5d1081e740e0a85d7e1a25c2
-  data.tar.gz: 0453554d47731a99e931c81dbd44e77eca935ff6ca453172f40f394da84bd1d5a92507aafa881ab491202cee5fa534aef4ba9b2a4ac1fa37327a664c7ceb8e61
+  metadata.gz: 25a25c7ec4df1183ef43d399f73cb7a4b661cc33df172d660dd551f658bebce01ac552c837608affeac59aeaaa85b137ad56247278fbe5a436ea15d03131b1e3
+  data.tar.gz: 07a394b356fb623ab7a8ca48486acd935ea5c69b86969ccae667d414bc6d7319ec2e5fe90c0cdc8ff2a9f46eace35bfd517df659fc445088f4e43a0f6536590c

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.0.9
+- Do not accept expired invitation on password reset ([#897](https://github.com/scambra/devise_invitable/pull/897))
+
+## 2.0.8
+- Fix for turbo stream
+
+## 2.0.7
 - Allow customizing invalid_token_path_for, the path to redirect users who try to accept with invalid token
 - Don't override registrations controller in routes if module option is used
 - Fix typo in spanish translation, add Catalan translation ([#857](https://github.com/scambra/devise_invitable/pull/857))

data/README.rdoc

@@ -341,7 +341,7 @@ To accept an invitation with a token use the <tt>accept_invitation!</tt> class m
 === Callbacks
 
 A callback event is fired before and after an invitation is created (User#invite!) or accepted (User#accept_invitation!). For example, in your resource model you can add:
-
+  # Note: callbacks should be placed after devise: :invitable is specified.
   before_invitation_created :email_admins
   after_invitation_accepted :email_invited_by
 

data/app/controllers/devise/invitations_controller.rb

@@ -31,7 +31,7 @@ class Devise::InvitationsController < DeviseController
         respond_with resource, location: after_invite_path_for(current_inviter, resource)
       end
     else
-      respond_with_navigational(resource) { render :new, status: :unprocessable_entity }
+      respond_with(resource)
     end
   end
 
@@ -63,7 +63,7 @@ class Devise::InvitationsController < DeviseController
       end
     else
       resource.invitation_token = raw_invitation_token
-      respond_with_navigational(resource) { render :edit, status: :unprocessable_entity }
+      respond_with(resource)
     end
   end
 

data/config/locales/fr.yml

@@ -14,10 +14,8 @@ fr:
         legend: Envoyer l’invitation
         submit_button: Envoyer
       edit:
-        header: Confirmation
-        submit_button: Confirmer
-        new_password: Mot de passe
-        new_password_confirmation: Confirmation du mot de passe
+        header: Définissez votre mot de passe
+        submit_button: Définir mon mot de passe
     mailer:
       invitation_instructions:
         subject: 'Vous avez reçu une invitation'
@@ -31,4 +29,4 @@ fr:
       devise:
         mailer:
           invitation_instructions:
-            accept_until_format: "%B %d, %Y %I:%M %p"
+            accept_until_format: "%B %d, %Y %I:%M %p"

data/config/locales/id.yml

@@ -0,0 +1,31 @@
+id:
+  devise:
+    failure:
+      invited: "Anda memiliki undangan yang tertunda, harap terima undangan tersebut untuk menyelesaikan pembuatan akun Anda."
+    invitations:
+      send_instructions: "Email undangan telah dikirim ke %{email}."
+      invitation_token_invalid: "Token undangan yang diberikan tidak valid!"
+      updated: "Kata sandi Anda telah berhasil diatur. Anda sudah masuk."
+      updated_not_active: "Kata sandi Anda telah berhasil diatur."
+      no_invitations_remaining: "Tidak ada undangan tersisa."
+      invitation_removed: "Undangan Anda telah dihapus."
+      new:
+        header: "Kirim Undangan"
+        submit_button: "Kirim undangan"
+      edit:
+        header: "Atur kata sandi Anda"
+        submit_button: "Atur kata sandi"
+    mailer:
+      invitation_instructions:
+        subject: "Instruksi Undangan"
+        hello: "Halo %{email}"
+        someone_invited_you: "Seseorang telah mengundang Anda ke %{url}. Anda dapat menerima undangan ini melalui tautan di bawah ini."
+        accept: "Terima Undangan"
+        accept_until: "Undangan ini akan berakhir pada %{due_date}."
+        ignore: "Jika Anda tidak ingin menerima undangan ini, silakan abaikan email ini. Akun Anda tidak akan dibuat sampai Anda mengakses tautan di atas dan mengatur kata sandi Anda."
+  time:
+    formats:
+      devise:
+        mailer:
+          invitation_instructions:
+            accept_until_format: "%d %B %Y %H:%M:%S"

data/lib/devise_invitable/models.rb

@@ -195,7 +195,7 @@ module Devise
       def clear_reset_password_token
         reset_password_token_present = reset_password_token.present?
         super
-        accept_invitation! if reset_password_token_present && invited_to_sign_up?
+        accept_invitation! if reset_password_token_present && valid_invitation?
       end
 
       def clear_errors_on_valid_keys
@@ -231,7 +231,7 @@ module Devise
       def add_taken_error(key)
         errors.add(key, :taken)
       end
-    
+
       def invitation_taken?
         !invited_to_sign_up?
       end

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '2.0.7'.freeze
+  VERSION = '2.0.9'.freeze
 end

data/test/integration/invitation_test.rb

@@ -98,7 +98,7 @@ class InvitationTest < ActionDispatch::IntegrationTest
       fill_in 'Password confirmation', with: 'other_password'
     end
     assert_equal user_invitation_path, current_path
-    assert page.has_css?('#error_explanation li', text: /Password .*doesn\'t match/)
+    assert page.has_css?('#error_explanation li', text: /Password .*doesn['’]t match/)
     assert !user.confirmed?
   end
 

data/test/models/invitable_test.rb

@@ -279,6 +279,23 @@ class InvitableTest < ActiveSupport::TestCase
     refute_predicate user, :invited_to_sign_up?
   end
 
+  test 'should not accept expired invitation while resetting the password' do
+    User.stubs(:invite_for).returns(1.day)
+    user = User.invite!(email: 'valid@email.com')
+    assert user.invited_to_sign_up?
+    user.invitation_created_at = Time.now.utc - 2.days
+    token, user.reset_password_token = Devise.token_generator.generate(User, :reset_password_token)
+    user.reset_password_sent_at = Time.now.utc
+    user.save
+
+    assert user.reset_password_token.present?
+    assert user.invitation_token.present?
+    User.reset_password_by_token(reset_password_token: token, password: '123456789', password_confirmation: '123456789')
+    assert_nil user.reload.reset_password_token
+    assert user.reload.invitation_token.present?
+    assert user.reload.invited_to_sign_up?
+  end
+
   test 'should not accept invitation on failing to reset the password' do
     user = User.invite!(email: 'valid@email.com')
     assert user.invited_to_sign_up?
@@ -366,15 +383,51 @@ class InvitableTest < ActiveSupport::TestCase
     User.validate_on_invite = validate_on_invite
   end
 
+  test 'should not validate other attributes when validate_on_invite is disabled (for instance method)' do
+    validate_on_invite = User.validate_on_invite
+    User.validate_on_invite = false
+    user = new_user(email: 'valid@email.com', username: 'a' * 50)
+    user.invite!(nil, validate: false)
+    assert_empty user.errors
+    User.validate_on_invite = validate_on_invite
+  end
+
+  test 'should validate other attributes when validate_on_invite is disabled and validate option is enabled (for instance method)' do
+    validate_on_invite = User.validate_on_invite
+    User.validate_on_invite = false
+    user = new_user(email: 'valid@email.com', username: 'a' * 50)
+    user.invite!(nil, validate: true)
+    refute_empty user.errors[:username]
+    User.validate_on_invite = validate_on_invite
+  end
+
+  test 'should validate other attributes when validate_on_invite is enabled and validate option is disabled (for instance method)' do
+    validate_on_invite = User.validate_on_invite
+    User.validate_on_invite = true
+    user = new_user(email: 'valid@email.com', username: 'a' * 50)
+    user.invite!
+    refute_empty user.errors[:username]
+    User.validate_on_invite = validate_on_invite
+  end
+
+  test 'should validate other attributes when validate_on_invite is enabled and validate option is disabled explicitly (for instance method)' do
+    validate_on_invite = User.validate_on_invite
+    User.validate_on_invite = true
+    user = new_user(email: 'valid@email.com', username: 'a' * 50)
+    user.invite!(nil, validate: false)
+    assert_empty user.errors
+    User.validate_on_invite = validate_on_invite
+  end
+
   test 'should return a record with errors if user was found by e-mail' do
     existing_user = User.new(email: 'valid@email.com')
     existing_user.save(validate: false)
     user = User.invite!(email: 'valid@email.com')
     assert_equal user, existing_user
-    assert_equal ['has already been taken'], user.errors[:email]
+    assert_equal [{error: :taken}], user.errors.details[:email]
     same_user = User.invite!(email: 'valid@email.com')
     assert_equal same_user, existing_user
-    assert_equal ['has already been taken'], same_user.errors[:email]
+    assert_equal [{error: :taken}], same_user.errors.details[:email]
   end
 
   test 'should return a record with errors if user with pending invitation was found by e-mail' do
@@ -388,7 +441,7 @@ class InvitableTest < ActiveSupport::TestCase
 
       user = User.invite!(email: 'valid@email.com')
       assert_equal user, existing_user
-      assert_equal ['has already been taken'], user.errors[:email]
+      assert_equal [{error: :taken}], user.errors.details[:email]
     ensure
       User.resend_invitation = resend_invitation
     end
@@ -402,7 +455,7 @@ class InvitableTest < ActiveSupport::TestCase
       existing_user.save(validate: false)
       user = User.invite!(email: 'valid@email.com', username: 'a' * 50)
       assert_equal user, existing_user
-      assert_equal ['has already been taken'], user.errors[:email]
+      assert_equal [{error: :taken}], user.errors.details[:email]
       refute_empty user.errors[:username]
     ensure
       User.validate_on_invite = validate_on_invite
@@ -412,13 +465,13 @@ class InvitableTest < ActiveSupport::TestCase
   test 'should return a new record with errors if e-mail is blank' do
     invited_user = User.invite!(email: '')
     assert invited_user.new_record?
-    assert_equal ["can't be blank"], invited_user.errors[:email]
+    assert_equal [{error: :blank}], invited_user.errors.details[:email]
   end
 
   test 'should return a new record with errors if e-mail is invalid' do
     invited_user = User.invite!(email: 'invalid_email')
     assert invited_user.new_record?
-    assert_equal ['is invalid'], invited_user.errors[:email]
+    assert_equal [{error: :invalid}], invited_user.errors.details[:email]
   end
 
   test 'should set all attributes with errors if e-mail is invalid' do
@@ -438,13 +491,13 @@ class InvitableTest < ActiveSupport::TestCase
   test 'should return a new record with errors if no invitation_token is found' do
     invited_user = User.accept_invitation!(invitation_token: 'invalid_token')
     assert invited_user.new_record?
-    assert_equal ['is invalid'], invited_user.errors[:invitation_token]
+    assert_equal [{error: :invalid}], invited_user.errors.details[:invitation_token]
   end
 
   test 'should return a new record with errors if invitation_token is blank' do
     invited_user = User.accept_invitation!(invitation_token: '')
     assert invited_user.new_record?
-    assert_equal ["can't be blank"], invited_user.errors[:invitation_token]
+    assert_equal [{error: :blank}], invited_user.errors.details[:invitation_token]
   end
 
   test 'should return record with errors if invitation_token has expired' do
@@ -454,7 +507,7 @@ class InvitableTest < ActiveSupport::TestCase
     invited_user.save(validate: false)
     user = User.accept_invitation!(invitation_token: Thread.current[:token])
     assert_equal user, invited_user
-    assert_equal ['is invalid'], user.errors[:invitation_token]
+    assert_equal [{error: :invalid}], user.errors.details[:invitation_token]
   end
 
   test 'should allow record modification using block' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_invitable
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.9
 platform: ruby
 authors:
 - Sergio Cambra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -78,6 +78,7 @@ files:
 - config/locales/et.yml
 - config/locales/fa.yml
 - config/locales/fr.yml
+- config/locales/id.yml
 - config/locales/it.yml
 - config/locales/ja.yml
 - config/locales/ko.yml