feat: beginnings of the recruit me some money exploits

2021-08-11 10:48:16 -04:00
290 changed files with 33149 additions and 36730 deletions
--- a/.env
+++ b/.env
@@ -0,0 +1,26 @@
+NODE_ENV='production'
+ACCESS_TOKEN_COOKIE_NAME=null
+BASE_URL=null
+CREDENTIALS_BASE_URL=null
+CSRF_TOKEN_API_PATH=null
+ECOMMERCE_BASE_URL=null
+LANGUAGE_PREFERENCE_COOKIE_NAME=null
+LMS_BASE_URL=null
+LOGIN_URL=null
+LOGOUT_URL=null
+MARKETING_SITE_BASE_URL=null
+ORDER_HISTORY_URL=null
+REFRESH_ACCESS_TOKEN_ENDPOINT=null
+SEGMENT_KEY=''
+SITE_NAME=null
+USER_INFO_COOKIE_NAME=null
+AUTHN_MINIMAL_HEADER=true
+LOGIN_ISSUE_SUPPORT_LINK=''
+REGISTRATION_OPTIONAL_FIELDS=''
+USER_SURVEY_COOKIE_NAME=null
+COOKIE_DOMAIN=null
+WELCOME_PAGE_SUPPORT_LINK=null
+INFO_EMAIL=''
+DISABLE_ENTERPRISE_LOGIN=''
+REGISTER_CONVERSION_COOKIE_NAME=null
+ENABLE_PROGRESSIVE_PROFILING=''
--- a/.env.development
+++ b/.env.development
@@ -17,27 +17,16 @@ MARKETING_SITE_BASE_URL='http://localhost:18000'
 ORDER_HISTORY_URL='http://localhost:1996/orders'
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
 SEGMENT_KEY=''
-SITE_NAME='Your Platform Name Here'
-INFO_EMAIL='info@example.com'
-# ***** Features *****
-ENABLE_DYNAMIC_REGISTRATION_FIELDS='true'
-ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN='true'
-# ***** Cookies *****
-SESSION_COOKIE_DOMAIN='localhost'
+SITE_NAME='edX'
 USER_INFO_COOKIE_NAME='edx-user-info'
-# ***** Links *****
-LOGIN_ISSUE_SUPPORT_LINK='http://localhost:18000/login-issue-support-url'
+AUTHN_MINIMAL_HEADER=true
+LOGIN_ISSUE_SUPPORT_LINK='/login-issue-support-url'
 TOS_AND_HONOR_CODE='http://localhost:18000/honor'
-TOS_LINK='http://localhost:18000/tos'
 PRIVACY_POLICY='http://localhost:18000/privacy'
-AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK='http://localhost:1999/welcome'
-# ***** Base Container Images *****
-BANNER_IMAGE_LARGE=''
-BANNER_IMAGE_MEDIUM=''
-BANNER_IMAGE_SMALL=''
-BANNER_IMAGE_EXTRA_SMALL=''
-# ***** Miscellaneous *****
-APP_ID=''
-MFE_CONFIG_API_URL=''
-ZENDESK_KEY=''
-ZENDESK_LOGO_URL=''
+REGISTRATION_OPTIONAL_FIELDS=''
+USER_SURVEY_COOKIE_NAME='openedx-user-survey-type'
+COOKIE_DOMAIN='localhost'
+WELCOME_PAGE_SUPPORT_LINK='http://localhost:1999/welcome'
+INFO_EMAIL='info@edx.org'
+DISABLE_ENTERPRISE_LOGIN=''
+REGISTER_CONVERSION_COOKIE_NAME='openedx-user-register-conversion'
--- a/.env.test
+++ b/.env.test
@@ -0,0 +1,24 @@
+ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
+BASE_URL='http://localhost:1995'
+CREDENTIALS_BASE_URL='http://localhost:18150'
+CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
+ECOMMERCE_BASE_URL='http://localhost:18130'
+LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
+LMS_BASE_URL='http://localhost:18000'
+LOGIN_URL='http://localhost:18000/login'
+LOGOUT_URL='http://localhost:18000/logout'
+LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
+LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
+LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
+FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
+MARKETING_SITE_BASE_URL='http://localhost:18000'
+ORDER_HISTORY_URL='http://localhost:1996/orders'
+REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
+SEGMENT_KEY=''
+SITE_NAME='edX'
+USER_INFO_COOKIE_NAME='edx-user-info'
+LOGIN_ISSUE_SUPPORT_LINK='https://login-issue-support-url.com'
+USER_SURVEY_COOKIE_NAME='openedx-user-survey-type'
+WELCOME_PAGE_SUPPORT_LINK='http://localhost:1999/welcome'
+DISABLE_ENTERPRISE_LOGIN=''
+REGISTER_CONVERSION_COOKIE_NAME='openedx-user-register-conversion'
--- a/.eslintignore
+++ b/.eslintignore
@@ -0,0 +1,5 @@
+coverage/*
+dist/
+node_modules/
+__mocks__/
+__snapshots__/
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -0,0 +1,24 @@
+const { createConfig } = require('@edx/frontend-build');
+
+module.exports = createConfig('eslint', {
+  rules: {
+    // Temporarily update the 'indent', 'template-curly-spacing' and
+    // 'no-multiple-empty-lines' rules since they are causing eslint
+    // to fail for no apparent reason since upgrading 
+    // @edx/frontend-build from v3 to v5:
+    // - TypeError: Cannot read property 'range' of null
+    'indent': [
+      'error',
+      2,
+      { 'ignoredNodes': ['TemplateLiteral', 'SwitchCase'] }
+    ],
+    'template-curly-spacing': 'off',
+    'jsx-a11y/label-has-associated-control': ['error', {
+      labelComponents: [],
+      labelAttributes: [],
+      controlComponents: [],
+      assert: 'htmlFor',
+      depth: 25
+    }],
+  },
+});
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +0,0 @@
-*   @openedx/2U-infinity
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,7 +0,0 @@
-version: 2
-updates:
-    # Adding new check for github-actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-        interval: "weekly"
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,29 +0,0 @@
-### Description
-
-Include a description of your changes here, along with a link to any relevant Jira tickets and/or Github issues.
-
-#### JIRA
-
-[XXX-XXXX](https://2u-internal.atlassian.net/browse/XXX-XXXX)
-
-#### How Has This Been Tested?
-
-Please describe in detail how you tested your changes.
-
-#### Screenshots/sandbox (optional):
-
-Include a link to the sandbox for design changes or screenshot for before and after. **Remove this section if its not applicable.**
-
-|Before|After|
-|-------|-----|
-|      |      |
-
-#### Merge Checklist
-
-* [ ] If your update includes visual changes, have they been reviewed by a designer? Send them a link to the Sandbox, if applicable.
-* [ ] Is there adequate test coverage for your changes?
-
-#### Post-merge Checklist
-
-* [ ] Deploy the changes to prod after verifying on stage or ask **@openedx/2u-infinity** to do it. 
-* [ ] 🎉 🙌 Celebrate! Thanks for your contribution.
--- a/.github/workflows/add-depr-ticket-to-depr-board.yml
+++ b/.github/workflows/add-depr-ticket-to-depr-board.yml
@@ -1,19 +0,0 @@
-# Run the workflow that adds new tickets that are either:
-# - labelled "DEPR"
-# - title starts with "[DEPR]"
-# - body starts with "Proposal Date" (this is the first template field)
-# to the org-wide DEPR project board
-
-name: Add newly created DEPR issues to the DEPR project board
-
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  routeissue:
-    uses: openedx/.github/.github/workflows/add-depr-ticket-to-depr-board.yml@master
-    secrets:
-      GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
-      GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}
-      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}
--- a/.github/workflows/add-remove-label-on-comment.yml
+++ b/.github/workflows/add-remove-label-on-comment.yml
@@ -1,20 +0,0 @@
-# This workflow runs when a comment is made on the ticket
-# If the comment starts with "label: " it tries to apply
-# the label indicated in rest of comment.
-# If the comment starts with "remove label: ", it tries
-# to remove the indicated label.
-# Note: Labels are allowed to have spaces and this script does
-# not parse spaces (as often a space is legitimate), so the command
-# "label: really long lots of words label" will apply the
-# label "really long lots of words label"
-
-name: Allows for the adding and removing of labels via comment
-
-on:
-  issue_comment:
-    types: [created]
-
-jobs:
-  add_remove_labels:
-    uses: openedx/.github/.github/workflows/add-remove-label-on-comment.yml@master
-
--- a/.github/workflows/autoupdate-pull-request.yml
+++ b/.github/workflows/autoupdate-pull-request.yml
@@ -1,25 +0,0 @@
-name: autoupdate
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    types: [ labeled ]  
-    branches:
-      - master  
-jobs:
-  autoupdate:
-    name: autoupdate
-    runs-on: ubuntu-latest
-    steps:
-      - uses: docker://chinthakagodawita/autoupdate-action:v1
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          DRY_RUN: "false"
-          PR_FILTER: "labelled"
-          PR_LABELS: "autoupdate"
-          EXCLUDED_LABELS: "dependencies,wontfix"
-          MERGE_MSG: "Branch was auto-updated."
-          RETRY_COUNT: "5"
-          RETRY_SLEEP: "300"
-          MERGE_CONFLICT_ACTION: "fail"
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,45 +0,0 @@
-name: node_CI
-
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-    branches:
-    - '**'
-
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: Setup Nodejs
-      uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-
-    - name: Install Dependencies
-      run: npm ci
-
-    - name: Verify No Uncommitted Package-Lock Changes
-      run: make validate-no-uncommitted-package-lock-changes
-
-    - name: Run i18n_extract
-      run: npm run i18n_extract
-
-    - name: Lint
-      run: npm run lint
-
-    - name: Test
-      run: npm run test
-
-    - name: Build
-      run: npm run build
-
-    - name: Run Code Coverage
-      uses: codecov/codecov-action@v5
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        fail_ci_if_error: true
--- a/.github/workflows/commitlint.yml
+++ b/.github/workflows/commitlint.yml
@@ -1,10 +0,0 @@
-# Run commitlint on the commit messages in a pull request.
-
-name: Lint Commit Messages
-
-on:
-  - pull_request
-
-jobs:
-  commitlint:
-    uses: openedx/.github/.github/workflows/commitlint.yml@master
--- a/.github/workflows/lockfileversion-check.yml
+++ b/.github/workflows/lockfileversion-check.yml
@@ -1,13 +0,0 @@
-#check package-lock file version
-
-name: Lockfile Version check
-
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-
-jobs:
-  version-check:
-    uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master
--- a/.github/workflows/self-assign-issue.yml
+++ b/.github/workflows/self-assign-issue.yml
@@ -1,12 +0,0 @@
-# This workflow runs when a comment is made on the ticket
-# If the comment starts with "assign me" it assigns the author to the
-# ticket (case insensitive)
-
-name: Assign comment author to ticket if they say "assign me"
-on:
-  issue_comment:
-    types: [created]
-
-jobs:
-  self_assign_by_comment:
-    uses: openedx/.github/.github/workflows/self-assign-issue.yml@master
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,19 @@
+.DS_Store
+.eslintcache
+.idea
 node_modules
 npm-debug.log
 coverage
 module.config.js
+
 dist/
-/*.tgz
-
-### i18n ###
 src/i18n/transifex_input.json
+temp/babel-plugin-react-intl

-### Editors ###
-.DS_Store
+### pyenv ###
+.python-version
+
+### Emacs ###
 *~
 /temp
 /.vscode
--- a/.npmignore
+++ b/.npmignore
@@ -1,6 +1,12 @@
-__mocks__
+.eslintignore
+.eslintrc.json
+.gitignore
+.travis.yml
+docker-compose.yml
+Dockerfile
+Makefile
+npm-debug.log
+
+coverage
 node_modules
-*.test.js
-*.test.jsx
-*.test.ts
-*.test.tsx
+public
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +0,0 @@
-24
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: node_js
+node_js: 12
+install:
+- npm ci
+script:
+- make validate-no-uncommitted-package-lock-changes
+- npm run i18n_extract
+- npm run lint
+- npm run test
+- npm run build
+- npm run is-es5
+after_success:
+- codecov
--- a/.tx/config
+++ b/.tx/config
@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[edx-platform.frontend-app-authn]
+file_filter = src/i18n/messages/<lang>.json
+source_file = src/i18n/transifex_input.json
+source_lang = en
+type = KEYVALUEJSON
--- a/2
+++ b/2
@@ -1,2 +1,2 @@
 # The following users are the owners of all frontend-app-authn files
-*       @openedx/2u-infinity
+*       @edx/vanguards
--- a/58
+++ b/58
@@ -1,30 +1,21 @@
-intl_imports = ./node_modules/.bin/intl-imports.js
+transifex_resource = frontend-app-authn
+transifex_langs = "ar,fr,es_419,zh_CN"
+
 transifex_utils = ./node_modules/.bin/transifex-utils.js
 i18n = ./src/i18n
 transifex_input = $(i18n)/transifex_input.json
+tx_url1 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/translation/en/strings/
+tx_url2 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/source/

 # This directory must match .babelrc .
-transifex_temp = ./temp/babel-plugin-formatjs
+transifex_temp = ./temp/babel-plugin-react-intl

 precommit:
 	npm run lint
 	npm audit

 requirements:
-	npm ci
-
-clean:
-	rm -rf dist
-
-build: clean
-	tsc --project tsconfig.build.json
-	tsc-alias -p tsconfig.build.json
-	find src -type f -name '*.scss' -exec sh -c '\
-	  for f in "$$@"; do \
-	    d="dist/$${f#src/}"; \
-	    mkdir -p "$$(dirname "$$d")"; \
-	    cp "$$f" "$$d"; \
-	  done' sh {} +
+	npm install

 i18n.extract:
 	# Pulling display strings from .jsx files into .json files...
@@ -42,31 +33,22 @@ detect_changed_source_translations:
 	# Checking for changed translations...
 	git diff --exit-code $(i18n)

-pull_translations:
-	rm -rf src/i18n/messages
-	mkdir src/i18n/messages
-	cd src/i18n/messages \
-	  && atlas pull $(ATLAS_OPTIONS) \
-	           translations/paragon/src/i18n/messages:paragon \
-	           translations/frontend-platform/src/i18n/messages:frontend-platform \
-	           translations/frontend-app-authn/src/i18n/messages:frontend-app-authn
+# Pushes translations to Transifex.  You must run make extract_translations first.
+push_translations:
+	# Pushing strings to Transifex...
+	tx push -s
+	# Fetching hashes from Transifex...
+	./node_modules/reactifex/bash_scripts/get_hashed_strings.sh $(tx_url1)
+	# Writing out comments to file...
+	$(transifex_utils) $(transifex_temp) --comments
+	# Pushing comments to Transifex...
+	./node_modules/reactifex/bash_scripts/put_comments.sh $(tx_url2)

-	$(intl_imports) paragon frontend-platform frontend-app-authn
+# Pulls translations from Transifex.
+pull_translations:
+	tx pull -f --mode reviewed --language=$(transifex_langs)

 # This target is used by Travis.
 validate-no-uncommitted-package-lock-changes:
 	# Checking for package-lock.json changes...
 	git diff --exit-code package-lock.json
-
-.PHONY: validate
-validate:
-	make validate-no-uncommitted-package-lock-changes
-	npm run i18n_extract
-	npm run lint -- --max-warnings 0
-	npm run test
-	npm run build
-
-.PHONY: validate.ci
-validate.ci:
-	npm ci
-	make validate
--- a/README.rst
+++ b/README.rst
@@ -1,204 +1,48 @@
-##################
+|Build Status| |Codecov| |license|
+
 frontend-app-authn
-##################
-
-|Build Status| |ci-badge| |Codecov| |semantic-release|
-
-********
-Purpose
-********
+=================================

 This is a micro-frontend application responsible for the login, registration and password reset functionality.

-**What is the domain of this MFE?**
+Development
+-----------

- Register page
+Start Devstack
+^^^^^^^^^^^^^^

- Login page
+To use this application `devstack <https://github.com/edx/devstack>`__ must be running.

- Forgot password page
+-  Start devstack

- Reset password page
+Start the development server
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^

- Progressive profiling page
+In this project, install requirements and start the development server by running:

-***************
-Getting Started
-***************
+.. code:: bash

-Installation
-============
+   npm install
+   npm start # The server will run on port 1999

-`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.
+Once the dev server is up visit http://localhost:1999/login.

-.. _Tutor: https://github.com/overhangio/tutor
-.. _relevant tutor-mfe documentation: https://github.com/overhangio/tutor-mfe?tab=readme-ov-file#mfe-development
+Configuration and Deployment
+----------------------------

-Environment Variables/Setup Notes
-=================================
+This MFE is configured via node environment variables supplied at build time. See the .env file for the list of required environment variables. Example build syntax with a single environment variable:

-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>`__.
+.. code:: bash

-The authentication micro-frontend also requires the following additional variable:
+   NODE_ENV=development ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload' npm run build

-.. list-table:: Environment Variables
-   :widths: 30 50 20
-   :header-rows: 1
-
-   * - Name
-     - Description / Usage
-     - Example
-
-   * - ``LOGIN_ISSUE_SUPPORT_LINK``
-     - The fully-qualified URL to the login issue support page in the target environment.
-     - ``https://support.example.com``
-
-   * - ``ACTIVATION_EMAIL_SUPPORT_LINK``
-     - The fully-qualified URL to the activation email support page in the target environment.
-     - ``https://support.example.com``
-
-   * - ``PASSWORD_RESET_SUPPORT_LINK``
-     - The fully-qualified URL to the password reset support page in the target environment.
-     - ``https://support.example.com``
-
-   * - ``AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK``
-     - The fully-qualified URL to the progressive profiling support page in the target environment.
-     - ``https://support.example.com``
-
-   * - ``TOS_AND_HONOR_CODE``
-     - The fully-qualified URL to the Honor code page in the target environment.
-     - ``https://example.com/honor``
-
-   * - ``TOS_LINK``
-     - The fully-qualified URL to the Terms of service page in the target environment.
-     - ``https://example.com/tos``
-
-   * - ``PRIVACY_POLICY``
-     - The fully-qualified URL to the Privacy policy page in the target environment.
-     - ``https://example.com/privacy``
-
-   * - ``INFO_EMAIL``
-     - The valid email address for information query regarding the target environment.
-     - ``info@example.com``
-
-   * - ``ENABLE_DYNAMIC_REGISTRATION_FIELDS``
-     - Enables support for configurable registration fields on the MFE. This flag must be enabled to show any required registration field besides the default fields (name, email, username, password).
-     - ``true`` | ``''`` (empty strings are falsy)
-
-   * - ``ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN``
-     - Enables support for progressive profiling. If enabled, users are redirected to a second page where data for optional registration fields can be collected.
-     - ``true`` | ``''`` (empty strings are falsy)
-
-   * - ``DISABLE_ENTERPRISE_LOGIN``
-     - Disables the enterprise login from Authn MFE.
-     - ``true`` | ``''`` (empty strings are falsy)
-
-   * - ``MFE_CONFIG_API_URL``
-     - Link of the API to get runtime mfe configuration variables from the site configuration or django settings.
-     - ``/api/v1/mfe_config`` | ``''`` (empty strings are falsy)  
-
-   * - ``APP_ID``
-     - Name of MFE, this will be used by the API to get runtime configurations for the specific micro frontend. For a frontend repo `frontend-app-appName`, use `appName` as APP_ID.
-     - ``authn`` | ``''``
-
-   * - ``ENABLE_IMAGE_LAYOUT``
-     - Enables the image layout feature within the authn. When set to True, this feature allows the inclusion of images in the base container layout. For more details on configuring this feature, please refer to the `Modifying base container <docs/how_tos/modifying_base_container.rst>`_.
-     - ``true`` | ``''`` (empty strings are falsy)
-
-
-edX-specific Environment Variables
-==================================
-
-Furthermore, there are several edX-specific environment variables that enable integrations with closed-source services private to the edX organization, and might be unsupported in Open edX.
-
-.. list-table:: edX-specific Environment Variables
-   :widths: 30 50 20
-   :header-rows: 1
-
-   * - Name
-     - Description / Usage
-     - Example
-
-   * - ``MARKETING_EMAILS_OPT_IN``
-     - Enables support for opting in marketing emails that helps us getting user consent for sending marketing emails.
-     - ``true`` | ``''`` (empty strings are falsy)

 For more information see the document: `Micro-frontend applications in Open
-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://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.
-
-PR description template should be automatically applied if you are sending PR from github interface; otherwise you
-can find it it at `PULL_REQUEST_TEMPLATE.md <https://github.com/openedx/frontend-app-authn/blob/master/.github/pull_request_template.md>`_
-
-This project is currently accepting all types of contributions, bug fixes and security fixes.
-
-Getting Help
-============
-
-If you're having trouble, we have discussion forums at
-https://discuss.openedx.org where you can connect with others in the community.
-
-Our real-time conversations are on Slack. You can request a `Slack
-invitation`_, then join our `community Slack workspace`_.  Because this is a
-frontend repository, the best place to discuss it would be in the `#wg-frontend
-channel`_.
-
-For anything non-trivial, the best path is to open an issue in this repository
-with as many details about the issue you are facing as you can provide.
-
-https://github.com/openedx/frontend-app-authn/issues
-
-For more information about these options, see the `Getting Help`_ page.
-
-.. _Slack invitation: https://openedx.org/slack
-.. _community Slack workspace: https://openedx.slack.com/
-.. _#wg-frontend channel: https://openedx.slack.com/archives/C04BM6YC7A6
-.. _Getting Help: https://openedx.org/community/connect
-
-The Open edX Code of Conduct
-============================
-All community members are expected to follow the `Open edX Code of Conduct <https://openedx.org/code-of-conduct/>`_.
-
-People
-======
-The assigned maintainers for this component and other project details may be
-found in `Backstage <https://backstage.openedx.org/catalog/default/group/2u-infinity>`_. Backstage pulls this data from the ``catalog-info.yaml``
-file in this repo.
-
-Reporting Security Issues
-=========================
-
-Please do not report security issues in public. Please email security@openedx.org.
-
-Known Issues
-============
-
-None
-
-License
-=======
-
-The code in this repository is licensed under the GNU Affero General Public License v3.0, unless
-otherwise noted.
-
-Please see `LICENSE <https://github.com/openedx/frontend-app-authn/blob/master/LICENSE>`_ for details.
-
-
-==============================
+edX <https://github.com/edx/edx-developer-docs/blob/5191e800bf16cf42f25c58c58f983bdaf7f9305d/docs/micro-frontends-in-open-edx.rst>`__.

 .. |Build Status| image:: https://api.travis-ci.com/edx/frontend-app-authn.svg?branch=master
   :target: https://travis-ci.com/edx/frontend-app-authn
 .. |Codecov| image:: https://img.shields.io/codecov/c/github/edx/frontend-app-authn
   :target: https://codecov.io/gh/edx/frontend-app-authn
-.. |ci-badge| image:: https://github.com/openedx/edx-developer-docs/actions/workflows/ci.yml/badge.svg
-   :target: https://github.com/openedx/edx-developer-docs/actions/workflows/ci.yml
-   :alt: Continuous Integration
-.. |semantic-release| image:: https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg
-   :target: https://github.com/semantic-release/semantic-release
+.. |license| image:: https://img.shields.io/npm/l/@edx/frontend-app-authn.svg
+   :target: @edx/frontend-app-authn
--- a/app.d.ts
+++ b/app.d.ts
@@ -1,5 +0,0 @@
-/// <reference types="@openedx/frontend-base" />
-
-declare module 'site.config' {
-  export default SiteConfig;
-}
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,3 +0,0 @@
-const { createConfig } = require('@openedx/frontend-base/tools');
-
-module.exports = createConfig('babel');
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -1,19 +0,0 @@
-# This file records information about this repo. Its use is described in OEP-55:
-# https://open-edx-proposals.readthedocs.io/en/latest/processes/oep-0055-proc-project-maintainers.html
-
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: 'frontend-app-authn'
-  description: "Micro-frontend for authentication service. It contains views for login, registration and password reset functionality."
-  links:
-    - url: 'https://github.com/openedx/frontend-app-authn/blob/master/README.rst'
-      title: 'Documentation'
-      icon: 'Article'
-  annotations:
-    openedx.org/arch-interest-groups: ""
-    openedx.org/release: "master"
-spec:
-  owner: group:2u-infinity
-  type: 'service'
-  lifecycle: 'production'
--- a/docs/decisions/0002-feature-based-application-organization.rst
+++ b/docs/decisions/0002-feature-based-application-organization.rst
@@ -91,7 +91,7 @@ In the data sub-directory, the file names describe what each piece of code does.
    /ProfilePhotoUploader.jsx // supporting view
    /data // Note: most files here are named with a plural, as they contain many of the things in question.
      /actions.js
-      /mockedData.js
+      /constants.js
      /reducers.js
      /sagas.js
      /selectors.js
--- a/docs/how_tos/enable_social_auth.rst
+++ b/docs/how_tos/enable_social_auth.rst
@@ -1,14 +0,0 @@
-Enable Social Auth Locally
--------------------------
-
-Please follow the steps below to enable social auth (SSO) locally.
-
-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.
-
-   * If the provider has an ``iconImage``, then it will be rendered as image in SSO button.
-
-   * If ``iconImage`` is not available in provider, but the provider's ``iconClass`` is from the supported icon classes ``['apple', 'facebook', 'google', 'microsoft']`` then it is used as icon image.
-
-   * If ``iconClass`` doesn't match the supported icon classes then the ``faSignInAlt`` from font awesome icons is used as icon image for SSO button.
--- a/docs/how_tos/i18n.rst
+++ b/docs/how_tos/i18n.rst
@@ -2,4 +2,4 @@
 React App i18n HOWTO
 ####################

-This document has moved to the frontend-platform repo: https://github.com/openedx/frontend-platform/blob/master/docs/how_tos/i18n.rst
+This document has moved to the frontend-platform repo: https://github.com/edx/frontend-platform/blob/master/docs/how_tos/i18n.rst
--- a/docs/how_tos/modifying_base_container.rst
+++ b/docs/how_tos/modifying_base_container.rst
@@ -1,39 +0,0 @@
-========================================
-Modifying the Base Container in Authn
-========================================
-
-The base container in Authn serves as the fundamental layout structure for rendering different components based on configurations. This document outlines the process for modifying the base container to accommodate changes or customize layouts as needed.
-
-Understanding Base Container Versions
--------------------------------------
-
-The base container supports two main versions:
-
- **Default Layout:** The default layout is the standard layout used when specific configurations do not dictate otherwise.
-.. image:: ../images/default_layout.png
- **Image Layout:** The image layout is an alternative layout option that can be enabled based on configurations.
-.. image:: ../images/image_layout.png
-
-Enabling the Image Layout
---------------------------
-
-To activate the image layout feature, navigate to your .env file and update the configurations:
-
-**Update Configuration**
-
-Locate the ``ENABLE_IMAGE_LAYOUT`` parameter and set its value to  ``true``. Additionally, ensure that the Image configuration settings are provided. Your overall configurations should resemble the following:
-
-
-   .. code-block::
-
-      # ***** Image Layout Configuration *****
-      ENABLE_IMAGE_LAYOUT = True  # Set to True to enable image layout feature
-
-      # ***** Base Container Images *****
-      BANNER_IMAGE_LARGE='' # Path to the large banner image
-      BANNER_IMAGE_MEDIUM='' # Path to the medium-sized banner image
-      BANNER_IMAGE_SMALL=''  # Path to the small banner image
-      BANNER_IMAGE_EXTRA_SMALL=''  # Path to the extra-small banner image
-
-
-This allows for the customization and adaptation of the base container layout according to specific requirements.
--- a/docs/images/default_layout.png
+++ b/docs/images/default_layout.png
--- a/docs/images/frontend-app-authn-localhost-preview.png
+++ b/docs/images/frontend-app-authn-localhost-preview.png
--- a/docs/images/image_layout.png
+++ b/docs/images/image_layout.png
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,22 +0,0 @@
-// @ts-check
-
-const { createLintConfig } = require('@openedx/frontend-base/tools');
-
-module.exports = createLintConfig(
-  {
-    files: [
-      'src/**/*',
-      'site.config.*',
-    ],
-  },
-  {
-    ignores: [
-      'coverage/*',
-      'dist/*',
-      'docs/*',
-      'node_modules/*',
-      '**/__mocks__/*',
-      '**/__snapshots__/*',
-    ],
-  },
-);
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,15 +1,12 @@
-const { createConfig } = require('@openedx/frontend-base/tools');
+const { createConfig } = require('@edx/frontend-build');

