Merge pull request #1470 from regisb/regisb/no-husky

chore: remove husky 🪓🐶

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+    # Adding new check for github-actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+        interval: "weekly"

.github/workflows/autoupdate-pull-request.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   autoupdate:
     name: autoupdate
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: docker://chinthakagodawita/autoupdate-action:v1
         env:

.github/workflows/ci.yml

@@ -10,18 +10,15 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        node: [18, 20]
+    runs-on: ubuntu-latest
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Setup Nodejs
       uses: actions/setup-node@v4
       with:
-        node-version: ${{ matrix.node }}
+        node-version-file: '.nvmrc'
 
     - name: Install Dependencies
       run: npm ci
@@ -42,7 +39,7 @@ jobs:
       run: npm run build
 
     - name: Run Code Coverage
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         fail_ci_if_error: true

README.rst

@@ -29,7 +29,13 @@ Getting Started
 Installation
 ============
 
-This MFE is bundled with `Devstack <https://github.com/openedx/devstack>`_, see the `Getting Started <https://github.com/openedx/devstack#getting-started>`_ section for setup instructions.
+`Tutor`_ is currently recommended as a development environment for your new MFE. Please refer to the `relevant tutor-mfe documentation`_ to get started using it.
+
+.. _Tutor: https://github.com/overhangio/tutor
+.. _relevant tutor-mfe documentation: https://github.com/overhangio/tutor-mfe?tab=readme-ov-file#mfe-development
+
+Devstack (Deprecated) instructions
+==================================
 
 1. Install Devstack using the `Getting Started <https://github.com/openedx/devstack#getting-started>`_ instructions.
 
@@ -51,7 +57,7 @@ This MFE is bundled with `Devstack <https://github.com/openedx/devstack>`_, see
 Environment Variables/Setup Notes
 =================================
 
-This MFE is configured via environment variables supplied at build time.  All micro-frontends have a shared set of required environment variables, as documented in the Open edX Developer Guide under `Required Environment Variables <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`__.
+This MFE is configured via environment variables supplied at build time.  All micro-frontends have a shared set of required environment variables, as documented in the Open edX Developer Guide under `Required Environment Variables <https://github.com/overhangio/tutor-mfe?tab=readme-ov-file#mfe-development>`__.
 
 The authentication micro-frontend also requires the following additional variable:
 
@@ -142,13 +148,13 @@ Furthermore, there are several edX-specific environment variables that enable in
      - ``true`` | ``''`` (empty strings are falsy)    
 
 For more information see the document: `Micro-frontend applications in Open
-edX <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`__.
+edX <https://github.com/overhangio/tutor-mfe?tab=readme-ov-file#mfe-development>`__.
 
 How To Contribute
 =================
 
 Contributions are very welcome, and strongly encouraged! We've
-put together `some documentation that describes our contribution process <https://edx.readthedocs.org/projects/edx-developer-guide/en/latest/process/index.html>`_.
+put together `some documentation that describes our contribution process <https://docs.openedx.org/en/latest/developers/references/developer_guide/process/index.html>`_.
 
 Even though they were written with edx-platform in mind, the guidelines should be followed for Open edX code in general.
 

catalog-info.yaml

@@ -12,6 +12,7 @@ metadata:
       icon: 'Article'
   annotations:
     openedx.org/arch-interest-groups: ""
+    openedx.org/release: "master"
 spec:
   owner: group:2u-infinity
   type: 'service'

docs/how_tos/enable_social_auth.rst

@@ -3,7 +3,7 @@ Enable Social Auth Locally
 
 Please follow the steps below to enable social auth (SSO) locally.
 
-1. Follow `Enabling Third Party Authentication <https://edx.readthedocs.io/projects/edx-installing-configuring-and-running/en/latest/configuration/tpa/index.html>`_ for backend configuration.
+1. Follow `Enabling Third Party Authentication <https://docs.openedx.org/en/latest/site_ops/install_configure_run_guide/configuration/tpa/index.html>`_ for backend configuration.
 
 2. Authn has a component for rendering Social Auth providers at frontend which goes through each provider.
 

openedx.yaml

@@ -1,8 +0,0 @@
-# This file describes this Open edX repo, as described in OEP-2:
-# http://open-edx-proposals.readthedocs.io/en/latest/oeps/oep-0002.html#specification
-
-nick: Authn MFE
-oeps: {}
-owner: openedx/2u-infinity
-openedx-release:
-  ref: master

package.json

@@ -13,15 +13,12 @@
     "build": "fedx-scripts webpack",
     "i18n_extract": "fedx-scripts formatjs extract",
     "lint": "fedx-scripts eslint --ext .js --ext .jsx .",
+    "lint:fix": "fedx-scripts eslint --fix --ext .js --ext .jsx .",
     "snapshot": "fedx-scripts jest --updateSnapshot",
     "start": "fedx-scripts webpack-dev-server --progress",
+    "dev": "PUBLIC_PATH=/authn/ MFE_CONFIG_API_URL='http://localhost:8000/api/mfe_config/v1' fedx-scripts webpack-dev-server --progress --host apps.local.openedx.io",
     "test": "fedx-scripts jest --coverage --passWithNoTests"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "npm run lint"
-    }
-  },
   "author": "edX",
   "license": "AGPL-3.0",
   "homepage": "https://github.com/openedx/frontend-app-authn#readme",
@@ -33,53 +30,51 @@
   },
   "dependencies": {
     "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
-    "@edx/frontend-platform": "^8.0.0",
+    "@edx/frontend-platform": "^8.3.1",
     "@edx/openedx-atlas": "^0.6.0",
-    "@fortawesome/fontawesome-svg-core": "6.6.0",
-    "@fortawesome/free-brands-svg-icons": "6.6.0",
-    "@fortawesome/free-solid-svg-icons": "6.6.0",
+    "@fortawesome/fontawesome-svg-core": "6.7.2",
+    "@fortawesome/free-brands-svg-icons": "6.7.2",
+    "@fortawesome/free-solid-svg-icons": "6.7.2",
     "@fortawesome/react-fontawesome": "0.2.2",
-    "@openedx/paragon": "^22.1.1",
+    "@openedx/paragon": "^22.16.0",
     "@optimizely/react-sdk": "^2.9.1",
     "@redux-devtools/extension": "3.3.0",
-    "@testing-library/react": "^12.1.5",
-    "@testing-library/react-hooks": "^8.0.1",
+    "@testing-library/react": "^16.2.0",
     "algoliasearch": "^4.14.3",
     "algoliasearch-helper": "^3.14.0",
     "classnames": "2.5.1",
-    "core-js": "3.38.1",
+    "core-js": "3.41.0",
     "fastest-levenshtein": "1.0.16",
     "form-urlencoded": "6.1.5",
     "prop-types": "15.8.1",
     "query-string": "7.1.3",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "react-helmet": "6.1.0",
-    "react-loading-skeleton": "3.4.0",
+    "react-loading-skeleton": "3.5.0",
     "react-redux": "7.2.9",
     "react-responsive": "8.2.0",
-    "react-router": "6.26.1",
-    "react-router-dom": "6.26.1",
+    "react-router": "6.30.0",
+    "react-router-dom": "6.30.0",
     "react-zendesk": "^0.1.13",
     "redux": "4.2.1",
     "redux-logger": "3.0.6",
-    "redux-mock-store": "1.5.4",
+    "redux-mock-store": "1.5.5",
     "redux-saga": "1.3.0",
     "redux-thunk": "2.4.2",
     "regenerator-runtime": "0.14.1",
-    "reselect": "4.1.8",
-    "universal-cookie": "4.0.4"
+    "reselect": "5.1.1",
+    "universal-cookie": "7.2.2"
   },
   "devDependencies": {
     "@edx/browserslist-config": "^1.1.1",
     "@edx/reactifex": "1.1.0",
-    "@openedx/frontend-build": "^14.0.3",
-    "babel-plugin-formatjs": "10.5.16",
-    "eslint-plugin-import": "2.29.1",
+    "@openedx/frontend-build": "^14.4.2",
+    "babel-plugin-formatjs": "10.5.37",
+    "eslint-plugin-import": "2.31.0",
     "glob": "7.2.3",
     "history": "5.3.0",
-    "husky": "7.0.4",
     "jest": "29.7.0",
-    "react-test-renderer": "^17.0.2"
+    "react-test-renderer": "^18.3.1"
   }
 }

src/common-components/InstitutionLogistration.jsx

