devise_invitable 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24a36c592f8c636eb4cf7e704165f41abc0c14c5
-  data.tar.gz: 9a999cc7bc9523e1b100ce415aee6270d8a9fc66
+  metadata.gz: 120262595eb64c2331645be7ee5b72be56cf69dd
+  data.tar.gz: 9cf5ffa08b34fe9d69e09272c23f92800b0357f6
 SHA512:
-  metadata.gz: ca000182ea194f46655066899e531094801c347461926d8185fa8a039208af55d108c6a35cad22bfa31e60d7cad63b62203cf18b9e39a43702dcedd815cb9c33
-  data.tar.gz: 66e68e6a7facedfdb0752f4d4b1310e255cdcd33892f816158149154e94a2104d71b88a80af3672fd9a325984666770c66cf115a85758e7b57273d9ef3bee00a
+  metadata.gz: 2f73d12b8a22bb35067552438a6fa394e150525c54de6e3d25372b0a0d345b4ec74332cdd190075b1b5f4b82b34413115ec1fb650ab83cf20acc3345906daae4
+  data.tar.gz: a24d5a8744f72552413216e8f7947ff58a7be06fcbc2683cd9caaa9fc4a90b4384b4c89f54c2aa9930bf369da289922dbb9b445824de139f685671a9a6e48a1b

data/app/controllers/devise/invitations_controller.rb

@@ -1,15 +1,8 @@
 class Devise::InvitationsController < DeviseController
-  if Rails::VERSION::MAJOR >= 5
-    prepend_before_action :authenticate_inviter!, :only => [:new, :create]
-    prepend_before_action :has_invitations_left?, :only => [:create]
-    prepend_before_action :require_no_authentication, :only => [:edit, :update, :destroy]
-    prepend_before_action :resource_from_invitation_token, :only => [:edit, :destroy]
-  else
-    prepend_before_filter :authenticate_inviter!, :only => [:new, :create]
-    prepend_before_filter :has_invitations_left?, :only => [:create]
-    prepend_before_filter :require_no_authentication, :only => [:edit, :update, :destroy]
-    prepend_before_filter :resource_from_invitation_token, :only => [:edit, :destroy]
-  end
+  prepend_before_action :authenticate_inviter!, :only => [:new, :create]
+  prepend_before_action :has_invitations_left?, :only => [:create]
+  prepend_before_action :require_no_authentication, :only => [:edit, :update, :destroy]
+  prepend_before_action :resource_from_invitation_token, :only => [:edit, :destroy]
 
   if respond_to? :helper_method
     helper_method :after_sign_in_path_for

data/app/views/devise/invitations/edit.html.erb

@@ -2,7 +2,7 @@
 
 <%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f| %>
   <%= devise_error_messages! %>
-  <%= f.hidden_field :invitation_token %>
+  <%= f.hidden_field :invitation_token, readonly: true %>
 
   <% if f.object.class.require_password_on_accepting %>
   <p><%= f.label :password %><br />

data/lib/devise_invitable.rb

@@ -84,4 +84,4 @@ module Devise
   @@require_password_on_accepting = true
 end
 
-Devise.add_module :invitable, :controller => :invitations, :model => 'devise_invitable/model', :route => {:invitation => [nil, :new, :accept]}
+Devise.add_module :invitable, :controller => :invitations, :model => 'devise_invitable/models', :route => {:invitation => [nil, :new, :accept]}

data/lib/devise_invitable/controllers/helpers.rb

@@ -3,19 +3,20 @@ module DeviseInvitable::Controllers::Helpers
 
   included do
   end
-  
+
   def after_invite_path_for(inviter, invitee = nil)
-    after_sign_in_path_for(inviter)
+    signed_in_root_path(inviter)
   end
-  
+
   def after_accept_path_for(resource)
-    after_sign_in_path_for(resource)
+    signed_in_root_path(resource)
   end
-  
+
   protected
+
   def authenticate_inviter!
     send(:"authenticate_#{resource_name}!", :force => true)
   end
-  
+
 end
 

data/lib/devise_invitable/{model.rb → models.rb}

@@ -1,4 +1,5 @@
 require 'active_support/deprecation'
+require 'devise_invitable/models/authenticatable'
 
 module Devise
   module Models
@@ -96,7 +97,7 @@ module Devise
             self.accept_invitation
             self.confirmed_at = self.invitation_accepted_at if self.respond_to?(:confirmed_at)
             self.save
-          end
+          end.tap { @accepting_invitation = false }
         end
       end
 
@@ -167,6 +168,11 @@ module Devise
         super unless !accepting_invitation? && block_from_invitation?
       end
 
+      # Prevent password changed email when accepting invitation
+      def send_password_change_notification?
+        super && !accepting_invitation?
+      end
+
       # Enforce password when invitation is being accepted
       def password_required?
         (accepting_invitation? && self.class.require_password_on_accepting) || super

data/lib/devise_invitable/models/authenticatable.rb

@@ -0,0 +1,11 @@
+module Devise
+  module Models
+    module Authenticatable
+      BLACKLIST_FOR_SERIALIZATION.concat %i[
+        invitation_token invitation_created_at invitation_sent_at
+        invitation_accepted_at invitation_limit invited_by_type
+        invited_by_id invitations_count
+      ]
+    end
+  end
+end

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '1.7.2'
+  VERSION = '1.7.3'
 end

data/lib/generators/active_record/devise_invitable_generator.rb

@@ -6,7 +6,13 @@ module ActiveRecord
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_devise_migration
-        migration_template "migration.rb", "db/migrate/devise_invitable_add_to_#{table_name}.rb"
+        migration_template "migration.rb", "db/migrate/devise_invitable_add_to_#{table_name}.rb", migration_version: migration_version
+      end
+
+      def migration_version
+        if Rails.version.start_with? '5.'
+          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+        end
       end
     end
   end

data/lib/generators/active_record/templates/migration.rb

@@ -1,4 +1,4 @@
-class DeviseInvitableAddTo<%= table_name.camelize %> < ActiveRecord::Migration
+class DeviseInvitableAddTo<%= table_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
   def up
     change_table :<%= table_name %> do |t|
       t.string     :invitation_token

data/test/functional/registrations_controller_test.rb

@@ -31,7 +31,7 @@ class DeviseInvitable::RegistrationsControllerTest < ActionController::TestCase
 
     # sign_up the invitee
     assert_difference('ActionMailer::Base.deliveries.size') do
-      post :create, :user => {:email => invitee_email, :password => "1password", :bio => '.'}
+      post :create, params: {:user => {:email => invitee_email, :password => "1password", :bio => '.'}}
     end
 
     @invitee = User.where(:email => invitee_email).first
@@ -57,7 +57,7 @@ class DeviseInvitable::RegistrationsControllerTest < ActionController::TestCase
     register_email = "invitee@example.org"
     # sign_up the invitee
     assert_difference('ActionMailer::Base.deliveries.size') do
-      post :create, :user => {:email => register_email, :password => "1password", :bio => '.'}
+      post :create, params: {:user => {:email => register_email, :password => "1password", :bio => '.'}}
     end
     assert_nil @controller.current_user
 
@@ -85,7 +85,7 @@ class DeviseInvitable::RegistrationsControllerTest < ActionController::TestCase
 
     assert_nil Admin.where(:email => invitee_email).first
 
-    post :create, :admin => {:email => invitee_email, :password => "1password"}
+    post :create, params: {:admin => {:email => invitee_email, :password => "1password"}}
 
     @invitee = Admin.where(:email => invitee_email).first
     assert @invitee.encrypted_password.present?
@@ -95,14 +95,14 @@ class DeviseInvitable::RegistrationsControllerTest < ActionController::TestCase
     @request.env["devise.mapping"] = Devise.mappings[:admin]
     invitee_email = "invitee@example.org"
 
-    post :create, :admin => {:email => invitee_email, :password => "1password"}
+    post :create, params: {:admin => {:email => invitee_email, :password => "1password"}}
     assert_response 302
 
     @invitee = Admin.where(:email => invitee_email).first
     assert @invitee.encrypted_password.present?
 
     sign_out @invitee
-    post :create, :admin => {:email => invitee_email, :password => "2password"}
+    post :create, params: {:admin => {:email => invitee_email, :password => "2password"}}
     assert_response 200
     assert_equal @invitee.encrypted_password, Admin.where(:email => invitee_email).first.encrypted_password
     assert @controller.send(:resource).errors.present?

data/test/integration/invitation_test.rb

@@ -252,7 +252,7 @@ class InvitationTest < ActionDispatch::IntegrationTest
     sign_in_as_user admin
 
     send_invitation new_admin_path
-    assert_equal edit_admin_registration_path(admin), current_path
+    assert_equal root_path, current_path
     assert page.has_css?('p#notice', :text => 'An invitation email has been sent to user@test.com.')
   end
 
@@ -261,7 +261,7 @@ class InvitationTest < ActionDispatch::IntegrationTest
     sign_in_as_user admin
 
     send_invitation new_free_invitation_path
-    assert_equal edit_admin_registration_path(admin), current_path
+    assert_equal root_path, current_path
     assert page.has_css?('p#notice', :text => 'An invitation email has been sent to user@test.com.')
   end
 end

data/test/models/invitable_test.rb

@@ -619,6 +619,24 @@ class InvitableTest < ActiveSupport::TestCase
     refute_predicate user, :confirmed?
   end
 
+  test 'should not send password change notification when accepting invitation' do
+    send_password_change_notification = User.send_password_change_notification
+
+    begin
+      User.send_password_change_notification = true
+
+      user = User.invite!(:email => "valid@email.com")
+
+      assert_no_difference('ActionMailer::Base.deliveries.size') do
+        user.password = user.password_confirmation = '123456789'
+        user.accept_invitation!
+      end
+
+    ensure
+      User.send_password_change_notification = send_password_change_notification
+    end
+  end
+
   def assert_callbacks_fired(callback, user)
     assert_callbacks_status callback, user, true
   end

data/test/rails_app/app/controllers/application_controller.rb

@@ -1,6 +1,6 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  before_filter :configure_permitted_parameters, :if => :devise_controller?
+  before_action :configure_permitted_parameters, :if => :devise_controller?
 
   protected
   def after_sign_in_path_for(resource)

data/test/rails_app/app/controllers/users_controller.rb

@@ -1,5 +1,5 @@
 class UsersController < ApplicationController
-  before_filter :authenticate_user!
+  before_action :authenticate_user!
 
   def index
     user_session[:cart] = "Cart"

data/test/rails_app/app/models/user.rb

@@ -56,7 +56,7 @@ class User < PARENT_MODEL_CLASS
     object.after_invitation_accepted_callback_works = true
   end
 
-  def send_devise_notification(method, raw, *args)
+  def send_devise_notification(method, raw=nil, *args)
     Thread.current[:token] = raw
     super
   end

data/test/rails_app/db/migrate/20100401102949_create_tables.rb

@@ -1,4 +1,4 @@
-class CreateTables < ActiveRecord::Migration
+class CreateTables < (Rails.version < '5.1' ? ActiveRecord::Migration : ActiveRecord::Migration[5.0])
   def change
     create_table :users do |t|
       ## Database authenticatable

data/test/test_helper.rb

@@ -36,4 +36,11 @@ class ActionController::TestCase
       end
     end
   end
+      
+  if Rails.version < '5.0.0'
+    def post(action, *args)
+      hash = args[0] || {}
+      super action, hash[:params], hash[:session], hash[:flash]
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_invitable
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Sergio Cambra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,8 @@ files:
 - lib/devise_invitable/inviter.rb
 - lib/devise_invitable/mailer.rb
 - lib/devise_invitable/mapping.rb
-- lib/devise_invitable/model.rb
+- lib/devise_invitable/models.rb
+- lib/devise_invitable/models/authenticatable.rb
 - lib/devise_invitable/parameter_sanitizer.rb
 - lib/devise_invitable/rails.rb
 - lib/devise_invitable/routes.rb