From f2a14c4d08b9d9dab731db4d797f34138508e888 Mon Sep 17 00:00:00 2001
From: Matthew MacRae-Bovell <mmacrae-bovell@gitlab.com>
Date: Thu, 10 Jul 2025 21:44:06 -0400
Subject: [PATCH 1/2] Delete the "update email" functionality from signup

---
 .../new/components/email_verification.vue     |  21 +---
 .../sessions/new/components/update_email.vue  |  73 -----------
 .../javascripts/sessions/new/constants.js     |   7 --
 app/assets/javascripts/sessions/new/index.js  |   6 +-
 locale/gitlab.pot                             |   9 --
 .../new/components/email_verification_spec.js |  46 +------
 .../new/components/update_email_spec.js       | 118 ------------------
 7 files changed, 3 insertions(+), 277 deletions(-)
 delete mode 100644 app/assets/javascripts/sessions/new/components/update_email.vue
 delete mode 100644 spec/frontend/sessions/new/components/update_email_spec.js

diff --git a/app/assets/javascripts/sessions/new/components/email_verification.vue b/app/assets/javascripts/sessions/new/components/email_verification.vue
index 9096e27a13db5a..02f0d3c2f96e3d 100644
--- a/app/assets/javascripts/sessions/new/components/email_verification.vue
+++ b/app/assets/javascripts/sessions/new/components/email_verification.vue
@@ -13,7 +13,6 @@ import {
   I18N_RESEND_LINK,
   I18N_EMAIL_RESEND_SUCCESS,
   I18N_GENERIC_ERROR,
-  I18N_UPDATE_EMAIL,
   I18N_HELP_TEXT,
   I18N_SEND_TO_SECONDARY_EMAIL_BUTTON_TEXT,
   I18N_SEND_TO_SECONDARY_EMAIL_GUIDE,
@@ -23,10 +22,8 @@ import {
   FAILURE_RESPONSE,
 } from '../constants';
 import EmailForm from './email_form.vue';
-import UpdateEmail from './update_email.vue';
 
 const VERIFY_TOKEN_FORM = 'VERIFY_TOKEN_FORM';
-const UPDATE_EMAIL_FORM = 'UPDATE_EMAIL_FORM';
 const SEND_TO_SECONDARY_EMAIL_FORM = 'SEND_TO_SECONDARY_EMAIL_FORM';
 
 export default {
@@ -39,7 +36,6 @@ export default {
     GlButton,
     GlLink,
     EmailForm,
-    UpdateEmail,
   },
   mixins: [glFeatureFlagsMixin()],
   props: {
@@ -59,10 +55,6 @@ export default {
       type: String,
       required: true,
     },
-    isOfferEmailReset: {
-      type: Boolean,
-      required: true,
-    },
   },
   data() {
     return {
@@ -167,7 +159,6 @@ export default {
     inputLabel: I18N_INPUT_LABEL,
     submitButton: I18N_SUBMIT_BUTTON,
     resendLink: I18N_RESEND_LINK,
-    updateEmail: I18N_UPDATE_EMAIL,
     helpText: I18N_HELP_TEXT,
     sendToSecondaryEmailButtonText: I18N_SEND_TO_SECONDARY_EMAIL_BUTTON_TEXT,
     sendToSecondaryEmailGuide: I18N_SEND_TO_SECONDARY_EMAIL_GUIDE,
@@ -175,7 +166,6 @@ export default {
   },
   forms: {
     verifyTokenForm: VERIFY_TOKEN_FORM,
-    updateEmailForm: UPDATE_EMAIL_FORM,
     sendToSecondaryEmailForm: SEND_TO_SECONDARY_EMAIL_FORM,
   },
 };
@@ -183,9 +173,8 @@ export default {
 
 <template>
   <div>
-    <update-email v-if="activeForm === $options.forms.updateEmailForm" @verifyToken="verifyToken" />
     <email-form
-      v-else-if="activeForm === $options.forms.sendToSecondaryEmailForm"
+      v-if="activeForm === $options.forms.sendToSecondaryEmailForm"
       :form-info="$options.i18n.sendToSecondaryEmailGuide"
       :submit-text="$options.i18n.resendLink"
       @submit-email="sendToSecondaryEmail"
@@ -224,14 +213,6 @@ export default {
         <gl-button block variant="link" class="gl-mt-3 gl-h-7" @click="() => resend()">{{
           $options.i18n.resendLink
         }}</gl-button>
-        <gl-button
-          v-if="isOfferEmailReset"
-          block
-          variant="link"
-          class="gl-mt-3 gl-h-7"
-          @click="() => (activeForm = $options.forms.updateEmailForm)"
-          >{{ $options.i18n.updateEmail }}</gl-button
-        >
       </section>
       <p class="gl-mt-3 gl-text-subtle">
         <gl-sprintf :message="$options.i18n.helpText">
diff --git a/app/assets/javascripts/sessions/new/components/update_email.vue b/app/assets/javascripts/sessions/new/components/update_email.vue
deleted file mode 100644
index 4a9ebcd7e779d1..00000000000000
--- a/app/assets/javascripts/sessions/new/components/update_email.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<script>
-import { createAlert, VARIANT_SUCCESS } from '~/alert';
-import axios from '~/lib/utils/axios_utils';
-import {
-  I18N_UPDATE_EMAIL,
-  I18N_UPDATE_EMAIL_GUIDANCE,
-  I18N_UPDATE_EMAIL_SUCCESS,
-  I18N_GENERIC_ERROR,
-  SUCCESS_RESPONSE,
-  FAILURE_RESPONSE,
-} from '../constants';
-import EmailForm from './email_form.vue';
-
-export default {
-  name: 'UpdateEmail',
-  components: { EmailForm },
-  inject: ['updateEmailPath'],
-  data() {
-    return {
-      email: '',
-      verifyError: '',
-    };
-  },
-  methods: {
-    updateEmail(email) {
-      this.verifyError = '';
-      this.email = email;
-
-      axios
-        .patch(this.updateEmailPath, { user: { email } })
-        .then(this.handleResponse)
-        .catch(this.handleError);
-    },
-    handleResponse(response) {
-      if (response.data.status === undefined) {
-        this.handleError();
-      } else if (response.data.status === SUCCESS_RESPONSE) {
-        this.handleSuccess();
-      } else if (response.data.status === FAILURE_RESPONSE) {
-        this.verifyError = response.data.message;
-      }
-    },
-    handleSuccess() {
-      createAlert({
-        message: I18N_UPDATE_EMAIL_SUCCESS,
-        variant: VARIANT_SUCCESS,
-      });
-      this.$emit('verifyToken', this.email);
-    },
-    handleError(error) {
-      createAlert({
-        message: I18N_GENERIC_ERROR,
-        captureError: true,
-        error,
-      });
-    },
-  },
-  i18n: {
-    updateEmail: I18N_UPDATE_EMAIL,
-    guidance: I18N_UPDATE_EMAIL_GUIDANCE,
-  },
-};
-</script>
-
-<template>
-  <email-form
-    :error="verifyError"
-    :form-info="$options.i18n.guidance"
-    :submit-text="$options.i18n.updateEmail"
-    @submit-email="updateEmail"
-    @cancel="() => $emit('verifyToken')"
-  />
-</template>
diff --git a/app/assets/javascripts/sessions/new/constants.js b/app/assets/javascripts/sessions/new/constants.js
index cca96eb21fa50f..8e4367b0a02d88 100644
--- a/app/assets/javascripts/sessions/new/constants.js
+++ b/app/assets/javascripts/sessions/new/constants.js
@@ -16,10 +16,6 @@ export const I18N_GENERIC_ERROR = s__(
 );
 
 export const I18N_EMAIL = __('Email');
-export const I18N_UPDATE_EMAIL = s__('IdentityVerification|Update email');
-export const I18N_UPDATE_EMAIL_GUIDANCE = s__(
-  "EmailVerification|Update your email to a valid permanent address. If you use a temporary email, you won't be able to sign in later.",
-);
 export const I18N_SEND_TO_SECONDARY_EMAIL_BUTTON_TEXT = s__(
   'IdentityVerification|send a code to another address associated with this account',
 );
@@ -31,9 +27,6 @@ export const I18N_SEND_TO_SECONDARY_EMAIL_GUIDE = s__(
 );
 export const I18N_CANCEL = __('Cancel');
 export const I18N_EMAIL_INVALID = s__('IdentityVerification|Please enter a valid email address.');
-export const I18N_UPDATE_EMAIL_SUCCESS = s__(
-  'IdentityVerification|A new code has been sent to your updated email address.',
-);
 
 export const VERIFICATION_CODE_REGEX = /^\d{6}$/;
 export const SUCCESS_RESPONSE = 'success';
diff --git a/app/assets/javascripts/sessions/new/index.js b/app/assets/javascripts/sessions/new/index.js
index dea852e8008a5e..f7679b28e040f6 100644
--- a/app/assets/javascripts/sessions/new/index.js
+++ b/app/assets/javascripts/sessions/new/index.js
@@ -1,5 +1,4 @@
 import Vue from 'vue';
-import { parseBoolean } from '~/lib/utils/common_utils';
 import EmailVerification from './components/email_verification.vue';
 
 export default () => {
@@ -9,13 +8,11 @@ export default () => {
     return null;
   }
 
-  const { username, obfuscatedEmail, verifyPath, resendPath, offerEmailReset, updateEmailPath } =
-    el.dataset;
+  const { username, obfuscatedEmail, verifyPath, resendPath } = el.dataset;
 
   return new Vue({
     el,
     name: 'EmailVerificationRoot',
-    provide: { updateEmailPath },
     render(createElement) {
       return createElement(EmailVerification, {
         props: {
@@ -23,7 +20,6 @@ export default () => {
           obfuscatedEmail,
           verifyPath,
           resendPath,
-          isOfferEmailReset: parseBoolean(offerEmailReset),
         },
       });
     },
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index c9a885242a71fa..f3064c2d823c42 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -24517,9 +24517,6 @@ msgstr ""
 msgid "EmailParticipantsWarning|and %{moreCount} more"
 msgstr ""
 
-msgid "EmailVerification|Update your email to a valid permanent address. If you use a temporary email, you won't be able to sign in later."
-msgstr ""
-
 msgid "Emails"
 msgstr ""
 
@@ -32063,9 +32060,6 @@ msgstr[1] ""
 msgid "IdentityVerification|A code has already been sent to this email address. Check your spam folder or enter another email address."
 msgstr ""
 
-msgid "IdentityVerification|A new code has been sent to your updated email address."
-msgstr ""
-
 msgid "IdentityVerification|A new code has been sent."
 msgstr ""
 
@@ -32207,9 +32201,6 @@ msgstr ""
 msgid "IdentityVerification|The code is incorrect. Enter it again, or send a new code."
 msgstr ""
 
-msgid "IdentityVerification|Update email"
-msgstr ""
-
 msgid "IdentityVerification|Verification code"
 msgstr ""
 
diff --git a/spec/frontend/sessions/new/components/email_verification_spec.js b/spec/frontend/sessions/new/components/email_verification_spec.js
index 86dc57c156c997..1ac6a3fe9d9f94 100644
--- a/spec/frontend/sessions/new/components/email_verification_spec.js
+++ b/spec/frontend/sessions/new/components/email_verification_spec.js
@@ -7,13 +7,11 @@ import { createAlert, VARIANT_SUCCESS } from '~/alert';
 import { HTTP_STATUS_NOT_FOUND, HTTP_STATUS_OK } from '~/lib/utils/http_status';
 import EmailVerification from '~/sessions/new/components/email_verification.vue';
 import EmailForm from '~/sessions/new/components/email_form.vue';
-import UpdateEmail from '~/sessions/new/components/update_email.vue';
 import { visitUrl } from '~/lib/utils/url_utility';
 import {
   I18N_EMAIL_EMPTY_CODE,
   I18N_EMAIL_INVALID_CODE,
   I18N_GENERIC_ERROR,
-  I18N_UPDATE_EMAIL,
   I18N_RESEND_LINK,
   I18N_EMAIL_RESEND_SUCCESS,
   I18N_SEND_TO_SECONDARY_EMAIL_BUTTON_TEXT,
@@ -41,19 +39,17 @@ describe('EmailVerification', () => {
   const createComponent = ({ props, provide } = { props: {}, provide: {} }) => {
     wrapper = mountExtended(EmailVerification, {
       propsData: { ...defaultPropsData, ...props },
-      provide: { ...provide, updateEmailPath: '/users/update_email' },
+      provide: { ...provide },
     });
   };
 
   const findForm = () => wrapper.findComponent(GlForm);
   const findSecondaryEmailForm = () => wrapper.findComponent(EmailForm);
   const findCodeInput = () => wrapper.findComponent(GlFormInput);
-  const findUpdateEmail = () => wrapper.findComponent(UpdateEmail);
   const findSubmitButton = () => wrapper.find('[type="submit"]');
   const findResendLink = () => wrapper.findByText(I18N_RESEND_LINK);
   const findShowSecondaryEmailFormLink = () =>
     wrapper.findByText(I18N_SEND_TO_SECONDARY_EMAIL_BUTTON_TEXT);
-  const findUpdateEmailLink = () => wrapper.findByText(I18N_UPDATE_EMAIL);
   const enterCode = (code) => findCodeInput().setValue(code);
   const submitForm = () => findForm().trigger('submit');
 
@@ -257,46 +253,6 @@ describe('EmailVerification', () => {
     });
   });
 
-  describe('updating the email', () => {
-    it('contains the link to show the update email form', () => {
-      expect(findUpdateEmailLink().exists()).toBe(true);
-    });
-
-    describe('when the isOfferEmailReset property is set to false', () => {
-      beforeEach(() => {
-        createComponent({ props: { isOfferEmailReset: false } });
-      });
-
-      it('does not contain the link to show the update email form', () => {
-        expect(findUpdateEmailLink().exists()).toBe(false);
-      });
-    });
-
-    it('shows the UpdateEmail component when clicking the link', async () => {
-      expect(findUpdateEmail().exists()).toBe(false);
-
-      await findUpdateEmailLink().trigger('click');
-
-      expect(findUpdateEmail().exists()).toBe(true);
-    });
-
-    describe('when the UpdateEmail component triggers verifyToken', () => {
-      const newEmail = 'new@ema.il';
-
-      beforeEach(async () => {
-        enterCode('123');
-        await findUpdateEmailLink().trigger('click');
-        findUpdateEmail().vm.$emit('verifyToken', newEmail);
-      });
-
-      it('hides the UpdateEmail component, shows the updated email address and resets the form', () => {
-        expect(findUpdateEmail().exists()).toBe(false);
-        expect(wrapper.text()).toContain(newEmail);
-        expect(findCodeInput().element.value).toBe('');
-      });
-    });
-  });
-
   describe('secondary email form', () => {
     beforeEach(() => {
       createComponent();
diff --git a/spec/frontend/sessions/new/components/update_email_spec.js b/spec/frontend/sessions/new/components/update_email_spec.js
deleted file mode 100644
index eed346b24b3c87..00000000000000
--- a/spec/frontend/sessions/new/components/update_email_spec.js
+++ /dev/null
@@ -1,118 +0,0 @@
-import MockAdapter from 'axios-mock-adapter';
-import axios from '~/lib/utils/axios_utils';
-import { mountExtended } from 'helpers/vue_test_utils_helper';
-import { createAlert, VARIANT_SUCCESS } from '~/alert';
-import { HTTP_STATUS_NOT_FOUND, HTTP_STATUS_OK } from '~/lib/utils/http_status';
-import UpdateEmail from '~/sessions/new/components/update_email.vue';
-import EmailForm from '~/sessions/new/components/email_form.vue';
-import {
-  I18N_UPDATE_EMAIL,
-  I18N_UPDATE_EMAIL_GUIDANCE,
-  I18N_UPDATE_EMAIL_SUCCESS,
-  I18N_GENERIC_ERROR,
-  SUCCESS_RESPONSE,
-  FAILURE_RESPONSE,
-} from '~/sessions/new/constants';
-
-const email = 'foo+bar@ema.il';
-
-jest.mock('~/alert');
-
-describe('UpdateEmail', () => {
-  let wrapper;
-  let axiosMock;
-
-  const provide = {
-    updateEmailPath: '/users/update_email',
-  };
-
-  const createComponent = () => {
-    wrapper = mountExtended(UpdateEmail, { provide });
-  };
-
-  const findEmailForm = () => wrapper.findComponent(EmailForm);
-  const submitEmailForm = () => findEmailForm().vm.$emit('submit-email', email);
-  const mockUpdateEmailEndpoint = (response) => {
-    axiosMock.onPatch(provide.updateEmailPath, { user: { email } }).reply(HTTP_STATUS_OK, response);
-  };
-
-  beforeEach(() => {
-    axiosMock = new MockAdapter(axios);
-    createComponent();
-  });
-
-  afterEach(() => {
-    createAlert.mockClear();
-    axiosMock.restore();
-  });
-
-  it('renders EmailForm with the correct props', () => {
-    expect(findEmailForm().props()).toMatchObject({
-      error: '',
-      formInfo: I18N_UPDATE_EMAIL_GUIDANCE,
-      submitText: I18N_UPDATE_EMAIL,
-    });
-  });
-
-  describe('when successfully verifying the email address', () => {
-    beforeEach(async () => {
-      mockUpdateEmailEndpoint({ status: SUCCESS_RESPONSE });
-      submitEmailForm();
-
-      await axios.waitForAll();
-    });
-
-    it('shows a successfully updated alert', () => {
-      expect(createAlert).toHaveBeenCalledWith({
-        message: I18N_UPDATE_EMAIL_SUCCESS,
-        variant: VARIANT_SUCCESS,
-      });
-    });
-
-    it('emits a verifyToken event with the updated email address', () => {
-      expect(wrapper.emitted('verifyToken')[0]).toEqual([email]);
-    });
-  });
-
-  describe('error messages', () => {
-    describe('when the server responds with an error message', () => {
-      it('passes the error as error prop to EmailForm', async () => {
-        const serverErrorMessage = 'server error message';
-
-        mockUpdateEmailEndpoint({ status: FAILURE_RESPONSE, message: serverErrorMessage });
-        submitEmailForm();
-
-        await axios.waitForAll();
-
-        expect(findEmailForm().props('error')).toBe(serverErrorMessage);
-      });
-    });
-
-    describe('when the server responds unexpectedly', () => {
-      it.each`
-        scenario                       | statusCode
-        ${'the response is undefined'} | ${HTTP_STATUS_OK}
-        ${'the request failed'}        | ${HTTP_STATUS_NOT_FOUND}
-      `(`shows an alert when $scenario`, async ({ statusCode }) => {
-        axiosMock.onPatch(provide.updateEmailPath).replyOnce(statusCode);
-        submitEmailForm();
-
-        await axios.waitForAll();
-
-        expect(createAlert).toHaveBeenCalledWith({
-          message: I18N_GENERIC_ERROR,
-          captureError: true,
-          error: expect.any(Error),
-        });
-      });
-    });
-  });
-
-  describe('when EmailForm emits cancel event', () => {
-    it('emits a verifyToken event without an email address', () => {
-      findEmailForm().vm.$emit('cancel');
-
-      expect(wrapper.emitted('verifyToken')[0]).toEqual([]);
-    });
-  });
-});
-- 
GitLab


From 4d6fbd0c671adca3ef8d2709be53d1f97f4d4370 Mon Sep 17 00:00:00 2001
From: Matthew MacRae-Bovell <mmacrae-bovell@gitlab.com>
Date: Fri, 11 Jul 2025 10:54:44 -0400
Subject: [PATCH 2/2] Update "update email" test

---
 .../users/email_verification_on_login_spec.rb | 47 -------------------
 1 file changed, 47 deletions(-)

diff --git a/spec/features/users/email_verification_on_login_spec.rb b/spec/features/users/email_verification_on_login_spec.rb
index 5227c2c2858c87..1076196f19705c 100644
--- a/spec/features/users/email_verification_on_login_spec.rb
+++ b/spec/features/users/email_verification_on_login_spec.rb
@@ -151,53 +151,6 @@
       end
     end
 
-    describe 'updating the email address' do
-      it 'offers to update the email address' do
-        perform_enqueued_jobs do
-          # When logging in
-          gitlab_sign_in(user)
-
-          # Expect an instructions email to be sent with a code
-          code = expect_instructions_email_and_extract_code
-
-          # It shows an update email button
-          expect(page).to have_button s_('IdentityVerification|Update email')
-
-          # Click Update email button
-          click_button s_('IdentityVerification|Update email')
-
-          # Try to update with another user's email address
-          fill_in _('Email'), with: another_user.email
-          click_button s_('IdentityVerification|Update email')
-          expect(page).to have_content('Email has already been taken')
-
-          # Update to a unique email address
-          fill_in _('Email'), with: new_email
-          click_button s_('IdentityVerification|Update email')
-          expect(page).to have_content(s_('IdentityVerification|A new code has been sent to ' \
-                                          'your updated email address.'))
-          expect_log_message('Instructions Sent', 2)
-
-          new_code = expect_email_changed_notification_to_old_address_and_instructions_email_to_new_address
-
-          # Verify the old code is different from the new code
-          expect(code).not_to eq(new_code)
-          verify_code(new_code)
-
-          # Expect the user to be unlocked
-          expect_user_to_be_unlocked
-          expect_user_to_be_confirmed
-
-          # When logging in again
-          gitlab_sign_out
-          gitlab_sign_in(user)
-
-          # It does not show an update email button anymore
-          expect(page).not_to have_button s_('IdentityVerification|Update email')
-        end
-      end
-    end
-
     describe 'verification errors' do
       it 'rate limits verifications' do
         perform_enqueued_jobs do
-- 
GitLab