Merge pull request #10705 from demarches-simplifiees/email-expert-need-confirmation-ldu
ETQ expert, je dois confirmer mon mail
This commit is contained in:
commit
8e7e8d9624
14 changed files with 122 additions and 21 deletions
|
@ -62,8 +62,12 @@ module CreateAvisConcern
|
|||
avis.dossier.demander_un_avis!(avis)
|
||||
if avis.dossier == dossier
|
||||
if avis.experts_procedure.notify_on_new_avis?
|
||||
if avis.expert.user.unverified_email?
|
||||
avis.expert.user.invite_expert_and_send_avis!(avis)
|
||||
else
|
||||
AvisMailer.avis_invitation(avis).deliver_later
|
||||
end
|
||||
end
|
||||
sent_emails_addresses << avis.expert.email
|
||||
# the email format is already verified, we update value to nil
|
||||
avis.update_column(:email, nil)
|
||||
|
|
|
@ -146,6 +146,7 @@ module Experts
|
|||
|
||||
if user.valid?
|
||||
sign_in(user)
|
||||
user.update!(email_verified_at: Time.zone.now) if user.unverified_email?
|
||||
redirect_to url_for(expert_all_avis_path)
|
||||
else
|
||||
flash[:alert] = user.errors.full_messages
|
||||
|
|
|
@ -19,7 +19,11 @@ module Instructeurs
|
|||
def remind
|
||||
avis = Avis.find(params[:id])
|
||||
if avis.remind_by!(current_instructeur)
|
||||
if avis.expert.user.unverified_email?
|
||||
avis.expert.user.invite_expert_and_send_avis!(avis)
|
||||
else
|
||||
AvisMailer.avis_invitation(avis).deliver_later
|
||||
end
|
||||
flash.notice = "Un mail de relance a été envoyé à #{avis.expert.email}"
|
||||
redirect_back(fallback_location: avis_instructeur_dossier_path(avis.procedure, avis.dossier))
|
||||
end
|
||||
|
|
|
@ -42,7 +42,7 @@ class Users::ActivateController < ApplicationController
|
|||
else
|
||||
if user.present?
|
||||
flash[:alert] = "Ce lien n'est plus valable, un nouveau lien a été envoyé à l'adresse #{user.email}"
|
||||
User.create_or_promote_to_tiers(user.email, SecureRandom.hex)
|
||||
user.resend_confirmation_email!
|
||||
else
|
||||
flash[:alert] = "Un problème est survenu, vous pouvez nous contacter sur #{Current.contact_email}"
|
||||
end
|
||||
|
|
|
@ -22,6 +22,25 @@ class AvisMailer < ApplicationMailer
|
|||
end
|
||||
end
|
||||
|
||||
def avis_invitation_and_confirm_email(user, token, avis, targeted_user_link = nil) # ensure re-entrance if existing AvisMailer.avis_invitation in queue
|
||||
if avis.dossier.visible_by_administration?
|
||||
targeted_user_link = avis.targeted_user_links
|
||||
.find_or_create_by(target_context: 'avis',
|
||||
target_model_type: Avis.name,
|
||||
target_model_id: avis.id,
|
||||
user: avis.expert.user)
|
||||
email = user.email
|
||||
@token = token
|
||||
@avis = avis
|
||||
@url = targeted_user_link_url(targeted_user_link)
|
||||
subject = "Donnez votre avis sur le dossier nº #{@avis.dossier.id} (#{@avis.dossier.procedure.libelle})"
|
||||
|
||||
bypass_unverified_mail_protection!
|
||||
|
||||
mail(to: email, subject: subject)
|
||||
end
|
||||
end
|
||||
|
||||
# i18n-tasks-use t("avis_mailer.#{action}.subject")
|
||||
def notify_new_commentaire_to_expert(dossier, avis, expert)
|
||||
I18n.with_locale(dossier.user_locale) do
|
||||
|
|
|
@ -65,6 +65,20 @@ class UserMailer < ApplicationMailer
|
|||
reply_to: Current.contact_email)
|
||||
end
|
||||
|
||||
def resend_confirmation_email(user, token)
|
||||
@token = token
|
||||
@user = user
|
||||
subject = "Vérification de votre mail"
|
||||
|
||||
configure_defaults_for_user(user)
|
||||
|
||||
bypass_unverified_mail_protection!
|
||||
|
||||
mail(to: user.email,
|
||||
subject: subject,
|
||||
reply_to: Current.contact_email)
|
||||
end
|
||||
|
||||
def invite_gestionnaire(user, reset_password_token, groupe_gestionnaire)
|
||||
@reset_password_token = reset_password_token
|
||||
@user = user
|
||||
|
|
|
@ -33,11 +33,13 @@ class TargetedUserLink < ApplicationRecord
|
|||
url_helper.invite_path(invite, params: { email: invite.email })
|
||||
when "avis"
|
||||
avis = target_model
|
||||
avis.expert.user.active? ?
|
||||
url_helper.expert_avis_path(avis.procedure, avis) :
|
||||
if avis.expert.user.active?
|
||||
url_helper.expert_avis_path(avis.procedure, avis)
|
||||
else
|
||||
url_helper.sign_up_expert_avis_path(avis.procedure, avis, email: avis.expert.email)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
|
|
|
@ -91,6 +91,18 @@ class User < ApplicationRecord
|
|||
UserMailer.invite_tiers(self, token, dossier).deliver_later
|
||||
end
|
||||
|
||||
def invite_expert_and_send_avis!(avis)
|
||||
token = SecureRandom.hex(10)
|
||||
self.update!(confirmation_token: token, confirmation_sent_at: Time.zone.now)
|
||||
AvisMailer.avis_invitation_and_confirm_email(self, token, avis).deliver_later
|
||||
end
|
||||
|
||||
def resend_confirmation_email!
|
||||
token = SecureRandom.hex(10)
|
||||
self.update!(confirmation_token: token, confirmation_sent_at: Time.zone.now)
|
||||
UserMailer.resend_confirmation_email(self, token).deliver_later
|
||||
end
|
||||
|
||||
def invite_gestionnaire!(groupe_gestionnaire)
|
||||
UserMailer.invite_gestionnaire(self, set_reset_password_token, groupe_gestionnaire).deliver_later
|
||||
end
|
||||
|
@ -163,14 +175,12 @@ class User < ApplicationRecord
|
|||
|
||||
def self.create_or_promote_to_expert(email, password)
|
||||
user = User
|
||||
.create_with(password: password, confirmed_at: Time.zone.now, email_verified_at: Time.zone.now)
|
||||
.create_with(password: password, confirmed_at: Time.zone.now)
|
||||
.find_or_create_by(email: email)
|
||||
|
||||
if user.valid?
|
||||
if user.expert.nil?
|
||||
if user.valid? && user.expert.nil?
|
||||
user.create_expert!
|
||||
end
|
||||
end
|
||||
|
||||
user
|
||||
end
|
||||
|
|
|
@ -22,11 +22,7 @@
|
|||
%p{ style: "padding: 8px; color: #333333; background-color: #EEEEEE; font-size: 14px;" }
|
||||
= @avis.introduction
|
||||
|
||||
- if @avis.expert.user.active?.present?
|
||||
%p
|
||||
= round_button("Donner votre avis", @url, :primary)
|
||||
- else
|
||||
%p
|
||||
= round_button("Inscrivez-vous pour donner votre avis", @url, :primary)
|
||||
|
||||
= render partial: "layouts/mailers/signature"
|
||||
|
|
|
@ -0,0 +1,33 @@
|
|||
- content_for(:title, 'Invitation à donner votre avis')
|
||||
|
||||
- content_for(:footer) do
|
||||
Merci de ne pas répondre à cet email. Donnez votre avis
|
||||
= link_to("sur #{Current.application_name}", @url)
|
||||
ou
|
||||
= succeed '.' do
|
||||
= mail_to(@avis.claimant.email, "contactez la personne qui vous a invité")
|
||||
|
||||
%p
|
||||
Bonjour,
|
||||
|
||||
%p
|
||||
Vous avez été invité par
|
||||
%strong= @avis.claimant.email
|
||||
= "à donner votre avis sur le dossier nº #{@avis.dossier.id} de la démarche :"
|
||||
%strong= @avis.procedure.libelle
|
||||
|
||||
%p
|
||||
= "#{@avis.claimant.email} vous a écrit :"
|
||||
%br
|
||||
%p{ style: "padding: 8px; color: #333333; background-color: #EEEEEE; font-size: 14px;" }
|
||||
= @avis.introduction
|
||||
|
||||
- if @avis.expert.user.active?
|
||||
%p
|
||||
= round_button('Confirmez votre adresse email pour donner votre avis', users_confirm_email_url(token: @token), :primary)
|
||||
- else
|
||||
%p
|
||||
= round_button("Inscrivez-vous pour donner votre avis", @url, :primary)
|
||||
|
||||
|
||||
= render partial: "layouts/mailers/signature"
|
18
app/views/user_mailer/resend_confirmation_email.html.haml
Normal file
18
app/views/user_mailer/resend_confirmation_email.html.haml
Normal file
|
@ -0,0 +1,18 @@
|
|||
- content_for(:title, "Vérification de votre mail sur #{Current.application_name}")
|
||||
|
||||
%p
|
||||
Bonjour,
|
||||
|
||||
%p
|
||||
Votre précédente confirmation de mail n'a pas fonctionné, vous pouvez essayer de nouveau en cliquant sur ce bouton :
|
||||
= round_button 'Je confirme', users_confirm_email_url(token: @token), :primary
|
||||
|
||||
%p
|
||||
Vous pouvez aussi utiliser ce lien :
|
||||
= link_to(users_confirm_email_url(token: @token), users_confirm_email_url(token: @token))
|
||||
|
||||
%p
|
||||
Nous restons à votre disposition si vous avez besoin d’accompagnement à l'adresse #{link_to CONTACT_EMAIL, "mailto:#{CONTACT_EMAIL}"}.
|
||||
|
||||
|
||||
= render partial: "layouts/mailers/signature"
|
|
@ -29,14 +29,14 @@ describe Instructeurs::AvisController, type: :controller do
|
|||
|
||||
describe 'remind' do
|
||||
before do
|
||||
allow(AvisMailer).to receive(:avis_invitation).and_return(double(deliver_later: nil))
|
||||
allow(AvisMailer).to receive(:avis_invitation_and_confirm_email).and_return(double(deliver_later: nil))
|
||||
end
|
||||
context 'without question' do
|
||||
let!(:avis) { create(:avis, dossier: dossier, claimant: instructeur, experts_procedure: experts_procedure) }
|
||||
|
||||
it 'sends a reminder to the expert' do
|
||||
get :remind, params: { procedure_id: procedure.id, id: avis.id }
|
||||
expect(AvisMailer).to have_received(:avis_invitation).once.with(avis)
|
||||
expect(AvisMailer).to have_received(:avis_invitation_and_confirm_email)
|
||||
expect(flash.notice).to eq("Un mail de relance a été envoyé à #{avis.expert.email}")
|
||||
expect(avis.reload.reminded_at).to be_present
|
||||
end
|
||||
|
@ -47,7 +47,7 @@ describe Instructeurs::AvisController, type: :controller do
|
|||
|
||||
it 'sends a reminder to the expert' do
|
||||
get :remind, params: { procedure_id: procedure.id, id: avis.id }
|
||||
expect(AvisMailer).to have_received(:avis_invitation).once.with(avis)
|
||||
expect(AvisMailer).to have_received(:avis_invitation_and_confirm_email)
|
||||
expect(flash.notice).to eq("Un mail de relance a été envoyé à #{avis.expert.email}")
|
||||
expect(avis.reload.reminded_at).to be_present
|
||||
end
|
||||
|
|
|
@ -83,7 +83,7 @@ describe Users::ActivateController, type: :controller do
|
|||
end
|
||||
|
||||
it 'redirects to root path with an explanation notice and it send a new link if user present' do
|
||||
expect { subject }.to have_enqueued_mail(UserMailer, :invite_tiers)
|
||||
expect { subject }.to have_enqueued_mail(UserMailer, :resend_confirmation_email)
|
||||
expect(response).to redirect_to(root_path(user))
|
||||
expect(flash[:alert]).to eq("Ce lien n'est plus valable, un nouveau lien a été envoyé à l'adresse #{user.email}")
|
||||
end
|
||||
|
|
|
@ -193,7 +193,7 @@ describe User, type: :model do
|
|||
user = subject
|
||||
expect(user.valid_password?(password)).to be true
|
||||
expect(user.confirmed_at).to be_present
|
||||
expect(user.email_verified_at).to be_present
|
||||
expect(user.email_verified_at).to be_nil
|
||||
expect(user.expert).to be_present
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue