diff --git a/app/assets/images/logo-france-connect.png b/app/assets/images/logo-france-connect.png new file mode 100644 index 000000000..c33a34723 Binary files /dev/null and b/app/assets/images/logo-france-connect.png differ diff --git a/app/models/dossier.rb b/app/models/dossier.rb index d4a99ce22..7c4ddc06e 100644 --- a/app/models/dossier.rb +++ b/app/models/dossier.rb @@ -59,6 +59,7 @@ class Dossier < ApplicationRecord has_one :etablissement, dependent: :destroy has_one :individual, validate: false, dependent: :destroy has_one :attestation, dependent: :destroy + has_one :france_connect_information, through: :user has_one_attached :justificatif_motivation diff --git a/app/views/dossiers/show.pdf.prawn b/app/views/dossiers/show.pdf.prawn index 36c1c6329..5d85579cb 100644 --- a/app/views/dossiers/show.pdf.prawn +++ b/app/views/dossiers/show.pdf.prawn @@ -188,6 +188,9 @@ prawn_document(page_size: "A4") do |pdf| add_title(pdf, "Identité du demandeur") + if @dossier.france_connect_information.present? + format_in_2_columns(pdf, 'Informations France Connect', "Le dossier a été déposé par le compte de #{@dossier.france_connect_information.given_name} #{@dossier.france_connect_information.family_name}, authentifié par France Connect le #{@dossier.france_connect_information.updated_at.strftime('%d/%m/%Y')}") + end format_in_2_columns(pdf, "Email", @dossier.user.email) add_identite_individual(pdf, @dossier) if @dossier.individual.present? render_identite_etablissement(pdf, @dossier.etablissement) if @dossier.etablissement.present? diff --git a/app/views/shared/dossiers/_demande.html.haml b/app/views/shared/dossiers/_demande.html.haml index 55870541c..a4c45ec87 100644 --- a/app/views/shared/dossiers/_demande.html.haml +++ b/app/views/shared/dossiers/_demande.html.haml @@ -5,6 +5,8 @@ .tab-title Identité du demandeur .card + - if dossier.france_connect_information.present? + = render partial: "shared/dossiers/france_connect_informations", locals: { user_information: dossier.france_connect_information } = render partial: "shared/dossiers/user_infos", locals: { user: dossier.user } - if dossier.etablissement.present? diff --git a/app/views/shared/dossiers/_edit.html.haml b/app/views/shared/dossiers/_edit.html.haml index a8a420e3f..67e21b38a 100644 --- a/app/views/shared/dossiers/_edit.html.haml +++ b/app/views/shared/dossiers/_edit.html.haml @@ -21,7 +21,8 @@ Votre dossier est enregistré automatiquement après chaque modification. Vous pouvez à tout moment fermer la fenêtre et reprendre plus tard là où vous en étiez. - else Pour enregistrer votre dossier et le reprendre plus tard, cliquez sur le bouton « Enregistrer le brouillon » en bas à gauche du formulaire. - + - if !apercu && dossier.france_connect_information.present? + = render partial: "shared/dossiers/france_connect_informations", locals: { user_information: dossier.france_connect_information } - if notice_url(dossier.procedure).present? = link_to notice_url(dossier.procedure), target: '_blank', rel: 'noopener', class: 'button notice', title: "Pour vous aider à remplir votre dossier, vous pouvez consulter le guide de cette démarche." do %span.icon.info> diff --git a/app/views/shared/dossiers/_france_connect_informations.html.haml b/app/views/shared/dossiers/_france_connect_informations.html.haml new file mode 100644 index 000000000..ba7256521 --- /dev/null +++ b/app/views/shared/dossiers/_france_connect_informations.html.haml @@ -0,0 +1,4 @@ +.card.featured + .flex.justify-center + = image_tag "logo-france-connect.png", alt: "France Connect logo", width: 200, class: "mb-2" + .card-title Le dossier a été déposé par le compte de #{user_information.given_name} #{user_information.family_name}, authentifié par France Connect le #{user_information.updated_at.strftime('%d/%m/%Y')}. diff --git a/spec/features/france_connect/france_connect_particulier_spec.rb b/spec/features/france_connect/france_connect_particulier_spec.rb index 123a10d7d..37a5171c3 100644 --- a/spec/features/france_connect/france_connect_particulier_spec.rb +++ b/spec/features/france_connect/france_connect_particulier_spec.rb @@ -68,6 +68,10 @@ feature 'France Connect Particulier Connexion' do scenario 'he is redirected to user dossiers page' do expect(page).to have_content('Dossiers') end + + scenario 'the updated_at date is well updated' do + expect(france_connect_information.updated_at).not_to eq(france_connect_information.created_at) + end end end diff --git a/spec/views/instructeur/dossiers/show.html.haml_spec.rb b/spec/views/instructeur/dossiers/show.html.haml_spec.rb index 25072b3e5..7eb30ba0a 100644 --- a/spec/views/instructeur/dossiers/show.html.haml_spec.rb +++ b/spec/views/instructeur/dossiers/show.html.haml_spec.rb @@ -18,4 +18,19 @@ describe 'instructeurs/dossiers/show.html.haml', type: :view do expect(rendered).to have_text('Identité') expect(rendered).to have_text('Demande') end + + context 'when the user is logged in with france connect' do + let(:france_connect_information) { build(:france_connect_information) } + let(:user) { build(:user, france_connect_information: france_connect_information) } + let(:procedure1) { create(:procedure, :with_type_de_champ, for_individual: true) } + let(:dossier) { create(:dossier, procedure: procedure1, user: user) } + + before do + render + end + + it 'fills the individual with the informations from France Connect' do + expect(rendered).to have_text("Le dossier a été déposé par le compte de #{france_connect_information.given_name} #{france_connect_information.family_name}, authentifié par France Connect le #{france_connect_information.updated_at.strftime('%d/%m/%Y')}") + end + end end diff --git a/spec/views/users/dossiers/demande.html.haml_spec.rb b/spec/views/users/dossiers/demande.html.haml_spec.rb index 0a46903d4..4b0859420 100644 --- a/spec/views/users/dossiers/demande.html.haml_spec.rb +++ b/spec/views/users/dossiers/demande.html.haml_spec.rb @@ -33,4 +33,19 @@ describe 'users/dossiers/demande.html.haml', type: :view do it { expect(rendered).not_to have_text('Déposé le') } end + + context 'when the user is logged in with france connect' do + let(:france_connect_information) { build(:france_connect_information) } + let(:user) { build(:user, france_connect_information: france_connect_information) } + let(:procedure1) { create(:procedure, :with_type_de_champ, for_individual: true) } + let(:dossier) { create(:dossier, procedure: procedure1, user: user) } + + before do + render + end + + it 'fills the individual with the informations from France Connect' do + expect(rendered).to have_text("Le dossier a été déposé par le compte de #{france_connect_information.given_name} #{france_connect_information.family_name}, authentifié par France Connect le #{france_connect_information.updated_at.strftime('%d/%m/%Y')}") + end + end end