Merge branch '41206-show-signin-pane-after-email-confirmation' into 'master'

Resolve "New user is sent back to Register tab after confirming email"

Closes #41206

See merge request gitlab-org/gitlab-ce!16174

app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js

-/* eslint no-param-reassign: ["error", { "props": false }]*/
-/* eslint no-new: "off" */
 import AccessorUtilities from '~/lib/utils/accessor';
 
 /**
@@ -11,6 +9,10 @@ export default class SigninTabsMemoizer {
     this.currentTabKey = currentTabKey;
     this.tabSelector = tabSelector;
     this.isLocalStorageAvailable = AccessorUtilities.isLocalStorageAccessSafe();
+    // sets selected tab if given as hash tag
+    if (window.location.hash) {
+      this.saveData(window.location.hash);
+    }
 
     this.bootstrap();
   }

app/controllers/confirmations_controller.rb

@@ -17,7 +17,7 @@ class ConfirmationsController < Devise::ConfirmationsController
     else
       Gitlab::AppLogger.info("Email Confirmed: username=#{resource.username} email=#{resource.email} ip=#{request.remote_ip}")
       flash[:notice] += " Please sign in."
-      new_session_path(:user)
+      new_session_path(:user, anchor: 'login-pane')
     end
   end
 

app/views/devise/shared/_signin_box.html.haml

@@ -8,7 +8,7 @@
       .login-body
         = render 'devise/sessions/new_ldap', server: server
   - if password_authentication_enabled_for_web?
-    .login-box.tab-pane{ id: 'ldap-standard', role: 'tabpanel' }
+    .login-box.tab-pane{ id: 'login-pane', role: 'tabpanel' }
       .login-body
         = render 'devise/sessions/new_base'
 

app/views/devise/shared/_tabs_ldap.html.haml

@@ -7,7 +7,7 @@
       = link_to server['label'], "##{server['provider_name']}",  'data-toggle' => 'tab'
   - if password_authentication_enabled_for_web?
     %li
-      = link_to 'Standard', '#ldap-standard', 'data-toggle' => 'tab'
+      = link_to 'Standard', '#login-pane', 'data-toggle' => 'tab'
   - if allow_signup?
     %li
       = link_to 'Register', '#register-pane', 'data-toggle' => 'tab'

changelogs/unreleased/41206-show-signin-pane-after-email-confirmation.yml

+---
+title: Shows signin tab after new user email confirmation
+merge_request: 16174
+author: Jacopo Beschi @jacopo-beschi
+type: fixed

spec/javascripts/signin_tabs_memoizer_spec.js

@@ -53,6 +53,13 @@ import SigninTabsMemoizer from '~/pages/sessions/new/signin_tabs_memoizer';
       expect(memo.readData()).toEqual('#standard');
     });
 
+    it('overrides last selected tab with hash tag when given', () => {
+      window.location.hash = '#ldap';
+      createMemoizer();
+
+      expect(memo.readData()).toEqual('#ldap');
+    });
+
     describe('class constructor', () => {
       beforeEach(() => {
         memo = createMemoizer();