Merge pull request #12784 from demarche-numerique/hide_pro_connect

LeSim · web-flow · commit 45c5dbf1b77b · 2026-03-13T14:25:54.000+01:00
ETQ Usager, le bouton pro connect de m'est plus propose au mm niveau que FranceConnect
diff --git a/app/controllers/pro_connect_controller.rb b/app/controllers/pro_connect_controller.rb
@@ -13,7 +13,6 @@ class ProConnectController < ApplicationController
   NONCE_COOKIE_NAME = :proConnect_nonce
 
   def index
-    redirect_to new_user_session_path, status: :moved_permanently
   end
 
   def required; end
diff --git a/app/views/commencer/show.html.haml b/app/views/commencer/show.html.haml
@@ -16,7 +16,7 @@
           .fr-grid-row.fr-grid-row--gutters
             .fr-col-12.fr-col-lg-5
               = render partial: 'shared/france_connect_login', locals: { url: commencer_france_connect_path(path: @procedure.path, prefill_token: @prefilled_dossier&.prefill_token), heading_level: :h3, title: t('views.shared.france_connect_login.commencer_title') }
-              = render ProConnectLoginComponent.new(url: commencer_pro_connect_path(path: @procedure.path, prefill_token: @prefilled_dossier&.prefill_token), heading_level: :h3, title: t('views.shared.france_connect_login.commencer_pc_title'))
+              -# = render ProConnectLoginComponent.new(url: commencer_pro_connect_path(path: @procedure.path, prefill_token: @prefilled_dossier&.prefill_token), heading_level: :h3, title: t('views.shared.france_connect_login.commencer_pc_title'))
             .fr-hidden.fr-unhidden-lg.fr-col-lg-1
               .fr-vr-or{ role: "separator", "aria-orientation": "vertical" }
                 %span= t('views.shared.france_connect_login.separator')
diff --git a/app/views/layouts/_header.haml b/app/views/layouts/_header.haml
@@ -43,6 +43,9 @@
                 - elsif request.path != new_user_session_path && !content_for?(:hide_header_login)
                   - if request.path == new_user_registration_path
                     %li.fr-hidden-sm.fr-unhidden-lg.fr-link--sm.fr-mr-1v= t('views.shared.account.already_user_question')
+                  %li= link_to 'Professionnel',
+                    content_for(:pro_connect_path) || pro_connect_path,
+                    class: "fr-btn fr-btn--tertiary fr-icon-government-fill fr-btn--icon-left"
                   %li= link_to t('views.shared.account.signin'), new_user_session_path, class: "fr-btn fr-btn--tertiary fr-icon-account-circle-fill fr-btn--icon-left"
 
                 %li
diff --git a/app/views/pro_connect/index.html.haml b/app/views/pro_connect/index.html.haml
@@ -0,0 +1,60 @@
+- content_for(:title, t('.cta'))
+
+#proconnect
+  .fr-container
+    .fr-grid-row.fr-grid-row--gutters.fr-mt-0
+
+      .fr-col-lg.fr-p-6w.fr-background-alt--blue-france
+
+        #session-new.auth-form.sign-in-form
+          = form_for User.new, url: user_session_path do |f|
+
+            %h1.fr-h2= t('views.users.sessions.new.sign_in', application_name: Current.application_name)
+
+            .fr-mb-0.fr-fieldset
+              .fr-fieldset__legend
+                %h2.fr-h6= t('.cta')
+
+              .fr-fieldset__element
+                %p= t('.explanation')
+
+                = render ProConnectLoginComponent.new
+
+            - if !params[:force_pro_connect]
+              %p.fr-hr-or= t('views.shared.france_connect_login.separator')
+
+              %fieldset.fr-mb-0.fr-fieldset{ aria: { labelledby: 'new-account-legend' } }
+                %legend.fr-fieldset__legend#new-account-legend
+                  %h2.fr-h6= t('views.users.sessions.new.subtitle')
+
+                .fr-fieldset__element
+                  %p.fr-text--sm= t('utils.asterisk_html')
+
+                .fr-fieldset__element
+                  = render Dsfr::InputComponent.new(form: f, attribute: :email, input_type: :email_field, opts: { autocomplete: 'email' }) do |c|
+                    - c.with_label { t('.pro_email') }
+
+                .fr-fieldset__element
+                  = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field, opts: { autocomplete: 'current-password' })
+
+                  %p= link_to t('views.users.sessions.new.reset_password'), new_user_password_path, class: "fr-link"
+
+                .fr-fieldset__element
+                  .auth-options
+                    .flex-no-shrink
+                      = f.check_box :remember_me
+                      = f.label :remember_me, t('views.users.sessions.new.remember_me'), class: 'remember-me'
+
+                  .fr-btns-group= f.submit t('views.users.sessions.new.connection'), class: "fr-btn"
+
+          %hr
+
+        %h2.fr-h6= t('.you_are_a_citizen')
+        .fr-btns-group= link_to t('.citizen_page'), new_user_session_path, class: "fr-btn fr-btn--secondary"
+
+      .fr-col-lg.fr-p-6w
+        = render Dsfr::CalloutComponent.new(title: t('.full_deploy_title'), icon: 'fr-icon-information-line') do |c|
+          - c.with_body do
+            = t('.full_deploy_body')
+        %h2.fr-h6= t('.whats_ds', application_name: Current.application_name)
+        = image_tag "landing/hero/dematerialiser.svg", class: "fr-responsive-img", alt: ""
diff --git a/app/views/users/registrations/new.html.haml b/app/views/users/registrations/new.html.haml
@@ -8,7 +8,7 @@
     %h1.fr-h2= t('views.registrations.new.title', name: Current.application_name)
 
     = render partial: 'shared/france_connect_login', locals: { url: france_connect_path, title: t('views.shared.france_connect_login.signup_title') }
-    = render ProConnectLoginComponent.new(title: t('views.shared.france_connect_login.signup_pc_title'))
+    -# = render ProConnectLoginComponent.new(title: t('views.shared.france_connect_login.signup_pc_title'))
 
     %p.fr-hr-or= t('views.shared.france_connect_login.separator')
 
diff --git a/app/views/users/sessions/new.html.haml b/app/views/users/sessions/new.html.haml
@@ -7,7 +7,7 @@
     %h1.fr-h2= t('views.users.sessions.new.sign_in', application_name: Current.application_name)
 
     = render partial: 'shared/france_connect_login', locals: { url: france_connect_path }
-    = render ProConnectLoginComponent.new
+    -# = render ProConnectLoginComponent.new
 
     %p.fr-hr-or= t('views.shared.france_connect_login.separator')
 
diff --git a/config/locales/views/pro_connect/en.yml b/config/locales/views/pro_connect/en.yml
@@ -3,3 +3,12 @@ en:
     required:
       title: "ProConnect login required"
       explanation: "This procedure requires ProConnect authentication. Please sign in with ProConnect to access it."
+    index:
+      cta: Connect with ProConnect
+      explanation: ProConnect is the solution provided by the French government to secure and simplify connection to online services
+      full_deploy_title: ProConnect is now fully deployed
+      full_deploy_body: All ministries and operators can use it today
+      you_are_a_citizen: Are you a citizen?
+      citizen_page: Connect to your space
+      whats_ds: '%{application_name}, the national platform for digitizing administrative procedures'
+      pro_email: Professional email address
diff --git a/config/locales/views/pro_connect/fr.yml b/config/locales/views/pro_connect/fr.yml
@@ -3,3 +3,12 @@ fr:
     required:
       title: "Connexion ProConnect requise"
       explanation: "Cette démarche nécessite une authentification via ProConnect. Seuls les agents disposant d’un compte ProConnect peuvent y accéder."
+    index:
+      cta: Se connecter avec ProConnect
+      explanation: ProConnect est la solution proposée par l’État pour sécuriser et simplifier la connexion aux services en ligne
+      full_deploy_title: ProConnect est désormais entièrement déployé
+      full_deploy_body: Tous les ministères et opérateurs peuvent l’utiliser à ce jour
+      you_are_a_citizen: Vous êtes un particulier ?
+      citizen_page: Se connecter sur votre espace
+      whats_ds: '%{application_name}, la plateforme nationale de dématérialisation des démarches administratives'
+      pro_email: Adresse électronique professionnelle
diff --git a/config/locales/views/shared/en.yml b/config/locales/views/shared/en.yml
@@ -15,9 +15,9 @@ en:
       france_connect_login:
         title: "Sign in with FranceConnect"
         signup_title: "Create an account with FranceConnect"
-        signup_pc_title: "Create an account with ProConnect"
+        # signup_pc_title: "Create an account with ProConnect"
         commencer_title: "Are you an individual?"
-        commencer_pc_title: "Are you a professional?"
+        # commencer_pc_title: "Are you a professional?"
         login_button: "Sign in with"
         help_link: What is FranceConnect?
         separator: or
diff --git a/config/locales/views/shared/fr.yml b/config/locales/views/shared/fr.yml
@@ -15,9 +15,9 @@ fr:
       france_connect_login:
         title: "Se connecter avec FranceConnect"
         signup_title: "Se créer un compte avec FranceConnect"
-        signup_pc_title: "Se créer un compte avec ProConnect"
+        # signup_pc_title: "Se créer un compte avec ProConnect"
         commencer_title: "Vous êtes un particulier ?"
-        commencer_pc_title: "Vous êtes un professionnel ?"
+        # commencer_pc_title: "Vous êtes un professionnel ?"
         login_button: "S’identifier avec"
         help_link: "Qu’est-ce que FranceConnect ?"
         separator: ou
diff --git a/spec/views/commencer/show.html.haml_spec.rb b/spec/views/commencer/show.html.haml_spec.rb
@@ -44,7 +44,7 @@
       expect(rendered).to have_link('S’identifier avec FranceConnect')
     end
 
-    it 'renders ProConnect login button' do
+    xit 'renders ProConnect login button' do
       subject
       expect(rendered).to have_css('.pro-connect-login')
     end
diff --git a/spec/views/users/registrations/new.html.haml_spec.rb b/spec/views/users/registrations/new.html.haml_spec.rb
@@ -10,7 +10,7 @@
     assign(:user, User.new)
   end
 
-  context 'when ProConnect is enabled' do
+  xcontext 'when ProConnect is enabled' do
     before do
       allow(ProConnectService).to receive(:enabled?).and_return(true)
       render
diff --git a/spec/views/users/sessions/new.html.haml_spec.rb b/spec/views/users/sessions/new.html.haml_spec.rb
@@ -27,7 +27,7 @@
       expect(rendered).to have_css('.france-connect-login')
     end
 
-    it 'renders ProConnect login button' do
+    xit 'renders ProConnect login button' do
       expect(rendered).to have_css('.pro-connect-login')
     end
   end