-module.exports = createConfig('test', {
-  setupFilesAfterEnv: [
+module.exports = createConfig('jest', {
+  setupFiles: [
    '<rootDir>/src/setupTest.js',
  ],
  coveragePathIgnorePatterns: [
    'src/setupTest.js',
    'src/i18n',
+    'src/index.jsx',
  ],
-  moduleNameMapper: {
-    '\\.svg$': '<rootDir>/src/__mocks__/svg.js',
-    '\\.(jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/src/__mocks__/file.js',
-  },
 });
--- a/openedx.yaml
+++ b/openedx.yaml
@@ -0,0 +1,9 @@
+# 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: edx/vanguards
+openedx-release:
+  maybe: true   # Delete this "maybe" line when you have decided about Open edX inclusion.
+  ref: master
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,84 +1,89 @@
 {
-  "name": "@openedx/frontend-app-authn",
-  "version": "1.0.0-alpha.6",
-  "description": "Frontend authentication",
-  "engines": {
-    "node": "^24.12"
-  },
+  "name": "@edx/frontend-app-authn",
+  "version": "0.1.0",
+  "description": "Frontend application template",
  "repository": {
    "type": "git",
-    "url": "git+https://github.com/openedx/frontend-app-authn.git"
+    "url": "git+https://github.com/edx/frontend-app-authn.git"
  },
-  "exports": {
-    ".": "./dist/index.js",
-    "./app.scss": "./dist/app.scss"
-  },
-  "files": [
-    "/dist"
-  ],
  "browserslist": [
-    "extends @edx/browserslist-config"
-  ],
-  "sideEffects": [
-    "*.css",
-    "*.scss"
+    "last 2 versions",
+    "ie 11"
  ],
  "scripts": {
-    "build": "make build",
-    "clean": "make clean",
-    "dev": "PORT=1999 PUBLIC_PATH=/authn openedx dev",
-    "i18n_extract": "openedx formatjs extract",
-    "lint": "openedx lint .",
-    "lint:fix": "openedx lint --fix .",
-    "prepack": "npm run build",
-    "snapshot": "openedx test --updateSnapshot",
-    "test": "openedx test --coverage --passWithNoTests"
+    "build": "fedx-scripts webpack",
+    "i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
+    "is-es5": "es-check es5 ./dist/*.js",
+    "lint": "fedx-scripts eslint --ext .js --ext .jsx .",
+    "snapshot": "fedx-scripts jest --updateSnapshot",
+    "start": "fedx-scripts webpack-dev-server --progress",
+    "test": "fedx-scripts jest --coverage --passWithNoTests"
  },
-  "author": "Open edX",
+  "husky": {
+    "hooks": {
+      "pre-commit": "npm run lint"
+    }
+  },
+  "author": "edX",
  "license": "AGPL-3.0",
-  "homepage": "https://github.com/openedx/frontend-app-authn#readme",
+  "homepage": "https://github.com/edx/frontend-app-authn#readme",
  "publishConfig": {
    "access": "public"
  },
  "bugs": {
-    "url": "https://github.com/openedx/frontend-app-authn/issues"
+    "url": "https://github.com/edx/frontend-app-authn/issues"
  },
  "dependencies": {
-    "@edx/brand": "npm:@openedx/brand-openedx@^1.2.3",
-    "@edx/openedx-atlas": "^0.7.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",
-    "classnames": "^2.5.1",
-    "fastest-levenshtein": "^1.0.16",
-    "form-urlencoded": "^6.1.5",
-    "i18n-iso-countries": "^7.13.0",
-    "prop-types": "^15.8.1",
-    "query-string": "^7.1.3",
-    "react-helmet": "^6.1.0",
-    "react-loading-skeleton": "^3.5.0",
-    "react-responsive": "^8.2.0",
-    "universal-cookie": "^8.0.1"
+    "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
+    "@edx/frontend-component-cookie-policy-banner": "2.1.12",
+    "@edx/frontend-platform": "1.12.0",
+    "@edx/paragon": "16.6.1",
+    "@fortawesome/fontawesome-svg-core": "1.2.32",
+    "@fortawesome/free-brands-svg-icons": "5.15.1",
+    "@fortawesome/free-regular-svg-icons": "5.15.1",
+    "@fortawesome/free-solid-svg-icons": "5.15.1",
+    "@fortawesome/react-fontawesome": "0.1.13",
+    "classnames": "2.2.6",
+    "core-js": "3.9.1",
+    "extract-react-intl-messages": "4.1.1",
+    "fastest-levenshtein": "1.0.12",
+    "form-urlencoded": "4.2.1",
+    "formik": "2.2.6",
+    "lodash.camelcase": "4.3.0",
+    "lodash.snakecase": "4.1.1",
+    "prop-types": "15.7.2",
+    "query-string": "5.1.1",
+    "react": "16.14.0",
+    "react-dom": "16.14.0",
+    "react-helmet": "6.1.0",
+    "react-loading-skeleton": "2.2.0",
+    "react-onclickoutside": "6.11.2",
+    "react-redux": "7.2.3",
+    "react-responsive": "8.2.0",
+    "react-router": "5.2.0",
+    "react-router-dom": "5.2.0",
+    "redux": "4.0.5",
+    "redux-devtools-extension": "2.13.8",
+    "redux-logger": "3.0.6",
+    "redux-mock-store": "1.5.4",
+    "redux-saga": "1.1.3",
+    "redux-thunk": "2.3.0",
+    "regenerator-runtime": "0.13.9",
+    "reselect": "4.0.0",
+    "universal-cookie": "^4.0.4"
  },
  "devDependencies": {
-    "@edx/browserslist-config": "^1.5.0",
-    "@testing-library/react": "^16.3.0",
-    "@types/jest": "^29.5.14",
-    "babel-plugin-formatjs": "10.5.38",
-    "eslint-plugin-import": "2.31.0",
-    "jest": "^29.7.0",
-    "react-test-renderer": "^18.3.1",
-    "ts-jest": "^29.4.0",
-    "tsc-alias": "^1.8.16"
-  },
-  "peerDependencies": {
-    "@openedx/frontend-base": "^1.0.0-alpha.14",
-    "@openedx/paragon": "^23",
-    "@tanstack/react-query": "^5",
-    "react": "^18",
-    "react-dom": "^18",
-    "react-router": "^6",
-    "react-router-dom": "^6"
+    "@edx/frontend-build": "5.6.11",
+    "babel-plugin-react-intl": "8.2.25",
+    "codecov": "3.8.1",
+    "enzyme": "3.11.0",
+    "enzyme-adapter-react-16": "1.15.6",
+    "es-check": "5.2.3",
+    "glob": "7.1.6",
+    "history": "5.0.0",
+    "husky": "4.3.8",
+    "jest": "26.6.3",
+    "react-test-renderer": "16.14.0",
+    "reactifex": "1.1.1"
  }
 }
--- a/public/index.html
+++ b/public/index.html
@@ -1,9 +1,19 @@
 <!doctype html>
 <html lang="en-us">
  <head>
-      <title>Authentication Development Site></title>
+      <title>Authn | edX</title>
      <meta charset="utf-8">
      <meta name="viewport" content="width=device-width, initial-scale=1.0">
+      <link rel="shortcut icon" href="<%=htmlWebpackPlugin.options.FAVICON_URL%>" type="image/x-icon" />
+      <% if (process.env.OPTIMIZELY_URL) { %>
+        <script
+          src="<%= process.env.OPTIMIZELY_URL %>"
+        ></script>
+      <% } else if (process.env.OPTIMIZELY_PROJECT_ID) { %>
+        <script
+          src="<%= process.env.MARKETING_SITE_BASE_URL %>/optimizelyjs/<%= process.env.OPTIMIZELY_PROJECT_ID %>.js"
+        ></script>
+      <% } %>
  </head>
  <body>
    <div id="root"></div>
--- a/renovate.json
+++ b/renovate.json
@@ -1,20 +1,9 @@
 {
  "extends": [
-    "config:base",
-    ":automergeLinters",
-    ":automergeTesters",
-    ":automergeMinor",
-    ":noUnscheduledUpdates",
-    ":semanticCommits"
+    "config:base"
  ],
-  "rebaseStalePrs": true,
-  "schedule": [
-    "every weekday"
-  ],
-  "packageRules": [
-    {
-      "matchPackageNames": ["node", "npm"],
-      "enabled": false
-    }
-  ]
+  "patch": {
+    "automerge": true
+  },
+  "rebaseStalePrs": true
 }
--- a/site.config.dev.tsx
+++ b/site.config.dev.tsx
@@ -1,19 +0,0 @@
-import { EnvironmentTypes, SiteConfig } from '@openedx/frontend-base';
-
-import { authnApp } from './src';
-
-import './src/app.scss';
-
-const siteConfig: SiteConfig = {
-  siteId: 'authn-dev',
-  siteName: 'Authn Dev',
-  baseUrl: 'http://apps.local.openedx.io:8080',
-  lmsBaseUrl: 'http://local.openedx.io:8000',
-  loginUrl: 'http://local.openedx.io:8000/login',
-  logoutUrl: 'http://local.openedx.io:8000/logout',
-
-  environment: EnvironmentTypes.DEVELOPMENT,
-  apps: [authnApp],
-};
-
-export default siteConfig;
--- a/site.config.test.tsx
+++ b/site.config.test.tsx
@@ -1,52 +0,0 @@
-import type { SiteConfig } from '@openedx/frontend-base';
-
-import { appId } from './src/constants';
-
-const siteConfig: SiteConfig = {
-  siteId: 'test-site',
-  siteName: 'Test Site',
-  baseUrl: 'http://localhost:1996',
-  lmsBaseUrl: 'http://localhost:8000',
-  loginUrl: 'http://localhost:8000/login',
-  logoutUrl: 'http://localhost:8000/logout',
-
-  // Use 'test' instead of EnvironmentTypes.TEST to break a circular dependency
-  // when mocking `@openedx/frontend-base` itself.
-  environment: 'test' as SiteConfig['environment'],
-  apps: [{
-    appId,
-    config: {
-      ACTIVATION_EMAIL_SUPPORT_LINK: null,
-      ALLOW_PUBLIC_ACCOUNT_CREATION: false,
-      AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK: null,
-      BANNER_IMAGE_EXTRA_SMALL: '',
-      BANNER_IMAGE_LARGE: '',
-      BANNER_IMAGE_MEDIUM: '',
-      BANNER_IMAGE_SMALL: '',
-      DISABLE_ENTERPRISE_LOGIN: true,
-      ENABLE_AUTO_GENERATED_USERNAME: false,
-      ENABLE_DYNAMIC_REGISTRATION_FIELDS: false,
-      ENABLE_IMAGE_LAYOUT: false,
-      ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN: false,
-      FAVICON_URL: 'https://edx-cdn.org/v3/default/favicon.ico',
-      INFO_EMAIL: '',
-      LOGIN_ISSUE_SUPPORT_LINK: null,
-      LOGO_TRADEMARK_URL: 'https://edx-cdn.org/v3/default/logo-trademark.svg',
-      LOGO_URL: 'https://edx-cdn.org/v3/default/logo.svg',
-      LOGO_WHITE_URL: 'https://edx-cdn.org/v3/default/logo-white.svg',
-      MARKETING_EMAILS_OPT_IN: '',
-      MARKETING_SITE_BASE_URL: 'http://localhost:18000',
-      PASSWORD_RESET_SUPPORT_LINK: null,
-      POST_REGISTRATION_REDIRECT_URL: '',
-      PRIVACY_POLICY: null,
-      SEARCH_CATALOG_URL: null,
-      SESSION_COOKIE_DOMAIN: 'local.openedx.io',
-      SHOW_REGISTRATION_LINKS: false,
-      TOS_AND_HONOR_CODE: null,
-      TOS_LINK: null,
-      USER_RETENTION_COOKIE_NAME: '',
-    },
-  }],
-};
-
-export default siteConfig;
--- a/src/Main.tsx
+++ b/src/Main.tsx
@@ -1,19 +0,0 @@
-import { Outlet } from 'react-router-dom';
-import { CurrentAppProvider } from '@openedx/frontend-base';
-
-import { appId } from './constants';
-import {
-  registerIcons,
-} from './common-components';
-
-import './sass/_style.scss';
-
-registerIcons();
-
-const Main = () => (
-  <CurrentAppProvider appId={appId}>
-    <Outlet />
-  </CurrentAppProvider>
-);
-
-export default Main;
--- a/src/MainApp.jsx
+++ b/src/MainApp.jsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import { Redirect, Route, Switch } from 'react-router-dom';
+
+import { AppProvider } from '@edx/frontend-platform/react';
+
+import {
+  UnAuthOnlyRoute, registerIcons, NotFoundPage, Logistration,
+} from './common-components';
+import {
+  LOGIN_PAGE, PAGE_NOT_FOUND, REGISTER_PAGE, RESET_PAGE, PASSWORD_RESET_CONFIRM, WELCOME_PAGE,
+} from './data/constants';
+import configureStore from './data/configureStore';
+import { updatePathWithQueryParams } from './data/utils';
+import ForgotPasswordPage from './forgot-password';
+import ResetPasswordPage from './reset-password';
+import WelcomePage from './welcome';
+import './index.scss';
+
+registerIcons();
+
+const MainApp = () => (
+  <AppProvider store={configureStore()}>
+    <Switch>
+      <Route exact path="/">
+        <Redirect to={updatePathWithQueryParams(REGISTER_PAGE)} />
+      </Route>
+      <UnAuthOnlyRoute exact path={LOGIN_PAGE} render={() => <Logistration selectedPage={LOGIN_PAGE} />} />
+      <UnAuthOnlyRoute exact path={REGISTER_PAGE} component={Logistration} />
+      <UnAuthOnlyRoute exact path={RESET_PAGE} component={ForgotPasswordPage} />
+      <Route exact path={PASSWORD_RESET_CONFIRM} component={ResetPasswordPage} />
+      <Route exact path={WELCOME_PAGE} component={WelcomePage} />
+      <Route path={PAGE_NOT_FOUND} component={NotFoundPage} />
+      <Route path="*">
+        <Redirect to={PAGE_NOT_FOUND} />
+      </Route>
+    </Switch>
+  </AppProvider>
+);
+
+export default MainApp;
--- a/src/mocks/file.js
+++ b/src/mocks/file.js
@@ -1 +0,0 @@
-module.exports = 'FileMock';
--- a/src/mocks/svg.js
+++ b/src/mocks/svg.js
@@ -1 +0,0 @@
-module.exports = 'SvgURL';
--- a/src/_style.scss
+++ b/src/_style.scss
@@ -0,0 +1,792 @@
+// ----------------------------
+// #COLORS
+// ----------------------------
+$font-blue: #126f9a;
+$white: #FFFFFF;
+
+// social platforms
+$facebook-blue: #1877F2;
+$facebook-focus-blue: #29487d;
+$google-blue: #4285f4;
+$google-focus-blue: #287ae6;
+$microsoft-black: #2f2f2f;
+$microsoft-focus-black: #000;
+$apple-black: #000000;
+$apple-focus-black: $apple-black;
+$accent-a-light: #c9f2f5;
+
+.main-content {
+  @extend .pt-4;
+  min-width: 464px !important;
+}
+
+.welcome-page-content {
+  min-width: 464px !important;
+}
+
+.stateful-button-width {
+  width: 12rem;
+}
+
+.login-button-width {
+  width: 6rem;
+}
+
+.tpa-skeleton {
+  margin-bottom: 0.75rem;
+}
+
+.sr-only {
+  position: absolute;
+  left: -10000px;
+  top: auto;
+  width: 1px;
+  height: 1px;
+  overflow: hidden;
+}
+
+.close {
+  padding-bottom: 0px !important;
+  padding-top: 3px !important;
+}
+
+.focus-out {
+  position: absolute;
+  padding-left: 17px;
+  opacity: 0.75;
+  z-index: 1;
+}
+
+.alert-link {
+  font-weight: normal;
+  text-decoration: underline;
+  color: #0075b4 !important;
+
+  &:hover {
+    color: #065683 !important;
+  }
+}
+
+.authn-header {
+  border-bottom: 1px solid #e7e7e7;
+  height: 3.75rem;
+  position: relative;
+  z-index: 1000;
+}
+
+.authn-header img {
+  height: 1.75rem;
+  margin-left: 2rem;
+  padding: 1rem 0;
+  display: block;
+  position: relative;
+  box-sizing: content-box;
+}
+
+.form-control {
+  background-color: white !important;
+  font-size: 0.875rem;
+  line-height: 1.5;
+  height: 2.75rem;
+
+}
+
+.btn-social {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+
+  margin-bottom: 1rem;
+  font-size: 14px;
+
+  background-color: $white;
+  border: 1px solid $font-blue;
+  width: 224px;
+  height: 36px;
+  color: $font-blue;
+
+  .icon-image {
+    background-color: transparent;
+    max-height: 24px;
+    max-width: 24px;
+  }
+}
+
+.btn-tpa {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+  padding-left: 1rem;
+  width: 14rem;
+
+  .icon-image {
+    background-color: transparent;
+    max-height: 24px;
+    max-width: 24px;
+  }
+}
+
+.font-container {
+  background-color: $font-blue;
+  color: $white;
+  font-size: 11px;
+
+  margin-left: -6px;
+  padding-top: 10px;
+  min-width: 30px;
+  height: 35px;
+}
+
+.btn-oa2-facebook {
+  color: $white;
+  border-color: $facebook-blue;
+  background-color: $facebook-blue;
+
+  &:hover,
+  &:focus {
+    background-color: $facebook-focus-blue;
+    border: 1px solid $facebook-focus-blue;
+    color: $white;
+  }
+}
+
+.btn-oa2-google-oauth2 {
+  color: $white;
+  border-color: $google-blue;
+  background-color: $google-blue;
+
+  .icon-image {
+    margin-left: 2px;
+  }
+
+  &:hover,
+  &:focus {
+    background-color: $google-focus-blue;
+    border: 1px solid $google-focus-blue;
+    color: $white;
+  }
+}
+
+.btn-oa2-apple-id {
+  color: $white;
+  border-color: $apple-black;
+  background-color: $apple-black;
+  font-size: 16px;
+
+  .icon-image {
+    max-height: 1.8em;
+    max-width: 2.0em;
+  }
+
+  &:hover,
+  &:focus {
+    background-color: $apple-focus-black;
+    border: 1px solid $apple-focus-black;
+    color: $white;
+  }
+}
+
+.btn-oa2-azuread-oauth2 {
+  color: $white;
+  border-color: $microsoft-black;
+  background-color: $microsoft-black;
+
+  &:hover,
+  &:focus {
+    background-color: $microsoft-focus-black;
+    border: 1px solid $microsoft-focus-black;
+    color: $white;
+  }
+}
+
+.submit {
+  display: inherit;
+  margin: 0 auto;
+  margin-bottom: 2rem;
+}
+
+.institute-icon {
+  @extend .mr-1;
+  @extend .text-gray;
+
+  display: inline-block;
+  margin-bottom: 0.25rem;
+  height: 18px;
+  width: 18px;
+
+  svg {
+    display: inline-block;
+  }
+}
+
+.login-help {
+  padding-left: 14px;
+}
+
+.invalid-feedback {
+  color: $red;
+}
+
+.full-vertical-height {
+  height: 100vh;
+}
+
+.help-links {
+  margin-left: -5px;
+}
+
+select.form-control {
+  background: none !important;
+}
+
+#honor-code p {
+  margin: 0;
+  padding: 0;
+}
+
+#honor-code a span {
+  @extend .sr-only;
+}
+
+.font-weight-500 {
+  font-weight: 500 !important;
+}
+
+.mw-420 {
+  max-width: 420px;
+}
+
+.mw-500 {
+  max-width: 500px;
+}
+
+.mw-32em {
+  max-width: 32em;
+}
+
+.h-90 {
+  height: 90%;
+}
+
+.mt-10 {
+  margin-top: 10px;
+}
+
+.mt-7 {
+  margin-top: 7rem;
+}
+
+.pt-10 {
+  padding-top: 10px;
+}
+.tooltip-shadow {
+  box-shadow: 0px 5px 15px 0px rgba(0,0,0,0.3) !important;
+}
+#password-requirement-left {
+  opacity: 1;
+  .tooltip-inner {
+    @extend .tooltip-shadow;
+    background: white;
+    display: block;
+    color: #707070;
+  }
+  .arrow::before {
+    border-left-color: #fff;
+    @extend .tooltip-shadow;
+  }
+
+}
+
+#password-requirement-top {
+  opacity: 1;
+  width: 90%;
+  margin-bottom: 10px;
+  .tooltip-inner {
+    max-width: inherit;
+    background: white;
+    display: block;
+    @extend .tooltip-shadow;
+    color: #707070;
+  }
+  .arrow::before {
+    border-top-color: #fff;
+    @extend .tooltip-shadow;
+  }
+
+}
+#forgotpassword-success-alert {
+  .alert-link {
+    color: #454545 !important;
+  }
+}
+
+.screen-header-light {
+  background-color: $light-200;
+}
+
+.screen-header-primary {
+  background-color: $primary-400;
+}
+
+.large-screen-container {
+  background-color: $white;
+  width: 50vw;
+}
+
+.large-screen-svg-light,
+.large-screen-svg-primary {
+  fill: $light-200;
+  overflow: hidden;
+  position: absolute;
+}
+
+.large-screen-svg-primary {
+  fill: $primary-400;
+}
+
+.medium-screen-container {
+  flex-wrap: nowrap;
+  max-width: inherit;
+  height: 282px;
+}
+
+.medium-screen-svg-light,
+.medium-screen-svg-primary {
+  fill: $light-200;
+  overflow: inherit;
+  position: absolute;
+}
+
+.medium-screen-svg-primary {
+  fill: $primary-400;
+}
+
+.screen-polygon {
+  background-color: $white;
+}
+
+.small-screen-header-light,
+.small-screen-header-primary {
+  background-color: $light-200;
+  width: 100vw;
+}
+
+.small-screen-header-primary {
+  background-color: $primary-400;
+}
+
+.extra-large-screen-top-stripe {
+  height: 0.5rem;
+  background-image: linear-gradient(
+    102.02deg,
+    $brand-700 10%,
+    $brand 10%,
+    $brand 45%,
+    $primary-700 45%,
+    $primary-700 55%,
+    $accent-a 55%,
+    $accent-a 75%,
+    $accent-a-light 75%,
+  );
+  background-repeat: no-repeat;
+}
+
+.medium-screen-top-stripe {
+  height: 0.5rem;
+  background-image: linear-gradient(
+    102.02deg,
+    $brand-700,
+    $brand-700 10%,
+    $brand 10%,
+    $brand 90%,
+    $primary-700 90%,
+    $primary-700 100%,
+  );
+  background-repeat: no-repeat;
+}
+
+.large-screen-top-stripe {
+  height: 0.5rem;
+  background-image: linear-gradient(
+  102.02deg,
+  $brand-700 10%,
+  $brand 10%,
+  $brand 65%,
+  $primary-700 65%,
+  $primary-700 75%,
+  $accent-a 75%,
+  $accent-a 75%);
+  background-repeat: no-repeat;
+}
+
+.small-screen-top-stripe {
+  height: 0.5rem;
+  background-image: linear-gradient(
+    102.02deg,
+    $brand-700,
+    $brand-700 20%,
+    $brand 20%,
+  );
+  background-repeat: no-repeat;
+}
+
+// Progressive profiling base component classes
+.medium-container {
+  flex-wrap: nowrap;
+  max-width: inherit;
+  height: 260px;
+}
+
+.extra-extra-large-svg-line {
+  stroke: $accent-b;
+  stroke-width: 0.5rem;
+
+  width: 5.5rem;
+  height: 150px;
+}
+
+.extra-large-svg-line {
+  stroke: $accent-b;
+  stroke-width: 0.5rem;
+
+  width: 5.5rem;
+  height: 110px;
+}
+
+.medium-svg-line {
+  stroke: $accent-b;
+  stroke-width: 0.5rem;
+  width: 7em;
+  height: 110px;
+}
+
+.small-svg-line {
+  stroke: $accent-b;
+  stroke-width: 0.25rem;
+
+  width: 4em;
+  height: 90px;
+}
+
+.extra-small-svg-line {
+  stroke: $accent-b;
+  stroke-width: 0.25rem;
+
+  width: 4em;
+  height: 80px;
+}
+
+// Non-Auth Screen Svg Lines
+.large-screen-svg-line {
+  padding-top: 0.5rem;
+  stroke: $accent-b;
+  stroke-width: 0.5rem;
+  width: 5.5rem;
+  height: 240px;
+}
+
+.medium-screen-svg-line {
+  padding-top: 0.5rem;
+  stroke: $accent-b;
+  stroke-width: 0.5rem;
+  width: 7em;
+  height: 115px;
+}
+
+.small-screen-svg-line {
+  padding-top: 0.5rem;
+  stroke: $accent-b;
+  stroke-width: 0.25rem;
+  width: 4em;
+  height: 72px;
+}
+
+.large-heading {
+  margin-left: 7px;
+  color: $white;
+  max-width: 24.5rem;
+  line-height: 78px;
+  font-size: 78px;
+}
+
+.medium-heading {
+  padding-left: 1rem;
+  color: $white;
+  max-width: 27rem;
+  line-height: 60px;
+  font-size: 60px;
+}
+
+.small-heading {
+  padding-left: 0.5rem;
+  color: $white;
+  line-height: 40px;
+  font-size: 36px;
+}
+
+.logo {
+  width: 4.44rem;
+  margin-top: 1.5rem;
+  margin-left: 1.5rem;
+}
+
+.username-suggestion {
+  padding: 1px 0.5rem;
+  margin: 0.25rem;
+  border-radius: 0.375rem;
+  line-height: 24px;
+  font-size: 12px;
+  font-weight: normal;
+  color: $primary-700;
+}
+
+.username-suggestion-label {
+  font-size: 0.75rem;
+  line-height: 1.25rem;
+  margin-right: 0.25rem;
+}
+
+.yellow-border {
+  border: 2px solid #F0CC00;
+}
+
+.one-rem-font {
+  font-size: 0.99rem;
+  color: #707070;
+}
+
+.institute-heading {
+  color: $primary-700;
+}
+
+.logistration-button {
+  color: $gray-700;
+}
+
+.logistration-button:hover{
+  color: $gray-700;
+  text-decoration: none;
+}
+
+.dropdown-item:active {
+    background-color: #F2F0EF;
+}
+
+.dropdown-container {
+    box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.15), 0px 2px 8px rgba(0, 0, 0, 0.15);
+    border-radius: 4px;
+    max-height: 200px;
+    font-size: 1rem;
+    font-weight: normal;
+    line-height: 1.25rem;
+    overflow-y: scroll;
+    position: absolute;
+    background-color: #fff;
+    width: 464px;
+}
+
+.email-error-alert {
+  padding: 0.5rem 1rem;
+
+  .alert-close {
+    float: right;
+
+    &:hover {
+      cursor: pointer;
+    }
+  }
+
+  .alert-text {
+    font-size: 0.75rem;
+    line-height: 1.25rem;
+  }
+
+  .alert-link {
+    color: $primary !important;
+
+    &:hover {
+      text-decoration: underline;
+      color: $info-700 !important;
+    }
+  }
+}
+
+.email-warning-alert-link {
+  color: $info-500 !important;
+
+  &:hover {
+    text-decoration: underline;
+    color: $info-700 !important;
+  }
+}
+
+#forgot-password {
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
+.arrow-back-icon {
+  margin-top:2px;
+}
+
+.icon-size {
+  width: 2.3rem;
+}
+.has-floating-label {
+  color: $gray-500;
+}
+.pgn__form-control-floating-label .pgn__form-control-floating-label-content {
+  font-size: 0.875rem;
+  line-height: 1.5;
+}
+
+.pgn__form-text {
+  font-size: 0.75rem;
+}
+
+.form-field .form-control:focus ~ .pgn__form-control-floating-label .pgn__form-control-floating-label-content {
+    font-size: 16px;
+    color: $primary-700;
+}
+
+.form-field .form-control:not([value='']):not(:focus) ~
+  .pgn__form-control-floating-label .pgn__form-control-floating-label-content {
+  font-size: 16px;
+}
+
+.pgn__form-group {
+  margin-bottom: 1.75rem;
+}
+
+.form-text-size {
+  margin-top: 0.188rem !important;
+  line-height: 1.25rem;
+}
+
+.progressive-profiling-support {
+  font-size: 0.875rem;
+  font-weight: 400;
+}
+
+
+@media (min-width: 1024px) {
+  .mw-500 {
+    width: 500px;
+  }
+}
+
+@media (max-width: 600px) {
+  .form-control {
+    width: 100%;
+  }
+}
+
+@media (min-width: 463px) {
+  .reset-password-container {
+    width: 420px;
+    max-width: 420px;
+  }
+
+  .tpa-skeleton {
+    min-width: 464px !important;
+  }
+}
+
+
+@media (max-width: 767px) {
+  .welcome-page-content {
+    padding-top: 1.5rem !important;
+  }
+
+  .layout {
+    display: flex;
+    align-items: center;
+    flex-direction:column;
+    justify-content: center;
+  }
+}
+
+@media (max-width: 1199px) and (min-width: 768px) {
+  .layout {
+    display: flex;
+    align-items: center;
+    flex-direction:column;
+    justify-content: center;
+  }
+}
+
+@media (min-width: 1200px) {
+  .layout{
+    display: flex;
+    justify-content: space-between;
+
+  }
+  .content {
+    width: 50vw;
+    display: flex;
+    justify-content: center;
+    margin-top: 4rem;
+  }
+}
+
+@media (max-width: 464px) {
+  .dropdown-container {
+    width: auto;
+    left: 0;
+    right: 0;
+    position: relative;
+  }
+}
+
+@media (max-height: 500px) {
+  .large-screen-svg-line, .large-heading {
+    margin-top: 5rem;
+  }
+}
+
+.alert {
+  p:last-child {
+    margin-bottom: 0;
+  }
+}
+
+@media screen and (min-width: 960px) {
+  html {
+    margin-right: calc(100% - 100vw);
+    margin-left: 0;
+  }
+}
+
+// Smaller than Extra Small (Mobile Screens)
+@media (max-width: 464px) {
+  .btn-social {
+    min-width: 100%;
+    margin-bottom: 0.75rem;
+    margin-right: 0 !important;
+  }
+
+  .welcome-page-content,
+  .main-content {
+    min-width: 100vw !important;
+    padding: 1.5rem !important;
+  }
+
+  .progressive-profiling-support {
+    font-size: 0.688rem;
+    font-weight: normal;
+    line-height: 0.938rem;
+  }
+}
+
+.table-striped tbody tr:nth-of-type(odd) {
+  background-color: $light-200;
+}
+
+.secondary-provider-link {
+  font-weight: normal;
+  font-size: 0.875rem;
+  line-height: 1.5rem;
+  color: $primary-700
+}
--- a/src/app.scss
+++ b/src/app.scss
@@ -1,2 +0,0 @@
-@use "@openedx/frontend-base/shell/app.scss";
-@use "./sass/style";
--- a/src/app.ts
+++ b/src/app.ts
@@ -1,43 +0,0 @@
-import { App } from '@openedx/frontend-base';
-import { appId } from './constants';
-import routes from './routes';
-import messages from './i18n';
-
-const app: App = {
-  appId,
-  routes,
-  messages,
-  config: {
-    ACTIVATION_EMAIL_SUPPORT_LINK: null,
-    ALLOW_PUBLIC_ACCOUNT_CREATION: true,
-    AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK: null,
-    BANNER_IMAGE_EXTRA_SMALL: '',
-    BANNER_IMAGE_LARGE: '',
-    BANNER_IMAGE_MEDIUM: '',
-    BANNER_IMAGE_SMALL: '',
-    DISABLE_ENTERPRISE_LOGIN: true,
-    ENABLE_AUTO_GENERATED_USERNAME: false,
-    ENABLE_DYNAMIC_REGISTRATION_FIELDS: false,
-    ENABLE_IMAGE_LAYOUT: false,
-    ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN: false,
-    FAVICON_URL: 'https://edx-cdn.org/v3/default/favicon.ico',
-    INFO_EMAIL: '',
-    LOGIN_ISSUE_SUPPORT_LINK: null,
-    LOGO_TRADEMARK_URL: 'https://edx-cdn.org/v3/default/logo-trademark.svg',
-    LOGO_URL: 'https://edx-cdn.org/v3/default/logo.svg',
-    LOGO_WHITE_URL: 'https://edx-cdn.org/v3/default/logo-white.svg',
-    MARKETING_EMAILS_OPT_IN: '',
-    MARKETING_SITE_BASE_URL: 'http://local.openedx.io',
-    PASSWORD_RESET_SUPPORT_LINK: null,
-    POST_REGISTRATION_REDIRECT_URL: '',
-    PRIVACY_POLICY: null,
-    SEARCH_CATALOG_URL: null,
-    SESSION_COOKIE_DOMAIN: 'local.openedx.io',
-    SHOW_REGISTRATION_LINKS: true,
-    TOS_AND_HONOR_CODE: null,
-    TOS_LINK: null,
-    USER_RETENTION_COOKIE_NAME: '',
-  },
-};
-
-export default app;
--- a/src/base-component/AuthExtraLargeLayout.jsx
+++ b/src/base-component/AuthExtraLargeLayout.jsx
@@ -0,0 +1,97 @@
+import React from 'react';
+
+import classNames from 'classnames';
+import PropTypes from 'prop-types';
+
+import { getConfig } from '@edx/frontend-platform';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import {
+  Col, Hyperlink, Image, Row,
+} from '@edx/paragon';
+
+import messages from './messages';
+
+const AuthExtraLargeLayout = (props) => {
+  const { intl, username, variant } = props;
+
+  return (
+    <div className="container row p-0 m-0 large-screen-container">
+      <div className="col-md-9 p-0 screen-header-light">
+        <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
+          <Image alt="edx" className="logo position-absolute" src={getConfig().LOGO_WHITE_URL} />
+        </Hyperlink>
+        <div className="min-vh-100 d-flex align-items-center">
+          <div>
+            <Row>
+              <Col xs={3}>
+                <svg className={classNames(
+                  'ml-5 mt-5',
+                  {
+                    'extra-large-svg-line': variant === 'xl',
+                    'extra-extra-large-svg-line': variant === 'xxl',
+                  },
+                )}
+                >
+                  <line x1="60" y1="0" x2="5" y2="220" />
+                </svg>
+              </Col>
+              <Col xs={9}>
+                <div className={classNames(
+                  'data-hj-suppress',
+                  {
+                    h3: variant === 'xl',
+                    h2: variant === 'xxl',
+                  },
+                )}
+                >
+                  {intl.formatMessage(
+                    messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, username },
+                  )}
+                </div>
+                <div
+                  className={classNames(
+                    'text-primary',
+                    {
+                      'display-1': variant === 'xl',
+                      'display-2': variant === 'xxl',
+                    },
+                  )}
+                >
+                  {intl.formatMessage(messages['complete.your.profile.1'])}
+                  <span className="text-accent-a">
+                    <br />
+                    {intl.formatMessage(messages['complete.your.profile.2'])}
+                  </span>
+                </div>
+              </Col>
+            </Row>
+          </div>
+        </div>
+      </div>
+      <div className="col-md-3 p-0 screen-polygon">
+        <svg
+          width="100%"
+          height="100%"
+          className="m1-n1 large-screen-svg-light"
+          preserveAspectRatio="xMaxYMin meet"
+        >
+          <g transform="skewX(171.6)">
+            <rect x="0" y="0" height="100%" width="100%" />
+          </g>
+        </svg>
+      </div>
+    </div>
+  );
+};
+
+AuthExtraLargeLayout.defaultProps = {
+  variant: 'xl',
+};
+
+AuthExtraLargeLayout.propTypes = {
+  intl: intlShape.isRequired,
+  username: PropTypes.string.isRequired,
+  variant: PropTypes.oneOf(['xl', 'xxl']),
+};
+
+export default injectIntl(AuthExtraLargeLayout);
--- a/src/base-component/AuthMediumLayout.jsx
+++ b/src/base-component/AuthMediumLayout.jsx
@@ -0,0 +1,69 @@
+import React from 'react';
+
+import PropTypes from 'prop-types';
+
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { getConfig } from '@edx/frontend-platform';
+import {
+  Col, Hyperlink, Image, Row,
+} from '@edx/paragon';
+
+import messages from './messages';
+
+const AuthMediumLayout = (props) => {
+  const { intl, username } = props;
+
+  return (
+    <div className="container row p-0 mb-3 medium-container">
+      <div className="col-md-10 p-0 screen-header-light">
+        <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
+          <Image alt="edx" className="logo" src={getConfig().LOGO_WHITE_URL} />
+        </Hyperlink>
+        <div className="d-flex align-items-center justify-content-center ml-6">
+          <div>
+            <Row>
+              <Col xs={3}>
+                <svg className="medium-svg-line ml-5 mt-5">
+                  <line x1="60" y1="0" x2="5" y2="220" />
+                </svg>
+              </Col>
+              <Col xs={9}>
+                <h3 className="data-hj-suppress">
+                  {intl.formatMessage(
+                    messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, username },
+                  )}
+                </h3>
+                <div className="display-1 text-primary">
+                  {intl.formatMessage(messages['complete.your.profile.1'])}
+                  <span className="text-accent-a">
+                    <br />
+                    {intl.formatMessage(messages['complete.your.profile.2'])}
+                  </span>
+                </div>
+              </Col>
+            </Row>
+          </div>
+        </div>
+      </div>
+      <div className="col-md-2 p-0 screen-polygon">
+        <svg
+          width="100%"
+          height="100%"
+          className="medium-screen-svg-light"
+          preserveAspectRatio="xMaxYMin meet"
+        >
+          <g transform="skewX(168)">
+            <rect x="0" y="0" height="100%" width="100%" />
+          </g>
+        </svg>
+      </div>
+    </div>
+  );
+};
+
+AuthMediumLayout.propTypes = {
+  intl: intlShape.isRequired,
+  username: PropTypes.string.isRequired,
+};
+
+export default injectIntl(AuthMediumLayout);
--- a/src/base-component/AuthSmallLayout.jsx
+++ b/src/base-component/AuthSmallLayout.jsx
@@ -0,0 +1,68 @@
+import React from 'react';
+
+import classNames from 'classnames';
+import PropTypes from 'prop-types';
+
+import { getConfig } from '@edx/frontend-platform';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import {
+  Col, Hyperlink, Image, Row,
+} from '@edx/paragon';
+
+import messages from './messages';
+
+const AuthSmallLayout = (props) => {
+  const { intl, username, variant } = props;
+
+  return (
+    <div className="small-screen-header-light">
+      <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
+        <Image alt="edx" className="logo" src={getConfig().LOGO_WHITE_URL} />
+      </Hyperlink>
+      <div className={classNames('d-flex mt-3', { 'pl-6': variant === 'sm' })}>
+        <div>
+          <Row>
+            <Col xs={3}>
+              <svg className={classNames(
+                'mt-4\.5', // eslint-disable-line no-useless-escape
+                {
+                  'extra-small-svg-line': variant === 'xs',
+                  'small-svg-line': variant === 'sm',
+                },
+              )}
+              >
+                <line x1="60" y1="0" x2="5" y2="220" />
+              </svg>
+            </Col>
+            <Col xs={9}>
+              <h5 className="data-hj-suppress">
+                {intl.formatMessage(
+                  messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, username },
+                )}
+              </h5>
+              <h1>
+                {intl.formatMessage(messages['complete.your.profile.1'])}
+                <br />
+                <span className="text-accent-a">
+                  {intl.formatMessage(messages['complete.your.profile.2'])}
+                </span>
+              </h1>
+            </Col>
+          </Row>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+AuthSmallLayout.defaultProps = {
+  variant: 'sm',
+};
+
+AuthSmallLayout.propTypes = {
+  intl: intlShape.isRequired,
+  username: PropTypes.string.isRequired,
+  variant: PropTypes.oneOf(['sm', 'xs']),
+};
+
+export default injectIntl(AuthSmallLayout);
--- a/src/base-component/BaseComponent.jsx
+++ b/src/base-component/BaseComponent.jsx
@@ -0,0 +1,69 @@
+import React from 'react';
+import classNames from 'classnames';
+import PropTypes from 'prop-types';
+
+import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
+import {
+  ExtraSmall, Small, Medium, Large, ExtraLarge, ExtraExtraLarge,
+} from '@edx/paragon';
+import CookiePolicyBanner from '@edx/frontend-component-cookie-policy-banner';
+import { getLocale } from '@edx/frontend-platform/i18n';
+
+import LargeLayout from './LargeLayout';
+import MediumLayout from './MediumLayout';
+import SmallLayout from './SmallLayout';
+
+import AuthExtraLargeLayout from './AuthExtraLargeLayout';
+import AuthMediumLayout from './AuthMediumLayout';
+import AuthSmallLayout from './AuthSmallLayout';
+
+const BaseComponent = ({ children }) => {
+  const authenticatedUser = getAuthenticatedUser();
+
+  return (
+    <>
+      <CookiePolicyBanner languageCode={getLocale()} />
+      <ExtraLarge>
+        <div className="col-md-12 extra-large-screen-top-stripe" />
+      </ExtraLarge>
+      <ExtraExtraLarge>
+        <div className="col-md-12 extra-large-screen-top-stripe" />
+      </ExtraExtraLarge>
+
+      <div className={classNames('layout', { authenticated: authenticatedUser })}>
+        <ExtraSmall>
+          <div className="col-md-12 small-screen-top-stripe" />
+          {authenticatedUser ? <AuthSmallLayout variant="xs" username={authenticatedUser.username} /> : <SmallLayout />}
+        </ExtraSmall>
+        <Small>
+          <div className="col-md-12 small-screen-top-stripe" />
+          {authenticatedUser ? <AuthSmallLayout username={authenticatedUser.username} /> : <SmallLayout />}
+        </Small>
+        <Medium>
+          <div className="w-100 medium-screen-top-stripe" />
+          {authenticatedUser ? <AuthMediumLayout username={authenticatedUser.username} /> : <MediumLayout />}
+        </Medium>
+        <Large>
+          <div className="w-100 large-screen-top-stripe" />
+          {authenticatedUser ? <AuthMediumLayout username={authenticatedUser.username} /> : <MediumLayout />}
+        </Large>
+        <ExtraLarge>
+          {authenticatedUser ? <AuthExtraLargeLayout username={authenticatedUser.username} /> : <LargeLayout />}
+        </ExtraLarge>
+        <ExtraExtraLarge>
+          {authenticatedUser ? <AuthExtraLargeLayout variant="xxl" username={authenticatedUser.username} /> : <LargeLayout />}
+        </ExtraExtraLarge>
+
+        <div className={classNames('content', { 'align-items-center mt-0': authenticatedUser })}>
+          {children}
+        </div>
+      </div>
+    </>
+  );
+};
+
+BaseComponent.propTypes = {
+  children: PropTypes.node.isRequired,
+};
+
+export default BaseComponent;
--- a/src/base-component/LargeLayout.jsx
+++ b/src/base-component/LargeLayout.jsx
@@ -0,0 +1,31 @@
+import React from 'react';
+
+import { getConfig } from '@edx/frontend-platform';
+import { Hyperlink, Image } from '@edx/paragon';
+
+import LargeScreenLeftLayout from './LargeLeftLayout';
+
+const LargeLayout = () => (
+  <div className="container row p-0 m-0 large-screen-container">
+    <div className="col-md-9 p-0 screen-header-primary">
+      <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
+        <Image alt="edx" className="logo position-absolute" src={getConfig().LOGO_WHITE_URL} />
+      </Hyperlink>
+      <LargeScreenLeftLayout />
+    </div>
+    <div className="col-md-3 p-0 screen-polygon">
+      <svg
+        width="100%"
+        height="100%"
+        className="ml-n1 large-screen-svg-primary"
+        preserveAspectRatio="xMaxYMin meet"
+      >
+        <g transform="skewX(171.6)">
+          <rect x="0" y="0" height="100%" width="100%" />
+        </g>
+      </svg>
+    </div>
+  </div>
+);
+
+export default LargeLayout;
--- a/src/base-component/LargeLeftLayout.jsx
+++ b/src/base-component/LargeLeftLayout.jsx
@@ -0,0 +1,30 @@
+import React from 'react';
+
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { getConfig } from '@edx/frontend-platform';
+
+import messages from './messages';
+
+const LargeLeftLayout = (props) => {
+  const { intl } = props;
+
+  return (
+    <div className="min-vh-100 pr-0 mt-lg-n2 d-flex align-items-center">
+      <svg className="large-screen-svg-line ml-5">
+        <line x1="50" y1="0" x2="10" y2="215" />
+      </svg>
+      <h1 className="large-heading">
+        {intl.formatMessage(messages['start.learning'])}
+        <span className="text-accent-a"><br />
+          {intl.formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
+        </span>
+      </h1>
+    </div>
+  );
+};
+
+LargeLeftLayout.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(LargeLeftLayout);
--- a/src/base-component/MediumLayout.jsx
+++ b/src/base-component/MediumLayout.jsx
@@ -0,0 +1,45 @@
+import React from 'react';
+
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { getConfig } from '@edx/frontend-platform';
+import { Hyperlink, Image } from '@edx/paragon';
+
+import messages from './messages';
+
+const MediumLayout = (props) => {
+  const { intl } = props;
+
+  return (
+    <div className="container row p-0 mb-3 medium-screen-container">
+      <div className="col-md-10 p-0 screen-header-primary">
+        <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
+          <Image alt="edx" className="logo" src={getConfig().LOGO_WHITE_URL} />
+        </Hyperlink>
+        <div className="row mt-4 justify-content-center">
+          <svg className="medium-screen-svg-line pl-5">
+            <line x1="50" y1="0" x2="10" y2="215" />
+          </svg>
+          <h1 className="medium-heading pb-4">
+            {intl.formatMessage(messages['start.learning'])}
+            <span className="text-accent-a"><br />
+              {intl.formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
+            </span>
+          </h1>
+        </div>
+      </div>
+      <div className="col-md-2 p-0 screen-polygon">
+        <svg width="100%" height="100%" className="medium-screen-svg-primary" preserveAspectRatio="xMaxYMin meet">
+          <g transform="skewX(168)">
+            <rect x="0" y="0" height="100%" width="100%" />
+          </g>
+        </svg>
+      </div>
+    </div>
+  );
+};
+
+MediumLayout.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(MediumLayout);
--- a/src/base-component/SmallLayout.jsx
+++ b/src/base-component/SmallLayout.jsx
@@ -0,0 +1,39 @@
+import React from 'react';
+
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { getConfig } from '@edx/frontend-platform';
+import { Hyperlink, Image } from '@edx/paragon';
+
+import messages from './messages';
+
+const SmallLayout = (props) => {
+  const { intl } = props;
+
+  return (
+    <>
+      <div className="small-screen-header-primary">
+        <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
+          <Image alt="edx" className="logo" src={getConfig().LOGO_WHITE_URL} />
+        </Hyperlink>
+        <div className="d-flex mt-3">
+          <svg className="small-screen-svg-line">
+            <line x1="55" y1="0" x2="40" y2="65" />
+          </svg>
+          <h1 className="small-heading pb-3">
+            {intl.formatMessage(messages['start.learning'])}
+            <br />
+            <span className="text-accent-a">
+              {intl.formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
+            </span>
+          </h1>
+        </div>
+      </div>
+    </>
+  );
+};
+
+SmallLayout.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(SmallLayout);
--- a/src/base-component/index.jsx
+++ b/src/base-component/index.jsx
@@ -0,0 +1 @@
+export { default } from './BaseComponent';
--- a/src/base-container/components/welcome-page-layout/messages.js
+++ b/src/base-container/components/welcome-page-layout/messages.js
@@ -1,11 +1,17 @@
-import { defineMessages } from '@openedx/frontend-base';
+import { defineMessages } from '@edx/frontend-platform/i18n';

 const messages = defineMessages({
-  'welcome.to.platform': {
-    id: 'welcome.to.platform',
-    defaultMessage: 'Welcome to {siteName}, {fullName}!',
-    description: 'Welcome message that appears on progressive profile page',
+  'start.learning': {
+    id: 'start.learning',
+    defaultMessage: 'Start learning',
+    description: 'Header text for logistration MFE pages',
  },
+  'with.site.name': {
+    id: 'with.site.name',
+    defaultMessage: 'with {siteName}',
+    description: 'Header text with site name for logistration MFE pages',
+  },
+  // authenticated user base component text
  'complete.your.profile.1': {
    id: 'complete.your.profile.1',
    defaultMessage: 'Complete',
@@ -16,6 +22,11 @@ const messages = defineMessages({
    defaultMessage: 'your profile',
    description: 'part of text "complete your profile"',
  },
+  'welcome.to.platform': {
+    id: 'welcome.to.platform',
+    defaultMessage: 'Welcome to {siteName}, {username}!',
+    description: 'Welcome message that appears on progressive profile page',
+  },
 });

 export default messages;
--- a/src/base-component/tests/BaseComponent.test.jsx
+++ b/src/base-component/tests/BaseComponent.test.jsx
@@ -0,0 +1,51 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import { IntlProvider } from '@edx/frontend-platform/i18n';
+
+import LargeLayout from '../LargeLayout';
+import MediumLayout from '../MediumLayout';
+import SmallLayout from '../SmallLayout';
+
+describe('ScreenLayout', () => {
+  it('should display the form, pass as a child in SmallScreenLayout', () => {
+    const smallScreen = mount(
+      <IntlProvider locale="en">
+        <div>
+          <SmallLayout />
+          <form>
+            <input type="text" />
+          </form>
+        </div>
+      </IntlProvider>,
+    );
+    expect(smallScreen.find('form').exists()).toEqual(true);
+  });
+
+  it('should display the form, pass as a child in MediumScreenLayout', () => {
+    const mediumScreen = mount(
+      <IntlProvider locale="en">
+        <div>
+          <MediumLayout />
+          <form>
+            <input type="text" />
+          </form>
+        </div>
+      </IntlProvider>,
+    );
+    expect(mediumScreen.find('form').exists()).toEqual(true);
+  });
+
+  it('should display the form, pass as a child in LargeScreenLayout', () => {
+    const largeScreen = mount(
+      <IntlProvider locale="en">
+        <div>
+          <LargeLayout />
+          <form>
+            <input type="text" />
+          </form>
+        </div>
+      </IntlProvider>,
+    );
+    expect(largeScreen.find('form').exists()).toEqual(true);
+  });
+});
--- a/src/base-container/components/default-layout/DefaultLayout.test.jsx
+++ b/src/base-container/components/default-layout/DefaultLayout.test.jsx
@@ -1,48 +0,0 @@
-import { IntlProvider } from '@openedx/frontend-base';
-import { render, screen } from '@testing-library/react';
-
-import { DefaultLargeLayout, DefaultMediumLayout, DefaultSmallLayout } from './index';
-
-describe('Default Layout tests', () => {
-  it('should display the form passed as a child in SmallScreenLayout', () => {
-    render(
-      <IntlProvider locale="en">
-        <div>
-          <DefaultSmallLayout />
-          <form aria-label="form">
-            <input type="text" />
-          </form>
-        </div>
-      </IntlProvider>,
-    );
-    expect(screen.getByRole('form')).toBeDefined();
-  });
-
-  it('should display the form passed as a child in MediumScreenLayout', () => {
-    render(
-      <IntlProvider locale="en">
-        <div>
-          <DefaultMediumLayout />
-          <form aria-label="form">
-            <input type="text" />
-          </form>
-        </div>
-      </IntlProvider>,
-    );
-    expect(screen.getByRole('form')).toBeDefined();
-  });
-
-  it('should display the form passed as a child in LargeScreenLayout', () => {
-    render(
-      <IntlProvider locale="en">
-        <div>
-          <DefaultLargeLayout />
-          <form aria-label="form">
-            <input type="text" />
-          </form>
-        </div>
-      </IntlProvider>,
-    );
-    expect(screen.getByRole('form')).toBeDefined();
-  });
-});
--- a/src/base-container/components/default-layout/LargeLayout.jsx
+++ b/src/base-container/components/default-layout/LargeLayout.jsx
@@ -1,42 +0,0 @@
-import { useAppConfig, getSiteConfig, useIntl } from '@openedx/frontend-base';
-import { Hyperlink, Image } from '@openedx/paragon';
-import classNames from 'classnames';
-
-import messages from './messages';
-
-const LargeLayout = () => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <div className="w-50 d-flex">
-      <div className="col-md-9 bg-primary-400">
-        <Hyperlink destination={useAppConfig().MARKETING_SITE_BASE_URL}>
-          <Image className="logo position-absolute" alt={getSiteConfig().siteName} src={useAppConfig().LOGO_WHITE_URL} />
-        </Hyperlink>
-        <div className="min-vh-100 d-flex align-items-center">
-          <div className={classNames({ 'large-yellow-line mr-n4.5': getSiteConfig().siteName === 'edX' })} />
-          <h1
-            className={classNames(
-              'display-2 text-white mw-xs',
-              { 'ml-6': getSiteConfig().siteName !== 'edX' },
-            )}
-          >
-            {formatMessage(messages['start.learning'])}
-            <div className="text-accent-a">
-              {formatMessage(messages['with.site.name'], { siteName: getSiteConfig().siteName })}
-            </div>
-          </h1>
-        </div>
-      </div>
-      <div className="col-md-3 bg-white p-0">
-        <svg className="ml-n1 w-100 h-100 large-screen-svg-primary" preserveAspectRatio="xMaxYMin meet">
-          <g transform="skewX(171.6)">
-            <rect x="0" y="0" height="100%" width="100%" />
-          </g>
-        </svg>
-      </div>
-    </div>
-  );
-};
-
-export default LargeLayout;
--- a/src/base-container/components/default-layout/MediumLayout.jsx
+++ b/src/base-container/components/default-layout/MediumLayout.jsx
@@ -1,49 +0,0 @@
-import { useAppConfig, getSiteConfig, useIntl } from '@openedx/frontend-base';
-import { Hyperlink, Image } from '@openedx/paragon';
-import classNames from 'classnames';
-
-import messages from './messages';
-
-const MediumLayout = () => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <>
-      <div className="w-100 medium-screen-top-stripe" />
-      <div className="w-100 p-0 mb-3 d-flex">
-        <div className="col-md-10 bg-primary-400">
-          <Hyperlink destination={useAppConfig().MARKETING_SITE_BASE_URL}>
-            <Image alt={getSiteConfig().siteName} className="logo" src={useAppConfig().LOGO_WHITE_URL} />
-          </Hyperlink>
-          <div className="d-flex align-items-center justify-content-center mb-4 ">
-            <div className={classNames({ 'mt-1 medium-yellow-line': getSiteConfig().siteName === 'edX' })} />
-            <div>
-              <h1
-                className={classNames(
-                  'display-1 text-white mt-5 mb-5 mr-2 main-heading',
-                  { 'ml-4.5': getSiteConfig().siteName !== 'edX' },
-                )}
-              >
-                <span>
-                  {formatMessage(messages['start.learning'])}{' '}
-                  <span className="text-accent-a d-inline-block">
-                    {formatMessage(messages['with.site.name'], { siteName: getSiteConfig().siteName })}
-                  </span>
-                </span>
-              </h1>
-            </div>
-          </div>
-        </div>
-        <div className="col-md-2 bg-white p-0">
-          <svg className="w-100 h-100 medium-screen-svg-primary" preserveAspectRatio="xMaxYMin meet">
-            <g transform="skewX(168)">
-              <rect x="0" y="0" height="100%" width="100%" />
-            </g>
-          </svg>
-        </div>
-      </div>
-    </>
-  );
-};
-
-export default MediumLayout;
--- a/src/base-container/components/default-layout/SmallLayout.jsx
+++ b/src/base-container/components/default-layout/SmallLayout.jsx
@@ -1,37 +0,0 @@
-import { useAppConfig, getSiteConfig, useIntl } from '@openedx/frontend-base';
-import { Hyperlink, Image } from '@openedx/paragon';
-import classNames from 'classnames';
-
-import messages from './messages';
-
-const SmallLayout = () => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <span className="bg-primary-400 w-100">
-      <div className="col-md-12 small-screen-top-stripe" />
-      <div>
-        <Hyperlink destination={useAppConfig().MARKETING_SITE_BASE_URL}>
-          <Image className="logo-small" alt={getSiteConfig().siteName} src={useAppConfig().LOGO_WHITE_URL} />
-        </Hyperlink>
-        <div className="d-flex align-items-center m-3.5">
-          <div className={classNames({ 'small-yellow-line mr-n2.5': getSiteConfig().siteName === 'edX' })} />
-          <h1
-            className={classNames(
-              'text-white mt-3.5 mb-3.5',
-            )}
-          >
-            <span>
-              {formatMessage(messages['start.learning'])}{' '}
-              <span className="text-accent-a d-inline-block">
-                {formatMessage(messages['with.site.name'], { siteName: getSiteConfig().siteName })}
-              </span>
-            </span>
-          </h1>
-        </div>
-      </div>
-    </span>
-  );
-};
-
-export default SmallLayout;
--- a/src/base-container/components/default-layout/index.jsx
+++ b/src/base-container/components/default-layout/index.jsx
@@ -1,3 +0,0 @@
-export { default as DefaultLargeLayout } from './LargeLayout';
-export { default as DefaultMediumLayout } from './MediumLayout';
-export { default as DefaultSmallLayout } from './SmallLayout';
--- a/src/base-container/components/default-layout/messages.js
+++ b/src/base-container/components/default-layout/messages.js
@@ -1,16 +0,0 @@
-import { defineMessages } from '@openedx/frontend-base';
-
-const messages = defineMessages({
-  'start.learning': {
-    id: 'start.learning',
-    defaultMessage: 'Start learning',
-    description: 'Header text for logistration MFE pages',
-  },
-  'with.site.name': {
-    id: 'with.site.name',
-    defaultMessage: 'with {siteName}',
-    description: 'Header text with site name for logistration MFE pages',
-  },
-});
-
-export default messages;
--- a/src/base-container/components/image-layout/ExtraSmallLayout.jsx
+++ b/src/base-container/components/image-layout/ExtraSmallLayout.jsx
@@ -1,31 +0,0 @@
-import { useAppConfig, getSiteConfig, useIntl } from '@openedx/frontend-base';
-import { Hyperlink, Image } from '@openedx/paragon';
-
-import messages from './messages';
-
-const ExtraSmallLayout = () => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <span
-      className="w-100 bg-primary-500 banner__image extra-small-layout"
-      style={{ backgroundImage: `url(${useAppConfig().BANNER_IMAGE_EXTRA_SMALL})` }}
-    >
-      <Hyperlink destination={useAppConfig().MARKETING_SITE_BASE_URL}>
-        <Image className="company-logo" alt={getSiteConfig().siteName} src={useAppConfig().LOGO_WHITE_URL} />
-      </Hyperlink>
-      <div className="ml-4.5 mr-1 pb-3.5 pt-3.5">
-        <h1 className="banner__heading">
-          <span className="text-light-500">
-            {formatMessage(messages['your.career.turning.point'])}{' '}
-          </span>
-          <span className="text-warning-300">
-            {formatMessage(messages['is.here'])}
-          </span>
-        </h1>
-      </div>
-    </span>
-  );
-};
-
-export default ExtraSmallLayout;
--- a/src/base-container/components/image-layout/LargeLayout.jsx
+++ b/src/base-container/components/image-layout/LargeLayout.jsx
@@ -1,32 +0,0 @@
-import { useAppConfig, getSiteConfig, useIntl } from '@openedx/frontend-base';
-import { Hyperlink, Image } from '@openedx/paragon';
-
-import './index.scss';
-import messages from './messages';
-
-const LargeLayout = () => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <div
-      className="w-50 bg-primary-500 banner__image large-layout"
-      style={{ backgroundImage: `url(${useAppConfig().BANNER_IMAGE_LARGE})` }}
-    >
-      <Hyperlink destination={useAppConfig().MARKETING_SITE_BASE_URL}>
-        <Image className="company-logo position-absolute" alt={getSiteConfig().siteName} src={useAppConfig().LOGO_WHITE_URL} />
-      </Hyperlink>
-      <div className="min-vh-100 p-5 d-flex align-items-end">
-        <h1 className="display-2 mw-sm mb-3 d-flex flex-column flex-shrink-0 justify-content-center">
-          <span className="text-light-500">
-            {formatMessage(messages['your.career.turning.point'])}
-          </span>
-          <span className="text-warning-300">
-            {formatMessage(messages['is.here'])}
-          </span>
-        </h1>
-      </div>
-    </div>
-  );
-};
-
-export default LargeLayout;
--- a/src/base-container/components/image-layout/MediumLayout.jsx
+++ b/src/base-container/components/image-layout/MediumLayout.jsx
@@ -1,32 +0,0 @@
-import { useAppConfig, getSiteConfig, useIntl } from '@openedx/frontend-base';
-import { Hyperlink, Image } from '@openedx/paragon';
-
-import './index.scss';
-import messages from './messages';
-
-const MediumLayout = () => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <div
-      className="w-100 mb-3 bg-primary-500 banner__image medium-layout"
-      style={{ backgroundImage: `url(${useAppConfig().BANNER_IMAGE_MEDIUM})` }}
-    >
-      <Hyperlink destination={useAppConfig().MARKETING_SITE_BASE_URL}>
-        <Image className="company-logo" alt={getSiteConfig().siteName} src={useAppConfig().LOGO_WHITE_URL} />
-      </Hyperlink>
-      <div className="ml-5 pb-4 pt-4">
-        <h1 className="display-2 banner__heading">
-          <span className="text-light-500">
-            {formatMessage(messages['your.career.turning.point'])}{' '}
-          </span>
-          <span className="text-warning-300 d-inline-block">
-            {formatMessage(messages['is.here'])}
-          </span>
-        </h1>
-      </div>
-    </div>
-  );
-};
-
-export default MediumLayout;
--- a/src/base-container/components/image-layout/SmallLayout.jsx
+++ b/src/base-container/components/image-layout/SmallLayout.jsx
@@ -1,31 +0,0 @@
-import { useAppConfig, getSiteConfig, useIntl } from '@openedx/frontend-base';
-import { Hyperlink, Image } from '@openedx/paragon';
-
-import messages from './messages';
-
-const SmallLayout = () => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <span
-      className="w-100 bg-primary-500 banner__image small-layout"
-      style={{ backgroundImage: `url(${useAppConfig().BANNER_IMAGE_SMALL})` }}
-    >
-      <Hyperlink destination={useAppConfig().MARKETING_SITE_BASE_URL}>
-        <Image className="company-logo" alt={getSiteConfig().siteName} src={useAppConfig().LOGO_WHITE_URL} />
-      </Hyperlink>
-      <div className="ml-5 mr-1 pb-3.5 pt-3.5">
-        <h1 className="display-2">
-          <span className="text-light-500">
-            {formatMessage(messages['your.career.turning.point'])}{' '}
-          </span>
-          <span className="text-warning-300">
-            {formatMessage(messages['is.here'])}
-          </span>
-        </h1>
-      </div>
-    </span>
-  );
-};
-
-export default SmallLayout;
--- a/src/base-container/components/image-layout/index.jsx
+++ b/src/base-container/components/image-layout/index.jsx
@@ -1,4 +0,0 @@
-export { default as ImageLargeLayout } from './LargeLayout';
-export { default as ImageMediumLayout } from './MediumLayout';
-export { default as ImageSmallLayout } from './SmallLayout';
-export { default as ImageExtraSmallLayout } from './ExtraSmallLayout';
--- a/src/base-container/components/image-layout/index.scss
+++ b/src/base-container/components/image-layout/index.scss
@@ -1,37 +0,0 @@
-.company-logo {
-  width: 71px;
-  margin-top: 2rem;
-  margin-left: 1.5rem;
-}
-
-@media (max-width: 576px) {
-  .company-logo {
-    width: 44.67px;
-    margin-top: 1.25rem;
-    margin-left: 1.5rem;
-  }
-}
-
-.banner__image {
-  background-size: cover;
-  background-repeat: no-repeat;
-  border:none;
-}
-
-@media (min-width: 464px) and (max-width: 575.98px) {
-  .banner__heading {
-    font-size: 60px;
-    font-weight: 700;
-    line-height: 60px;
-    letter-spacing: -1.2px;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 800px) {
-  .banner__heading {
-    font-size: 60px !important;
-    font-weight: 700 !important;
-    line-height: 60px !important;
-    letter-spacing: -2px !important;
-  }
-}
--- a/src/base-container/components/image-layout/messages.js
+++ b/src/base-container/components/image-layout/messages.js
@@ -1,16 +0,0 @@
-import { defineMessages } from '@openedx/frontend-base';
-
-const messages = defineMessages({
-  'your.career.turning.point': {
-    id: 'your.career.turning.point',
-    defaultMessage: 'Your career turning point',
-    description: 'Part of the heading "Your career turning point is here." shown on Authn MFE',
-  },
-  'is.here': {
-    id: 'is.here',
-    defaultMessage: 'is here.',
-    description: 'Part of the heading "Your career turning point is here." shown on Authn MFE',
-  },
-});
-
-export default messages;
--- a/src/base-container/components/welcome-page-layout/LargeLayout.jsx
+++ b/src/base-container/components/welcome-page-layout/LargeLayout.jsx
@@ -1,46 +0,0 @@
-import { useAppConfig, getSiteConfig, useIntl } from '@openedx/frontend-base';
-import { Hyperlink, Image } from '@openedx/paragon';
-import PropTypes from 'prop-types';
-
-import messages from './messages';
-
-const LargeLayout = ({ fullName }) => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <div className="w-50 d-flex">
-      <div className="col-md-10 bg-light-200 p-0">
-        <Hyperlink destination={useAppConfig().MARKETING_SITE_BASE_URL}>
-          <Image className="logo position-absolute" alt={getSiteConfig().siteName} src={useAppConfig().LOGO_URL} />
-        </Hyperlink>
-        <div className="min-vh-100 d-flex align-items-center">
-          <div className="large-screen-left-container mr-n4.5 large-yellow-line mt-5" />
-          <div>
-            <h1 className="welcome-to-platform data-hj-suppress">
-              {formatMessage(messages['welcome.to.platform'], { siteName: getSiteConfig().siteName, fullName })}
-            </h1>
-            <h2 className="complete-your-profile">
-              {formatMessage(messages['complete.your.profile.1'])}
-              <div className="text-accent-a">
-                {formatMessage(messages['complete.your.profile.2'])}
-              </div>
-            </h2>
-          </div>
-        </div>
-      </div>
-      <div className="col-md-2 bg-white p-0">
-        <svg className="m1-n1 w-100 h-100 large-screen-svg-light" preserveAspectRatio="xMaxYMin meet">
-          <g transform="skewX(171.6)">
-            <rect x="0" y="0" height="100%" width="100%" />
-          </g>
-        </svg>
-      </div>
-    </div>
-  );
-};
-
-LargeLayout.propTypes = {
-  fullName: PropTypes.string.isRequired,
-};
-
-export default LargeLayout;
--- a/src/base-container/components/welcome-page-layout/MediumLayout.jsx
+++ b/src/base-container/components/welcome-page-layout/MediumLayout.jsx
@@ -1,49 +0,0 @@
-import { useAppConfig, getSiteConfig, useIntl } from '@openedx/frontend-base';
-import { Hyperlink, Image } from '@openedx/paragon';
-import PropTypes from 'prop-types';
-
-import messages from './messages';
-
-const MediumLayout = ({ fullName }) => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <>
-      <div className="w-100 medium-screen-top-stripe" />
-      <div className="w-100 p-0 mb-3 d-flex">
-        <div className="col-md-10 bg-light-200">
-          <Hyperlink destination={useAppConfig().MARKETING_SITE_BASE_URL}>
-            <Image className="logo" alt={getSiteConfig().siteName} src={useAppConfig().LOGO_URL} />
-          </Hyperlink>
-          <div className="d-flex align-items-center justify-content-center mb-4 ml-5">
-            <div className="medium-yellow-line mt-5 mr-n2" />
-            <div>
-              <h1 className="h3 data-hj-suppress mw-320">
-                {formatMessage(messages['welcome.to.platform'], { siteName: getSiteConfig().siteName, fullName })}
-              </h1>
-              <h2 className="display-1">
-                {formatMessage(messages['complete.your.profile.1'])}
-                <div className="text-accent-a">
-                  {formatMessage(messages['complete.your.profile.2'])}
-                </div>
-              </h2>
-            </div>
-          </div>
-        </div>
-        <div className="col-md-2 bg-white p-0">
-          <svg className="w-100 h-100 medium-screen-svg-light" preserveAspectRatio="xMaxYMin meet">
-            <g transform="skewX(168)">
-              <rect x="0" y="0" height="100%" width="100%" />
-            </g>
-          </svg>
-        </div>
-      </div>
-    </>
-  );
-};
-
-MediumLayout.propTypes = {
-  fullName: PropTypes.string.isRequired,
-};
-
-export default MediumLayout;
--- a/src/base-container/components/welcome-page-layout/SmallLayout.jsx
+++ b/src/base-container/components/welcome-page-layout/SmallLayout.jsx
@@ -1,38 +0,0 @@
-import { useAppConfig, getSiteConfig, useIntl } from '@openedx/frontend-base';
-import { Hyperlink, Image } from '@openedx/paragon';
-import PropTypes from 'prop-types';
-
-import messages from './messages';
-
-const SmallLayout = ({ fullName }) => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <div className="min-vw-100 bg-light-200">
-      <div className="col-md-12 small-screen-top-stripe" />
-      <Hyperlink destination={useAppConfig().MARKETING_SITE_BASE_URL}>
-        <Image className="logo-small" alt={getSiteConfig().siteName} src={useAppConfig().LOGO_URL} />
-      </Hyperlink>
-      <div className="d-flex align-items-center m-3.5">
-        <div className="small-yellow-line mt-4.5" />
-        <div>
-          <h1 className="h5 data-hj-suppress">
-            {formatMessage(messages['welcome.to.platform'], { siteName: getSiteConfig().siteName, fullName })}
-          </h1>
-          <h2 className="h1">
-            {formatMessage(messages['complete.your.profile.1'])}
-            <div className="text-accent-a">
-              {formatMessage(messages['complete.your.profile.2'])}
-            </div>
-          </h2>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-SmallLayout.propTypes = {
-  fullName: PropTypes.string.isRequired,
-};
-
-export default SmallLayout;
--- a/src/base-container/components/welcome-page-layout/index.jsx
+++ b/src/base-container/components/welcome-page-layout/index.jsx
@@ -1,3 +0,0 @@
-export { default as AuthLargeLayout } from './LargeLayout';
-export { default as AuthMediumLayout } from './MediumLayout';
-export { default as AuthSmallLayout } from './SmallLayout';
--- a/src/base-container/index.jsx
+++ b/src/base-container/index.jsx
@@ -1,70 +0,0 @@
-import { useAppConfig } from '@openedx/frontend-base';
-import { breakpoints } from '@openedx/paragon';
-import classNames from 'classnames';
-import PropTypes from 'prop-types';
-import MediaQuery from 'react-responsive';
-
-import { DefaultLargeLayout, DefaultMediumLayout, DefaultSmallLayout } from './components/default-layout';
-import {
-  ImageExtraSmallLayout, ImageLargeLayout, ImageMediumLayout, ImageSmallLayout,
-} from './components/image-layout';
-import { AuthLargeLayout, AuthMediumLayout, AuthSmallLayout } from './components/welcome-page-layout';
-
-const BaseContainer = ({ children, showWelcomeBanner, fullName }) => {
-  const enableImageLayout = useAppConfig().ENABLE_IMAGE_LAYOUT;
-
-  if (enableImageLayout) {
-    return (
-      <div className="layout">
-        <MediaQuery maxWidth={breakpoints.extraSmall.maxWidth - 1}>
-          {showWelcomeBanner ? <AuthSmallLayout fullName={fullName} /> : <ImageExtraSmallLayout />}
-        </MediaQuery>
-        <MediaQuery minWidth={breakpoints.small.minWidth} maxWidth={breakpoints.small.maxWidth - 1}>
-          {showWelcomeBanner ? <AuthSmallLayout fullName={fullName} /> : <ImageSmallLayout />}
-        </MediaQuery>
-        <MediaQuery minWidth={breakpoints.medium.minWidth} maxWidth={breakpoints.large.maxWidth - 1}>
-          {showWelcomeBanner ? <AuthMediumLayout fullName={fullName} /> : <ImageMediumLayout />}
-        </MediaQuery>
-        <MediaQuery minWidth={breakpoints.extraLarge.minWidth}>
-          {showWelcomeBanner ? <AuthLargeLayout fullName={fullName} /> : <ImageLargeLayout />}
-        </MediaQuery>
-        <div className={classNames('content', { 'align-items-center mt-0': showWelcomeBanner })}>
-          {children}
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <>
-      <div className="col-md-12 extra-large-screen-top-stripe" />
-      <div className="layout">
-        <MediaQuery maxWidth={breakpoints.small.maxWidth - 1}>
-          {showWelcomeBanner ? <AuthSmallLayout fullName={fullName} /> : <DefaultSmallLayout />}
-        </MediaQuery>
-        <MediaQuery minWidth={breakpoints.medium.minWidth} maxWidth={breakpoints.large.maxWidth - 1}>
-          {showWelcomeBanner ? <AuthMediumLayout fullName={fullName} /> : <DefaultMediumLayout />}
-        </MediaQuery>
-        <MediaQuery minWidth={breakpoints.extraLarge.minWidth}>
-          {showWelcomeBanner ? <AuthLargeLayout fullName={fullName} /> : <DefaultLargeLayout />}
-        </MediaQuery>
-        <div className={classNames('content', { 'align-items-center mt-0': showWelcomeBanner })}>
-          {children}
-        </div>
-      </div>
-    </>
-  );
-};
-
-BaseContainer.defaultProps = {
-  showWelcomeBanner: false,
-  fullName: null,
-};
-
-BaseContainer.propTypes = {
-  children: PropTypes.node.isRequired,
-  showWelcomeBanner: PropTypes.bool,
-  fullName: PropTypes.string,
-};
-
-export default BaseContainer;
--- a/src/base-container/tests/BaseContainer.test.jsx
+++ b/src/base-container/tests/BaseContainer.test.jsx
@@ -1,44 +0,0 @@
-import { IntlProvider, mergeAppConfig } from '@openedx/frontend-base';
-import { render } from '@testing-library/react';
-import { Context as ResponsiveContext } from 'react-responsive';
-
-import BaseContainer from '../index';
-import { appId } from '../../constants';
-
-const LargeScreen = {
-  wrappingComponent: ResponsiveContext.Provider,
-  wrappingComponentProps: { value: { width: 1200 } },
-};
-
-describe('Base component tests', () => {
-  it('should show default layout', () => {
-    const { container } = render(
-      <IntlProvider locale="en">
-        <BaseContainer>
-          <div>Test Content</div>
-        </BaseContainer>
-      </IntlProvider>,
-      LargeScreen,
-    );
-
-    expect(container.querySelector('.banner__image')).toBeNull();
-    expect(container.querySelector('.large-screen-svg-primary')).toBeDefined();
-  });
-
-  it('renders Image layout when ENABLE_IMAGE_LAYOUT configuration is enabled', () => {
-    mergeAppConfig(appId, {
-      ENABLE_IMAGE_LAYOUT: true,
-    });
-
-    const { container } = render(
-      <IntlProvider locale="en">
-        <BaseContainer showWelcomeBanner={false}>
-          <div>Test Content</div>
-        </BaseContainer>
-      </IntlProvider>,
-      LargeScreen,
-    );
-
-    expect(container.querySelector('.banner__image')).toBeDefined();
-  });
-});
--- a/src/common-components/EmbeddedRegistrationRoute.jsx
+++ b/src/common-components/EmbeddedRegistrationRoute.jsx
@@ -1,26 +0,0 @@
-import PropTypes from 'prop-types';
-import { Navigate } from 'react-router-dom';
-
-import { PAGE_NOT_FOUND } from '../data/constants';
-import { isHostAvailableInQueryParams } from '../data/utils';
-
-/**
- * This wrapper redirects the requester to embedded register page only if host
- * query param is present.
- */
-const EmbeddedRegistrationRoute = ({ children }) => {
-  const registrationEmbedded = isHostAvailableInQueryParams();
-
-  // Show registration page for embedded experience even if the user is authenticated
-  if (registrationEmbedded) {
-    return children;
-  }
-
-  return <Navigate to={PAGE_NOT_FOUND} replace />;
-};
-
-EmbeddedRegistrationRoute.propTypes = {
-  children: PropTypes.node.isRequired,
-};
-
-export default EmbeddedRegistrationRoute;
--- a/src/common-components/EnterpriseSSO.jsx
+++ b/src/common-components/EnterpriseSSO.jsx
@@ -1,27 +1,25 @@
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { useAppConfig, getSiteConfig, useIntl } from '@openedx/frontend-base';
-import {
-  Button, Form,
-  Icon,
-} from '@openedx/paragon';
-import { Login } from '@openedx/paragon/icons';
+import React from 'react';
+
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import PropTypes from 'prop-types';
+import { getConfig } from '@edx/frontend-platform';
+import { faSignInAlt } from '@fortawesome/free-solid-svg-icons';
+
+import {
+  Form, Button,
+} from '@edx/paragon';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

 import { LOGIN_PAGE, SUPPORTED_ICON_CLASSES } from '../data/constants';
 import messages from './messages';

-/**
- * This component renders the Single sign-on (SSO) button only for the tpa provider passed
- * */
 const EnterpriseSSO = (props) => {
-  const { formatMessage } = useIntl();
+  const { intl } = props;
  const tpaProvider = props.provider;
-  const hideRegistrationLink = useAppConfig().ALLOW_PUBLIC_ACCOUNT_CREATION === false
-    || useAppConfig().SHOW_REGISTRATION_LINKS === false;

  const handleSubmit = (e, url) => {
    e.preventDefault();
-    window.location.href = getSiteConfig().lmsBaseUrl + url;
+    window.location.href = getConfig().LMS_BASE_URL + url;
  };

  const handleClick = (e) => {
@@ -35,7 +33,7 @@ const EnterpriseSSO = (props) => {
        <div className="d-flex flex-column">
          <div className="mw-450">
            <Form className="m-0">
-              <p>{formatMessage(messages['enterprisetpa.title.heading'], { providerName: tpaProvider.name })}</p>
+              <p>{intl.formatMessage(messages['enterprisetpa.title.heading'], { providerName: tpaProvider.name })}</p>
              <Button
                id={tpaProvider.id}
                key={tpaProvider.id}
@@ -46,35 +44,30 @@ const EnterpriseSSO = (props) => {
              >
                {tpaProvider.iconImage ? (
                  <div aria-hidden="true">
-                    <img className="btn-tpa__image-icon" src={tpaProvider.iconImage} alt={`icon ${tpaProvider.name}`} />
-                    <span className="pl-2" aria-hidden="true">{tpaProvider.name}</span>
+                    <img className="icon-image" src={tpaProvider.iconImage} alt={`icon ${tpaProvider.name}`} />
+                    <span className="pl-2" aria-hidden="true">{ tpaProvider.name }</span>
                  </div>
                )
                  : (
                    <>
-                      <div className="btn-tpa__font-container" aria-hidden="true">
-                        {SUPPORTED_ICON_CLASSES.includes(tpaProvider.iconClass) ? (
-                          <FontAwesomeIcon icon={['fab', tpaProvider.iconClass]} />)
-                          : (
-                            <Icon className="h-75" src={Login} />
-                          )}
+                      <div className="font-container" aria-hidden="true">
+                        <FontAwesomeIcon
+                          icon={SUPPORTED_ICON_CLASSES.includes(tpaProvider.iconClass) ? ['fab', tpaProvider.iconClass] : faSignInAlt}
+                        />
                      </div>
-                      <span className="pl-2" aria-hidden="true">{tpaProvider.name}</span>
+                      <span className="pl-2" aria-hidden="true">{ tpaProvider.name }</span>
                    </>
                  )}
              </Button>
              <div className="mb-4" />
              <Button
                type="submit"
-                id="other-ways-to-sign-in"
                variant="outline-primary"
                state="Complete"
                className="w-100"
                onClick={(e) => handleClick(e)}
              >
-                {hideRegistrationLink
-                  ? formatMessage(messages['enterprisetpa.login.button.text.public.account.creation.disabled'])
-                  : formatMessage(messages['enterprisetpa.login.button.text'])}
+                {intl.formatMessage(messages['enterprisetpa.login.button.text'])}
              </Button>
            </Form>
          </div>
@@ -105,6 +98,7 @@ EnterpriseSSO.propTypes = {
    loginUrl: PropTypes.string,
    registerUrl: PropTypes.string,
  }),
+  intl: intlShape.isRequired,
 };

-export default EnterpriseSSO;
+export default injectIntl(EnterpriseSSO);
--- a/src/common-components/FormGroup.jsx
+++ b/src/common-components/FormGroup.jsx
@@ -1,8 +1,8 @@
-import { useState } from 'react';
+import React, { useState } from 'react';

 import {
  Form, TransitionReplace,
-} from '@openedx/paragon';
+} from '@edx/paragon';
 import PropTypes from 'prop-types';

 const FormGroup = (props) => {
@@ -24,12 +24,9 @@ const FormGroup = (props) => {
    <Form.Group controlId={props.name} className={props.className} isInvalid={props.errorMessage !== ''}>
      <Form.Control
        as={props.as}
-        readOnly={props.readOnly}
        type={props.type}
-        aria-invalid={props.errorMessage !== ''}
-        className="form-group__form-field"
+        className="form-field"
        autoComplete={props.autoComplete}
-        spellCheck={props.spellCheck}
        name={props.name}
        value={props.value}
        onFocus={handleFocus}
@@ -37,6 +34,7 @@ const FormGroup = (props) => {
        onClick={handleClick}
        onChange={props.handleChange}
        controlClassName={props.borderClass}
+
        trailingElement={props.trailingElement}
        floatingLabel={props.floatingLabel}
      >
@@ -64,43 +62,39 @@ const FormGroup = (props) => {

 FormGroup.defaultProps = {
  as: 'input',
-  autoComplete: null,
-  borderClass: '',
-  children: null,
-  className: '',
  errorMessage: '',
+  borderClass: '',
+  autoComplete: null,
  handleBlur: null,
  handleChange: () => {},
-  handleClick: null,
  handleFocus: null,
+  handleClick: null,
  helpText: [],
  options: null,
-  readOnly: false,
-  spellCheck: null,
  trailingElement: null,
  type: 'text',
+  children: null,
+  className: '',
 };

 FormGroup.propTypes = {
  as: PropTypes.string,
-  autoComplete: PropTypes.string,
-  borderClass: PropTypes.string,
-  children: PropTypes.element,
-  className: PropTypes.string,
  errorMessage: PropTypes.string,
+  borderClass: PropTypes.string,
+  autoComplete: PropTypes.string,
  floatingLabel: PropTypes.string.isRequired,
  handleBlur: PropTypes.func,
  handleChange: PropTypes.func,
-  handleClick: PropTypes.func,
  handleFocus: PropTypes.func,
+  handleClick: PropTypes.func,
  helpText: PropTypes.arrayOf(PropTypes.string),
  name: PropTypes.string.isRequired,
  options: PropTypes.func,
-  readOnly: PropTypes.bool,
-  spellCheck: PropTypes.string,
  trailingElement: PropTypes.element,
  type: PropTypes.string,
  value: PropTypes.string.isRequired,
+  children: PropTypes.element,
+  className: PropTypes.string,
 };

 export default FormGroup;
--- a/src/common-components/InstitutionLogistration.jsx
+++ b/src/common-components/InstitutionLogistration.jsx
@@ -1,13 +1,11 @@
-import { getSiteConfig, useIntl } from '@openedx/frontend-base';
-import { Button, Hyperlink, Icon } from '@openedx/paragon';
-import { Institution } from '@openedx/paragon/icons';
+import React from 'react';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { getConfig } from '@edx/frontend-platform';
 import PropTypes from 'prop-types';
-
+import { Button, Hyperlink, Icon } from '@edx/paragon';
+import { Institution } from '@edx/paragon/icons';
 import messages from './messages';

-/**
- * This component renders the Institution login button
- * */
 export const RenderInstitutionButton = props => {
  const { onSubmitHandler, buttonTitle } = props;

@@ -24,13 +22,10 @@ export const RenderInstitutionButton = props => {
  );
 };

-/**
- * This component renders the page list of available institutions for login
- * */
 const InstitutionLogistration = props => {
-  const lmsBaseUrl = getSiteConfig().lmsBaseUrl;
-  const { formatMessage } = useIntl();
+  const lmsBaseUrl = getConfig().LMS_BASE_URL;
  const {
+    intl,
    secondaryProviders,
    headingTitle,
  } = props;
@@ -39,11 +34,11 @@ const InstitutionLogistration = props => {
    <>
      <div className="d-flex justify-content-left mb-4 mt-2">
        <div className="flex-column">
-          <h4 className="mb-2 font-weight-bold institutions__heading">
+          <h4 className="mb-2 font-weight-bold institute-heading">
            {headingTitle}
          </h4>
          <p className="mb-2">
-            {formatMessage(messages['institution.login.page.sub.heading'])}
+            {intl.formatMessage(messages['institution.login.page.sub.heading'])}
          </p>
        </div>
      </div>
@@ -54,7 +49,7 @@ const InstitutionLogistration = props => {
              <tr key={provider} className="pgn__data-table-row">
                <td>
                  <Hyperlink
-                    className="btn nav-item p-0 mb-1 institutions--provider-link"
+                    className="btn nav-item p-0 mb-1 secondary-provider-link"
                    destination={lmsBaseUrl + provider.loginUrl}
                  >
                    {provider.name}
@@ -75,7 +70,7 @@ const LogistrationDefaultProps = {
 };
 const LogistrationProps = {
  secondaryProviders: PropTypes.arrayOf(PropTypes.shape({
-    name: PropTypes.string.isRequired,
+    name: PropTypes.string.isRequried,
    loginUrl: PropTypes.string.isRequired,
  })),
 };
@@ -92,6 +87,7 @@ RenderInstitutionButton.defaultProps = {

 InstitutionLogistration.propTypes = {
  ...LogistrationProps,
+  intl: intlShape.isRequired,
  headingTitle: PropTypes.string,
 };
 InstitutionLogistration.defaultProps = {
@@ -99,4 +95,4 @@ InstitutionLogistration.defaultProps = {
  headingTitle: '',
 };

-export default InstitutionLogistration;
+export default injectIntl(InstitutionLogistration);
--- a/src/common-components/Logistration.jsx
+++ b/src/common-components/Logistration.jsx
@@ -0,0 +1,95 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { Redirect } from 'react-router-dom';
+
+import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import {
+  Tabs,
+  Tab,
+  Icon,
+} from '@edx/paragon';
+import { ChevronLeft } from '@edx/paragon/icons';
+
+import messages from './messages';
+import { LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';
+import { updatePathWithQueryParams, getTpaHint } from '../data/utils';
+import { LoginPage } from '../login';
+import { RegistrationPage } from '../register';
+import BaseComponent from '../base-component';
+
+const Logistration = (props) => {
+  const { intl, selectedPage } = props;
+  const tpa = getTpaHint();
+  const [institutionLogin, setInstitutionLogin] = useState(false);
+  const [key, setKey] = useState('');
+
+  const handleInstitutionLogin = (e) => {
+    sendTrackEvent('edx.bi.institution_login_form.toggled', { category: 'user-engagement' });
+    if (typeof e === 'string') {
+      sendPageEvent('login_and_registration', e === '/login' ? 'login' : 'register');
+    } else {
+      sendPageEvent('login_and_registration', e.target.dataset.eventName);
+    }
+
+    setInstitutionLogin(!institutionLogin);
+  };
+
+  const handleOnSelect = (tabKey) => {
+    sendTrackEvent(`edx.bi.${tabKey.replace('/', '')}_form.toggled`, { category: 'user-engagement' });
+    setKey(tabKey);
+  };
+
+  const tabTitle = (
+    <div className="d-flex">
+      <Icon src={ChevronLeft} className="left-icon" />
+      <span className="ml-2">
+        {selectedPage === LOGIN_PAGE
+          ? intl.formatMessage(messages['logistration.sign.in'])
+          : intl.formatMessage(messages['logistration.register'])}
+      </span>
+    </div>
+  );
+
+  return (
+    <BaseComponent>
+      <div>
+        {institutionLogin
+          ? (
+            <Tabs defaultActiveKey="" id="controlled-tab" onSelect={handleInstitutionLogin}>
+              <Tab title={tabTitle} eventKey={selectedPage === LOGIN_PAGE ? LOGIN_PAGE : REGISTER_PAGE} />
+            </Tabs>
+          )
+          : (
+            <>
+              {!tpa && (
+                <Tabs defaultActiveKey={selectedPage} id="controlled-tab" onSelect={handleOnSelect}>
+                  <Tab title={intl.formatMessage(messages['logistration.register'])} eventKey={REGISTER_PAGE} />
+                  <Tab title={intl.formatMessage(messages['logistration.sign.in'])} eventKey={LOGIN_PAGE} />
+                </Tabs>
+              )}
+            </>
+          )}
+        { key && (
+          <Redirect to={updatePathWithQueryParams(key)} />
+        )}
+        <div id="main-content" className="main-content">
+          {selectedPage === LOGIN_PAGE
+            ? <LoginPage institutionLogin={institutionLogin} handleInstitutionLogin={handleInstitutionLogin} />
+            : <RegistrationPage institutionLogin={institutionLogin} handleInstitutionLogin={handleInstitutionLogin} />}
+        </div>
+      </div>
+    </BaseComponent>
+  );
+};
+
+Logistration.propTypes = {
+  intl: intlShape.isRequired,
+  selectedPage: PropTypes.string,
+};
+
+Logistration.defaultProps = {
+  selectedPage: REGISTER_PAGE,
+};
+
+export default injectIntl(Logistration);
--- a/src/common-components/NotFoundPage.jsx
+++ b/src/common-components/NotFoundPage.jsx
@@ -1,15 +1,16 @@
-import { FormattedMessage } from '@openedx/frontend-base';
+import React from 'react';
+import { FormattedMessage } from '@edx/frontend-platform/i18n';

-const NotFoundPage = () => (
-  <div className="container-fluid d-flex py-5 justify-content-center align-items-start text-center">
-    <p className="my-0 py-5 text-muted mw-32em">
-      <FormattedMessage
-        id="error.notfound.message"
-        defaultMessage="The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again."
-        description="error message when a page does not exist"
-      />
-    </p>
-  </div>
-);
-
-export default NotFoundPage;
+export default function NotFoundPage() {
+  return (
+    <div className="container-fluid d-flex py-5 justify-content-center align-items-start text-center">
+      <p className="my-0 py-5 text-muted mw-32em">
+        <FormattedMessage
+          id="error.notfound.message"
+          defaultMessage="The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again."
+          description="error message when a page does not exist"
+        />
+      </p>
+    </div>
+  );
+}
--- a/src/common-components/PasswordField.jsx
+++ b/src/common-components/PasswordField.jsx
@@ -1,119 +1,54 @@
-import { useState } from 'react';
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';

-import { useIntl } from '@openedx/frontend-base';
 import {
-  Form, Icon, IconButton, OverlayTrigger, Tooltip, useToggle,
-} from '@openedx/paragon';
+  Form, IconButton, useToggle, Tooltip, OverlayTrigger, Icon,
+} from '@edx/paragon';
 import {
  Check, Remove, Visibility, VisibilityOff,
-} from '@openedx/paragon/icons';
-import PropTypes from 'prop-types';
+} from '@edx/paragon/icons';

-import { LETTER_REGEX, NUMBER_REGEX } from '../data/constants';
-import { validatePasswordField } from '../register/data/utils';
 import messages from './messages';
-
-const noopFn = () => {};
+import { LETTER_REGEX, NUMBER_REGEX } from '../data/constants';

 const PasswordField = (props) => {
-  const { formatMessage } = useIntl();
+  const { formatMessage } = props.intl;
  const [isPasswordHidden, setHiddenTrue, setHiddenFalse] = useToggle(true);
  const [showTooltip, setShowTooltip] = useState(false);

-  const {
-    validationApiRateLimited = false,
-    clearRegistrationBackendError = noopFn,
-    validateField = noopFn,
-  } = props;
-
  const handleBlur = (e) => {
-    const { name, value } = e.target;
-    if (name === props.name && e.relatedTarget?.name === 'passwordIcon') {
-      return; // Do not run validations on password icon click
-    }
-
-    let passwordValue = value;
-    if (name === 'passwordIcon') {
-      // To validate actual password value when onBlur is triggered by focusing out the password icon
-      passwordValue = props.value;
-    }
-
-    if (props.handleBlur) {
-      props.handleBlur({
-        target: {
-          name: props.name,
-          value: passwordValue,
-        },
-      });
-    }
-
+    if (props.handleBlur) { props.handleBlur(e); }
    setShowTooltip(props.showRequirements && false);
-    if (props.handleErrorChange) { // If rendering from register page
-      const fieldError = validatePasswordField(passwordValue, formatMessage);
-      if (fieldError) {
-        props.handleErrorChange('password', fieldError);
-      } else if (!validationApiRateLimited) {
-        validateField({ password: passwordValue });
-      }
-    }
  };

  const handleFocus = (e) => {
-    if (e.target?.name === 'passwordIcon') {
-      return; // Do not clear error on password icon focus
-    }
-
    if (props.handleFocus) {
      props.handleFocus(e);
    }
-    if (props.handleErrorChange) {
-      props.handleErrorChange('password', '');
-      clearRegistrationBackendError('password');
-    }
    setTimeout(() => setShowTooltip(props.showRequirements && true), 150);
  };

  const HideButton = (
-    <IconButton
-      onFocus={handleFocus}
-      onBlur={handleBlur}
-      name="passwordIcon"
-      src={VisibilityOff}
-      iconAs={Icon}
-      onClick={setHiddenTrue}
-      size="sm"
-      variant="secondary"
-      alt={formatMessage(messages['hide.password'])}
-    />
+    <IconButton onFocus={handleFocus} onBlur={handleBlur} name="passwordValidation" src={VisibilityOff} iconAs={Icon} onClick={setHiddenTrue} size="sm" variant="secondary" alt={formatMessage(messages['hide.password'])} />
  );

  const ShowButton = (
-    <IconButton
-      onFocus={handleFocus}
-      onBlur={handleBlur}
-      name="passwordIcon"
-      src={Visibility}
-      iconAs={Icon}
-      onClick={setHiddenFalse}
-      size="sm"
-      variant="secondary"
-      alt={formatMessage(messages['show.password'])}
-    />
+    <IconButton onFocus={handleFocus} onBlur={handleBlur} name="passwordValidation" src={Visibility} iconAs={Icon} onClick={setHiddenFalse} size="sm" variant="secondary" alt={formatMessage(messages['show.password'])} />
  );
-
  const placement = window.innerWidth < 768 ? 'top' : 'left';
  const tooltip = (
    <Tooltip id={`password-requirement-${placement}`}>
-      <span id="letter-check" className="d-flex align-items-center">
-        {LETTER_REGEX.test(props.value) ? <Icon className="text-success mr-1" src={Check} /> : <Icon className="mr-1 text-light-700" src={Remove} />}
+      <span id="letter-check" className="d-flex position-relative align-content-start">
+        {LETTER_REGEX.test(props.value) ? <Icon className="text-success mr-1" src={Check} /> : <Icon className="mr-1" src={Remove} />}
        {formatMessage(messages['one.letter'])}
      </span>
-      <span id="number-check" className="d-flex align-items-center">
-        {NUMBER_REGEX.test(props.value) ? <Icon className="text-success mr-1" src={Check} /> : <Icon className="mr-1 text-light-700" src={Remove} />}
+      <span id="number-check" className="d-flex position-relative align-content-start">
+        {NUMBER_REGEX.test(props.value) ? <Icon className="text-success mr-1" src={Check} /> : <Icon className="mr-1" src={Remove} />}
        {formatMessage(messages['one.number'])}
      </span>
-      <span id="characters-check" className="d-flex align-items-center">
-        {props.value.length >= 8 ? <Icon className="text-success mr-1" src={Check} /> : <Icon className="mr-1 text-light-700" src={Remove} />}
+      <span id="characters-check" className="d-flex position-relative align-content-start">
+        {props.value.length >= 8 ? <Icon className="text-success mr-1" src={Check} /> : <Icon className="mr-1" src={Remove} />}
        {formatMessage(messages['eight.characters'])}
      </span>
    </Tooltip>
@@ -124,12 +59,10 @@ const PasswordField = (props) => {
      <OverlayTrigger key="tooltip" placement={placement} overlay={tooltip} show={showTooltip}>
        <Form.Control
          as="input"
-          className="form-group__form-field"
+          className="form-field"
          type={isPasswordHidden ? 'password' : 'text'}
          name={props.name}
          value={props.value}
-          autoComplete={props.autoComplete}
-          aria-invalid={props.errorMessage !== ''}
          onFocus={handleFocus}
          onBlur={handleBlur}
          onChange={props.handleChange}
@@ -141,7 +74,7 @@ const PasswordField = (props) => {
      {props.errorMessage !== '' && (
        <Form.Control.Feedback key="error" className="form-text-size" hasIcon={false} feedback-for={props.name} type="invalid">
          {props.errorMessage}
-          {props.showScreenReaderText && <span className="sr-only">{formatMessage(messages['password.sr.only.helping.text'])}</span>}
+          <span className="sr-only">{formatMessage(messages['password.sr.only.helping.text'])}</span>
        </Form.Control.Feedback>
      )}
    </Form.Group>
@@ -154,13 +87,7 @@ PasswordField.defaultProps = {
  handleBlur: null,
  handleFocus: null,
  handleChange: () => {},
-  handleErrorChange: null,
  showRequirements: true,
-  showScreenReaderText: true,
-  autoComplete: null,
-  clearRegistrationBackendError: noopFn,
-  validateField: noopFn,
-  validationApiRateLimited: false,
 };

 PasswordField.propTypes = {
@@ -170,15 +97,10 @@ PasswordField.propTypes = {
  handleBlur: PropTypes.func,
  handleFocus: PropTypes.func,
  handleChange: PropTypes.func,
-  handleErrorChange: PropTypes.func,
+  intl: intlShape.isRequired,
  name: PropTypes.string.isRequired,
  showRequirements: PropTypes.bool,
  value: PropTypes.string.isRequired,
-  autoComplete: PropTypes.string,
-  showScreenReaderText: PropTypes.bool,
-  clearRegistrationBackendError: PropTypes.func,
-  validateField: PropTypes.func,
-  validationApiRateLimited: PropTypes.bool,
 };

-export default PasswordField;
+export default injectIntl(PasswordField);
--- a/src/common-components/RedirectLogistration.jsx
+++ b/src/common-components/RedirectLogistration.jsx
@@ -1,24 +1,16 @@
-import { useAppConfig, getSiteConfig } from '@openedx/frontend-base';
-import PropTypes from 'prop-types';
-import { Navigate } from 'react-router-dom';
+import React from 'react';

-import {
-  AUTHN_PROGRESSIVE_PROFILING, REDIRECT,
-} from '../data/constants';
+import PropTypes from 'prop-types';
+import { Redirect } from 'react-router-dom';
+
+import { getConfig } from '@edx/frontend-platform';
+
+import { WELCOME_PAGE } from '../data/constants';
 import { setCookie } from '../data/utils';

-const RedirectLogistration = (props) => {
+function RedirectLogistration(props) {
  const {
-    authenticatedUser,
-    finishAuthUrl,
-    redirectUrl,
-    redirectToProgressiveProfilingPage,
-    success,
-    optionalFields,
-    educationLevel,
-    userId,
-    registrationEmbedded,
-    host,
+    finishAuthUrl, redirectUrl, redirectToWelcomePage, success,
  } = props;
  let finalRedirectUrl = '';

@@ -28,67 +20,36 @@ const RedirectLogistration = (props) => {
    // Note: For multiple enterprise use case, we need to make sure that user first visits the
    // enterprise selection page and then complete the auth workflow
    if (finishAuthUrl && !redirectUrl.includes(finishAuthUrl)) {
-      finalRedirectUrl = getSiteConfig().lmsBaseUrl + finishAuthUrl;
+      finalRedirectUrl = getConfig().LMS_BASE_URL + finishAuthUrl;
    } else {
      finalRedirectUrl = redirectUrl;
    }

-    // Redirect to Progressive Profiling after successful registration
-    if (redirectToProgressiveProfilingPage) {
-      // TODO: Do we still need this cookie?
-      setCookie('van-504-returning-user', true, useAppConfig().SESSION_COOKIE_DOMAIN);
-
-      if (registrationEmbedded) {
-        window.parent.postMessage({
-          action: REDIRECT,
-          redirectUrl: useAppConfig().POST_REGISTRATION_REDIRECT_URL,
-        }, host);
-        return null;
-      }
+    if (redirectToWelcomePage) {
+      setCookie('van-504-returning-user', true);
+      // use this component to redirect WelcomePage after successful registration
+      // return <Redirect to={WELCOME_PAGE} />;
      const registrationResult = { redirectUrl: finalRedirectUrl, success };
-      return (
-        <Navigate
-          to={AUTHN_PROGRESSIVE_PROFILING}
-          state={{
-            registrationResult,
-            optionalFields,
-            authenticatedUser,
-          }}
-          replace
-        />
-      );
+      return <Redirect to={{ pathname: WELCOME_PAGE, state: { registrationResult } }} />;
    }

    window.location.href = finalRedirectUrl;
  }
-
-  return null;
-};
+  return <></>;
+}

 RedirectLogistration.defaultProps = {
-  authenticatedUser: {},
-  educationLevel: null,
  finishAuthUrl: null,
  success: false,
  redirectUrl: '',
-  redirectToProgressiveProfilingPage: false,
-  optionalFields: {},
-  userId: null,
-  registrationEmbedded: false,
-  host: '',
+  redirectToWelcomePage: false,
 };

 RedirectLogistration.propTypes = {
-  authenticatedUser: PropTypes.shape({}),
-  educationLevel: PropTypes.string,
  finishAuthUrl: PropTypes.string,
  success: PropTypes.bool,
  redirectUrl: PropTypes.string,
-  redirectToProgressiveProfilingPage: PropTypes.bool,
-  optionalFields: PropTypes.shape({}),
-  userId: PropTypes.number,
-  registrationEmbedded: PropTypes.bool,
-  host: PropTypes.string,
+  redirectToWelcomePage: PropTypes.bool,
 };

 export default RedirectLogistration;
--- a/src/common-components/SocialAuthProviders.jsx
+++ b/src/common-components/SocialAuthProviders.jsx
@@ -1,21 +1,22 @@
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { getSiteConfig, useIntl } from '@openedx/frontend-base';
-import { Icon } from '@openedx/paragon';
-import { Login } from '@openedx/paragon/icons';
+import React from 'react';
 import PropTypes from 'prop-types';

-import { LOGIN_PAGE, SUPPORTED_ICON_CLASSES } from '../data/constants';
-import messages from './messages';
+import { getConfig } from '@edx/frontend-platform';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faSignInAlt } from '@fortawesome/free-solid-svg-icons';

-const SocialAuthProviders = (props) => {
-  const { formatMessage } = useIntl();
-  const { referrer, socialAuthProviders } = props;
+import messages from './messages';
+import { LOGIN_PAGE, SUPPORTED_ICON_CLASSES } from '../data/constants';
+
+function SocialAuthProviders(props) {
+  const { intl, referrer, socialAuthProviders } = props;

  function handleSubmit(e) {
    e.preventDefault();

    const url = e.currentTarget.dataset.providerUrl;
-    window.location.href = getSiteConfig().lmsBaseUrl + url;
+    window.location.href = getConfig().LMS_BASE_URL + url;
  }

  const socialAuth = socialAuthProviders.map((provider, index) => (
@@ -29,30 +30,29 @@ const SocialAuthProviders = (props) => {
    >
      {provider.iconImage ? (
        <div aria-hidden="true">
-          <img className="btn-tpa__image-icon" src={provider.iconImage} alt={`icon ${provider.name}`} />
+          <img className="icon-image" src={provider.iconImage} alt={`icon ${provider.name}`} />
        </div>
      )
        : (
-          <div className="btn-tpa__font-container" aria-hidden="true">
-            {SUPPORTED_ICON_CLASSES.includes(provider.iconClass) ? (
-              <FontAwesomeIcon icon={['fab', provider.iconClass]} />)
-              : (
-                <Icon className="h-75" src={Login} />
-              )}
-          </div>
+          <>
+            <div className="font-container" aria-hidden="true">
+              <FontAwesomeIcon
+                icon={SUPPORTED_ICON_CLASSES.includes(provider.iconClass) ? ['fab', provider.iconClass] : faSignInAlt}
+              />
+            </div>
+          </>
        )}
-      <span id="provider-name" className="notranslate mr-auto pl-2" aria-hidden="true">{provider.name}</span>
+      <span id="provider-name" className="mr-auto pl-2" aria-hidden="true">{provider.name}</span>
      <span className="sr-only">
        {referrer === LOGIN_PAGE
-          ? formatMessage(messages['sso.sign.in.with'], { providerName: provider.name })
-          : formatMessage(messages['sso.create.account.using'], { providerName: provider.name })}
+          ? intl.formatMessage(messages['sso.sign.in.with'], { providerName: provider.name })
+          : intl.formatMessage(messages['sso.create.account.using'], { providerName: provider.name })}
      </span>
    </button>
  ));

-  // eslint-disable-next-line react/jsx-no-useless-fragment
  return <>{socialAuth}</>;
-};
+}

 SocialAuthProviders.defaultProps = {
  referrer: LOGIN_PAGE,
@@ -60,6 +60,7 @@ SocialAuthProviders.defaultProps = {
 };

 SocialAuthProviders.propTypes = {
+  intl: intlShape.isRequired,
  referrer: PropTypes.string,
  socialAuthProviders: PropTypes.arrayOf(PropTypes.shape({
    id: PropTypes.string,
@@ -68,8 +69,7 @@ SocialAuthProviders.propTypes = {
    iconImage: PropTypes.string,
    loginUrl: PropTypes.string,
    registerUrl: PropTypes.string,
-    skipRegistrationForm: PropTypes.bool,
  })),
 };

-export default SocialAuthProviders;
+export default injectIntl(SocialAuthProviders);
--- a/src/common-components/SwitchContent.jsx
+++ b/src/common-components/SwitchContent.jsx
@@ -0,0 +1,61 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { TransitionReplace } from '@edx/paragon';
+
+const onChildExit = (htmlNode) => {
+  // If the leaving child has focus, take control and redirect it
+  if (htmlNode.contains(document.activeElement)) {
+    // Get the newly entering sibling.
+    // It's the previousSibling, but not for any explicit reason. So checking for both.
+    const enteringChild = htmlNode.previousSibling || htmlNode.nextSibling;
+
+    // There's no replacement, do nothing.
+    if (!enteringChild) return; // eslint-disable-line curly
+
+    // Get all the focusable elements in the entering child and focus the first one
+    const focusableElements = enteringChild.querySelectorAll('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])');
+    if (focusableElements.length) {
+      focusableElements[0].focus();
+    }
+  }
+};
+
+function SwitchContent({ expression, cases, className }) {
+  const getContent = (caseKey) => {
+    if (cases[caseKey]) {
+      if (typeof cases[caseKey] === 'string') {
+        return getContent(cases[caseKey]);
+      }
+      return React.cloneElement(cases[caseKey], { key: caseKey });
+    } else if (cases.default) { // eslint-disable-line no-else-return
+      if (typeof cases.default === 'string') {
+        return getContent(cases.default);
+      }
+      React.cloneElement(cases.default, { key: 'default' });
+    }
+
+    return null;
+  };
+
+  return (
+    <TransitionReplace
+      className={className}
+      onChildExit={onChildExit}
+    >
+      {getContent(expression)}
+    </TransitionReplace>
+  );
+}
+
+SwitchContent.propTypes = {
+  expression: PropTypes.string,
+  cases: PropTypes.objectOf(PropTypes.node).isRequired,
+  className: PropTypes.string,
+};
+
+SwitchContent.defaultProps = {
+  expression: null,
+  className: null,
+};
+
+export default SwitchContent;
--- a/src/common-components/ThirdPartyAuth.jsx
+++ b/src/common-components/ThirdPartyAuth.jsx
@@ -1,123 +0,0 @@
-import { useAppConfig, getSiteConfig, useIntl } from '@openedx/frontend-base';
-import {
-  Hyperlink, Icon,
-} from '@openedx/paragon';
-import { Institution } from '@openedx/paragon/icons';
-import classNames from 'classnames';
-import PropTypes from 'prop-types';
-import Skeleton from 'react-loading-skeleton';
-
-import {
-  ENTERPRISE_LOGIN_URL, LOGIN_PAGE, PENDING_STATE, REGISTER_PAGE,
-} from '../data/constants';
-import messages from './messages';
-
-import {
-  RenderInstitutionButton,
-  SocialAuthProviders,
-} from './index';
-
-/**
- * This component renders the Single sign-on (SSO) buttons for the providers passed.
- * */
-const ThirdPartyAuth = (props) => {
-  const { formatMessage } = useIntl();
-  const {
-    providers,
-    secondaryProviders,
-    currentProvider,
-    handleInstitutionLogin,
-    thirdPartyAuthApiStatus,
-    isLoginPage,
-  } = props;
-  const isInstitutionAuthActive = !!secondaryProviders.length && !currentProvider;
-  const isSocialAuthActive = !!providers.length && !currentProvider;
-  const isEnterpriseLoginDisabled = useAppConfig().DISABLE_ENTERPRISE_LOGIN;
-  const enterpriseLoginURL = getSiteConfig().lmsBaseUrl + ENTERPRISE_LOGIN_URL;
-  const isThirdPartyAuthActive = isSocialAuthActive || (isEnterpriseLoginDisabled && isInstitutionAuthActive);
-
-  return (
-    <>
-      {((isEnterpriseLoginDisabled && isInstitutionAuthActive) || isSocialAuthActive) && (
-        <div className="mt-4 mb-3 h4">
-          {isLoginPage
-            ? formatMessage(messages['login.other.options.heading'])
-            : formatMessage(messages['registration.other.options.heading'])}
-        </div>
-      )}
-      {(isLoginPage && !isEnterpriseLoginDisabled && isSocialAuthActive) && (
-        <Hyperlink
-          className={classNames(
-            'btn btn-link btn-sm text-body p-0',
-            { 'mb-0': thirdPartyAuthApiStatus === PENDING_STATE },
-            { 'mb-4': thirdPartyAuthApiStatus !== PENDING_STATE },
-          )}
-          destination={enterpriseLoginURL}
-        >
-          <Icon src={Institution} className="institute-icon" />
-          {formatMessage(messages['enterprise.login.btn.text'])}
-        </Hyperlink>
-      )}
-
-      {thirdPartyAuthApiStatus === PENDING_STATE && isThirdPartyAuthActive ? (
-        <div className="mt-4">
-          <Skeleton className="tpa-skeleton" height={36} count={2} />
-        </div>
-      ) : (
-        <>
-          {(isEnterpriseLoginDisabled && isInstitutionAuthActive) && (
-            <RenderInstitutionButton
-              onSubmitHandler={handleInstitutionLogin}
-              buttonTitle={formatMessage(messages['institution.login.button'])}
-            />
-          )}
-          {isSocialAuthActive && (
-            <div className="row m-0">
-              <SocialAuthProviders
-                socialAuthProviders={providers}
-                referrer={isLoginPage ? LOGIN_PAGE : REGISTER_PAGE}
-              />
-            </div>
-          )}
-        </>
-      )}
-    </>
-  );
-};
-
-ThirdPartyAuth.defaultProps = {
-  currentProvider: null,
-  providers: [],
-  secondaryProviders: [],
-  thirdPartyAuthApiStatus: PENDING_STATE,
-  isLoginPage: false,
-};
-
-ThirdPartyAuth.propTypes = {
-  currentProvider: PropTypes.string,
-  handleInstitutionLogin: PropTypes.func.isRequired,
-  providers: PropTypes.arrayOf(
-    PropTypes.shape({
-      id: PropTypes.string,
-      name: PropTypes.string,
-      iconClass: PropTypes.string,
-      iconImage: PropTypes.string,
-      loginUrl: PropTypes.string,
-      registerUrl: PropTypes.string,
-    }),
-  ),
-  secondaryProviders: PropTypes.arrayOf(
-    PropTypes.shape({
-      id: PropTypes.string,
-      name: PropTypes.string,
-      iconClass: PropTypes.string,
-      iconImage: PropTypes.string,
-      loginUrl: PropTypes.string,
-      registerUrl: PropTypes.string,
-    }),
-  ),
-  thirdPartyAuthApiStatus: PropTypes.string,
-  isLoginPage: PropTypes.bool,
-};
-
-export default ThirdPartyAuth;
--- a/src/common-components/ThirdPartyAuthAlert.jsx
+++ b/src/common-components/ThirdPartyAuthAlert.jsx
@@ -1,49 +1,42 @@
-import { getSiteConfig, useIntl } from '@openedx/frontend-base';
-import { Alert } from '@openedx/paragon';
+import React from 'react';
 import PropTypes from 'prop-types';

-import { LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';
+import { getConfig } from '@edx/frontend-platform';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { Alert } from '@edx/paragon';
+
 import messages from './messages';
+import { LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';

 const ThirdPartyAuthAlert = (props) => {
-  const { formatMessage } = useIntl();
-  const { currentProvider, referrer } = props;
-  const platformName = getSiteConfig().siteName;
+  const { currentProvider, intl, referrer } = props;
+  const platformName = getConfig().SITE_NAME;
  let message;

  if (referrer === LOGIN_PAGE) {
-    message = formatMessage(messages['login.third.party.auth.account.not.linked'], { currentProvider, platformName });
+    message = intl.formatMessage(messages['login.third.party.auth.account.not.linked'], { currentProvider, platformName });
  } else {
-    message = formatMessage(messages['register.third.party.auth.account.not.linked'], { currentProvider, platformName });
-  }
-
-  if (!currentProvider) {
-    return null;
+    message = intl.formatMessage(messages['register.third.party.auth.account.not.linked'], { currentProvider, platformName });
  }

  return (
-    <>
-      <Alert id="tpa-alert" className={referrer === REGISTER_PAGE ? 'alert-success mt-n2 mb-5' : 'alert-warning mt-n2 mb-5'}>
-        {referrer === REGISTER_PAGE ? (
-          <Alert.Heading>{formatMessage(messages['tpa.alert.heading'])}</Alert.Heading>
-        ) : null}
-        <p>{message}</p>
-      </Alert>
+    <Alert id="tpa-alert" className={referrer === REGISTER_PAGE ? 'alert-success mt-n2' : 'alert-warning mt-n2'}>
      {referrer === REGISTER_PAGE ? (
-        <h4 className="mt-4 mb-4">{formatMessage(messages['registration.using.tpa.form.heading'])}</h4>
+        <Alert.Heading>{intl.formatMessage(messages['tpa.alert.heading'])}</Alert.Heading>
      ) : null}
-    </>
+      <p>{ message }</p>
+    </Alert>
  );
 };

 ThirdPartyAuthAlert.defaultProps = {
-  currentProvider: '',
  referrer: LOGIN_PAGE,
 };

 ThirdPartyAuthAlert.propTypes = {
-  currentProvider: PropTypes.string,
+  currentProvider: PropTypes.string.isRequired,
+  intl: intlShape.isRequired,
  referrer: PropTypes.string,
 };

-export default ThirdPartyAuthAlert;
+export default injectIntl(ThirdPartyAuthAlert);
--- a/src/common-components/UnAuthOnlyRoute.jsx
+++ b/src/common-components/UnAuthOnlyRoute.jsx
@@ -1,17 +1,14 @@
-import { useEffect, useState } from 'react';
-
-import { fetchAuthenticatedUser, getAuthenticatedUser, getSiteConfig } from '@openedx/frontend-base';
-import PropTypes from 'prop-types';
-
-import {
-  DEFAULT_REDIRECT_URL,
-} from '../data/constants';
+import React, { useEffect, useState } from 'react';
+import { Route } from 'react-router-dom';
+import { getConfig } from '@edx/frontend-platform';
+import { fetchAuthenticatedUser, getAuthenticatedUser } from '@edx/frontend-platform/auth';
+import { DEFAULT_REDIRECT_URL } from '../data/constants';

 /**
 * This wrapper redirects the requester to our default redirect url if they are
 * already authenticated.
 */
-const UnAuthOnlyRoute = ({ children }) => {
+const UnAuthOnlyRoute = (props) => {
  const [authUser, setAuthUser] = useState({});
  const [isReady, setIsReady] = useState(false);

@@ -24,18 +21,14 @@ const UnAuthOnlyRoute = ({ children }) => {

  if (isReady) {
    if (authUser && authUser.username) {
-      global.location.href = getSiteConfig().lmsBaseUrl.concat(DEFAULT_REDIRECT_URL);
+      global.location.href = getConfig().LMS_BASE_URL.concat(DEFAULT_REDIRECT_URL);
      return null;
    }

-    return children;
+    return <Route {...props} />;
  }

-  return null;
-};
-
-UnAuthOnlyRoute.propTypes = {
-  children: PropTypes.node.isRequired,
+  return <></>;
 };

 export default UnAuthOnlyRoute;
--- a/src/common-components/components/ThirdPartyAuthContext.test.tsx
+++ b/src/common-components/components/ThirdPartyAuthContext.test.tsx
@@ -1,60 +0,0 @@
-import { render, screen } from '@testing-library/react';
-
-import { ThirdPartyAuthProvider, useThirdPartyAuthContext } from './ThirdPartyAuthContext';
-
-const TestComponent = () => {
-  const {
-    fieldDescriptions,
-    optionalFields,
-    thirdPartyAuthApiStatus,
-    thirdPartyAuthContext,
-  } = useThirdPartyAuthContext();
-
-  return (
-    <div>
-      <div>{fieldDescriptions ? 'FieldDescriptions Available' : 'FieldDescriptions Not Available'}</div>
-      <div>{optionalFields ? 'OptionalFields Available' : 'OptionalFields Not Available'}</div>
-      <div>{thirdPartyAuthApiStatus !== null ? 'AuthApiStatus Available' : 'AuthApiStatus Not Available'}</div>
-      <div>{thirdPartyAuthContext ? 'AuthContext Available' : 'AuthContext Not Available'}</div>
-    </div>
-  );
-};
-
-describe('ThirdPartyAuthContext', () => {
-  it('should render children', () => {
-    render(
-      <ThirdPartyAuthProvider>
-        <div>Test Child</div>
-      </ThirdPartyAuthProvider>,
-    );
-
-    expect(screen.getByText('Test Child')).toBeTruthy();
-  });
-
-  it('should provide all context values to children', () => {
-    render(
-      <ThirdPartyAuthProvider>
-        <TestComponent />
-      </ThirdPartyAuthProvider>,
-    );
-
-    expect(screen.getByText('FieldDescriptions Available')).toBeTruthy();
-    expect(screen.getByText('OptionalFields Available')).toBeTruthy();
-    expect(screen.getByText('AuthApiStatus Not Available')).toBeTruthy(); // Initially null
-    expect(screen.getByText('AuthContext Available')).toBeTruthy();
-  });
-
-  it('should render multiple children', () => {
-    render(
-      <ThirdPartyAuthProvider>
-        <div>First Child</div>
-        <div>Second Child</div>
-        <div>Third Child</div>
-      </ThirdPartyAuthProvider>,
-    );
-
-    expect(screen.getByText('First Child')).toBeTruthy();
-    expect(screen.getByText('Second Child')).toBeTruthy();
-    expect(screen.getByText('Third Child')).toBeTruthy();
-  });
-});
--- a/src/common-components/components/ThirdPartyAuthContext.tsx
+++ b/src/common-components/components/ThirdPartyAuthContext.tsx
@@ -1,133 +0,0 @@
-import {
-  createContext, FC, ReactNode, useCallback, useContext, useMemo, useState,
-} from 'react';
-
-import { COMPLETE_STATE, FAILURE_STATE, PENDING_STATE } from '../../data/constants';
-
-interface ThirdPartyAuthContextType {
-  fieldDescriptions: any,
-  optionalFields: {
-    fields: any,
-    extended_profile: any[],
-  },
-  thirdPartyAuthApiStatus: string | null,
-  thirdPartyAuthContext: {
-    platformName: string | null,
-    autoSubmitRegForm: boolean,
-    currentProvider: string | null,
-    finishAuthUrl: string | null,
-    countryCode: string | null,
-    providers: any[],
-    secondaryProviders: any[],
-    pipelineUserDetails: any | null,
-    errorMessage: string | null,
-    welcomePageRedirectUrl: string | null,
-  },
-  setThirdPartyAuthContextBegin: () => void,
-  setThirdPartyAuthContextSuccess: (fieldDescData: any, optionalFieldsData: any, contextData: any) => void,
-  setThirdPartyAuthContextFailure: () => void,
-  clearThirdPartyAuthErrorMessage: () => void,
-}
-
-const ThirdPartyAuthContext = createContext<ThirdPartyAuthContextType | undefined>(undefined);
-
-interface ThirdPartyAuthProviderProps {
-  children: ReactNode,
-}
-
-export const ThirdPartyAuthProvider: FC<ThirdPartyAuthProviderProps> = ({ children }) => {
-  const [fieldDescriptions, setFieldDescriptions] = useState({});
-  const [optionalFields, setOptionalFields] = useState({
-    fields: {},
-    extended_profile: [],
-  });
-  const [thirdPartyAuthApiStatus, setThirdPartyAuthApiStatus] = useState<string | null>(null);
-  const [thirdPartyAuthContext, setThirdPartyAuthContext] = useState({
-    platformName: null,
-    autoSubmitRegForm: false,
-    currentProvider: null,
-    finishAuthUrl: null,
-    countryCode: null,
-    providers: [],
-    secondaryProviders: [],
-    pipelineUserDetails: null,
-    errorMessage: null,
-    welcomePageRedirectUrl: null,
-  });
-
-  // Function to handle begin state - mirrors THIRD_PARTY_AUTH_CONTEXT.BEGIN
-  const setThirdPartyAuthContextBegin = useCallback(() => {
-    setThirdPartyAuthApiStatus(PENDING_STATE);
-  }, []);
-
-  // Function to handle success - mirrors THIRD_PARTY_AUTH_CONTEXT.SUCCESS
-  const setThirdPartyAuthContextSuccess = useCallback((fieldDescData, optionalFieldsData, contextData) => {
-    setFieldDescriptions(fieldDescData?.fields || {});
-    setOptionalFields(optionalFieldsData || { fields: {}, extended_profile: [] });
-    setThirdPartyAuthContext(contextData || {
-      platformName: null,
-      autoSubmitRegForm: false,
-      currentProvider: null,
-      finishAuthUrl: null,
-      countryCode: null,
-      providers: [],
-      secondaryProviders: [],
-      pipelineUserDetails: null,
-      errorMessage: null,
-      welcomePageRedirectUrl: null,
-    });
-    setThirdPartyAuthApiStatus(COMPLETE_STATE);
-  }, []);
-
-  // Function to handle failure - mirrors THIRD_PARTY_AUTH_CONTEXT.FAILURE
-  const setThirdPartyAuthContextFailure = useCallback(() => {
-    setThirdPartyAuthApiStatus(FAILURE_STATE);
-    setThirdPartyAuthContext(prev => ({
-      ...prev,
-      errorMessage: null,
-    }));
-  }, []);
-
-  // Function to clear error message - mirrors THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG
-  const clearThirdPartyAuthErrorMessage = useCallback(() => {
-    setThirdPartyAuthApiStatus(PENDING_STATE);
-    setThirdPartyAuthContext(prev => ({
-      ...prev,
-      errorMessage: null,
-    }));
-  }, []);
-
-  const value = useMemo(() => ({
-    fieldDescriptions,
-    optionalFields,
-    thirdPartyAuthApiStatus,
-    thirdPartyAuthContext,
-    setThirdPartyAuthContextBegin,
-    setThirdPartyAuthContextSuccess,
-    setThirdPartyAuthContextFailure,
-    clearThirdPartyAuthErrorMessage,
-  }), [
-    fieldDescriptions,
-    optionalFields,
-    thirdPartyAuthApiStatus,
-    thirdPartyAuthContext,
-    setThirdPartyAuthContextBegin,
-    setThirdPartyAuthContextSuccess,
-    setThirdPartyAuthContextFailure,
-    clearThirdPartyAuthErrorMessage,
-  ]);
-
-  return (
-    <ThirdPartyAuthContext.Provider value={value}>
-      {children}
-    </ThirdPartyAuthContext.Provider>
-  );
-};
-
-export const useThirdPartyAuthContext = (): ThirdPartyAuthContextType => {
-  const context = useContext(ThirdPartyAuthContext);
-  if (context === undefined) {
-    throw new Error('useThirdPartyAuthContext must be used within a ThirdPartyAuthProvider');
-  }
-  return context;
-};
--- a/src/common-components/data/actions.js
+++ b/src/common-components/data/actions.js
@@ -0,0 +1,22 @@
+import { AsyncActionType } from '../../data/utils';
+
+export const THIRD_PARTY_AUTH_CONTEXT = new AsyncActionType('THIRD_PARTY_AUTH', 'GET_THIRD_PARTY_AUTH_CONTEXT');
+
+// Third party auth context
+export const getThirdPartyAuthContext = (urlParams) => ({
+  type: THIRD_PARTY_AUTH_CONTEXT.BASE,
+  payload: { urlParams },
+});
+
+export const getThirdPartyAuthContextBegin = () => ({
+  type: THIRD_PARTY_AUTH_CONTEXT.BEGIN,
+});
+
+export const getThirdPartyAuthContextSuccess = (thirdPartyAuthContext) => ({
+  type: THIRD_PARTY_AUTH_CONTEXT.SUCCESS,
+  payload: { thirdPartyAuthContext },
+});
+
+export const getThirdPartyAuthContextFailure = () => ({
+  type: THIRD_PARTY_AUTH_CONTEXT.FAILURE,
+});
--- a/src/common-components/data/api.ts
+++ b/src/common-components/data/api.ts
@@ -1,24 +0,0 @@
-import { getAuthenticatedHttpClient, getSiteConfig } from '@openedx/frontend-base';
-
-const getThirdPartyAuthContext = async (urlParams: string) => {
-  const requestConfig = {
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    params: urlParams,
-    isPublic: true,
-  };
-
-  const { data } = await getAuthenticatedHttpClient()
-    .get(
-      `${getSiteConfig().lmsBaseUrl}/api/mfe_context`,
-      requestConfig,
-    );
-  return {
-    fieldDescriptions: data.registrationFields || {},
-    optionalFields: data.optionalFields || {},
-    thirdPartyAuthContext: data.contextData || {},
-  };
-};
-
-export {
-  getThirdPartyAuthContext,
-};
--- a/src/common-components/data/apiHook.ts
+++ b/src/common-components/data/apiHook.ts
@@ -1,19 +0,0 @@
-import { useQuery } from '@tanstack/react-query';
-
-import { getThirdPartyAuthContext } from './api';
-import { ThirdPartyAuthQueryKeys } from './queryKeys';
-
-// Error constants
-export const THIRD_PARTY_AUTH_ERROR = 'third-party-auth-error';
-
-const useThirdPartyAuthHook = (pageId, payload, { enabled = true } = {}) => useQuery({
-  queryKey: ThirdPartyAuthQueryKeys.byPage(pageId, payload),
-  queryFn: () => getThirdPartyAuthContext(payload),
-  retry: false,
-  staleTime: 5 * 60 * 1000, // 5 minutes — TPA context is effectively static per session
-  enabled,
-});
-
-export {
-  useThirdPartyAuthHook,
-};
--- a/src/common-components/data/queryKeys.ts
+++ b/src/common-components/data/queryKeys.ts
@@ -1,6 +0,0 @@
-import { appId } from '../../constants';
-
-export const ThirdPartyAuthQueryKeys = {
-  all: [appId, 'ThirdPartyAuth'] as const,
-  byPage: (pageId: string, payload?: unknown) => [appId, 'ThirdPartyAuth', pageId, payload] as const,
-};
--- a/src/common-components/data/reducers.js
+++ b/src/common-components/data/reducers.js
@@ -0,0 +1,32 @@
+import { THIRD_PARTY_AUTH_CONTEXT } from './actions';
+
+import { PENDING_STATE, COMPLETE_STATE } from '../../data/constants';
+
+export const defaultState = {
+  thirdPartyAuthApiStatus: null,
+};
+
+const reducer = (state = defaultState, action) => {
+  switch (action.type) {
+    case THIRD_PARTY_AUTH_CONTEXT.BEGIN:
+      return {
+        ...state,
+        thirdPartyAuthApiStatus: PENDING_STATE,
+      };
+    case THIRD_PARTY_AUTH_CONTEXT.SUCCESS:
+      return {
+        ...state,
+        thirdPartyAuthContext: action.payload.thirdPartyAuthContext,
+        thirdPartyAuthApiStatus: COMPLETE_STATE,
+      };
+    case THIRD_PARTY_AUTH_CONTEXT.FAILURE:
+      return {
+        ...state,
+        thirdPartyAuthApiStatus: COMPLETE_STATE,
+      };
+    default:
+      return state;
+  }
+};
+
+export default reducer;
--- a/src/common-components/data/sagas.js
+++ b/src/common-components/data/sagas.js
@@ -0,0 +1,34 @@
+import { call, put, takeEvery } from 'redux-saga/effects';
+
+import { logError } from '@edx/frontend-platform/logging';
+
+// Actions
+import {
+  THIRD_PARTY_AUTH_CONTEXT,
+  getThirdPartyAuthContextBegin,
+  getThirdPartyAuthContextSuccess,
+  getThirdPartyAuthContextFailure,
+} from './actions';
+
+// Services
+import {
+  getThirdPartyAuthContext,
+} from './service';
+
+export function* fetchThirdPartyAuthContext(action) {
+  try {
+    yield put(getThirdPartyAuthContextBegin());
+    const { thirdPartyAuthContext } = yield call(getThirdPartyAuthContext, action.payload.urlParams);
+
+    yield put(getThirdPartyAuthContextSuccess(
+      thirdPartyAuthContext,
+    ));
+  } catch (e) {
+    yield put(getThirdPartyAuthContextFailure());
+    logError(e);
+  }
+}
+
+export default function* saga() {
+  yield takeEvery(THIRD_PARTY_AUTH_CONTEXT.BASE, fetchThirdPartyAuthContext);
+}
--- a/Show More
+++ b/Show More