@@ -60,7 +60,7 @@ const InstitutionLogistration = props => {
                     className="btn nav-item p-0 mb-1 institutions--provider-link"
                     destination={lmsBaseUrl + provider.loginUrl}
                   >
-                    {provider?.name}
+                    {provider.name}
                   </Hyperlink>
                 </td>
               </tr>

src/common-components/RedirectLogistration.jsx

@@ -5,7 +5,7 @@ import { Navigate } from 'react-router-dom';
 import {
   AUTHN_PROGRESSIVE_PROFILING, RECOMMENDATIONS, REDIRECT,
 } from '../data/constants';
-import setCookie from '../data/utils/cookies';
+import { setCookie } from '../data/utils';
 
 const RedirectLogistration = (props) => {
   const {

src/common-components/SocialAuthProviders.jsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import { useSelector } from 'react-redux';
 
 import { getConfig } from '@edx/frontend-platform';
 import { useIntl } from '@edx/frontend-platform/i18n';
@@ -9,20 +8,15 @@ import { Login } from '@openedx/paragon/icons';
 import PropTypes from 'prop-types';
 
 import messages from './messages';
-import { LOGIN_PAGE, REGISTER_PAGE, SUPPORTED_ICON_CLASSES } from '../data/constants';
-import { setCookie } from '../data/utils';
+import { LOGIN_PAGE, SUPPORTED_ICON_CLASSES } from '../data/constants';
 
 const SocialAuthProviders = (props) => {
   const { formatMessage } = useIntl();
   const { referrer, socialAuthProviders } = props;
-  const registrationFields = useSelector(state => state.register.registrationFormData);
 
   function handleSubmit(e) {
     e.preventDefault();
 
-    if (referrer === REGISTER_PAGE) {
-      setCookie('marketingEmailsOptIn', registrationFields?.configurableFormFields?.marketingEmailsOptIn);
-    }
     const url = e.currentTarget.dataset.providerUrl;
     window.location.href = getConfig().LMS_BASE_URL + url;
   }

src/common-components/ThirdPartyAuthAlert.jsx

@@ -7,7 +7,6 @@ import PropTypes from 'prop-types';
 
 import messages from './messages';
 import { LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';
-import setCookie from '../data/utils/cookies';
 
 const ThirdPartyAuthAlert = (props) => {
   const { formatMessage } = useIntl();
@@ -21,10 +20,7 @@ const ThirdPartyAuthAlert = (props) => {
     message = formatMessage(messages['register.third.party.auth.account.not.linked'], { currentProvider, platformName });
   }
 
-  if (currentProvider) {
-    // Setting this cookie to capture marketingEmailsOptIn for SSO flow on the onboarding component
-    setCookie('ssoPipelineRedirectionDone', true);
-  } else {
+  if (!currentProvider) {
     return null;
   }
 

src/common-components/UnAuthOnlyRoute.jsx

@@ -4,8 +4,9 @@ import { getConfig } from '@edx/frontend-platform';
 import { fetchAuthenticatedUser, getAuthenticatedUser } from '@edx/frontend-platform/auth';
 import PropTypes from 'prop-types';
 
-import { RESET_PAGE } from '../data/constants';
-import { updatePathWithQueryParams } from '../data/utils';
+import {
+  DEFAULT_REDIRECT_URL,
+} from '../data/constants';
 
 /**
  * This wrapper redirects the requester to our default redirect url if they are
@@ -24,12 +25,7 @@ const UnAuthOnlyRoute = ({ children }) => {
 
   if (isReady) {
     if (authUser && authUser.username) {
-      const updatedPath = updatePathWithQueryParams(window.location.pathname);
-      if (updatedPath.startsWith(RESET_PAGE)) {
-        global.location.href = getConfig().LMS_BASE_URL;
-        return null;
-      }
-      global.location.href = getConfig().LMS_BASE_URL.concat(updatedPath);
+      global.location.href = getConfig().LMS_BASE_URL.concat(DEFAULT_REDIRECT_URL);
       return null;
     }
 

src/common-components/data/constants.js

@@ -1,79 +0,0 @@
-export const registerFields = {
-  fields: {
-    country: {
-      name: 'country',
-      error_message: 'Select your country or region of residence',
-    },
-    honor_code: {
-      name: 'honor_code',
-      type: 'tos_and_honor_code',
-      error_message: '',
-    },
-  },
-};
-
-export const progressiveProfilingFields = {
-  extended_profile: [],
-  fields: {
-    level_of_education: {
-      name: 'level_of_education',
-      type: 'select',
-      label: 'Highest level of education completed',
-      error_message: '',
-      options: [
-        [
-          'p',
-          'Doctorate',
-        ],
-        [
-          'm',
-          "Master's or professional degree",
-        ],
-        [
-          'b',
-          "Bachelor's degree",
-        ],
-        [
-          'a',
-          'Associate degree',
-        ],
-        [
-          'hs',
-          'Secondary/high school',
-        ],
-        [
-          'jhs',
-          'Junior secondary/junior high/middle school',
-        ],
-        [
-          'none',
-          'No formal education',
-        ],
-        [
-          'other',
-          'Other education',
-        ],
-      ],
-    },
-    gender: {
-      name: 'gender',
-      type: 'select',
-      label: 'Gender',
-      error_message: '',
-      options: [
-        [
-          'm',
-          'Male',
-        ],
-        [
-          'f',
-          'Female',
-        ],
-        [
-          'o',
-          'Other/Prefer Not to Say',
-        ],
-      ],
-    },
-  },
-};

src/common-components/data/sagas.js

@@ -1,4 +1,3 @@
-import { getConfig } from '@edx/frontend-platform';
 import { logError } from '@edx/frontend-platform/logging';
 import { call, put, takeEvery } from 'redux-saga/effects';
 
@@ -8,7 +7,6 @@ import {
   getThirdPartyAuthContextSuccess,
   THIRD_PARTY_AUTH_CONTEXT,
 } from './actions';
-import { progressiveProfilingFields, registerFields } from './constants';
 import {
   getThirdPartyAuthContext,
 } from './service';
@@ -22,16 +20,7 @@ export function* fetchThirdPartyAuthContext(action) {
     } = yield call(getThirdPartyAuthContext, action.payload.urlParams);
 
     yield put(setCountryFromThirdPartyAuthContext(thirdPartyAuthContext.countryCode));
-    // hard code country field, level of education and gender fields
-    if (getConfig().ENABLE_HARD_CODE_OPTIONAL_FIELDS) {
-      yield put(getThirdPartyAuthContextSuccess(
-        registerFields,
-        progressiveProfilingFields,
-        thirdPartyAuthContext,
-      ));
-    } else {
-      yield put(getThirdPartyAuthContextSuccess(fieldDescriptions, optionalFields, thirdPartyAuthContext));
-    }
+    yield put(getThirdPartyAuthContextSuccess(fieldDescriptions, optionalFields, thirdPartyAuthContext));
   } catch (e) {
     yield put(getThirdPartyAuthContextFailure());
     logError(e);

src/common-components/tests/SocialAuthProviders.test.jsx

@@ -1,35 +1,16 @@
 import React from 'react';
-import { Provider } from 'react-redux';
 
 import { IntlProvider } from '@edx/frontend-platform/i18n';
 import renderer from 'react-test-renderer';
-import configureStore from 'redux-mock-store';
 
 import registerIcons from '../RegisterFaIcons';
 import SocialAuthProviders from '../SocialAuthProviders';
 
 registerIcons();
-const mockStore = configureStore();
 
 describe('SocialAuthProviders', () => {
   let props = {};
 
-  const initialState = {
-    register: {
-      registrationFormData: {
-        configurableFormFields: {
-          marketingEmailsOptIn: true,
-        },
-      },
-    },
-  };
-  const store = mockStore(initialState);
-  const reduxWrapper = children => (
-    <IntlProvider locale="en">
-      <Provider store={store}>{children}</Provider>
-    </IntlProvider>
-  );
-
   const appleProvider = {
     id: 'oa2-apple-id',
     name: 'Apple',
@@ -49,11 +30,11 @@ describe('SocialAuthProviders', () => {
   it('should match social auth provider with iconImage snapshot', () => {
     props = { socialAuthProviders: [appleProvider, facebookProvider] };
 
-    const tree = renderer.create(reduxWrapper(
+    const tree = renderer.create(
       <IntlProvider locale="en">
         <SocialAuthProviders {...props} />
       </IntlProvider>,
-    )).toJSON();
+    ).toJSON();
 
     expect(tree).toMatchSnapshot();
   });
@@ -67,11 +48,11 @@ describe('SocialAuthProviders', () => {
       }],
     };
 
-    const tree = renderer.create(reduxWrapper(
+    const tree = renderer.create(
       <IntlProvider locale="en">
         <SocialAuthProviders {...props} />
       </IntlProvider>,
-    )).toJSON();
+    ).toJSON();
 
     expect(tree).toMatchSnapshot();
   });
@@ -85,11 +66,11 @@ describe('SocialAuthProviders', () => {
       }],
     };
 
-    const tree = renderer.create(reduxWrapper(
+    const tree = renderer.create(
       <IntlProvider locale="en">
         <SocialAuthProviders {...props} />
       </IntlProvider>,
-    )).toJSON();
+    ).toJSON();
 
     expect(tree).toMatchSnapshot();
   });

src/config/index.js

@@ -11,7 +11,6 @@ const configuration = {
   MARKETING_EMAILS_OPT_IN: process.env.MARKETING_EMAILS_OPT_IN || '',
   SHOW_CONFIGURABLE_EDX_FIELDS: process.env.SHOW_CONFIGURABLE_EDX_FIELDS || false,
   SHOW_REGISTRATION_LINKS: process.env.SHOW_REGISTRATION_LINKS !== 'false',
-  ENABLE_HARD_CODE_OPTIONAL_FIELDS: process.env.ENABLE_HARD_CODE_OPTIONAL_FIELDS || false,
   ENABLE_IMAGE_LAYOUT: process.env.ENABLE_IMAGE_LAYOUT || false,
   // Links
   ACTIVATION_EMAIL_SUPPORT_LINK: process.env.ACTIVATION_EMAIL_SUPPORT_LINK || null,
@@ -36,7 +35,6 @@ const configuration = {
   ZENDESK_LOGO_URL: process.env.ZENDESK_LOGO_URL,
   ALGOLIA_APP_ID: process.env.ALGOLIA_APP_ID || '',
   ALGOLIA_SEARCH_API_KEY: process.env.ALGOLIA_SEARCH_API_KEY || '',
-  AUTO_GENERATED_USERNAME_EXPERIMENT_ID: process.env.AUTO_GENERATED_USERNAME_EXPERIMENT_ID || '',
 };
 
 export default configuration;

src/data/constants.js

@@ -37,4 +37,3 @@ export const VALID_EMAIL_REGEX = '(^[-!#$%&\'*+/=?^_`{}|~0-9A-Z]+(\\.[-!#$%&\'*+
 // things like auto-enrollment upon login and registration.
 export const AUTH_PARAMS = ['course_id', 'enrollment_action', 'course_mode', 'email_opt_in', 'purchase_workflow', 'next', 'register_for_free', 'track', 'is_account_recovery', 'variant', 'host', 'cta'];
 export const REDIRECT = 'redirect';
-export const APP_NAME = 'authn_mfe';

src/data/segment/utils.js

@@ -1,37 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
-
-import { APP_NAME } from '../constants';
-
-export const LINK_TIMEOUT = 300;
-
-/**
- * Creates an event tracker function that sends a tracking event with the given name and options.
- *
- * @param {string} name - The name of the event to be tracked.
- * @param {object} [options={}] - Additional options to be included with the event.
- * @returns {function} - A function that, when called, sends the tracking event.
- */
-export const createEventTracker = (name, options = {}) => () => sendTrackEvent(
-  name,
-  { ...options, app_name: APP_NAME },
-);
-
-/**
- * Creates an event tracker function that sends a tracking event with the given name and options.
- *
- * @param {string} name - The name of the event to be tracked.
- * @param {object} [options={}] - Additional options to be included with the event.
- * @returns {function} - A function that, when called, sends the tracking event.
- */
-export const createPageEventTracker = (name, options = null) => () => sendPageEvent(
-  name,
-  options,
-  { app_name: APP_NAME },
-);
-
-export const createLinkTracker = (tracker, href) => (e) => {
-  e.preventDefault();
-  tracker();
-  return setTimeout(() => { window.location.href = href; }, LINK_TIMEOUT);
-};

src/data/utils/cookies.js

@@ -11,11 +11,3 @@ export default function setCookie(cookieName, cookieValue, cookieExpiry) {
     cookies.set(cookieName, cookieValue, options);
   }
 }
-
-export function removeCookie(cookieName) {
-  if (cookieName) {
-    const cookies = new Cookies();
-    const options = { domain: getConfig().SESSION_COOKIE_DOMAIN, path: '/' };
-    cookies.remove(cookieName, options);
-  }
-}

src/data/utils/index.js

@@ -8,4 +8,4 @@ export {
   windowScrollTo,
 } from './dataUtils';
 export { default as AsyncActionType } from './reduxUtils';
-export { default as setCookie, removeCookie } from './cookies';
+export { default as setCookie } from './cookies';

src/forgot-password/ForgotPasswordPage.jsx

@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { connect } from 'react-redux';
 
 import { getConfig } from '@edx/frontend-platform';
+import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { useIntl } from '@edx/frontend-platform/i18n';
 import {
   Form,
@@ -24,10 +25,6 @@ import BaseContainer from '../base-container';
 import { FormGroup } from '../common-components';
 import { DEFAULT_STATE, LOGIN_PAGE, VALID_EMAIL_REGEX } from '../data/constants';
 import { updatePathWithQueryParams, windowScrollTo } from '../data/utils';
-import {
-  trackForgotPasswordPageEvent,
-  trackForgotPasswordPageViewed,
-} from '../tracking/trackers/forgotpassword';
 
 const ForgotPasswordPage = (props) => {
   const platformName = getConfig().SITE_NAME;
@@ -44,8 +41,8 @@ const ForgotPasswordPage = (props) => {
   const navigate = useNavigate();
 
   useEffect(() => {
-    trackForgotPasswordPageEvent();
-    trackForgotPasswordPageViewed();
+    sendPageEvent('login_and_registration', 'reset');
+    sendTrackEvent('edx.bi.password_reset_form.viewed', { category: 'user-engagement' });
   }, []);
 
   useEffect(() => {

src/index.jsx

@@ -1,27 +1,36 @@
 import 'core-js/stable';
 import 'regenerator-runtime/runtime';
 
-import React from 'react';
-import ReactDOM from 'react-dom';
+import React, { StrictMode } from 'react';
 
 import {
   APP_INIT_ERROR, APP_READY, initialize, mergeConfig, subscribe,
 } from '@edx/frontend-platform';
 import { ErrorPage } from '@edx/frontend-platform/react';
+import { createRoot } from 'react-dom/client';
 
 import configuration from './config';
 import messages from './i18n';
 import MainApp from './MainApp';
 
 subscribe(APP_READY, () => {
-  ReactDOM.render(
-    <MainApp />,
-    document.getElementById('root'),
+  const root = createRoot(document.getElementById('root'));
+
+  root.render(
+    <StrictMode>
+      <MainApp />
+    </StrictMode>,
   );
 });
 
 subscribe(APP_INIT_ERROR, (error) => {
-  ReactDOM.render(<ErrorPage message={error.message} />, document.getElementById('root'));
+  const root = createRoot(document.getElementById('root'));
+
+  root.render(
+    <StrictMode>
+      <ErrorPage message={error.message} />
+    </StrictMode>,
+  );
 });
 
 initialize({

src/login/LoginPage.jsx

@@ -2,6 +2,7 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { connect } from 'react-redux';
 
 import { getConfig } from '@edx/frontend-platform';
+import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { injectIntl, useIntl } from '@edx/frontend-platform/i18n';
 import {
   Form, StatefulButton,
@@ -41,11 +42,7 @@ import {
   getTpaProvider,
   updatePathWithQueryParams,
 } from '../data/utils';
-import { removeCookie } from '../data/utils/cookies';
 import ResetPasswordSuccess from '../reset-password/ResetPasswordSuccess';
-import {
-  trackForgotPasswordLinkClick, trackLoginPageViewed, trackLoginSuccess,
-} from '../tracking/trackers/login';
 
 const LoginPage = (props) => {
   const {
@@ -81,18 +78,9 @@ const LoginPage = (props) => {
   const tpaHint = getTpaHint();
 
   useEffect(() => {
-    trackLoginPageViewed();
+    sendPageEvent('login_and_registration', 'login');
   }, []);
 
-  useEffect(() => {
-    if (loginResult.success) {
-      trackLoginSuccess();
-
-      // Remove this cookie that was set to capture marketingEmailsOptIn for the onboarding component
-      removeCookie('ssoPipelineRedirectionDone');
-    }
-  }, [loginResult]);
-
   useEffect(() => {
     const payload = { ...queryParams };
     if (tpaHint) {
@@ -182,6 +170,9 @@ const LoginPage = (props) => {
     const { name } = event.target;
     setErrors(prevErrors => ({ ...prevErrors, [name]: '' }));
   };
+  const trackForgotPasswordLinkClick = () => {
+    sendTrackEvent('edx.bi.password-reset_form.toggled', { category: 'user-engagement' });
+  };
 
   const { provider, skipHintedLogin } = getTpaProvider(tpaHint, providers, secondaryProviders);
 

src/login/tests/LoginPage.test.jsx

@@ -11,9 +11,7 @@ import { act } from 'react-dom/test-utils';
 import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 
-import {
-  APP_NAME, COMPLETE_STATE, LOGIN_PAGE, PENDING_STATE,
-} from '../../data/constants';
+import { COMPLETE_STATE, LOGIN_PAGE, PENDING_STATE } from '../../data/constants';
 import { backupLoginFormBegin, dismissPasswordResetBanner, loginRequest } from '../data/actions';
 import { INTERNAL_SERVER_ERROR } from '../data/constants';
 import LoginPage from '../LoginPage';
@@ -753,7 +751,7 @@ describe('LoginPage', () => {
 
   it('should send page event when login page is rendered', () => {
     render(reduxWrapper(<IntlLoginPage {...props} />));
-    expect(sendPageEvent).toHaveBeenCalledWith('login_and_registration', 'login', { app_name: APP_NAME });
+    expect(sendPageEvent).toHaveBeenCalledWith('login_and_registration', 'login');
   });
 
   it('tests that form is in invalid state when it is submitted', () => {
@@ -786,7 +784,7 @@ describe('LoginPage', () => {
       { selector: '#forgot-password' },
     ));
 
-    expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.password-reset_form.toggled', { category: 'user-engagement', app_name: APP_NAME });
+    expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.password-reset_form.toggled', { category: 'user-engagement' });
   });
 
   it('should backup the login form state when shouldBackupState is true', () => {

src/logistration/Logistration.jsx

@@ -20,7 +20,7 @@ import {
   tpaProvidersSelector,
 } from '../common-components/data/selectors';
 import messages from '../common-components/messages';
-import { APP_NAME, LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';
+import { LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';
 import {
   getTpaHint, getTpaProvider, updatePathWithQueryParams,
 } from '../data/utils';
@@ -56,11 +56,11 @@ const Logistration = (props) => {
   }, [navigate, disablePublicAccountCreation]);
 
   const handleInstitutionLogin = (e) => {
-    sendTrackEvent('edx.bi.institution_login_form.toggled', { category: 'user-engagement', app_name: APP_NAME });
+    sendTrackEvent('edx.bi.institution_login_form.toggled', { category: 'user-engagement' });
     if (typeof e === 'string') {
-      sendPageEvent('login_and_registration', e === '/login' ? 'login' : 'register', { app_name: APP_NAME });
+      sendPageEvent('login_and_registration', e === '/login' ? 'login' : 'register');
     } else {
-      sendPageEvent('login_and_registration', e.target.dataset.eventName, { app_name: APP_NAME });
+      sendPageEvent('login_and_registration', e.target.dataset.eventName);
     }
 
     setInstitutionLogin(!institutionLogin);
@@ -70,7 +70,7 @@ const Logistration = (props) => {
     if (tabKey === currentTab) {
       return;
     }
-    sendTrackEvent(`edx.bi.${tabKey.replace('/', '')}_form.toggled`, { category: 'user-engagement', app_name: APP_NAME });
+    sendTrackEvent(`edx.bi.${tabKey.replace('/', '')}_form.toggled`, { category: 'user-engagement' });
     props.clearThirdPartyAuthContextErrorMessage();
     if (tabKey === LOGIN_PAGE) {
       props.backupRegistrationForm();

src/logistration/Logistration.test.jsx

@@ -11,21 +11,16 @@ import configureStore from 'redux-mock-store';
 import Logistration from './Logistration';
 import { clearThirdPartyAuthContextErrorMessage } from '../common-components/data/actions';
 import {
-  APP_NAME,
   COMPLETE_STATE, LOGIN_PAGE, REGISTER_PAGE,
 } from '../data/constants';
 import { backupLoginForm } from '../login/data/actions';
 import { backupRegistrationForm } from '../register/data/actions';
-import { NOT_INITIALIZED } from '../register/data/optimizelyExperiment/helper';
-import useAutoGeneratedUsernameExperimentVariation
-  from '../register/data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation';
 
 jest.mock('@edx/frontend-platform/analytics', () => ({
   sendPageEvent: jest.fn(),
   sendTrackEvent: jest.fn(),
 }));
 jest.mock('@edx/frontend-platform/auth');
-jest.mock('../register/data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation', () => jest.fn());
 
 const mockStore = configureStore();
 const IntlLogistration = injectIntl(Logistration);
@@ -89,7 +84,6 @@ describe('Logistration', () => {
       })),
     }));
 
-    useAutoGeneratedUsernameExperimentVariation.mockReturnValue(NOT_INITIALIZED);
     configure({
       loggingService: { logError: jest.fn() },
       config: {
@@ -230,8 +224,8 @@ describe('Logistration', () => {
     render(reduxWrapper(<IntlLogistration {...props} />));
     fireEvent.click(screen.getByText('Institution/campus credentials'));
 
-    expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.institution_login_form.toggled', { category: 'user-engagement', app_name: APP_NAME });
-    expect(sendPageEvent).toHaveBeenCalledWith('login_and_registration', 'institution_login', { app_name: APP_NAME });
+    expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.institution_login_form.toggled', { category: 'user-engagement' });
+    expect(sendPageEvent).toHaveBeenCalledWith('login_and_registration', 'institution_login');
 
     mergeConfig({
       DISABLE_ENTERPRISE_LOGIN: '',

src/progressive-profiling/ProgressiveProfiling.jsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { connect } from 'react-redux';
 
 import { getConfig, snakeCaseObject } from '@edx/frontend-platform';
-import { identifyAuthenticatedUser } from '@edx/frontend-platform/analytics';
+import { identifyAuthenticatedUser, sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
 import {
   AxiosJwtAuthService,
   configure as configureAuth,
@@ -39,13 +39,6 @@ import {
 import isOneTrustFunctionalCookieEnabled from '../data/oneTrust';
 import { getAllPossibleQueryParams, isHostAvailableInQueryParams } from '../data/utils';
 import { FormFieldRenderer } from '../field-renderer';
-import {
-  trackDisablePostRegistrationRecommendations,
-  trackProgressiveProfilingPageViewed,
-  trackProgressiveProfilingSkipLinkClick,
-  trackProgressiveProfilingSubmitClick,
-  trackProgressiveProfilingSupportLinkCLick,
-} from '../tracking/trackers/progressive-profiling';
 
 const ProgressiveProfiling = (props) => {
   const { formatMessage } = useIntl();
@@ -105,13 +98,14 @@ const ProgressiveProfiling = (props) => {
   useEffect(() => {
     if (authenticatedUser?.userId) {
       identifyAuthenticatedUser(authenticatedUser.userId);
-      trackProgressiveProfilingPageViewed();
+      sendPageEvent('login_and_registration', 'welcome');
     }
   }, [authenticatedUser]);
 
   useEffect(() => {
     if (!enablePostRegistrationRecommendations) {
-      trackDisablePostRegistrationRecommendations(
+      sendTrackEvent(
+        'edx.bi.user.recommendations.not.enabled',
         { functionalCookiesConsent, page: 'authn_recommendations' },
       );
       return;
@@ -155,23 +149,29 @@ const ProgressiveProfiling = (props) => {
       });
     }
     props.saveUserProfile(authenticatedUser.username, snakeCaseObject(payload));
-    const eventProperties = {
-      isGenderSelected: !!values.gender,
-      isYearOfBirthSelected: !!values.year_of_birth,
-      isLevelOfEducationSelected: !!values.level_of_education,
-      isWorkExperienceSelected: !!values.work_experience,
-      host: queryParams?.host || '',
-    };
-    trackProgressiveProfilingSubmitClick(eventProperties);
+
+    sendTrackEvent(
+      'edx.bi.welcome.page.submit.clicked',
+      {
+        isGenderSelected: !!values.gender,
+        isYearOfBirthSelected: !!values.year_of_birth,
+        isLevelOfEducationSelected: !!values.level_of_education,
+        isWorkExperienceSelected: !!values.work_experience,
+        host: queryParams?.host || '',
+      },
+    );
   };
 
   const handleSkip = (e) => {
     e.preventDefault();
     window.history.replaceState(location.state, null, '');
     setShowModal(true);
-    trackProgressiveProfilingSkipLinkClick({
-      host: queryParams?.host || '',
-    });
+    sendTrackEvent(
+      'edx.bi.welcome.page.skip.link.clicked',
+      {
+        host: queryParams?.host || '',
+      },
+    );
   };
 
   const onChangeHandler = (e) => {
@@ -242,7 +242,7 @@ const ProgressiveProfiling = (props) => {
                     destination={getConfig().AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK}
                     target="_blank"
                     showLaunchIcon={false}
-                    onClick={() => (trackProgressiveProfilingSupportLinkCLick())}
+                    onClick={() => (sendTrackEvent('edx.bi.welcome.page.support.link.clicked'))}
                   >
                     {formatMessage(messages['optional.fields.information.link'])}
                   </Hyperlink>

src/progressive-profiling/tests/ProgressiveProfiling.test.jsx

@@ -12,7 +12,6 @@ import { MemoryRouter, mockNavigate, useLocation } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 
 import {
-  APP_NAME,
   AUTHN_PROGRESSIVE_PROFILING,
   COMPLETE_STATE, DEFAULT_REDIRECT_URL,
   EMBEDDED,
@@ -144,9 +143,8 @@ describe('ProgressiveProfilingTests', () => {
     const modalContentContainer = document.getElementsByClassName('.pgn__modal-content-container');
 
     expect(modalContentContainer).toBeTruthy();
-    const payload = { host: '', app_name: APP_NAME };
 
-    expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.welcome.page.skip.link.clicked', payload);
+    expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.welcome.page.skip.link.clicked', { host: '' });
   });
 
   // ******** test event functionality ********
@@ -167,7 +165,7 @@ describe('ProgressiveProfilingTests', () => {
     const supportLink = screen.getByRole('link', { name: /learn more about how we use this information/i });
     fireEvent.click(supportLink);
 
-    expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.welcome.page.support.link.clicked', { app_name: APP_NAME });
+    expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.welcome.page.support.link.clicked');
   });
 
   it('should set empty host property value for non-embedded experience', () => {
@@ -177,7 +175,6 @@ describe('ProgressiveProfilingTests', () => {
       isLevelOfEducationSelected: false,
       isWorkExperienceSelected: false,
       host: '',
-      app_name: APP_NAME,
     };
     delete window.location;
     window.location = { href: getConfig().BASE_URL.concat(AUTHN_PROGRESSIVE_PROFILING) };
@@ -319,7 +316,7 @@ describe('ProgressiveProfilingTests', () => {
       const skipLinkButton = screen.getByText('Skip for now');
       fireEvent.click(skipLinkButton);
 
-      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.welcome.page.skip.link.clicked', { host, app_name: APP_NAME });
+      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.welcome.page.skip.link.clicked', { host });
     });
 
     it('should show spinner while fetching the optional fields', () => {
@@ -352,7 +349,6 @@ describe('ProgressiveProfilingTests', () => {
         isLevelOfEducationSelected: false,
         isWorkExperienceSelected: false,
         host: 'http://example.com',
-        app_name: APP_NAME,
       };
       delete window.location;
       window.location = {

src/recommendations/data/tests/hooks.test.jsx

@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react';
 import algoliasearchHelper from 'algoliasearch-helper';
 
 import mockedRecommendedProducts from './mockedData';

src/recommendations/track.js

@@ -15,7 +15,7 @@ const generateProductKey = (product) => (
 export const getProductMapping = (recommendedProducts) => recommendedProducts.map((product) => ({
   product_key: generateProductKey(product),
   product_line: product.cardType,
-  product_source: product?.productSource?.name,
+  product_source: product.productSource.name,
 }));
 
 export const trackRecommendationClick = (product, position, userId) => {
@@ -25,7 +25,7 @@ export const trackRecommendationClick = (product, position, userId) => {
     recommendation_type: product.recommendationType,
     product_key: generateProductKey(product),
     product_line: product.cardType,
-    product_source: product?.productSource?.name,
+    product_source: product.productSource.name,
     user_id: userId,
   });
 

src/register/RegistrationFields/NameField/validator.js

@@ -11,7 +11,7 @@ export const INVALID_NAME_REGEX = /https?:\/\/(?:[-\w.]|(?:%[\da-fA-F]{2}))*/g;
 
 const validateName = (value, formatMessage) => {
   let fieldError = '';
-  if (!value || (value && !value.trim())) {
+  if (!value.trim()) {
     fieldError = formatMessage(messages['empty.name.field.error']);
   } else if (URL_REGEX.test(value) || HTML_REGEX.test(value) || INVALID_NAME_REGEX.test(value)) {
     fieldError = formatMessage(messages['name.validation.message']);

src/register/RegistrationPage.jsx

@@ -4,6 +4,7 @@ import React, {
 import { useDispatch, useSelector } from 'react-redux';
 
 import { getConfig } from '@edx/frontend-platform';
+import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { useIntl } from '@edx/frontend-platform/i18n';
 import { Form, Spinner, StatefulButton } from '@openedx/paragon';
 import classNames from 'classnames';
@@ -17,7 +18,6 @@ import {
   backupRegistrationFormBegin,
   clearRegistrationBackendError,
   registerNewUser,
-  setAutoGeneratedUsernameExperimentData,
   setEmailSuggestionInStore,
   setUserPipelineDataLoaded,
 } from './data/actions';
@@ -25,8 +25,6 @@ import {
   FORM_SUBMISSION_ERROR,
   TPA_AUTHENTICATION_FAILURE,
 } from './data/constants';
-import { AUTO_GENERATED_USERNAME_REGISTRATION_EXP_VARIATION, NOT_INITIALIZED } from './data/optimizelyExperiment/helper';
-import useAutoGeneratedUsernameExperimentVariation from './data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation';
 import getBackendValidations from './data/selectors';
 import {
   isFormValid, prepareRegistrationPayload,
@@ -43,12 +41,11 @@ import { getThirdPartyAuthContext as getRegistrationDataFromBackend } from '../c
 import EnterpriseSSO from '../common-components/EnterpriseSSO';
 import ThirdPartyAuth from '../common-components/ThirdPartyAuth';
 import {
-  APP_NAME, COMPLETE_STATE, PENDING_STATE, REGISTER_PAGE,
+  COMPLETE_STATE, PENDING_STATE, REGISTER_PAGE,
 } from '../data/constants';
 import {
-  getAllPossibleQueryParams, getTpaHint, getTpaProvider, isHostAvailableInQueryParams, removeCookie, setCookie,
+  getAllPossibleQueryParams, getTpaHint, getTpaProvider, isHostAvailableInQueryParams, setCookie,
 } from '../data/utils';
-import { trackRegistrationPageViewed, trackRegistrationSuccess } from '../tracking/trackers/register';
 
 /**
  * Main Registration Page component
@@ -71,7 +68,6 @@ const RegistrationPage = (props) => {
   } = props;
 
   const backedUpFormData = useSelector(state => state.register.registrationFormData);
-  const initExpVariation = useSelector(state => state.register.autoGeneratedUsernameExperimentVariation);
   const registrationError = useSelector(state => state.register.registrationError);
   const registrationErrorCode = registrationError?.errorCode;
   const registrationResult = useSelector(state => state.register.registrationResult);
@@ -107,12 +103,6 @@ const RegistrationPage = (props) => {
     ? formatMessage(messages['create.account.cta.button'], { label: cta })
     : formatMessage(messages['create.account.for.free.button']);
 
-  const autoGeneratedUsernameExpVariation = useAutoGeneratedUsernameExperimentVariation(
-    initExpVariation, registrationEmbedded, tpaHint, currentProvider, thirdPartyAuthApiStatus,
-  );
-
-  const hideUsernameField = flags.autoGeneratedUsernameEnabled
-      || autoGeneratedUsernameExpVariation === AUTO_GENERATED_USERNAME_REGISTRATION_EXP_VARIATION;
   /**
    * Set the userPipelineDetails data in formFields for only first time
    */
@@ -138,7 +128,7 @@ const RegistrationPage = (props) => {
 
   useEffect(() => {
     if (!formStartTime) {
-      trackRegistrationPageViewed();
+      sendPageEvent('login_and_registration', 'register');
       const payload = { ...queryParams, is_register_page: true };
       if (tpaHint) {
         payload.tpa_hint = tpaHint;
@@ -159,10 +149,8 @@ const RegistrationPage = (props) => {
         formFields: { ...formFields },
         errors: { ...errors },
       }));
-      dispatch(setAutoGeneratedUsernameExperimentData(autoGeneratedUsernameExpVariation));
     }
-  }, [shouldBackupState, configurableFormFields, // eslint-disable-line react-hooks/exhaustive-deps
-    formFields, errors, dispatch, backedUpFormData]);
+  }, [shouldBackupState, configurableFormFields, formFields, errors, dispatch, backedUpFormData]);
 
   useEffect(() => {
     if (backendValidations) {
@@ -183,15 +171,10 @@ const RegistrationPage = (props) => {
   useEffect(() => {
     if (registrationResult.success) {
       // This event is used by GTM
-      trackRegistrationSuccess();
+      sendTrackEvent('edx.bi.user.account.registered.client', {});
 
       // This is used by the "User Retention Rate Event" on GTM
       setCookie(getConfig().USER_RETENTION_COOKIE_NAME, true);
-
-      // Remove marketingEmailsOptIn cookie that was set on SSO registration flow
-      removeCookie('marketingEmailsOptIn');
-      // Remove this cookie that was set to capture marketingEmailsOptIn for the onboarding component
-      removeCookie('ssoPipelineRedirectionDone');
     }
   }, [registrationResult]);
 
@@ -227,13 +210,13 @@ const RegistrationPage = (props) => {
 
   const registerUser = () => {
     const totalRegistrationTime = (Date.now() - formStartTime) / 1000;
-    let payload = { ...formFields, app_name: APP_NAME };
+    let payload = { ...formFields };
 
     if (currentProvider) {
       delete payload.password;
       payload.social_auth_provider = currentProvider;
     }
-    if (hideUsernameField) {
+    if (flags.autoGeneratedUsernameEnabled) {
       delete payload.username;
     }
 
@@ -303,109 +286,106 @@ const RegistrationPage = (props) => {
             getConfig().ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN && !!Object.keys(optionalFields.fields).length
           }
         />
-        {(autoSubmitRegForm && !errorCode.type)
-        || (!autoGeneratedUsernameExpVariation && !(
-          autoGeneratedUsernameExpVariation === NOT_INITIALIZED
-          || registrationEmbedded || !!tpaHint || !!currentProvider))
-          ? (
-            <div className="mw-xs mt-5 text-center">
-              <Spinner animation="border" variant="primary" id="tpa-spinner" />
-            </div>
-          ) : (
-            <div
-              className={classNames(
-                'mw-xs mt-3',
-                { 'w-100 m-auto pt-4 main-content': registrationEmbedded },
+        {autoSubmitRegForm && !errorCode.type ? (
+          <div className="mw-xs mt-5 text-center">
+            <Spinner animation="border" variant="primary" id="tpa-spinner" />
+          </div>
+        ) : (
+          <div
+            className={classNames(
+              'mw-xs mt-3',
+              { 'w-100 m-auto pt-4 main-content': registrationEmbedded },
+            )}
+          >
+            <ThirdPartyAuthAlert
+              currentProvider={currentProvider}
+              platformName={platformName}
+              referrer={REGISTER_PAGE}
+            />
+            <RegistrationFailure
+              errorCode={errorCode.type}
+              failureCount={errorCode.count}
+              context={{ provider: currentProvider, errorMessage: thirdPartyAuthErrorMessage }}
+            />
+            <Form id="registration-form" name="registration-form">
+              <NameField
+                name="name"
+                value={formFields.name}
+                shouldFetchUsernameSuggestions={!formFields.username.trim()}
+                handleChange={handleOnChange}
+                handleErrorChange={handleErrorChange}
+                errorMessage={errors.name}
+                helpText={[formatMessage(messages['help.text.name'])]}
+                floatingLabel={formatMessage(messages['registration.fullname.label'])}
+              />
+              <EmailField
+                name="email"
+                value={formFields.email}
+                confirmEmailValue={configurableFormFields?.confirm_email}
+                handleErrorChange={handleErrorChange}
+                handleChange={handleOnChange}
+                errorMessage={errors.email}
+                helpText={[formatMessage(messages['help.text.email'])]}
+                floatingLabel={formatMessage(messages['registration.email.label'])}
+              />
+              {!flags.autoGeneratedUsernameEnabled && (
+                <UsernameField
+                  name="username"
+                  spellCheck="false"
+                  value={formFields.username}
+                  handleChange={handleOnChange}
+                  handleErrorChange={handleErrorChange}
+                  errorMessage={errors.username}
+                  helpText={[formatMessage(messages['help.text.username.1']), formatMessage(messages['help.text.username.2'])]}
+                  floatingLabel={formatMessage(messages['registration.username.label'])}
+                />
               )}
-            >
-              <ThirdPartyAuthAlert
-                currentProvider={currentProvider}
-                platformName={platformName}
-                referrer={REGISTER_PAGE}
-              />
-              <RegistrationFailure
-                errorCode={errorCode.type}
-                failureCount={errorCode.count}
-                context={{ provider: currentProvider, errorMessage: thirdPartyAuthErrorMessage }}
-              />
-              <Form id="registration-form" name="registration-form">
-                <NameField
-                  name="name"
-                  value={formFields.name}
-                  shouldFetchUsernameSuggestions={!formFields.username.trim()}
+              {!currentProvider && (
+                <PasswordField
+                  name="password"
+                  value={formFields.password}
                   handleChange={handleOnChange}
                   handleErrorChange={handleErrorChange}
-                  errorMessage={errors.name}
-                  helpText={[formatMessage(messages['help.text.name'])]}
-                  floatingLabel={formatMessage(messages['registration.fullname.label'])}
+                  errorMessage={errors.password}
+                  floatingLabel={formatMessage(messages['registration.password.label'])}
                 />
-                <EmailField
-                  name="email"
-                  value={formFields.email}
-                  confirmEmailValue={configurableFormFields?.confirm_email}
-                  handleErrorChange={handleErrorChange}
-                  handleChange={handleOnChange}
-                  errorMessage={errors.email}
-                  helpText={[formatMessage(messages['help.text.email'])]}
-                  floatingLabel={formatMessage(messages['registration.email.label'])}
+              )}
+              <ConfigurableRegistrationForm
+                email={formFields.email}
+                fieldErrors={errors}
+                formFields={configurableFormFields}
+                setFieldErrors={registrationEmbedded ? setTemporaryErrors : setErrors}
+                setFormFields={setConfigurableFormFields}
+                autoSubmitRegisterForm={autoSubmitRegForm}
+                fieldDescriptions={fieldDescriptions}
+              />
+              <StatefulButton
+                id="register-user"
+                name="register-user"
+                type="submit"
+                variant="brand"
+                className="register-button mt-4 mb-4"
+                state={submitState}
+                labels={{
+                  default: buttonLabel,
+                  pending: '',
+                }}
+                onClick={handleSubmit}
+                onMouseDown={(e) => e.preventDefault()}
+              />
+              {!registrationEmbedded && (
+                <ThirdPartyAuth
+                  currentProvider={currentProvider}
+                  providers={providers}
+                  secondaryProviders={secondaryProviders}
+                  handleInstitutionLogin={handleInstitutionLogin}
+                  thirdPartyAuthApiStatus={thirdPartyAuthApiStatus}
                 />
-                {!hideUsernameField && (
-                  <UsernameField
-                    name="username"
-                    spellCheck="false"
-                    value={formFields.username}
-                    handleChange={handleOnChange}
-                    handleErrorChange={handleErrorChange}
-                    errorMessage={errors.username}
-                    helpText={[formatMessage(messages['help.text.username.1']), formatMessage(messages['help.text.username.2'])]}
-                    floatingLabel={formatMessage(messages['registration.username.label'])}
-                  />
-                )}
-                {!currentProvider && (
-                  <PasswordField
-                    name="password"
-                    value={formFields.password}
-                    handleChange={handleOnChange}
-                    handleErrorChange={handleErrorChange}
-                    errorMessage={errors.password}
-                    floatingLabel={formatMessage(messages['registration.password.label'])}
-                  />
-                )}
-                <ConfigurableRegistrationForm
-                  email={formFields.email}
-                  fieldErrors={errors}
-                  formFields={configurableFormFields}
-                  setFieldErrors={registrationEmbedded ? setTemporaryErrors : setErrors}
-                  setFormFields={setConfigurableFormFields}
-                  autoSubmitRegisterForm={autoSubmitRegForm}
-                  fieldDescriptions={fieldDescriptions}
-                />
-                <StatefulButton
-                  id="register-user"
-                  name="register-user"
-                  type="submit"
-                  variant="brand"
-                  className="register-button mt-4 mb-4"
-                  state={submitState}
-                  labels={{
-                    default: buttonLabel,
-                    pending: '',
-                  }}
-                  onClick={handleSubmit}
-                  onMouseDown={(e) => e.preventDefault()}
-                />
-                {!registrationEmbedded && (
-                  <ThirdPartyAuth
-                    currentProvider={currentProvider}
-                    providers={providers}
-                    secondaryProviders={secondaryProviders}
-                    handleInstitutionLogin={handleInstitutionLogin}
-                    thirdPartyAuthApiStatus={thirdPartyAuthApiStatus}
-                  />
-                )}
-              </Form>
-            </div>
-          )}
+              )}
+            </Form>
+          </div>
+        )}
+
       </>
     );
   };

src/register/RegistrationPage.test.jsx

@@ -17,12 +17,9 @@ import {
   setUserPipelineDataLoaded,
 } from './data/actions';
 import { INTERNAL_SERVER_ERROR } from './data/constants';
-import { NOT_INITIALIZED } from './data/optimizelyExperiment/helper';
-import useAutoGeneratedUsernameExperimentVariation
-  from './data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation';
 import RegistrationPage from './RegistrationPage';
 import {
-  APP_NAME, AUTHN_PROGRESSIVE_PROFILING, COMPLETE_STATE, PENDING_STATE, REGISTER_PAGE,
+  AUTHN_PROGRESSIVE_PROFILING, COMPLETE_STATE, PENDING_STATE, REGISTER_PAGE,
 } from '../data/constants';
 
 jest.mock('@edx/frontend-platform/analytics', () => ({
@@ -33,7 +30,6 @@ jest.mock('@edx/frontend-platform/i18n', () => ({
   ...jest.requireActual('@edx/frontend-platform/i18n'),
   getLocale: jest.fn(),
 }));
-jest.mock('./data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation', () => jest.fn());
 
 const IntlRegistrationPage = injectIntl(RegistrationPage);
 const mockStore = configureStore();
@@ -132,7 +128,6 @@ describe('RegistrationPage', () => {
       institutionLogin: false,
     };
     window.location = { search: '' };
-    useAutoGeneratedUsernameExperimentVariation.mockReturnValue(NOT_INITIALIZED);
   });
 
   afterEach(() => {
@@ -190,7 +185,6 @@ describe('RegistrationPage', () => {
         honor_code: true,
         total_registration_time: 0,
         next: '/course/demo-course-url',
-        app_name: APP_NAME,
       };
 
       store.dispatch = jest.fn(store.dispatch);
@@ -213,7 +207,6 @@ describe('RegistrationPage', () => {
         honor_code: true,
         social_auth_provider: 'Apple',
         total_registration_time: 0,
-        app_name: APP_NAME,
       };
 
       store = mockStore({
@@ -299,7 +292,6 @@ describe('RegistrationPage', () => {
         honor_code: true,
         total_registration_time: 0,
         marketing_emails_opt_in: true,
-        app_name: APP_NAME,
       };
 
       store.dispatch = jest.fn(store.dispatch);
@@ -326,7 +318,6 @@ describe('RegistrationPage', () => {
         country: 'Pakistan',
         honor_code: true,
         total_registration_time: 0,
-        app_name: APP_NAME,
       };
 
       store.dispatch = jest.fn(store.dispatch);
@@ -601,7 +592,7 @@ describe('RegistrationPage', () => {
 
     it('should send page event when register page is rendered', () => {
       render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
-      expect(sendPageEvent).toHaveBeenCalledWith('login_and_registration', 'register', { app_name: APP_NAME });
+      expect(sendPageEvent).toHaveBeenCalledWith('login_and_registration', 'register');
     });
 
     it('should send track event when user has successfully registered', () => {
@@ -619,7 +610,7 @@ describe('RegistrationPage', () => {
       delete window.location;
       window.location = { href: getConfig().BASE_URL };
       render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
-      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.user.account.registered.client', { app_name: APP_NAME });
+      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.user.account.registered.client', {});
     });
 
     it('should populate form with pipeline user details', () => {
@@ -892,7 +883,6 @@ describe('RegistrationPage', () => {
         country: 'PK',
         social_auth_provider: 'Apple',
         total_registration_time: 0,
-        app_name: APP_NAME,
       }));
     });
   });

src/register/components/ConfigurableRegistrationForm.jsx

@@ -1,12 +1,10 @@
 import React, { useEffect, useMemo } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
 
 import { getConfig } from '@edx/frontend-platform';
 import { getCountryList, getLocale, useIntl } from '@edx/frontend-platform/i18n';
 import PropTypes from 'prop-types';
 
 import { FormFieldRenderer } from '../../field-renderer';
-import { backupRegistrationFormBegin } from '../data/actions';
 import { FIELDS } from '../data/constants';
 import messages from '../messages';
 import { CountryField, HonorCode, TermsOfService } from '../RegistrationFields';
@@ -34,16 +32,12 @@ const ConfigurableRegistrationForm = (props) => {
     setFormFields,
     autoSubmitRegistrationForm,
   } = props;
-  const dispatch = useDispatch();
 
   /** The reason for adding the entry 'United States' is that Chrome browser aut-fill the form with the 'Unites
   States' instead of 'United States of America' which does not exist in country dropdown list and gets the user
   confused and unable to create an account. So we added the United States entry in the dropdown list.
  */
-
-  const countryList = useMemo(() => (
-    getCountryList(getLocale()).concat([{ code: 'US', name: 'United States' }]).filter(country => country.code !== 'RU')
-  ), []);
+  const countryList = useMemo(() => getCountryList(getLocale()).concat([{ code: 'US', name: 'United States' }]), []);
 
   let showTermsOfServiceAndHonorCode = false;
   let showCountryField = false;
@@ -56,8 +50,6 @@ const ConfigurableRegistrationForm = (props) => {
     showMarketingEmailOptInCheckbox: getConfig().MARKETING_EMAILS_OPT_IN,
   };
 
-  const backedUpFormData = useSelector(state => state.register.registrationFormData);
-
   /**
    * If auto submitting register form, we will check tos and honor code fields if they exist for feature parity.
    */
@@ -98,16 +90,6 @@ const ConfigurableRegistrationForm = (props) => {
         setFieldErrors(prevErrors => ({ ...prevErrors, [name]: '' }));
       }
     }
-    // setting marketingEmailsOptIn state for SSO authentication flow for register API call
-    if (name === 'marketingEmailsOptIn') {
-      dispatch(backupRegistrationFormBegin({
-        ...backedUpFormData,
-        configurableFormFields: {
-          ...backedUpFormData.configurableFormFields,
-          [name]: value,
-        },
-      }));
-    }
     setFormFields(prevState => ({ ...prevState, [name]: value }));
   };
 

src/register/components/tests/ConfigurableRegistrationForm.test.jsx

@@ -9,12 +9,8 @@ import { fireEvent, render } from '@testing-library/react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 
-import { APP_NAME } from '../../../data/constants';
 import { registerNewUser } from '../../data/actions';
 import { FIELDS } from '../../data/constants';
-import { NOT_INITIALIZED } from '../../data/optimizelyExperiment/helper';
-import useAutoGeneratedUsernameExperimentVariation
-  from '../../data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation';
 import RegistrationPage from '../../RegistrationPage';
 import ConfigurableRegistrationForm from '../ConfigurableRegistrationForm';
 
@@ -26,7 +22,6 @@ jest.mock('@edx/frontend-platform/i18n', () => ({
   ...jest.requireActual('@edx/frontend-platform/i18n'),
   getLocale: jest.fn(),
 }));
-jest.mock('../../data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation', () => jest.fn());
 
 const IntlConfigurableRegistrationForm = injectIntl(ConfigurableRegistrationForm);
 const IntlRegistrationPage = injectIntl(RegistrationPage);
@@ -126,7 +121,6 @@ describe('ConfigurableRegistrationForm', () => {
     };
     window.location = { search: '' };
     getLocale.mockImplementationOnce(() => ('en-us'));
-    useAutoGeneratedUsernameExperimentVariation.mockReturnValue(NOT_INITIALIZED);
   });
 
   afterEach(() => {
@@ -266,7 +260,7 @@ describe('ConfigurableRegistrationForm', () => {
 
       fireEvent.click(submitButton);
 
-      expect(store.dispatch).toHaveBeenCalledWith(registerNewUser({ ...payload, country: 'PK', app_name: APP_NAME }));
+      expect(store.dispatch).toHaveBeenCalledWith(registerNewUser({ ...payload, country: 'PK' }));
     });
 
     it('should show error messages for required fields on empty form submission', () => {

src/register/components/tests/RegistrationFailure.test.jsx

@@ -12,9 +12,6 @@ import configureStore from 'redux-mock-store';
 import {
   FORBIDDEN_REQUEST, INTERNAL_SERVER_ERROR, TPA_AUTHENTICATION_FAILURE, TPA_SESSION_EXPIRED,
 } from '../../data/constants';
-import { NOT_INITIALIZED } from '../../data/optimizelyExperiment/helper';
-import useAutoGeneratedUsernameExperimentVariation
-  from '../../data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation';
 import RegistrationPage from '../../RegistrationPage';
 import RegistrationFailureMessage from '../RegistrationFailure';
 
@@ -26,7 +23,6 @@ jest.mock('@edx/frontend-platform/i18n', () => ({
   ...jest.requireActual('@edx/frontend-platform/i18n'),
   getLocale: jest.fn(),
 }));
-jest.mock('../../data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation', () => jest.fn());
 
 const IntlRegistrationPage = injectIntl(RegistrationPage);
 const IntlRegistrationFailure = injectIntl(RegistrationFailureMessage);
@@ -125,7 +121,6 @@ describe('RegistrationFailure', () => {
       institutionLogin: false,
     };
     window.location = { search: '' };
-    useAutoGeneratedUsernameExperimentVariation.mockReturnValue(NOT_INITIALIZED);
   });
 
   afterEach(() => {

src/register/components/tests/ThirdPartyAuth.test.jsx

@@ -12,9 +12,6 @@ import configureStore from 'redux-mock-store';
 import {
   COMPLETE_STATE, LOGIN_PAGE, PENDING_STATE, REGISTER_PAGE,
 } from '../../../data/constants';
-import { NOT_INITIALIZED } from '../../data/optimizelyExperiment/helper';
-import useAutoGeneratedUsernameExperimentVariation
-  from '../../data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation';
 import RegistrationPage from '../../RegistrationPage';
 
 jest.mock('@edx/frontend-platform/analytics', () => ({
@@ -25,7 +22,6 @@ jest.mock('@edx/frontend-platform/i18n', () => ({
   ...jest.requireActual('@edx/frontend-platform/i18n'),
   getLocale: jest.fn(),
 }));
-jest.mock('../../data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation', () => jest.fn());
 
 const IntlRegistrationPage = injectIntl(RegistrationPage);
 const mockStore = configureStore();
@@ -124,7 +120,6 @@ describe('ThirdPartyAuth', () => {
       institutionLogin: false,
     };
     window.location = { search: '' };
-    useAutoGeneratedUsernameExperimentVariation.mockReturnValue(NOT_INITIALIZED);
   });
 
   afterEach(() => {

src/register/data/actions.js

@@ -8,7 +8,7 @@ export const REGISTRATION_CLEAR_BACKEND_ERROR = 'REGISTRATION_CLEAR_BACKEND_ERRO
 export const REGISTER_SET_COUNTRY_CODE = 'REGISTER_SET_COUNTRY_CODE';
 export const REGISTER_SET_USER_PIPELINE_DATA_LOADED = 'REGISTER_SET_USER_PIPELINE_DATA_LOADED';
 export const REGISTER_SET_EMAIL_SUGGESTIONS = 'REGISTER_SET_EMAIL_SUGGESTIONS';
-export const REGISTER_SET_AUTO_GENERATED_USERNAME_REGISTRATION_EXP_DATA = 'REGISTER_SET_AUTO_GENERATED_USERNAME_REGISTRATION_EXP_DATA';
+
 // Backup registration form
 export const backupRegistrationForm = () => ({
   type: BACKUP_REGISTRATION_DATA.BASE,
@@ -83,9 +83,3 @@ export const setUserPipelineDataLoaded = (value) => ({
   type: REGISTER_SET_USER_PIPELINE_DATA_LOADED,
   payload: { value },
 });
-
-// Auto Generated Username Registration Experiment Actions
-export const setAutoGeneratedUsernameExperimentData = (autoGeneratedRegExpVariation) => ({
-  type: REGISTER_SET_AUTO_GENERATED_USERNAME_REGISTRATION_EXP_DATA,
-  payload: { autoGeneratedRegExpVariation },
-});

src/register/data/optimizelyExperiment/helper.js

@@ -1,30 +0,0 @@
-/**
- * This file contains data for auto generated username Optimizely experiment
- */
-import { getConfig } from '@edx/frontend-platform';
-
-export const NOT_INITIALIZED = 'experiment-not-initialized';
-export const CONTROL = 'control-registration-page';
-export const AUTO_GENERATED_USERNAME_REGISTRATION_EXP_VARIATION = 'auto-generated-username-register-page';
-const AUTO_GENERATED_USERNAME_EXP_PAGE = 'targeting_for_auto_generated_username_page';
-
-export function getAutoGeneratedUsernameExperimentVariation() {
-  try {
-    if (window.optimizely
-        && window.optimizely.get('data').experiments[getConfig().AUTO_GENERATED_USERNAME_EXPERIMENT_ID]) {
-      const selectedVariant = window.optimizely.get('state').getVariationMap()[
-        getConfig().AUTO_GENERATED_USERNAME_EXPERIMENT_ID
-      ];
-      return selectedVariant?.name;
-    }
-  } catch (e) { /* empty */ }
-  return '';
-}
-
-export function activateAutoGeneratedUsernameExperiment() {
-  window.optimizely = window.optimizely || [];
-  window.optimizely.push({
-    type: 'page',
-    pageName: AUTO_GENERATED_USERNAME_EXP_PAGE,
-  });
-}

src/register/data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation.js

@@ -1,53 +0,0 @@
-import { useEffect, useState } from 'react';
-
-import {
-  activateAutoGeneratedUsernameExperiment,
-  getAutoGeneratedUsernameExperimentVariation,
-  NOT_INITIALIZED,
-} from './helper';
-import { COMPLETE_STATE } from '../../../data/constants';
-
-/**
- * This hook returns activates multi step registration experiment and returns the experiment
- * variation for the user.
- */
-const useAutoGeneratedUsernameExperimentVariation = (
-  initExpVariation,
-  registrationEmbedded,
-  tpaHint,
-  currentProvider,
-  thirdPartyAuthApiStatus,
-) => {
-  const [variation, setVariation] = useState(initExpVariation);
-  useEffect(() => {
-    if (initExpVariation || registrationEmbedded || !!tpaHint || !!currentProvider
-        || thirdPartyAuthApiStatus !== COMPLETE_STATE) {
-      return variation;
-    }
-
-    const getVariation = () => {
-      const expVariation = getAutoGeneratedUsernameExperimentVariation();
-      if (expVariation) {
-        setVariation(expVariation);
-      } else {
-        // This is to handle the case when user dont get variation for some reason, the register page
-        // shows unlimited spinner.
-        setVariation(NOT_INITIALIZED);
-      }
-    };
-
-    activateAutoGeneratedUsernameExperiment();
-
-    const timer = setTimeout(getVariation, 300);
-
-    return () => {
-      clearTimeout(timer);
-    };
-  }, [ // eslint-disable-line react-hooks/exhaustive-deps
-    initExpVariation, currentProvider, registrationEmbedded, thirdPartyAuthApiStatus, tpaHint,
-  ]);
-
-  return variation;
-};
-
-export default useAutoGeneratedUsernameExperimentVariation;

src/register/data/reducers.js

@@ -3,7 +3,6 @@ import {
   REGISTER_CLEAR_USERNAME_SUGGESTIONS,
   REGISTER_FORM_VALIDATIONS,
   REGISTER_NEW_USER,
-  REGISTER_SET_AUTO_GENERATED_USERNAME_REGISTRATION_EXP_DATA,
   REGISTER_SET_COUNTRY_CODE,
   REGISTER_SET_EMAIL_SUGGESTIONS,
   REGISTER_SET_USER_PIPELINE_DATA_LOADED,
@@ -40,7 +39,6 @@ export const defaultState = {
   usernameSuggestions: [],
   validationApiRateLimited: false,
   shouldBackupState: false,
-  autoGeneratedUsernameExperimentVariation: '',
 };
 
 const reducer = (state = defaultState, action = {}) => {
@@ -57,12 +55,6 @@ const reducer = (state = defaultState, action = {}) => {
         registrationFormData: { ...action.payload },
         userPipelineDataLoaded: state.userPipelineDataLoaded,
       };
-    case REGISTER_SET_AUTO_GENERATED_USERNAME_REGISTRATION_EXP_DATA: {
-      return {
-        ...state,
-        autoGeneratedUsernameExperimentVariation: action.payload.autoGeneratedRegExpVariation,
-      };
-    }
     case REGISTER_NEW_USER.BEGIN:
       return {
         ...state,

src/register/data/tests/reducers.test.js

@@ -38,7 +38,6 @@ describe('Registration Reducer Tests', () => {
     usernameSuggestions: [],
     validationApiRateLimited: false,
     shouldBackupState: false,
-    autoGeneratedUsernameExperimentVariation: '',
   };
 
   it('should return the initial state', () => {

src/register/data/utils.js

@@ -43,31 +43,39 @@ export const isFormValid = (
   Object.keys(payload).forEach(key => {
     switch (key) {
     case 'name':
-      fieldErrors.name = validateName(payload.name, formatMessage);
+      if (!fieldErrors.name) {
+        fieldErrors.name = validateName(payload.name, formatMessage);
+      }
       if (fieldErrors.name) { isValid = false; }
       break;
     case 'email': {
-      const {
-        fieldError, confirmEmailError, suggestion,
-      } = validateEmail(payload.email, configurableFormFields?.confirm_email, formatMessage);
-      if (fieldError) {
-        fieldErrors.email = fieldError;
-        isValid = false;
+      if (!fieldErrors.email) {
+        const {
+          fieldError, confirmEmailError, suggestion,
+        } = validateEmail(payload.email, configurableFormFields?.confirm_email, formatMessage);
+        if (fieldError) {
+          fieldErrors.email = fieldError;
+          isValid = false;
+        }
+        if (confirmEmailError) {
+          fieldErrors.confirm_email = confirmEmailError;
+          isValid = false;
+        }
+        emailSuggestion = suggestion;
       }
-      if (confirmEmailError) {
-        fieldErrors.confirm_email = confirmEmailError;
-        isValid = false;
-      }
-      emailSuggestion = suggestion;
       if (fieldErrors.email) { isValid = false; }
       break;
     }
     case 'username':
-      fieldErrors.username = validateUsername(payload.username, formatMessage);
+      if (!fieldErrors.username) {
+        fieldErrors.username = validateUsername(payload.username, formatMessage);
+      }
       if (fieldErrors.username) { isValid = false; }
       break;
     case 'password':
-      fieldErrors.password = validatePasswordField(payload.password, formatMessage);
+      if (!fieldErrors.password) {
+        fieldErrors.password = validatePasswordField(payload.password, formatMessage);
+      }
       if (fieldErrors.password) { isValid = false; }
       break;
     default:

src/reset-password/ResetPasswordPage.jsx

@@ -18,7 +18,7 @@ import { useNavigate, useParams } from 'react-router-dom';
 
 import { resetPassword, validateToken } from './data/actions';
 import {
-  FORM_SUBMISSION_ERROR, PASSWORD_RESET_ERROR, PASSWORD_VALIDATION_ERROR, SUCCESS, TOKEN_STATE,
+  FORM_SUBMISSION_ERROR, PASSWORD_RESET_ERROR, PASSWORD_VALIDATION_ERROR, TOKEN_STATE,
 } from './data/constants';
 import { resetPasswordResultSelector } from './data/selectors';
 import { validatePassword } from './data/service';
@@ -30,7 +30,6 @@ import {
   LETTER_REGEX, LOGIN_PAGE, NUMBER_REGEX, RESET_PAGE,
 } from '../data/constants';
 import { getAllPossibleQueryParams, updatePathWithQueryParams, windowScrollTo } from '../data/utils';
-import { trackPasswordResetSuccess, trackResetPasswordPageViewed } from '../tracking/trackers/reset-password';
 
 const ResetPasswordPage = (props) => {
   const { formatMessage } = useIntl();
@@ -43,15 +42,6 @@ const ResetPasswordPage = (props) => {
   const { token } = useParams();
   const navigate = useNavigate();
 
-  useEffect(() => {
-    if (props.status === TOKEN_STATE.VALID) {
-      trackResetPasswordPageViewed();
-    }
-    if (props.status === SUCCESS) {
-      trackPasswordResetSuccess();
-    }
-  }, [props.status]);
-
   useEffect(() => {
     if (props.status !== TOKEN_STATE.PENDING && props.status !== PASSWORD_RESET_ERROR) {
       setErrorCode(props.status);
@@ -149,7 +139,7 @@ const ResetPasswordPage = (props) => {
     }
   } else if (props.status === PASSWORD_RESET_ERROR) {
     navigate(updatePathWithQueryParams(RESET_PAGE));
-  } else if (props.status === SUCCESS) {
+  } else if (props.status === 'success') {
     navigate(updatePathWithQueryParams(LOGIN_PAGE));
   } else {
     return (

src/reset-password/tests/ResetPasswordPage.test.jsx

@@ -19,11 +19,6 @@ import ResetPasswordPage from '../ResetPasswordPage';
 const mockedNavigator = jest.fn();
 const token = '1c-bmjdkc-5e60e084cf8113048ca7';
 
-jest.mock('@edx/frontend-platform/analytics', () => ({
-  sendPageEvent: jest.fn(),
-  sendTrackEvent: jest.fn(),
-}));
-
 jest.mock('@edx/frontend-platform/auth');
 jest.mock('react-router-dom', () => ({
   ...(jest.requireActual('react-router-dom')),

src/tracking/trackers/forgotpassword.js

@@ -1,22 +0,0 @@
-import { createEventTracker, createPageEventTracker } from '../../data/segment/utils';
-
-export const eventNames = {
-  loginAndRegistration: 'login_and_registration',
-  forgotPasswordPageViewed: 'edx.bi.password_reset_form.viewed',
-};
-
-export const categories = {
-  userEngagement: 'user-engagement',
-};
-
-// Event tracker for forgot password page viewed
-export const trackForgotPasswordPageViewed = () => createEventTracker(
-  eventNames.forgotPasswordPageViewed,
-  {
-    category: categories.userEngagement,
-  },
-)();
-
-export const trackForgotPasswordPageEvent = () => {
-  createPageEventTracker(eventNames.loginAndRegistration, 'forgot-password')();
-};

src/tracking/trackers/login.js

@@ -1,29 +0,0 @@
-import { createEventTracker, createPageEventTracker } from '../../data/segment/utils';
-
-export const eventNames = {
-  forgotPasswordLinkClicked: 'edx.bi.password-reset_form.toggled',
-  loginAndRegistration: 'login_and_registration',
-  registerFormToggled: 'edx.bi.register_form.toggled',
-  loginSuccess: 'edx.bi.user.account.authenticated.client',
-};
-
-export const categories = {
-  userEngagement: 'user-engagement',
-};
-
-// Event tracker for Forgot Password link click
-export const trackForgotPasswordLinkClick = () => createEventTracker(
-  eventNames.forgotPasswordLinkClicked,
-  { category: categories.userEngagement },
-)();
-
-// Tracks the login page event.
-export const trackLoginPageViewed = () => {
-  createPageEventTracker(eventNames.loginAndRegistration, 'login')();
-};
-
-// Tracks the login sucess event.
-export const trackLoginSuccess = () => createEventTracker(
-  eventNames.loginSuccess,
-  {},
-)();

src/tracking/trackers/progressive-profiling.js

@@ -1,37 +0,0 @@
-import { createEventTracker, createPageEventTracker } from '../../data/segment/utils';
-
-export const eventNames = {
-  progressiveProfilingSubmitClick: 'edx.bi.welcome.page.submit.clicked',
-  progressiveProfilingSkipLinkClick: 'edx.bi.welcome.page.skip.link.clicked',
-  disablePostRegistrationRecommendations: 'edx.bi.user.recommendations.not.enabled',
-  progressiveProfilingSupportLinkCLick: 'edx.bi.welcome.page.support.link.clicked',
-  loginAndRegistration: 'login_and_registration',
-};
-
-// Event link tracker for Progressive profiling skip button click
-export const trackProgressiveProfilingSkipLinkClick = evenProperties => createEventTracker(
-  eventNames.progressiveProfilingSkipLinkClick, { ...evenProperties },
-)();
-
-// Event tracker for progressive profiling submit button click
-export const trackProgressiveProfilingSubmitClick = (evenProperties) => createEventTracker(
-  eventNames.progressiveProfilingSubmitClick,
-  { ...evenProperties },
-)();
-
-// Event tracker for progressive profiling submit button click
-export const trackDisablePostRegistrationRecommendations = (evenProperties) => createEventTracker(
-  eventNames.disablePostRegistrationRecommendations,
-  { ...evenProperties },
-)();
-
-// Tracks the progressive profiling page event.
-export const trackProgressiveProfilingPageViewed = () => {
-  createPageEventTracker(eventNames.loginAndRegistration, 'welcome')();
-};
-
-// Tracks the progressive profiling spport link click.
-export const trackProgressiveProfilingSupportLinkCLick = () => createEventTracker(
-  eventNames.progressiveProfilingSupportLinkCLick,
-  {},
-)();

src/tracking/trackers/register.js

@@ -1,22 +0,0 @@
-import { createEventTracker, createPageEventTracker } from '../../data/segment/utils';
-
-export const eventNames = {
-  loginAndRegistration: 'login_and_registration',
-  registrationSuccess: 'edx.bi.user.account.registered.client',
-  loginFormToggled: 'edx.bi.login_form.toggled',
-};
-
-export const categories = {
-  userEngagement: 'user-engagement',
-};
-
-// Event tracker for successful registration
-export const trackRegistrationSuccess = () => createEventTracker(
-  eventNames.registrationSuccess,
-  {},
-)();
-
-// Tracks the progressive profiling page event.
-export const trackRegistrationPageViewed = () => {
-  createPageEventTracker(eventNames.loginAndRegistration, 'register')();
-};

src/tracking/trackers/reset-password.js

@@ -1,14 +0,0 @@
-import { createEventTracker, createPageEventTracker } from '../../data/segment/utils';
-
-export const eventNames = {
-  loginAndRegistration: 'login_and_registration',
-  resetPasswordSuccess: 'edx.bi.user.password.reset.success',
-};
-
-export const trackResetPasswordPageViewed = () => {
-  createPageEventTracker(eventNames.loginAndRegistration, 'reset-password')();
-};
-
-export const trackPasswordResetSuccess = () => {
-  createEventTracker(eventNames.resetPasswordSuccess, {})();
-};

src/tracking/trackers/tests/forgot-password.test.jsx

@@ -1,37 +0,0 @@
-import { createEventTracker, createPageEventTracker } from '../../../data/segment/utils';
-import {
-  categories,
-  eventNames,
-  trackForgotPasswordPageEvent,
-  trackForgotPasswordPageViewed,
-} from '../forgotpassword';
-
-// Mock createEventTracker function
-jest.mock('../../../data/segment/utils', () => ({
-  createEventTracker: jest.fn().mockImplementation(() => jest.fn()),
-  createPageEventTracker: jest.fn().mockImplementation(() => jest.fn()),
-}));
-
-describe('Tracking Functions', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('should fire trackForgotPasswordPageEvent', () => {
-    trackForgotPasswordPageEvent();
-
-    expect(createPageEventTracker).toHaveBeenCalledWith(
-      eventNames.loginAndRegistration,
-      'forgot-password',
-    );
-  });
-
-  it('should fire forgotPasswordPageViewedEvent', () => {
-    trackForgotPasswordPageViewed();
-
-    expect(createEventTracker).toHaveBeenCalledWith(
-      eventNames.forgotPasswordPageViewed,
-      { category: categories.userEngagement },
-    );
-  });
-});

src/tracking/trackers/tests/login.test.jsx

@@ -1,37 +0,0 @@
-import { createEventTracker, createPageEventTracker } from '../../../data/segment/utils';
-import {
-  categories,
-  eventNames,
-  trackForgotPasswordLinkClick,
-  trackLoginPageViewed,
-} from '../login';
-
-// Mock createEventTracker function
-jest.mock('../../../data/segment/utils', () => ({
-  createEventTracker: jest.fn().mockImplementation(() => jest.fn()),
-  createPageEventTracker: jest.fn().mockImplementation(() => jest.fn()),
-}));
-
-describe('Tracking Functions', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('trackForgotPasswordLinkClick function', () => {
-    trackForgotPasswordLinkClick();
-
-    expect(createEventTracker).toHaveBeenCalledWith(
-      eventNames.forgotPasswordLinkClicked,
-      { category: categories.userEngagement },
-    );
-  });
-
-  it('trackLoginPageEvent function', () => {
-    trackLoginPageViewed();
-
-    expect(createPageEventTracker).toHaveBeenCalledWith(
-      eventNames.loginAndRegistration,
-      'login',
-    );
-  });
-});

src/tracking/trackers/tests/progressive-profiling.test.jsx

@@ -1,37 +0,0 @@
-import { createEventTracker, createPageEventTracker } from '../../../data/segment/utils';
-import {
-  eventNames,
-  trackProgressiveProfilingPageViewed,
-  trackProgressiveProfilingSkipLinkClick,
-} from '../progressive-profiling';
-
-// Mock createEventTracker function
-jest.mock('../../../data/segment/utils', () => ({
-  createEventTracker: jest.fn().mockImplementation(() => jest.fn()),
-  createPageEventTracker: jest.fn().mockImplementation(() => jest.fn()),
-  createLinkTracker: jest.fn().mockImplementation(() => jest.fn()),
-}));
-
-describe('Tracking Functions', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('should fire trackProgressiveProfilingSkipLinkClickEvent', () => {
-    trackProgressiveProfilingSkipLinkClick();
-
-    expect(createEventTracker).toHaveBeenCalledWith(
-      eventNames.progressiveProfilingSkipLinkClick,
-      {},
-    );
-  });
-
-  it('should fire trackProgressiveProfilingPageEvent', () => {
-    trackProgressiveProfilingPageViewed();
-
-    expect(createPageEventTracker).toHaveBeenCalledWith(
-      eventNames.loginAndRegistration,
-      'welcome',
-    );
-  });
-});

src/tracking/trackers/tests/register.test.jsx

@@ -1,36 +0,0 @@
-import { createEventTracker, createPageEventTracker } from '../../../data/segment/utils';
-import {
-  eventNames,
-  trackRegistrationPageViewed,
-  trackRegistrationSuccess,
-} from '../register';
-
-// Mock createEventTracker function
-jest.mock('../../../data/segment/utils', () => ({
-  createEventTracker: jest.fn().mockImplementation(() => jest.fn()),
-  createPageEventTracker: jest.fn().mockImplementation(() => jest.fn()),
-}));
-
-describe('Tracking Functions', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('should fire registrationSuccessEvent', () => {
-    trackRegistrationSuccess();
-
-    expect(createEventTracker).toHaveBeenCalledWith(
-      eventNames.registrationSuccess,
-      {},
-    );
-  });
-
-  it('should fire trackRegistrationPageEvent', () => {
-    trackRegistrationPageViewed();
-
-    expect(createPageEventTracker).toHaveBeenCalledWith(
-      eventNames.loginAndRegistration,
-      'register',
-    );
-  });
-});

src/tracking/trackers/tests/reset-password.test.jsx

@@ -1,26 +0,0 @@
-import { createPageEventTracker } from '../../../data/segment/utils';
-import {
-  eventNames,
-  trackResetPasswordPageViewed,
-} from '../reset-password';
-
-// Mock createEventTracker function
-jest.mock('../../../data/segment/utils', () => ({
-  createEventTracker: jest.fn().mockImplementation(() => jest.fn()),
-  createPageEventTracker: jest.fn().mockImplementation(() => jest.fn()),
-}));
-
-describe('Tracking Functions', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('should fire trackResettPasswordPageEvent', () => {
-    trackResetPasswordPageViewed();
-
-    expect(createPageEventTracker).toHaveBeenCalledWith(
-      eventNames.loginAndRegistration,
-      'reset-password',
-    );
-  });
-});