fix: update username suggestions placement (#1037)

Co-authored-by: Shahbaz Shabbir <shbzshbr@gmail.com>

.env

@@ -13,18 +13,24 @@ 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=''
-USER_SURVEY_COOKIE_NAME=null
-COOKIE_DOMAIN=null
-WELCOME_PAGE_SUPPORT_LINK=null
 INFO_EMAIL=''
-DISABLE_ENTERPRISE_LOGIN=''
+# ***** Cookies *****
 REGISTER_CONVERSION_COOKIE_NAME=null
-ENABLE_PROGRESSIVE_PROFILING=''
+USER_SURVEY_COOKIE_NAME=null
+# ***** Links *****
+LOGIN_ISSUE_SUPPORT_LINK=''
+AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK=null
+# ***** Features flags *****
+DISABLE_ENTERPRISE_LOGIN=''
+ENABLE_COOKIE_POLICY_BANNER=''
+ENABLE_DYNAMIC_REGISTRATION_FIELDS=''
+ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN=''
+ENABLE_PERSONALIZED_RECOMMENDATIONS=''
 MARKETING_EMAILS_OPT_IN=''
-ENABLE_COPPA_COMPLIANCE=''
-SHOW_DYNAMIC_PROFILING_PAGE=''
+SHOW_CONFIGURABLE_EDX_FIELDS=''
+# ***** Zendesk related keys *****
 ZENDESK_KEY=''
 ZENDESK_LOGO_URL=''
+# ***** Miscellaneous *****
+APP_ID=''
+MFE_CONFIG_API_URL=''

.env.development

@@ -18,18 +18,20 @@ ORDER_HISTORY_URL='http://localhost:1996/orders'
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
 SEGMENT_KEY=''
 SITE_NAME='Your Platform Name Here'
-USER_INFO_COOKIE_NAME='edx-user-info'
-AUTHN_MINIMAL_HEADER=true
-LOGIN_ISSUE_SUPPORT_LINK='/login-issue-support-url'
-TOS_AND_HONOR_CODE='http://localhost:18000/honor'
-PRIVACY_POLICY='http://localhost:18000/privacy'
-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=''
+INFO_EMAIL='info@example.com'
+# ***** Cookies *****
 REGISTER_CONVERSION_COOKIE_NAME='openedx-user-register-conversion'
-ENABLE_COPPA_COMPLIANCE=''
-MARKETING_EMAILS_OPT_IN=''
+SESSION_COOKIE_DOMAIN='localhost'
+USER_INFO_COOKIE_NAME='edx-user-info'
+USER_SURVEY_COOKIE_NAME='openedx-user-survey-type'
+# ***** Links *****
+LOGIN_ISSUE_SUPPORT_LINK='http://localhost:18000/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'
+# ***** Miscellaneous *****
+APP_ID=''
+MFE_CONFIG_API_URL=''
 ZENDESK_KEY=''
 ZENDESK_LOGO_URL=''

.env.private.example

@@ -0,0 +1,5 @@
+# Copy these to the .env.private to enable edX specific functionality on local system
+ENABLE_COOKIE_POLICY_BANNER='true'
+ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN='true'
+MARKETING_EMAILS_OPT_IN='true'
+SHOW_CONFIGURABLE_EDX_FIELDS='true'

.env.test

@@ -16,13 +16,7 @@ ORDER_HISTORY_URL='http://localhost:1996/orders'
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
 SEGMENT_KEY=''
 SITE_NAME='Your Platform Name Here'
-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'
-MARKETING_EMAILS_OPT_IN=''
-ENABLE_COPPA_COMPLIANCE=''
-ZENDESK_KEY=''
-ZENDESK_LOGO_URL=''
+APP_ID=''
+MFE_CONFIG_API_URL=''

.eslintignore

@@ -1,5 +1,6 @@
 coverage/*
 dist/
+docs
 node_modules/
 __mocks__/
 __snapshots__/

.eslintrc.js

@@ -1,16 +1,17 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
 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 
+    // to fail for no apparent reason since upgrading
     // @edx/frontend-build from v3 to v5:
     // - TypeError: Cannot read property 'range' of null
-    'indent': [
+    indent: [
       'error',
       2,
-      { 'ignoredNodes': ['TemplateLiteral', 'SwitchCase'] }
+      { ignoredNodes: ['TemplateLiteral', 'SwitchCase'] },
     ],
     'template-curly-spacing': 'off',
     'jsx-a11y/label-has-associated-control': ['error', {
@@ -18,7 +19,36 @@ module.exports = createConfig('eslint', {
       labelAttributes: [],
       controlComponents: [],
       assert: 'htmlFor',
-      depth: 25
+      depth: 25,
     }],
+    'sort-imports': ['error', { ignoreCase: true, ignoreDeclarationSort: true }],
+    'import/order': [
+      'error',
+      {
+        groups: [
+          'builtin',
+          'external',
+          'internal',
+          ['sibling', 'parent'],
+          'index',
+        ],
+        pathGroups: [
+          {
+            pattern: '@(react|react-dom|react-redux)',
+            group: 'external',
+            position: 'before',
+          },
+        ],
+        pathGroupsExcludedImportTypes: ['react'],
+        'newlines-between': 'always',
+        alphabetize: {
+          order: 'asc',
+          caseInsensitive: true,
+        },
+      },
+    ],
+    'function-paren-newline': 'off',
+    'no-import-assign': 'off',
+    'react/no-unstable-nested-components': 'off',
   },
 });

.github/pull_request_template.md

@@ -0,0 +1,29 @@
+### 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/vanguards** to do it. 
+* [ ] 🎉 🙌 Celebrate! Thanks for your contribution.

.github/workflows/add-depr-ticket-to-depr-board.yml

@@ -16,4 +16,4 @@ jobs:
     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 }}
+      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}

.github/workflows/add-remove-label-on-comment.yml

@@ -0,0 +1,20 @@
+# 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
+

.github/workflows/autoupdate.yml

@@ -0,0 +1,21 @@
+name: autoupdate
+on:
+  push:
+    branches:
+      - master
+jobs:
+  autoupdate:
+    name: autoupdate
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: docker://chinthakagodawita/autoupdate-action:v1
+        env:
+          GITHUB_TOKEN: "${{ secrets.CC_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"

.github/workflows/ci.yml

@@ -11,17 +11,16 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        node: [16]
+
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
-
+      uses: actions/checkout@v3
+    - name: Setup Nodejs Env
+      run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
     - name: Setup Nodejs
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
-        node-version: ${{ matrix.node }}
+        node-version: ${{ env.NODE_VER }}
 
     - name: Install Dependencies
       run: npm ci
@@ -41,8 +40,5 @@ jobs:
     - name: Build
       run: npm run build
 
-    - name: Verify Es5
-      run: npm run is-es5
-
     - name: Run Code Coverage
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v3

.github/workflows/commitlint.yml

@@ -7,4 +7,4 @@ on:
 
 jobs:
   commitlint:
-    uses: edx/.github/.github/workflows/commitlint.yml@master
+    uses: openedx/.github/.github/workflows/commitlint.yml@master

.github/workflows/lockfileversion-check.yml

@@ -10,4 +10,4 @@ on:
 
 jobs:
   version-check:
-    uses: edx/.github/.github/workflows/lockfileversion-check.yml@master
+    uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master

.github/workflows/self-assign-issue.yml

@@ -0,0 +1,12 @@
+# 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

.gitignore

@@ -5,6 +5,7 @@ node_modules
 npm-debug.log
 coverage
 module.config.js
+.env.private
 
 dist/
 src/i18n/transifex_input.json

.nvmrc

@@ -0,0 +1 @@
+18

CODEOWNERS

@@ -1,2 +1,2 @@
 # The following users are the owners of all frontend-app-authn files
-*       @edx/vanguards
+*       @openedx/vanguards

Makefile

@@ -44,7 +44,7 @@ push_translations:
 
 # Pulls translations from Transifex.
 pull_translations:
-	tx pull -f --mode reviewed --languages=$(transifex_langs)
+	tx pull -t -f --mode reviewed --languages=$(transifex_langs)
 
 # This target is used by CI.
 validate-no-uncommitted-package-lock-changes:

README.rst

@@ -1,48 +1,193 @@
-|Build Status| |Codecov| |license|
+|Build Status| |ci-badge| |Codecov| |semantic-release|
 
 frontend-app-authn
-=================================
+====================
+
+Please tag **@openedx/vanguards** on any PRs or issues.  Thanks!
+
+Introduction
+------------
 
 This is a micro-frontend application responsible for the login, registration and password reset functionality.
 
-Development
------------
+**What is the domain of this MFE?**
 
-Start Devstack
-^^^^^^^^^^^^^^
+- Register page
 
-To use this application `devstack <https://github.com/edx/devstack>`__ must be running.
+- Login page
 
--  Start devstack
+- Forgot password page
 
-Start the development server
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- Reset password page
 
-In this project, install requirements and start the development server by running:
+- Progressive profiling page
 
-.. code:: bash
 
-   npm install
-   npm start # The server will run on port 1999
+Installation
+------------
 
-Once the dev server is up visit http://localhost:1999/login.
+This MFE is bundled with `Devstack <https://github.com/openedx/devstack>`_, see the `Getting Started <https://github.com/openedx/devstack#getting-started>`_ section for setup instructions.
 
-Configuration and Deployment
-----------------------------
+1. Install Devstack using the `Getting Started <https://github.com/openedx/devstack#getting-started>`_ instructions.
 
-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:
+2. Start up LMS, if it's not already started.
 
-.. code:: bash
+4. Within this project (frontend-app-authn), install requirements and start the development server:
 
-   NODE_ENV=development ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload' npm run build
+   .. code-block::
 
+      npm install
+      npm start # The server will run on port 1999
+
+5. Once the dev server is up, visit http://localhost:1999 to access the MFE
+
+   .. image:: ./docs/images/frontend-app-authn-localhost-preview.png
+
+   **Note:** Follow `Enable social auth locally <docs/how_tos/enable_social_auth.rst>`_ for enabling Social Sign-on Buttons (SSO) locally
+
+Environment Variables/Setup Notes
+---------------------------------
+
+This MFE is configured via environment variables supplied at build time.  All micro-frontends have a shared set of required environment variables, as documented in the Open edX Developer Guide under `Required Environment Variables <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`__.
+
+The authentication micro-frontend also requires the following additional variable:
+
+.. 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_COOKIE_POLICY_BANNER``
+     - Enables support for displaying the cookies acceptance banner.
+     - ``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)
+
+   * - ``SHOW_CONFIGURABLE_EDX_FIELDS``
+     - For edX, country and honor code fields are required by default. This flag enables edX specific required fields.
+     - ``true`` | ``''`` (empty strings are falsy)    
 
 For more information see the document: `Micro-frontend applications in Open
-edX <https://github.com/edx/edx-developer-docs/blob/5191e800bf16cf42f25c58c58f983bdaf7f9305d/docs/micro-frontends-in-open-edx.rst>`__.
+edX <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`__.
+
+How To Contribute
+------------
+Contributions are very welcome, and strongly encouraged! We've
+put together `some documentation that describes our contribution process <https://edx.readthedocs.org/projects/edx-developer-guide/en/latest/process/index.html>`_.
+
+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.
+
+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/vanguards>`_. 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@edx.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.
+
+==============================
 
 .. |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
-.. |license| image:: https://img.shields.io/npm/l/@edx/frontend-app-authn.svg
-   :target: @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

catalog-info.yaml

@@ -0,0 +1,18 @@
+# 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: ""
+spec:
+  owner: group:vanguards
+  type: 'service'
+  lifecycle: 'production'

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
-      /constants.js
+      /mockedData.js
       /reducers.js
       /sagas.js
       /selectors.js

docs/how_tos/enable_social_auth.rst

@@ -0,0 +1,14 @@
+Enable Social Auth Locally
+--------------------------
+
+Please follow the steps below to enable social auth (SSO) locally.
+
+1. Follow `Enabling Third Party Authentication <https://edx.readthedocs.io/projects/edx-installing-configuring-and-running/en/latest/configuration/tpa/index.html>`_ for backend configuration.
+
+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.

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/edx/frontend-platform/blob/master/docs/how_tos/i18n.rst
+This document has moved to the frontend-platform repo: https://github.com/openedx/frontend-platform/blob/master/docs/how_tos/i18n.rst

jest.config.js

@@ -10,4 +10,5 @@ module.exports = createConfig('jest', {
     'src/index.jsx',
     'MainApp.jsx',
   ],
+  testEnvironment: 'jsdom',
 });

openedx.yaml

@@ -3,6 +3,6 @@
 
 nick: Authn MFE
 oeps: {}
-owner: edx/vanguards
+owner: openedx/vanguards
 openedx-release:
   ref: master

package.json

@@ -4,16 +4,14 @@
   "description": "Frontend application template",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/edx/frontend-app-authn.git"
+    "url": "git+https://github.com/openedx/frontend-app-authn.git"
   },
   "browserslist": [
-    "last 2 versions",
-    "ie 11"
+    "extends @edx/browserslist-config"
   ],
   "scripts": {
     "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",
@@ -26,30 +24,31 @@
   },
   "author": "edX",
   "license": "AGPL-3.0",
-  "homepage": "https://github.com/edx/frontend-app-authn#readme",
+  "homepage": "https://github.com/openedx/frontend-app-authn#readme",
   "publishConfig": {
     "access": "public"
   },
   "bugs": {
-    "url": "https://github.com/edx/frontend-app-authn/issues"
+    "url": "https://github.com/openedx/frontend-app-authn/issues"
   },
   "dependencies": {
-    "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
-    "@edx/frontend-component-cookie-policy-banner": "2.1.14",
-    "@edx/frontend-platform": "1.15.5",
-    "@edx/paragon": "19.10.2",
-    "@fortawesome/fontawesome-svg-core": "1.2.36",
-    "@fortawesome/free-brands-svg-icons": "5.15.4",
-    "@fortawesome/free-regular-svg-icons": "5.15.4",
-    "@fortawesome/free-solid-svg-icons": "5.15.4",
-    "@fortawesome/react-fontawesome": "0.1.18",
-    "classnames": "2.3.1",
-    "clipboard": "2.0.10",
-    "core-js": "3.21.1",
+    "@edx/brand": "npm:@edx/brand-openedx@1.2.0",
+    "@edx/frontend-component-cookie-policy-banner": "2.2.2",
+    "@edx/frontend-platform": "4.2.0",
+    "@edx/paragon": "20.30.1",
+    "@fortawesome/fontawesome-svg-core": "6.2.1",
+    "@fortawesome/free-brands-svg-icons": "6.2.1",
+    "@fortawesome/free-regular-svg-icons": "6.2.1",
+    "@fortawesome/free-solid-svg-icons": "6.2.1",
+    "@fortawesome/react-fontawesome": "0.2.0",
+    "@optimizely/react-sdk": "^2.9.1",
+    "@redux-devtools/extension": "3.2.5",
+    "algoliasearch": "^4.14.3",
+    "classnames": "2.3.2",
+    "core-js": "3.30.0",
     "extract-react-intl-messages": "4.1.1",
-    "fastest-levenshtein": "1.0.12",
-    "form-urlencoded": "4.2.1",
-    "formik": "2.2.9",
+    "fastest-levenshtein": "1.0.16",
+    "form-urlencoded": "6.1.0",
     "lodash.camelcase": "4.3.0",
     "lodash.snakecase": "4.1.1",
     "prop-types": "15.8.1",
@@ -57,36 +56,36 @@
     "react": "16.14.0",
     "react-dom": "16.14.0",
     "react-helmet": "6.1.0",
-    "react-loading-skeleton": "2.2.0",
-    "react-onclickoutside": "6.12.1",
-    "react-redux": "7.2.6",
+    "react-loading-skeleton": "3.2.0",
+    "react-onclickoutside": "6.13.0",
+    "react-redux": "7.2.9",
     "react-responsive": "8.2.0",
-    "react-router": "5.2.1",
-    "react-router-dom": "5.3.0",
-    "redux": "4.1.2",
-    "@redux-devtools/extension": "3.2.2",
+    "react-router": "5.3.4",
+    "react-router-dom": "5.3.4",
+    "react-zendesk": "^0.1.13",
+    "redux": "4.2.0",
     "redux-logger": "3.0.6",
     "redux-mock-store": "1.5.4",
-    "redux-saga": "1.1.3",
-    "redux-thunk": "2.4.1",
-    "regenerator-runtime": "0.13.9",
-    "reselect": "4.1.5",
-    "sanitize-html": "2.7.0",
+    "redux-saga": "1.2.3",
+    "redux-thunk": "2.4.2",
+    "regenerator-runtime": "0.13.11",
+    "reselect": "4.1.7",
+    "sanitize-html": "2.10.0",
     "semver-regex": "3.1.4",
     "universal-cookie": "4.0.4"
   },
   "devDependencies": {
-    "@edx/frontend-build": "9.1.4",
-    "@edx/reactifex": "1.0.3",
-    "babel-plugin-formatjs": "10.3.18",
-    "codecov": "3.8.2",
+    "@edx/browserslist-config": "^1.1.1",
+    "@edx/frontend-build": "12.8.6",
+    "@edx/reactifex": "1.1.0",
+    "babel-plugin-formatjs": "10.4.0",
     "enzyme": "3.11.0",
-    "enzyme-adapter-react-16": "1.15.6",
-    "es-check": "6.2.1",
-    "glob": "7.2.0",
+    "enzyme-adapter-react-16": "1.15.7",
+    "eslint-plugin-import": "2.26.0",
+    "glob": "7.2.3",
     "history": "5.3.0",
     "husky": "7.0.4",
-    "jest": "27.5.1",
+    "jest": "29.5.0",
     "react-test-renderer": "16.14.0"
   }
 }

public/index.html

@@ -1,10 +1,9 @@
 <!doctype html>
 <html lang="en-us">
   <head>
-      <title>Authn | edX</title>
+      <title>Authn | <%= process.env.SITE_NAME %></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 %>"
@@ -14,58 +13,6 @@
           src="<%= process.env.MARKETING_SITE_BASE_URL %>/optimizelyjs/<%= process.env.OPTIMIZELY_PROJECT_ID %>.js"
         ></script>
       <% } %>
-      <% if (process.env.ZENDESK_KEY) { %>
-        <script
-          id="ze-snippet"
-          src="https://static.zdassets.com/ekr/snippet.js?key=<%= process.env.ZENDESK_KEY %>"
-        >
-        </script>
-        <script type="text/javascript">
-          window.zESettings = {
-            cookies: true,
-            webWidget: {
-              contactOptions: {
-                enabled: false,
-              },
-              chat: {
-                suppress: false,
-              },
-              contactForm: {
-                ticketForms: [
-                  {
-                    id: 360003368814,
-                    subject: false,
-                    fields: [
-                      {
-                        id: 'description',
-                        prefill: {
-                          '*': '',
-                        },
-                      },
-                    ],
-                  },
-                ],
-                selectTicketForm: {
-                  '*': 'Please choose your request type:',
-                },
-                attachments: true,
-              },
-              helpCenter: {
-                originalArticleButton: true,
-              },
-              answerBot: {
-                suppress: false,
-                contactOnlyAfterQuery: true,
-                title: { '*': 'edX Support' },
-                avatar: {
-                  url: '<%= process.env.ZENDESK_LOGO_URL %>',
-                  name: { '*': 'edX Support' },
-                },
-              },
-            },
-          };
-        </script>
-      <% } %>
   </head>
   <body>
     <div id="root"></div>

src/MainApp.jsx

@@ -1,26 +1,38 @@
 import React from 'react';
-import { Redirect, Route, Switch } from 'react-router-dom';
 
 import { getConfig } from '@edx/frontend-platform';
 import { AppProvider } from '@edx/frontend-platform/react';
+import { Helmet } from 'react-helmet';
+import { Redirect, Route, Switch } from 'react-router-dom';
 
 import {
-  UnAuthOnlyRoute, registerIcons, NotFoundPage, Logistration,
+  Logistration, NotFoundPage, registerIcons, UnAuthOnlyRoute, Zendesk,
 } 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 {
+  AUTHN_PROGRESSIVE_PROFILING,
+  LOGIN_PAGE,
+  PAGE_NOT_FOUND,
+  PASSWORD_RESET_CONFIRM,
+  RECOMMENDATIONS,
+  REGISTER_PAGE,
+  RESET_PAGE,
+} from './data/constants';
 import { updatePathWithQueryParams } from './data/utils';
-import ForgotPasswordPage from './forgot-password';
-import ResetPasswordPage from './reset-password';
-import WelcomePage, { ProgressiveProfiling } from './welcome';
+import { ForgotPasswordPage } from './forgot-password';
+import { ProgressiveProfiling } from './progressive-profiling';
+import { RecommendationsPage } from './recommendations';
+import { ResetPasswordPage } from './reset-password';
 import './index.scss';
 
 registerIcons();
 
 const MainApp = () => (
   <AppProvider store={configureStore()}>
+    <Helmet>
+      <link rel="shortcut icon" href={getConfig().FAVICON_URL} type="image/x-icon" />
+    </Helmet>
+    {getConfig().ZENDESK_KEY && <Zendesk />}
     <Switch>
       <Route exact path="/">
         <Redirect to={updatePathWithQueryParams(REGISTER_PAGE)} />
@@ -29,11 +41,8 @@ const MainApp = () => (
       <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={(getConfig().SHOW_DYNAMIC_PROFILING_PAGE) ? ProgressiveProfiling : WelcomePage}
-      />
+      <Route exact path={AUTHN_PROGRESSIVE_PROFILING} component={ProgressiveProfiling} />
+      <Route exact path={RECOMMENDATIONS} component={RecommendationsPage} />
       <Route path={PAGE_NOT_FOUND} component={NotFoundPage} />
       <Route path="*">
         <Redirect to={PAGE_NOT_FOUND} />

src/base-component/AuthExtraLargeLayout.jsx

@@ -1,97 +0,0 @@
-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={getConfig().SITE_NAME} 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);

src/base-component/AuthLargeLayout.jsx

@@ -0,0 +1,49 @@
+import React from 'react';
+
+import { getConfig } from '@edx/frontend-platform';
+import { useIntl } from '@edx/frontend-platform/i18n';
+import { Hyperlink, Image } from '@edx/paragon';
+import PropTypes from 'prop-types';
+
+import messages from './messages';
+
+const AuthLargeLayout = ({ username }) => {
+  const { formatMessage } = useIntl();
+
+  return (
+    <div className="w-50 d-flex">
+      <div className="col-md-10 bg-light-200 p-0">
+        <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
+          <Image className="logo position-absolute" alt={getConfig().SITE_NAME} src={getConfig().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: getConfig().SITE_NAME, username })}
+            </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>
+  );
+};
+
+AuthLargeLayout.propTypes = {
+  username: PropTypes.string.isRequired,
+};
+
+export default AuthLargeLayout;

src/base-component/AuthMediumLayout.jsx

@@ -1,69 +1,52 @@
 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 { useIntl } from '@edx/frontend-platform/i18n';
+import { Hyperlink, Image } from '@edx/paragon';
+import PropTypes from 'prop-types';
 
 import messages from './messages';
 
-const AuthMediumLayout = (props) => {
-  const { intl, username } = props;
+const AuthMediumLayout = ({ username }) => {
+  const { formatMessage } = useIntl();
 
   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={getConfig().SITE_NAME} 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 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={getConfig().MARKETING_SITE_BASE_URL}>
+            <Image className="logo" alt={getConfig().SITE_NAME} src={getConfig().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: getConfig().SITE_NAME, username })}
+              </h1>
+              <h2 className="display-1">
+                {formatMessage(messages['complete.your.profile.1'])}
+                <div className="text-accent-a">
+                  {formatMessage(messages['complete.your.profile.2'])}
                 </div>
-              </Col>
-            </Row>
+              </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>
-      <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);
+export default AuthMediumLayout;

src/base-component/AuthSmallLayout.jsx

@@ -1,68 +1,41 @@
 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 { useIntl } from '@edx/frontend-platform/i18n';
+import { Hyperlink, Image } from '@edx/paragon';
+import PropTypes from 'prop-types';
 
 import messages from './messages';
 
-const AuthSmallLayout = (props) => {
-  const { intl, username, variant } = props;
+const AuthSmallLayout = ({ username }) => {
+  const { formatMessage } = useIntl();
 
   return (
-    <div className="small-screen-header-light">
+    <div className="min-vw-100 bg-light-200">
+      <div className="col-md-12 small-screen-top-stripe" />
       <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
-        <Image alt={getConfig().SITE_NAME} className="logo" src={getConfig().LOGO_WHITE_URL} />
+        <Image className="logo-small" alt={getConfig().SITE_NAME} src={getConfig().LOGO_URL} />
       </Hyperlink>
-      <div className={classNames('d-flex mt-3', { 'pl-6': variant === 'sm' })}>
+      <div className="d-flex align-items-center mb-3 mt-3 mr-3">
+        <div className="small-yellow-line mt-4.5" />
         <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>
+          <h1 className="h5 data-hj-suppress">
+            {formatMessage(messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, username })}
+          </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>
   );
 };
 
-AuthSmallLayout.defaultProps = {
-  variant: 'sm',
-};
-
 AuthSmallLayout.propTypes = {
-  intl: intlShape.isRequired,
   username: PropTypes.string.isRequired,
-  variant: PropTypes.oneOf(['sm', 'xs']),
 };
 
-export default injectIntl(AuthSmallLayout);
+export default AuthSmallLayout;

src/base-component/BaseComponent.jsx

@@ -1,79 +1,38 @@
-import React, { useState, useEffect } from 'react';
+import React from 'react';
+
+import CookiePolicyBanner from '@edx/frontend-component-cookie-policy-banner';
+import { getConfig } from '@edx/frontend-platform';
+import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
+import { getLocale } from '@edx/frontend-platform/i18n';
+import { breakpoints } from '@edx/paragon';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
-
-import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
 import MediaQuery from 'react-responsive';
-import { breakpoints } from '@edx/paragon';
-import CookiePolicyBanner from '@edx/frontend-component-cookie-policy-banner';
-import { getLocale } from '@edx/frontend-platform/i18n';
 
+import AuthLargeLayout from './AuthLargeLayout';
+import AuthMediumLayout from './AuthMediumLayout';
+import AuthSmallLayout from './AuthSmallLayout';
 import LargeLayout from './LargeLayout';
 import MediumLayout from './MediumLayout';
 import SmallLayout from './SmallLayout';
 
-import AuthExtraLargeLayout from './AuthExtraLargeLayout';
-import AuthMediumLayout from './AuthMediumLayout';
-import AuthSmallLayout from './AuthSmallLayout';
-import DiscountExperimentBanner from './DiscountBanner';
-
-const BaseComponent = ({ children, isRegistrationPage, showWelcomeBanner }) => {
+const BaseComponent = ({ children, showWelcomeBanner }) => {
   const authenticatedUser = showWelcomeBanner ? getAuthenticatedUser() : null;
-  const [optimizelyExperimentName, setOptimizelyExperimentName] = useState('');
-
-  useEffect(() => {
-    const { experimentName } = window;
-
-    if (experimentName) {
-      setOptimizelyExperimentName(experimentName);
-    }
-  });
+  const username = authenticatedUser ? authenticatedUser.username : null;
 
   return (
     <>
-      {isRegistrationPage && optimizelyExperimentName === 'variation2' ? <DiscountExperimentBanner /> : null}
-      <CookiePolicyBanner languageCode={getLocale()} />
-      <MediaQuery minWidth={breakpoints.extraLarge.minWidth} maxWidth={breakpoints.extraLarge.maxWidth}>
-        <div className="col-md-12 extra-large-screen-top-stripe" />
-      </MediaQuery>
-      <MediaQuery minWidth={breakpoints.extraExtraLarge.minWidth} maxWidth={breakpoints.extraExtraLarge.maxWidth}>
-        <div className="col-md-12 extra-large-screen-top-stripe" />
-      </MediaQuery>
-
-      <div className={classNames('layout', { authenticated: authenticatedUser })}>
-        <MediaQuery maxWidth={breakpoints.extraSmall.maxWidth}>
-          <div className="col-md-12 small-screen-top-stripe" />
-          {authenticatedUser ? <AuthSmallLayout variant="xs" username={authenticatedUser.username} /> : (
-            <SmallLayout experimentName={optimizelyExperimentName} isRegistrationPage={isRegistrationPage} />
-          )}
+      {getConfig().ENABLE_COOKIE_POLICY_BANNER ? <CookiePolicyBanner languageCode={getLocale()} /> : null}
+      <div className="col-md-12 extra-large-screen-top-stripe" />
+      <div className="layout">
+        <MediaQuery maxWidth={breakpoints.small.maxWidth - 1}>
+          {authenticatedUser ? <AuthSmallLayout username={username} /> : <SmallLayout />}
         </MediaQuery>
-        <MediaQuery minWidth={breakpoints.small.minWidth} maxWidth={breakpoints.small.maxWidth}>
-          <div className="col-md-12 small-screen-top-stripe" />
-          {authenticatedUser ? <AuthSmallLayout username={authenticatedUser.username} /> : (
-            <SmallLayout experimentName={optimizelyExperimentName} isRegistrationPage={isRegistrationPage} />
-          )}
+        <MediaQuery minWidth={breakpoints.medium.minWidth} maxWidth={breakpoints.large.maxWidth - 1}>
+          {authenticatedUser ? <AuthMediumLayout username={username} /> : <MediumLayout />}
         </MediaQuery>
-        <MediaQuery minWidth={breakpoints.medium.minWidth} maxWidth={breakpoints.medium.maxWidth}>
-          <div className="w-100 medium-screen-top-stripe" />
-          {authenticatedUser ? <AuthMediumLayout username={authenticatedUser.username} /> : (
-            <MediumLayout experimentName={optimizelyExperimentName} isRegistrationPage={isRegistrationPage} />
-          )}
-        </MediaQuery>
-        <MediaQuery minWidth={breakpoints.large.minWidth} maxWidth={breakpoints.large.maxWidth}>
-          <div className="w-100 large-screen-top-stripe" />
-          {authenticatedUser ? <AuthMediumLayout username={authenticatedUser.username} /> : (
-            <MediumLayout experimentName={optimizelyExperimentName} isRegistrationPage={isRegistrationPage} />
-          )}
-        </MediaQuery>
-        <MediaQuery minWidth={breakpoints.extraLarge.minWidth} maxWidth={breakpoints.extraLarge.maxWidth}>
-          {authenticatedUser ? <AuthExtraLargeLayout username={authenticatedUser.username} /> : (
-            <LargeLayout experimentName={optimizelyExperimentName} isRegistrationPage={isRegistrationPage} />
-          )}
-        </MediaQuery>
-        <MediaQuery minWidth={breakpoints.extraExtraLarge.minWidth} maxWidth={breakpoints.extraExtraLarge.maxWidth}>
-          {authenticatedUser ? <AuthExtraLargeLayout variant="xxl" username={authenticatedUser.username} /> : (
-            <LargeLayout experimentName={optimizelyExperimentName} isRegistrationPage={isRegistrationPage} />
-          )}
+        <MediaQuery minWidth={breakpoints.extraLarge.minWidth} maxWidth={breakpoints.extraExtraLarge.maxWidth}>
+          {authenticatedUser ? <AuthLargeLayout username={username} /> : <LargeLayout />}
         </MediaQuery>
 
         <div className={classNames('content', { 'align-items-center mt-0': authenticatedUser })}>
@@ -85,13 +44,11 @@ const BaseComponent = ({ children, isRegistrationPage, showWelcomeBanner }) => {
 };
 
 BaseComponent.defaultProps = {
-  isRegistrationPage: false,
   showWelcomeBanner: false,
 };
 
 BaseComponent.propTypes = {
   children: PropTypes.node.isRequired,
-  isRegistrationPage: PropTypes.bool,
   showWelcomeBanner: PropTypes.bool,
 };
 

src/base-component/DiscountBanner.jsx

@@ -1,71 +0,0 @@
-import React, { useState } from 'react';
-
-import ClipboardJS from 'clipboard';
-
-import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
-import { faCut } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-
-import { Toast, PageBanner } from '@edx/paragon';
-import messages from './messages';
-
-const DiscountExperimentBanner = (props) => {
-  const { intl } = props;
-  const [show, setShow] = useState(true);
-  const [showToast, setToastShow] = useState(false);
-  new ClipboardJS('.copyIcon'); // eslint-disable-line no-new
-  const getDiscountText = () => (
-    <strong>
-      15% <FormattedMessage
-        id="top.discount.message.15.off"
-        defaultMessage="off"
-        description="Text used with discounts e.g. 15% off"
-      />
-    </strong>
-  );
-
-  return (
-    <>
-      <Toast
-        onClose={() => setToastShow(false)}
-        show={showToast}
-      >
-        {intl.formatMessage(messages['code.copied'])}
-      </Toast>
-      <PageBanner
-        show={show}
-        dismissible
-        onDismiss={() => { setShow(false); }}
-      >
-        <span className="text-primary-700 small variation2-text-alignment">
-          <span className="mr-3">
-            <FormattedMessage
-              id="top.discount.message.body"
-              defaultMessage="Get {discount} your first verified certificate* with code"
-              description="Message body for edX discount"
-              values={{
-                discount: getDiscountText(),
-              }}
-            />
-          </span>
-          <span className="hover-text dashed-border p-1 d-inline-flex flex-wrap align-items-center">
-            <span id="edx-welcome" className="font-weight-bold ">EDXWELCOME</span>
-            <FontAwesomeIcon
-              className="text-dark-200 copyIcon ml-2 hover-icon"
-              icon={faCut}
-              data-clipboard-action="copy"
-              data-clipboard-target="#edx-welcome"
-              onClick={() => setToastShow(true)}
-            />
-          </span>
-        </span>
-      </PageBanner>
-    </>
-  );
-};
-
-DiscountExperimentBanner.propTypes = {
-  intl: intlShape.isRequired,
-
-};
-export default injectIntl(DiscountExperimentBanner);

src/base-component/LargeLayout.jsx

@@ -1,42 +1,45 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { getConfig } from '@edx/frontend-platform';
+import { useIntl } from '@edx/frontend-platform/i18n';
 import { Hyperlink, Image } from '@edx/paragon';
+import classNames from 'classnames';
 
-import LargeScreenLeftLayout from './LargeLeftLayout';
+import messages from './messages';
 
-const LargeLayout = ({ experimentName, isRegistrationPage }) => (
-  <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={getConfig().SITE_NAME} className="logo position-absolute" src={getConfig().LOGO_WHITE_URL} />
-      </Hyperlink>
-      <LargeScreenLeftLayout experimentName={experimentName} isRegistrationPage={isRegistrationPage} />
+const LargeLayout = () => {
+  const { formatMessage } = useIntl();
+
+  return (
+    <div className="w-50 d-flex">
+      <div className="col-md-9 bg-primary-400">
+        <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
+          <Image className="logo position-absolute" alt={getConfig().SITE_NAME} src={getConfig().LOGO_WHITE_URL} />
+        </Hyperlink>
+        <div className="min-vh-100 d-flex align-items-center">
+          <div className={classNames({ 'large-yellow-line mr-n4.5': getConfig().SITE_NAME === 'edX' })} />
+          <h1
+            className={classNames(
+              'display-2 text-white mw-xs',
+              { 'ml-6': getConfig().SITE_NAME !== 'edX' },
+            )}
+          >
+            {formatMessage(messages['start.learning'])}
+            <div className="text-accent-a">
+              {formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
+            </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>
-    <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>
-);
-
-LargeLayout.defaultProps = {
-  experimentName: '',
-  isRegistrationPage: false,
-};
-
-LargeLayout.propTypes = {
-  experimentName: PropTypes.string,
-  isRegistrationPage: PropTypes.bool,
+  );
 };
 
 export default LargeLayout;

src/base-component/LargeLeftLayout.jsx

@@ -1,86 +0,0 @@
-import React, { useState } from 'react';
-
-import classNames from 'classnames';
-
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { getConfig } from '@edx/frontend-platform';
-import PropTypes from 'prop-types';
-import ClipboardJS from 'clipboard';
-
-import { faCut } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { Toast } from '@edx/paragon';
-
-import messages from './messages';
-import SideDiscountBanner from './SideDiscountBanner';
-
-const LargeLeftLayout = (props) => {
-  const { intl, isRegistrationPage, experimentName } = props;
-  const [showToast, setToastShow] = useState(false);
-  new ClipboardJS('.copyIcon'); // eslint-disable-line no-new
-
-  return (
-    <div className="min-vh-100 d-flex justify-content-left align-items-center">
-      <div className="d-flex pr-0 mt-lg-n2">
-        <Toast
-          onClose={() => setToastShow(false)}
-          show={showToast}
-        >
-          {intl.formatMessage(messages['code.copied'])}
-        </Toast>
-        <svg className={classNames(
-          'large-screen-svg-line',
-          {
-            'variation1-bar-color mt-n6 pt-0 ml-5': experimentName === 'variation1' && isRegistrationPage,
-            'variation2-bar-color': experimentName === 'variation2' && isRegistrationPage,
-            'ml-5': experimentName !== 'variation1' || !isRegistrationPage,
-          },
-        )}
-        >
-          <line x1="50" y1="0" x2="10" y2="215" />
-        </svg>
-        <div className={classNames({ 'pl-4': experimentName === 'variation1' && isRegistrationPage })}>
-          <h1 className={classNames('large-heading', { 'mb-4.5': experimentName === 'variation1' && isRegistrationPage })}>
-            {intl.formatMessage(messages['start.learning'])}
-            <span
-              className={((experimentName === 'variation1' || experimentName === 'variation2') && isRegistrationPage) ? 'text-accent-b' : 'text-accent-a'}
-            >
-              <br />
-              {intl.formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
-            </span>
-          </h1>
-          {experimentName === 'variation1' && isRegistrationPage ? (
-            <span className="text-light-300 dicount-heading">
-              <span className="lead mr-3">
-                <SideDiscountBanner />
-              </span>
-              <span className="dashed-border d-inline-flex flex-wrap align-items-center">
-                <span id="edx-welcome" className="text-white edx-welcome font-weight-bold mr-1">EDXWELCOME</span>
-                <FontAwesomeIcon
-                  className="text-light-700 copyIcon ml-1.5 hover-discount-icon"
-                  icon={faCut}
-                  data-clipboard-action="copy"
-                  data-clipboard-target="#edx-welcome"
-                  onClick={() => setToastShow(true)}
-                />
-              </span>
-            </span>
-          ) : null}
-        </div>
-      </div>
-    </div>
-  );
-};
-
-LargeLeftLayout.propTypes = {
-  intl: intlShape.isRequired,
-  experimentName: PropTypes.string,
-  isRegistrationPage: PropTypes.bool,
-};
-
-LargeLeftLayout.defaultProps = {
-  experimentName: '',
-  isRegistrationPage: false,
-};
-
-export default injectIntl(LargeLeftLayout);

src/base-component/MediumLayout.jsx

@@ -1,102 +1,50 @@
-import React, { useState } from 'react';
+import React from 'react';
 
+import { getConfig } from '@edx/frontend-platform';
+import { useIntl } from '@edx/frontend-platform/i18n';
+import { Hyperlink, Image } from '@edx/paragon';
 import classNames from 'classnames';
 
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { getConfig } from '@edx/frontend-platform';
-import { Hyperlink, Image, Toast } from '@edx/paragon';
-import PropTypes from 'prop-types';
-
-import ClipboardJS from 'clipboard';
-
-import { faCut } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import messages from './messages';
-import SideDiscountBanner from './SideDiscountBanner';
 
-const MediumLayout = (props) => {
-  const { intl, isRegistrationPage, experimentName } = props;
-  const [showToast, setToastShow] = useState(false);
-  new ClipboardJS('.copyIcon'); // eslint-disable-line no-new
+const MediumLayout = () => {
+  const { formatMessage } = useIntl();
 
   return (
-    <div className={classNames(
-      'container row p-0 mb-3 medium-screen-container',
-      {
-        'variation1-medium-screen': experimentName === 'variation1' && isRegistrationPage,
-      },
-    )}
-    >
-      <Toast
-        onClose={() => setToastShow(false)}
-        show={showToast}
-      >
-        {intl.formatMessage(messages['code.copied'])}
-      </Toast>
-      <div className="col-md-10 p-0 screen-header-primary">
-        <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
-          <Image alt={getConfig().SITE_NAME} className="logo" src={getConfig().LOGO_WHITE_URL} />
-        </Hyperlink>
-        <div className="row mt-4 justify-content-center">
-          <svg className={classNames(
-            'medium-screen-svg-line pl-5',
-            {
-              'variation1-bar-color': experimentName === 'variation1' && isRegistrationPage,
-              'variation2-bar-color': experimentName === 'variation2' && isRegistrationPage,
-            },
-          )}
-          >
-            <line x1="50" y1="0" x2="10" y2="215" />
-          </svg>
-          <div className="pb-4">
-            <h1 className="medium-heading">
-              {intl.formatMessage(messages['start.learning'])}
-              <span
-                className={((experimentName === 'variation1' || experimentName === 'variation2') && isRegistrationPage) ? 'text-accent-b' : 'text-accent-a'}
+    <>
+      <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={getConfig().MARKETING_SITE_BASE_URL}>
+            <Image alt={getConfig().SITE_NAME} className="logo" src={getConfig().LOGO_WHITE_URL} />
+          </Hyperlink>
+          <div className="d-flex align-items-center justify-content-center mb-4 ">
+            <div className={classNames({ 'mt-1 medium-yellow-line': getConfig().SITE_NAME === 'edX' })} />
+            <div>
+              <h1
+                className={classNames(
+                  'display-1 text-white mt-5 mb-5 mr-2',
+                  { 'ml-4.5': getConfig().SITE_NAME !== 'edX' },
+                )}
               >
-                <br />
-                {intl.formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
-              </span>
-            </h1>
-            {experimentName === 'variation1' && isRegistrationPage ? (
-              <div className="text-light-300 pl-3">
-                <SideDiscountBanner />
-                <span className="dashed-border h5 text-white">
-                  <span id="edx-welcome" className="edx-welcome">EDXWELCOME </span>
-                  <FontAwesomeIcon
-                    className="text-light-700 copyIcon ml-1 hover-discount-icon"
-                    icon={faCut}
-                    data-clipboard-action="copy"
-                    data-clipboard-target="#edx-welcome"
-                    onClick={() => setToastShow(true)}
-                  />
+                <span className="mr-2">{formatMessage(messages['start.learning'])}</span>
+                <span className="text-accent-a d-inline-block">
+                  {formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
                 </span>
-              </div>
-            ) : null}
+              </h1>
+            </div>
           </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>
-      <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,
-  experimentName: PropTypes.string,
-  isRegistrationPage: PropTypes.bool,
-};
-
-MediumLayout.defaultProps = {
-  experimentName: '',
-  isRegistrationPage: false,
-};
-
-export default injectIntl(MediumLayout);
+export default MediumLayout;

src/base-component/SideDiscountBanner.jsx

@@ -1,38 +0,0 @@
-import React from 'react';
-
-import { FormattedMessage } from '@edx/frontend-platform/i18n';
-
-export default function SideDiscountBanner() {
-  const getDiscountText = () => (
-    <span className="text-accent-a h3">
-      15% <FormattedMessage
-        id="side.discount.message.15.off"
-        defaultMessage="off"
-        description="Text used with discounts e.g. 15% off"
-      />
-    </span>
-  );
-  const getCerificateMsg = () => (
-    <span className="dicount-heading">
-      <FormattedMessage
-        id="certificate.message"
-        defaultMessage="certificate* with code"
-        description="Text with certificate"
-      />
-    </span>
-  );
-  return (
-    <span className="mr-1.5">
-      <FormattedMessage
-        id="side.discount.message.body"
-        defaultMessage="Get {discountText} your first verified {lineBreak} {certificateMsg}"
-        description="Message body for edX discount"
-        values={{
-          discountText: getDiscountText(),
-          lineBreak: <br />,
-          certificateMsg: getCerificateMsg(),
-        }}
-      />
-    </span>
-  );
-}

src/base-component/SmallLayout.jsx

@@ -1,90 +1,39 @@
-import React, { useState } from 'react';
+import React from 'react';
 
+import { getConfig } from '@edx/frontend-platform';
+import { useIntl } from '@edx/frontend-platform/i18n';
+import { Hyperlink, Image } from '@edx/paragon';
 import classNames from 'classnames';
 
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { getConfig } from '@edx/frontend-platform';
-import { Hyperlink, Image, Toast } from '@edx/paragon';
-
-import PropTypes from 'prop-types';
-
-import ClipboardJS from 'clipboard';
-
-import { faCut } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import messages from './messages';
-import SideDiscountBanner from './SideDiscountBanner';
 
-const SmallLayout = (props) => {
-  const { intl, isRegistrationPage, experimentName } = props;
-  const [showToast, setToastShow] = useState(false);
-  new ClipboardJS('.copyIcon'); // eslint-disable-line no-new
+const SmallLayout = () => {
+  const { formatMessage } = useIntl();
 
   return (
-    <>
-      <div className="small-screen-header-primary">
-        <Toast
-          onClose={() => setToastShow(false)}
-          show={showToast}
-        >
-          {intl.formatMessage(messages['code.copied'])}
-        </Toast>
+    <span className="bg-primary-400 w-100">
+      <div className="col-md-12 small-screen-top-stripe" />
+      <div>
         <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
-          <Image alt={getConfig().SITE_NAME} className="logo" src={getConfig().LOGO_WHITE_URL} />
+          <Image className="logo-small" alt={getConfig().SITE_NAME} src={getConfig().LOGO_WHITE_URL} />
         </Hyperlink>
-        <div className="d-flex mt-3">
-          <svg className={classNames(
-            'small-screen-svg-line',
-            {
-              'variation1-bar-color': experimentName === 'variation1' && isRegistrationPage,
-              'variation2-bar-color': experimentName === 'variation2' && isRegistrationPage,
-            },
-          )}
+        <div className="d-flex align-items-center mb-3 mt-3 mr-3">
+          <div className={classNames({ 'small-yellow-line mr-n2.5': getConfig().SITE_NAME === 'edX' })} />
+          <h1
+            className={classNames(
+              'text-white mt-3.5 mb-3.5',
+              { 'ml-4.5': getConfig().SITE_NAME !== 'edX' },
+            )}
           >
-            <line x1="55" y1="0" x2="40" y2="65" />
-          </svg>
-          <div className="pb-3">
-            <h1 className="small-heading">
-              {intl.formatMessage(messages['start.learning'])}
-              <br />
-              <span
-                className={((experimentName === 'variation1' || experimentName === 'variation2') && isRegistrationPage) ? 'text-accent-b' : 'text-accent-a'}
-              >
-                {intl.formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
-              </span>
-            </h1>
-            {(experimentName === 'variation1' && isRegistrationPage) ? (
-              <div className="small text-light-300 pl-2">
-                <SideDiscountBanner />
-                <span className="dashed-border h6 text-white d-inline-flex flex-wrap align-items-center">
-                  <span id="edx-welcome" className="edx-welcome mr-1">EDXWELCOME</span>
-                  <FontAwesomeIcon
-                    className="text-light-700 copyIcon ml-1 hover-discount-icon"
-                    icon={faCut}
-                    data-clipboard-action="copy"
-                    data-clipboard-target="#edx-welcome"
-                    onClick={() => setToastShow(true)}
-                  />
-                </span>
-              </div>
-            ) : null}
-          </div>
+            <span className="mr-1">{formatMessage(messages['start.learning'])}</span>
+            <span className="text-accent-a d-inline-block">
+              {formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
+            </span>
+          </h1>
         </div>
       </div>
-    </>
+    </span>
   );
 };
 
-SmallLayout.propTypes = {
-  intl: intlShape.isRequired,
-  experimentName: PropTypes.string,
-  isRegistrationPage: PropTypes.bool,
-};
-
-SmallLayout.defaultProps = {
-  experimentName: '',
-  isRegistrationPage: false,
-
-};
-
-export default injectIntl(SmallLayout);
+export default SmallLayout;

src/base-component/index.jsx

@@ -1 +1,2 @@
-export { default } from './BaseComponent';
+/* eslint-disable import/prefer-default-export */
+export { default as BaseComponent } from './BaseComponent';

src/base-component/messages.jsx

@@ -11,11 +11,6 @@ const messages = defineMessages({
     defaultMessage: 'with {siteName}',
     description: 'Header text with site name for logistration MFE pages',
   },
-  'code.copied': {
-    id: 'code.copied',
-    defaultMessage: 'Code copied',
-    description: 'part of 15% discount code copied',
-  },
   // authenticated user base component text
   'complete.your.profile.1': {
     id: 'complete.your.profile.1',

src/base-component/tests/BaseComponent.test.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
-import { mount } from 'enzyme';
+
 import { IntlProvider } from '@edx/frontend-platform/i18n';
+import { mount } from 'enzyme';
 
 import LargeLayout from '../LargeLayout';
 import MediumLayout from '../MediumLayout';

src/common-components/EnterpriseSSO.jsx

@@ -1,21 +1,24 @@
 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 { useIntl } from '@edx/frontend-platform/i18n';
 import {
-  Form, Button,
+  Button, Form,
 } from '@edx/paragon';
+import { faSignInAlt } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import PropTypes from 'prop-types';
 
 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 { intl } = props;
+  const { formatMessage } = useIntl();
   const tpaProvider = props.provider;
+  const disablePublicAccountCreation = getConfig().ALLOW_PUBLIC_ACCOUNT_CREATION === false;
 
   const handleSubmit = (e, url) => {
     e.preventDefault();
@@ -33,7 +36,7 @@ const EnterpriseSSO = (props) => {
         <div className="d-flex flex-column">
           <div className="mw-450">
             <Form className="m-0">
-              <p>{intl.formatMessage(messages['enterprisetpa.title.heading'], { providerName: tpaProvider.name })}</p>
+              <p>{formatMessage(messages['enterprisetpa.title.heading'], { providerName: tpaProvider.name })}</p>
               <Button
                 id={tpaProvider.id}
                 key={tpaProvider.id}
@@ -62,12 +65,15 @@ const EnterpriseSSO = (props) => {
               <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)}
               >
-                {intl.formatMessage(messages['enterprisetpa.login.button.text'])}
+                {disablePublicAccountCreation
+                  ? formatMessage(messages['enterprisetpa.login.button.text.public.account.creation.disabled'])
+                  : formatMessage(messages['enterprisetpa.login.button.text'])}
               </Button>
             </Form>
           </div>
@@ -98,7 +104,6 @@ EnterpriseSSO.propTypes = {
     loginUrl: PropTypes.string,
     registerUrl: PropTypes.string,
   }),
-  intl: intlShape.isRequired,
 };
 
-export default injectIntl(EnterpriseSSO);
+export default EnterpriseSSO;

src/common-components/FormGroup.jsx

@@ -29,6 +29,7 @@ const FormGroup = (props) => {
         aria-invalid={props.errorMessage !== ''}
         className="form-field"
         autoComplete={props.autoComplete}
+        spellCheck={props.spellCheck}
         name={props.name}
         value={props.value}
         onFocus={handleFocus}
@@ -36,7 +37,6 @@ const FormGroup = (props) => {
         onClick={handleClick}
         onChange={props.handleChange}
         controlClassName={props.borderClass}
-
         trailingElement={props.trailingElement}
         floatingLabel={props.floatingLabel}
       >
@@ -64,41 +64,43 @@ const FormGroup = (props) => {
 
 FormGroup.defaultProps = {
   as: 'input',
-  errorMessage: '',
-  borderClass: '',
   autoComplete: null,
-  readOnly: false,
-  handleBlur: null,
-  handleChange: () => {},
-  handleFocus: null,
-  handleClick: null,
-  helpText: [],
-  options: null,
-  trailingElement: null,
-  type: 'text',
+  borderClass: '',
   children: null,
   className: '',
+  errorMessage: '',
+  handleBlur: null,
+  handleChange: () => {},
+  handleClick: null,
+  handleFocus: null,
+  helpText: [],
+  options: null,
+  readOnly: false,
+  spellCheck: null,
+  trailingElement: null,
+  type: 'text',
 };
 
 FormGroup.propTypes = {
   as: PropTypes.string,
-  errorMessage: PropTypes.string,
-  borderClass: PropTypes.string,
   autoComplete: PropTypes.string,
-  readOnly: PropTypes.bool,
+  borderClass: PropTypes.string,
+  children: PropTypes.element,
+  className: PropTypes.string,
+  errorMessage: PropTypes.string,
   floatingLabel: PropTypes.string.isRequired,
   handleBlur: PropTypes.func,
   handleChange: PropTypes.func,
-  handleFocus: PropTypes.func,
   handleClick: PropTypes.func,
+  handleFocus: 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;

src/common-components/InstitutionLogistration.jsx

@@ -1,11 +1,16 @@
 import React from 'react';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+
 import { getConfig } from '@edx/frontend-platform';
-import PropTypes from 'prop-types';
+import { useIntl } from '@edx/frontend-platform/i18n';
 import { Button, Hyperlink, Icon } from '@edx/paragon';
 import { Institution } from '@edx/paragon/icons';
+import PropTypes from 'prop-types';
+
 import messages from './messages';
 
+/**
+ * This component renders the Institution login button
+ * */
 export const RenderInstitutionButton = props => {
   const { onSubmitHandler, buttonTitle } = props;
 
@@ -22,10 +27,13 @@ export const RenderInstitutionButton = props => {
   );
 };
 
+/**
+ * This component renders the page list of available institutions for login
+ * */
 const InstitutionLogistration = props => {
   const lmsBaseUrl = getConfig().LMS_BASE_URL;
+  const { formatMessage } = useIntl();
   const {
-    intl,
     secondaryProviders,
     headingTitle,
   } = props;
@@ -38,7 +46,7 @@ const InstitutionLogistration = props => {
             {headingTitle}
           </h4>
           <p className="mb-2">
-            {intl.formatMessage(messages['institution.login.page.sub.heading'])}
+            {formatMessage(messages['institution.login.page.sub.heading'])}
           </p>
         </div>
       </div>
@@ -87,7 +95,6 @@ RenderInstitutionButton.defaultProps = {
 
 InstitutionLogistration.propTypes = {
   ...LogistrationProps,
-  intl: intlShape.isRequired,
   headingTitle: PropTypes.string,
 };
 InstitutionLogistration.defaultProps = {
@@ -95,4 +102,4 @@ InstitutionLogistration.defaultProps = {
   headingTitle: '',
 };
 
-export default injectIntl(InstitutionLogistration);
+export default InstitutionLogistration;

src/common-components/Logistration.jsx

@@ -1,30 +1,41 @@
 import React, { useEffect, useState } from 'react';
+import { connect } from 'react-redux';
+
+import { getConfig } from '@edx/frontend-platform';
+import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
+import { getAuthService } from '@edx/frontend-platform/auth';
+import { useIntl } from '@edx/frontend-platform/i18n';
+import {
+  Icon,
+  Tab,
+  Tabs,
+} from '@edx/paragon';
+import { ChevronLeft } from '@edx/paragon/icons';
 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 { getConfig } from '@edx/frontend-platform';
-import { getAuthService } from '@edx/frontend-platform/auth';
-import {
-  Tabs,
-  Tab,
-  Icon,
-} from '@edx/paragon';
-import { ChevronLeft } from '@edx/paragon/icons';
-
-import messages from './messages';
+import { BaseComponent } from '../base-component';
 import { LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';
-import { updatePathWithQueryParams, getTpaHint } from '../data/utils';
+import { getTpaHint, getTpaProvider, updatePathWithQueryParams } from '../data/utils';
 import { LoginPage } from '../login';
 import { RegistrationPage } from '../register';
-import BaseComponent from '../base-component';
+import { backupRegistrationForm } from '../register/data/actions';
+import { clearThirdPartyAuthContextErrorMessage } from './data/actions';
+import {
+  tpaProvidersSelector,
+} from './data/selectors';
+import messages from './messages';
 
 const Logistration = (props) => {
-  const { intl, selectedPage } = props;
-  const tpa = getTpaHint();
+  const { selectedPage, tpaProviders } = props;
+  const tpaHint = getTpaHint();
+  const {
+    providers, secondaryProviders,
+  } = tpaProviders;
+  const { formatMessage } = useIntl();
   const [institutionLogin, setInstitutionLogin] = useState(false);
   const [key, setKey] = useState('');
+  const disablePublicAccountCreation = getConfig().ALLOW_PUBLIC_ACCOUNT_CREATION === false;
 
   useEffect(() => {
     const authService = getAuthService();
@@ -46,6 +57,10 @@ const Logistration = (props) => {
 
   const handleOnSelect = (tabKey) => {
     sendTrackEvent(`edx.bi.${tabKey.replace('/', '')}_form.toggled`, { category: 'user-engagement' });
+    props.clearThirdPartyAuthContextErrorMessage();
+    if (tabKey === LOGIN_PAGE) {
+      props.backupRegistrationForm();
+    }
     setKey(tabKey);
   };
 
@@ -54,51 +69,100 @@ const Logistration = (props) => {
       <Icon src={ChevronLeft} className="left-icon" />
       <span className="ml-2">
         {selectedPage === LOGIN_PAGE
-          ? intl.formatMessage(messages['logistration.sign.in'])
-          : intl.formatMessage(messages['logistration.register'])}
+          ? formatMessage(messages['logistration.sign.in'])
+          : formatMessage(messages['logistration.register'])}
       </span>
     </div>
   );
 
+  const isValidTpaHint = () => {
+    const { provider } = getTpaProvider(tpaHint, providers, secondaryProviders);
+    return !!provider;
+  };
+
   return (
-    <BaseComponent isRegistrationPage={selectedPage === REGISTER_PAGE}>
+    <BaseComponent>
       <div>
-        {institutionLogin
+        {disablePublicAccountCreation
           ? (
-            <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} />
+              <Redirect to={updatePathWithQueryParams(LOGIN_PAGE)} />
+              {institutionLogin && (
+                <Tabs defaultActiveKey="" id="controlled-tab" onSelect={handleInstitutionLogin}>
+                  <Tab title={tabTitle} eventKey={LOGIN_PAGE} />
                 </Tabs>
               )}
+              <div id="main-content" className="main-content">
+                {!institutionLogin && (
+                  <h3 className="mb-4.5">{formatMessage(messages['logistration.sign.in'])}</h3>
+                )}
+                <LoginPage institutionLogin={institutionLogin} handleInstitutionLogin={handleInstitutionLogin} />
+              </div>
             </>
+          )
+          : (
+            <div>
+              {institutionLogin
+                ? (
+                  <Tabs defaultActiveKey="" id="controlled-tab" onSelect={handleInstitutionLogin}>
+                    <Tab title={tabTitle} eventKey={selectedPage === LOGIN_PAGE ? LOGIN_PAGE : REGISTER_PAGE} />
+                  </Tabs>
+                )
+                : (!isValidTpaHint() && (
+                  <Tabs defaultActiveKey={selectedPage} id="controlled-tab" onSelect={handleOnSelect}>
+                    <Tab title={formatMessage(messages['logistration.register'])} eventKey={REGISTER_PAGE} />
+                    <Tab title={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>
           )}
-        { 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,
+  backupRegistrationForm: PropTypes.func.isRequired,
+  clearThirdPartyAuthContextErrorMessage: PropTypes.func.isRequired,
+  tpaProviders: PropTypes.shape({
+    providers: PropTypes.arrayOf(PropTypes.shape({})),
+    secondaryProviders: PropTypes.arrayOf(PropTypes.shape({})),
+  }),
+};
+
+Logistration.defaultProps = {
+  tpaProviders: {
+    providers: [],
+    secondaryProviders: [],
+  },
 };
 
 Logistration.defaultProps = {
   selectedPage: REGISTER_PAGE,
 };
 
-export default injectIntl(Logistration);
+const mapStateToProps = state => ({
+  tpaProviders: tpaProvidersSelector(state),
+});
+
+export default connect(
+  mapStateToProps,
+  {
+    backupRegistrationForm,
+    clearThirdPartyAuthContextErrorMessage,
+  },
+)(Logistration);

src/common-components/NotFoundPage.jsx

@@ -1,16 +1,17 @@
 import React from 'react';
+
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 
-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>
-  );
-}
+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;

src/common-components/PasswordField.jsx

@@ -1,19 +1,19 @@
 import React, { useState } from 'react';
-import PropTypes from 'prop-types';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
+import { useIntl } from '@edx/frontend-platform/i18n';
 import {
-  Form, IconButton, useToggle, Tooltip, OverlayTrigger, Icon,
+  Form, Icon, IconButton, OverlayTrigger, Tooltip, useToggle,
 } from '@edx/paragon';
 import {
   Check, Remove, Visibility, VisibilityOff,
 } from '@edx/paragon/icons';
+import PropTypes from 'prop-types';
 
-import messages from './messages';
 import { LETTER_REGEX, NUMBER_REGEX } from '../data/constants';
+import messages from './messages';
 
 const PasswordField = (props) => {
-  const { formatMessage } = props.intl;
+  const { formatMessage } = useIntl();
   const [isPasswordHidden, setHiddenTrue, setHiddenFalse] = useToggle(true);
   const [showTooltip, setShowTooltip] = useState(false);
 
@@ -30,24 +30,24 @@ const PasswordField = (props) => {
   };
 
   const HideButton = (
-    <IconButton onFocus={handleFocus} onBlur={handleBlur} name="passwordValidation" src={VisibilityOff} iconAs={Icon} onClick={setHiddenTrue} size="sm" variant="secondary" alt={formatMessage(messages['hide.password'])} />
+    <IconButton onFocus={handleFocus} onBlur={handleBlur} name="password" src={VisibilityOff} iconAs={Icon} onClick={setHiddenTrue} size="sm" variant="secondary" alt={formatMessage(messages['hide.password'])} />
   );
 
   const ShowButton = (
-    <IconButton onFocus={handleFocus} onBlur={handleBlur} name="passwordValidation" src={Visibility} iconAs={Icon} onClick={setHiddenFalse} size="sm" variant="secondary" alt={formatMessage(messages['show.password'])} />
+    <IconButton onFocus={handleFocus} onBlur={handleBlur} name="password" 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 position-relative align-content-start">
+      <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} />}
         {formatMessage(messages['one.letter'])}
       </span>
-      <span id="number-check" className="d-flex position-relative align-content-start">
+      <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} />}
         {formatMessage(messages['one.number'])}
       </span>
-      <span id="characters-check" className="d-flex position-relative align-content-start">
+      <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} />}
         {formatMessage(messages['eight.characters'])}
       </span>
@@ -63,6 +63,7 @@ const PasswordField = (props) => {
           type={isPasswordHidden ? 'password' : 'text'}
           name={props.name}
           value={props.value}
+          autoComplete={props.autoComplete}
           aria-invalid={props.errorMessage !== ''}
           onFocus={handleFocus}
           onBlur={handleBlur}
@@ -89,6 +90,7 @@ PasswordField.defaultProps = {
   handleFocus: null,
   handleChange: () => {},
   showRequirements: true,
+  autoComplete: null,
 };
 
 PasswordField.propTypes = {
@@ -98,10 +100,10 @@ PasswordField.propTypes = {
   handleBlur: PropTypes.func,
   handleFocus: PropTypes.func,
   handleChange: PropTypes.func,
-  intl: intlShape.isRequired,
   name: PropTypes.string.isRequired,
   showRequirements: PropTypes.bool,
   value: PropTypes.string.isRequired,
+  autoComplete: PropTypes.string,
 };
 
-export default injectIntl(PasswordField);
+export default PasswordField;

src/common-components/RedirectLogistration.jsx

@@ -1,16 +1,22 @@
 import React from 'react';
 
+import { getConfig } from '@edx/frontend-platform';
 import PropTypes from 'prop-types';
 import { Redirect } from 'react-router-dom';
 
-import { getConfig } from '@edx/frontend-platform';
-
-import { WELCOME_PAGE } from '../data/constants';
+import { AUTHN_PROGRESSIVE_PROFILING, RECOMMENDATIONS } from '../data/constants';
 import { setCookie } from '../data/utils';
 
-function RedirectLogistration(props) {
+const RedirectLogistration = (props) => {
   const {
-    finishAuthUrl, redirectUrl, redirectToWelcomePage, success,
+    finishAuthUrl,
+    redirectUrl,
+    redirectToProgressiveProfilingPage,
+    success,
+    optionalFields,
+    redirectToRecommendationsPage,
+    educationLevel,
+    userId,
   } = props;
   let finalRedirectUrl = '';
 
@@ -25,31 +31,65 @@ function RedirectLogistration(props) {
       finalRedirectUrl = redirectUrl;
     }
 
-    if (redirectToWelcomePage) {
+    // Redirect to Progressive Profiling after successful registration
+    if (redirectToProgressiveProfilingPage) {
+      // TODO: Do we still need this cookie?
       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 <Redirect to={{ pathname: WELCOME_PAGE, state: { registrationResult } }} />;
+      return (
+        <Redirect to={{
+          pathname: AUTHN_PROGRESSIVE_PROFILING,
+          state: {
+            registrationResult,
+            optionalFields,
+          },
+        }}
+        />
+      );
+    }
+
+    // Redirect to Recommendation page
+    if (redirectToRecommendationsPage) {
+      const registrationResult = { redirectUrl: finalRedirectUrl, success };
+      return (
+        <Redirect to={{
+          pathname: RECOMMENDATIONS,
+          state: {
+            registrationResult,
+            educationLevel,
+            userId,
+          },
+        }}
+        />
+      );
     }
 
     window.location.href = finalRedirectUrl;
   }
-  return <></>;
-}
+
+  return null;
+};
 
 RedirectLogistration.defaultProps = {
+  educationLevel: null,
   finishAuthUrl: null,
   success: false,
   redirectUrl: '',
-  redirectToWelcomePage: false,
+  redirectToProgressiveProfilingPage: false,
+  optionalFields: {},
+  redirectToRecommendationsPage: false,
+  userId: null,
 };
 
 RedirectLogistration.propTypes = {
+  educationLevel: PropTypes.string,
   finishAuthUrl: PropTypes.string,
   success: PropTypes.bool,
   redirectUrl: PropTypes.string,
-  redirectToWelcomePage: PropTypes.bool,
+  redirectToProgressiveProfilingPage: PropTypes.bool,
+  optionalFields: PropTypes.shape({}),
+  redirectToRecommendationsPage: PropTypes.bool,
+  userId: PropTypes.number,
 };
 
 export default RedirectLogistration;

src/common-components/SocialAuthProviders.jsx

@@ -1,16 +1,17 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { getConfig } from '@edx/frontend-platform';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { useIntl } from '@edx/frontend-platform/i18n';
 import { faSignInAlt } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import PropTypes from 'prop-types';
 
-import messages from './messages';
 import { LOGIN_PAGE, SUPPORTED_ICON_CLASSES } from '../data/constants';
+import messages from './messages';
 
-function SocialAuthProviders(props) {
-  const { intl, referrer, socialAuthProviders } = props;
+const SocialAuthProviders = (props) => {
+  const { formatMessage } = useIntl();
+  const { referrer, socialAuthProviders } = props;
 
   function handleSubmit(e) {
     e.preventDefault();
@@ -34,25 +35,24 @@ function SocialAuthProviders(props) {
         </div>
       )
         : (
-          <>
-            <div className="font-container" aria-hidden="true">
-              <FontAwesomeIcon
-                icon={SUPPORTED_ICON_CLASSES.includes(provider.iconClass) ? ['fab', provider.iconClass] : faSignInAlt}
-              />
-            </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 className="sr-only">
         {referrer === LOGIN_PAGE
-          ? intl.formatMessage(messages['sso.sign.in.with'], { providerName: provider.name })
-          : intl.formatMessage(messages['sso.create.account.using'], { providerName: provider.name })}
+          ? formatMessage(messages['sso.sign.in.with'], { providerName: provider.name })
+          : 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,7 +60,6 @@ SocialAuthProviders.defaultProps = {
 };
 
 SocialAuthProviders.propTypes = {
-  intl: intlShape.isRequired,
   referrer: PropTypes.string,
   socialAuthProviders: PropTypes.arrayOf(PropTypes.shape({
     id: PropTypes.string,
@@ -69,7 +68,8 @@ SocialAuthProviders.propTypes = {
     iconImage: PropTypes.string,
     loginUrl: PropTypes.string,
     registerUrl: PropTypes.string,
+    skipRegistrationForm: PropTypes.bool,
   })),
 };
 
-export default injectIntl(SocialAuthProviders);
+export default SocialAuthProviders;

src/common-components/SwitchContent.jsx

@@ -1,61 +0,0 @@
-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;

src/common-components/ThirdPartyAuthAlert.jsx

@@ -1,42 +1,52 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { getConfig } from '@edx/frontend-platform';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { useIntl } from '@edx/frontend-platform/i18n';
 import { Alert } from '@edx/paragon';
+import PropTypes from 'prop-types';
 
-import messages from './messages';
 import { LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';
+import messages from './messages';
 
 const ThirdPartyAuthAlert = (props) => {
-  const { currentProvider, intl, referrer } = props;
+  const { formatMessage } = useIntl();
+  const { currentProvider, referrer } = props;
   const platformName = getConfig().SITE_NAME;
   let message;
 
   if (referrer === LOGIN_PAGE) {
-    message = intl.formatMessage(messages['login.third.party.auth.account.not.linked'], { currentProvider, platformName });
+    message = formatMessage(messages['login.third.party.auth.account.not.linked'], { currentProvider, platformName });
   } else {
-    message = intl.formatMessage(messages['register.third.party.auth.account.not.linked'], { currentProvider, platformName });
+    message = formatMessage(messages['register.third.party.auth.account.not.linked'], { currentProvider, platformName });
+  }
+
+  if (!currentProvider) {
+    return null;
   }
 
   return (
-    <Alert id="tpa-alert" className={referrer === REGISTER_PAGE ? 'alert-success mt-n2' : 'alert-warning mt-n2'}>
+    <>
+      <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>
       {referrer === REGISTER_PAGE ? (
-        <Alert.Heading>{intl.formatMessage(messages['tpa.alert.heading'])}</Alert.Heading>
+        <h4 className="mt-4 mb-4">{formatMessage(messages['registration.using.tpa.form.heading'])}</h4>
       ) : null}
-      <p>{ message }</p>
-    </Alert>
+    </>
   );
 };
 
 ThirdPartyAuthAlert.defaultProps = {
+  currentProvider: '',
   referrer: LOGIN_PAGE,
 };
 
 ThirdPartyAuthAlert.propTypes = {
-  currentProvider: PropTypes.string.isRequired,
-  intl: intlShape.isRequired,
+  currentProvider: PropTypes.string,
   referrer: PropTypes.string,
 };
 
-export default injectIntl(ThirdPartyAuthAlert);
+export default ThirdPartyAuthAlert;

src/common-components/UnAuthOnlyRoute.jsx

@@ -1,7 +1,9 @@
 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 { Route } from 'react-router-dom';
+
 import { DEFAULT_REDIRECT_URL } from '../data/constants';
 
 /**
@@ -28,7 +30,7 @@ const UnAuthOnlyRoute = (props) => {
     return <Route {...props} />;
   }
 
-  return <></>;
+  return null;
 };
 
 export default UnAuthOnlyRoute;

src/common-components/Zendesk.jsx

@@ -0,0 +1,53 @@
+import React from 'react';
+
+import { getConfig } from '@edx/frontend-platform';
+import { useIntl } from '@edx/frontend-platform/i18n';
+import Zendesk from 'react-zendesk';
+
+import messages from './messages';
+
+const ZendeskHelp = () => {
+  const { formatMessage } = useIntl();
+  const setting = {
+    cookies: true,
+    webWidget: {
+      contactOptions: {
+        enabled: false,
+      },
+      chat: {
+        suppress: false,
+      },
+      contactForm: {
+        ticketForms: [
+          {
+            id: 360003368814,
+            subject: false,
+            fields: [{ id: 'description', prefill: { '*': '' } }],
+          },
+        ],
+        selectTicketForm: {
+          '*': formatMessage(messages.selectTicketForm),
+        },
+        attachments: true,
+      },
+      helpCenter: {
+        originalArticleButton: true,
+      },
+      answerBot: {
+        suppress: false,
+        contactOnlyAfterQuery: true,
+        title: { '*': formatMessage(messages.supportTitle) },
+        avatar: {
+          url: getConfig().ZENDESK_LOGO_URL,
+          name: { '*': formatMessage(messages.supportTitle) },
+        },
+      },
+    },
+  };
+
+  return (
+    <Zendesk defer zendeskKey={getConfig().ZENDESK_KEY} {...setting} />
+  );
+};
+
+export default ZendeskHelp;

src/common-components/data/actions.js

@@ -1,6 +1,7 @@
 import { AsyncActionType } from '../../data/utils';
 
 export const THIRD_PARTY_AUTH_CONTEXT = new AsyncActionType('THIRD_PARTY_AUTH', 'GET_THIRD_PARTY_AUTH_CONTEXT');
+export const THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG = 'THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG';
 
 // Third party auth context
 export const getThirdPartyAuthContext = (urlParams) => ({
@@ -12,11 +13,15 @@ export const getThirdPartyAuthContextBegin = () => ({
   type: THIRD_PARTY_AUTH_CONTEXT.BEGIN,
 });
 
-export const getThirdPartyAuthContextSuccess = (fieldDescriptions, thirdPartyAuthContext) => ({
+export const getThirdPartyAuthContextSuccess = (fieldDescriptions, optionalFields, thirdPartyAuthContext) => ({
   type: THIRD_PARTY_AUTH_CONTEXT.SUCCESS,
-  payload: { fieldDescriptions, thirdPartyAuthContext },
+  payload: { fieldDescriptions, optionalFields, thirdPartyAuthContext },
 });
 
 export const getThirdPartyAuthContextFailure = () => ({
   type: THIRD_PARTY_AUTH_CONTEXT.FAILURE,
 });
+
+export const clearThirdPartyAuthContextErrorMessage = () => ({
+  type: THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG,
+});

src/common-components/data/reducers.js

@@ -1,33 +1,51 @@
-import { THIRD_PARTY_AUTH_CONTEXT } from './actions';
-
-import { PENDING_STATE, COMPLETE_STATE } from '../../data/constants';
+import { COMPLETE_STATE, PENDING_STATE } from '../../data/constants';
+import { THIRD_PARTY_AUTH_CONTEXT, THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG } from './actions';
 
 export const defaultState = {
-  extendedProfile: [],
   fieldDescriptions: {},
+  optionalFields: {},
   thirdPartyAuthApiStatus: null,
+  thirdPartyAuthContext: {
+    currentProvider: null,
+    finishAuthUrl: null,
+    countryCode: null,
+    providers: [],
+    secondaryProviders: [],
+    pipelineUserDetails: null,
+    errorMessage: null,
+  },
 };
 
-const reducer = (state = defaultState, action) => {
+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:
+    case THIRD_PARTY_AUTH_CONTEXT.SUCCESS: {
       return {
         ...state,
-        extendedProfile: action.payload.fieldDescriptions.extendedProfile,
         fieldDescriptions: action.payload.fieldDescriptions.fields,
+        optionalFields: action.payload.optionalFields,
         thirdPartyAuthContext: action.payload.thirdPartyAuthContext,
         thirdPartyAuthApiStatus: COMPLETE_STATE,
       };
+    }
     case THIRD_PARTY_AUTH_CONTEXT.FAILURE:
       return {
         ...state,
         thirdPartyAuthApiStatus: COMPLETE_STATE,
       };
+    case THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG:
+      return {
+        ...state,
+        thirdPartyAuthApiStatus: PENDING_STATE,
+        thirdPartyAuthContext: {
+          ...state.thirdPartyAuthContext,
+          errorMessage: null,
+        },
+      };
     default:
       return state;
   }

src/common-components/data/sagas.js

@@ -1,16 +1,13 @@
+import { logError } from '@edx/frontend-platform/logging';
 import { call, put, takeEvery } from 'redux-saga/effects';
 
-import { logError } from '@edx/frontend-platform/logging';
-
-// Actions
+import { setCountryFromThirdPartyAuthContext } from '../../register/data/actions';
 import {
-  THIRD_PARTY_AUTH_CONTEXT,
   getThirdPartyAuthContextBegin,
-  getThirdPartyAuthContextSuccess,
   getThirdPartyAuthContextFailure,
+  getThirdPartyAuthContextSuccess,
+  THIRD_PARTY_AUTH_CONTEXT,
 } from './actions';
-
-// Services
 import {
   getThirdPartyAuthContext,
 } from './service';
@@ -18,11 +15,12 @@ import {
 export function* fetchThirdPartyAuthContext(action) {
   try {
     yield put(getThirdPartyAuthContextBegin());
-    const { fieldDescriptions, thirdPartyAuthContext } = yield call(getThirdPartyAuthContext, action.payload.urlParams);
+    const {
+      fieldDescriptions, optionalFields, thirdPartyAuthContext,
+    } = yield call(getThirdPartyAuthContext, action.payload.urlParams);
 
-    yield put(getThirdPartyAuthContextSuccess(
-      fieldDescriptions, thirdPartyAuthContext,
-    ));
+    yield put(setCountryFromThirdPartyAuthContext(thirdPartyAuthContext.countryCode));
+    yield put(getThirdPartyAuthContextSuccess(fieldDescriptions, optionalFields, thirdPartyAuthContext));
   } catch (e) {
     yield put(getThirdPartyAuthContextFailure());
     logError(e);

src/common-components/data/selectors.js

@@ -14,7 +14,15 @@ export const fieldDescriptionSelector = createSelector(
   commonComponents => commonComponents.fieldDescriptions,
 );
 
-export const extendedProfileSelector = createSelector(
+export const optionalFieldsSelector = createSelector(
   commonComponentsSelector,
-  commonComponents => commonComponents.extendedProfile,
+  commonComponents => commonComponents.optionalFields,
+);
+
+export const tpaProvidersSelector = createSelector(
+  commonComponentsSelector,
+  commonComponents => ({
+    providers: commonComponents.thirdPartyAuthContext.providers,
+    secondaryProviders: commonComponents.thirdPartyAuthContext.secondaryProviders,
+  }),
 );

src/common-components/data/service.js

@@ -1,4 +1,4 @@
-import { camelCaseObject, convertKeyNames, getConfig } from '@edx/frontend-platform';
+import { getConfig } from '@edx/frontend-platform';
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 
 // eslint-disable-next-line import/prefer-default-export
@@ -18,11 +18,8 @@ export async function getThirdPartyAuthContext(urlParams) {
       throw (e);
     });
   return {
-    fieldDescriptions: data.registration_fields || {},
-    // For backward compatibility with the API, once https://github.com/openedx/edx-platform/pull/30198 is merged
-    // and deployed update it to use data.context_data
-    thirdPartyAuthContext: camelCaseObject(
-      convertKeyNames(data.context_data || data, { fullname: 'name' }),
-    ),
+    fieldDescriptions: data.registrationFields || data.registration_fields,
+    optionalFields: data.optionalFields || data.optional_fields,
+    thirdPartyAuthContext: data.contextData || data.context_data,
   };
 }

src/common-components/data/tests/reducer.test.js

@@ -0,0 +1,82 @@
+import { PENDING_STATE } from '../../../data/constants';
+import { THIRD_PARTY_AUTH_CONTEXT, THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG } from '../actions';
+import reducer from '../reducers';
+
+describe('common components reducer', () => {
+  it('test mfe context response', () => {
+    const state = {
+      fieldDescriptions: {},
+      optionalFields: {},
+      thirdPartyAuthApiStatus: null,
+      thirdPartyAuthContext: {
+        currentProvider: null,
+        finishAuthUrl: null,
+        countryCode: null,
+        providers: [],
+        secondaryProviders: [],
+        pipelineUserDetails: null,
+        errorMessage: null,
+      },
+    };
+    const fieldDescriptions = {
+      fields: [],
+    };
+    const optionalFields = {
+      fields: [],
+      extended_profile: {},
+    };
+    const thirdPartyAuthContext = { ...state.thirdPartyAuthContext };
+    const action = {
+      type: THIRD_PARTY_AUTH_CONTEXT.SUCCESS,
+      payload: { fieldDescriptions, optionalFields, thirdPartyAuthContext },
+    };
+
+    expect(
+      reducer(state, action),
+    ).toEqual(
+      {
+        ...state,
+        fieldDescriptions: [],
+        optionalFields: {
+          fields: [],
+          extended_profile: {},
+        },
+        thirdPartyAuthApiStatus: 'complete',
+      },
+    );
+  });
+
+  it('should clear tpa context error message', () => {
+    const state = {
+      fieldDescriptions: {},
+      optionalFields: {},
+      thirdPartyAuthApiStatus: null,
+      thirdPartyAuthContext: {
+        currentProvider: null,
+        finishAuthUrl: null,
+        countryCode: null,
+        providers: [],
+        secondaryProviders: [],
+        pipelineUserDetails: null,
+        errorMessage: 'An error occured',
+      },
+    };
+
+    const action = {
+      type: THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG,
+    };
+
+    expect(
+      reducer(state, action),
+    ).toEqual(
+      {
+        ...state,
+        thirdPartyAuthApiStatus: PENDING_STATE,
+        thirdPartyAuthContext: {
+          ...state.thirdPartyAuthContext,
+          errorMessage: null,
+        },
+      },
+    );
+  });
+});

src/common-components/data/tests/sagas.test.js

@@ -1,9 +1,10 @@
 import { runSaga } from 'redux-saga';
 
+import { setCountryFromThirdPartyAuthContext } from '../../../register/data/actions';
+import initializeMockLogging from '../../../setupTest';
 import * as actions from '../actions';
 import { fetchThirdPartyAuthContext } from '../sagas';
 import * as api from '../service';
-import initializeMockLogging from '../../../setupTest';
 
 const { loggingService } = initializeMockLogging();
 
@@ -26,7 +27,11 @@ describe('fetchThirdPartyAuthContext', () => {
 
   it('should call service and dispatch success action', async () => {
     const getThirdPartyAuthContext = jest.spyOn(api, 'getThirdPartyAuthContext')
-      .mockImplementation(() => Promise.resolve({ thirdPartyAuthContext: data, fieldDescriptions: {} }));
+      .mockImplementation(() => Promise.resolve({
+        thirdPartyAuthContext: data,
+        fieldDescriptions: {},
+        optionalFields: {},
+      }));
 
     const dispatched = [];
     await runSaga(
@@ -38,7 +43,8 @@ describe('fetchThirdPartyAuthContext', () => {
     expect(getThirdPartyAuthContext).toHaveBeenCalledTimes(1);
     expect(dispatched).toEqual([
       actions.getThirdPartyAuthContextBegin(),
-      actions.getThirdPartyAuthContextSuccess({}, data),
+      setCountryFromThirdPartyAuthContext(),
+      actions.getThirdPartyAuthContextSuccess({}, {}, data),
     ]);
     getThirdPartyAuthContext.mockClear();
   });

src/common-components/index.jsx

@@ -12,3 +12,4 @@ export { storeName } from './data/selectors';
 export { default as FormGroup } from './FormGroup';
 export { default as PasswordField } from './PasswordField';
 export { default as Logistration } from './Logistration';
+export { default as Zendesk } from './Zendesk';

src/common-components/messages.jsx

@@ -1,29 +1,13 @@
 import { defineMessages } from '@edx/frontend-platform/i18n';
 
 const messages = defineMessages({
+  // institution login strings
   'institution.login.page.sub.heading': {
     id: 'institution.login.page.sub.heading',
     defaultMessage: 'Choose your institution from the list below',
     description: 'Heading of the institutions list',
   },
-  // Confirmation Alert Message
-  'forgot.password.confirmation.title': {
-    id: 'forgot.password.confirmation.title',
-    defaultMessage: 'Check your email',
-    description: 'Forgot password confirmation message title',
-  },
-  'forgot.password.confirmation.support.link': {
-    id: 'forgot.password.confirmation.support.link',
-    defaultMessage: 'contact technical support',
-    description: 'Technical support link text',
-  },
-  'forgot.password.confirmation.info': {
-    id: 'forgot.password.confirmation.info',
-    defaultMessage: 'If you do not receive a password reset message after 1 minute, verify that you entered the correct '
-                    + 'email address, or check your spam folder.',
-    description: 'Part of message that appears after user requests password change',
-  },
-  // Logistration strinsg
+  // logistration strings
   'logistration.sign.in': {
     id: 'logistration.sign.in',
     defaultMessage: 'Sign in',
@@ -34,32 +18,22 @@ const messages = defineMessages({
     defaultMessage: 'Register',
     description: 'Text that appears on the tab to switch between login and register',
   },
-  'internal.server.error.message': {
-    id: 'internal.server.error.message',
-    defaultMessage: 'An error has occurred. Try refreshing the page, or check your internet connection.',
-    description: 'Error message that appears when server responds with 500 error code',
-  },
-  'server.ratelimit.error.message': {
-    id: 'server.ratelimit.error.message',
-    defaultMessage: 'An error has occurred because of too many requests. Please try again after some time.',
-    description: 'Error message that appears when server responds with 429 error code',
-  },
   // enterprise sso strings
   'enterprisetpa.title.heading': {
     id: 'enterprisetpa.title.heading',
     defaultMessage: 'Would you like to sign in using your {providerName} credentials?',
     description: 'Header text used in enterprise third party authentication',
   },
-  'enterprisetpa.sso.button.title': {
-    id: 'enterprisetpa.sso.button.title',
-    defaultMessage: 'Sign in using {providerName}',
-    description: 'Text for third party auth provider buttons',
-  },
   'enterprisetpa.login.button.text': {
     id: 'enterprisetpa.login.button.text',
     defaultMessage: 'Show me other ways to sign in or register',
     description: 'Button text for login',
   },
+  'enterprisetpa.login.button.text.public.account.creation.disabled': {
+    id: 'enterprisetpa.login.button.text.public.account.creation.disabled',
+    defaultMessage: 'Show me other ways to sign in',
+    description: 'Button text for login when account creation is disabled',
+  },
   // social auth providers
   'sso.sign.in.with': {
     id: 'sso.sign.in.with',
@@ -84,17 +58,17 @@ const messages = defineMessages({
   },
   'one.letter': {
     id: 'one.letter',
-    defaultMessage: '1 Letter',
+    defaultMessage: '1 letter',
     description: 'password requirement to have 1 letter',
   },
   'one.number': {
     id: 'one.number',
-    defaultMessage: '1 Number',
+    defaultMessage: '1 number',
     description: 'password requirement to have 1 number',
   },
   'eight.characters': {
     id: 'eight.characters',
-    defaultMessage: '8 Characters',
+    defaultMessage: '8 characters',
     description: 'password requirement to have a minimum of 8 characters',
   },
   'password.sr.only.helping.text': {
@@ -123,6 +97,21 @@ const messages = defineMessages({
     description: 'Message that appears on register page if user has successfully authenticated with TPA '
                   + 'but no associated platform account exists',
   },
+  'registration.using.tpa.form.heading': {
+    id: 'registration.using.tpa.form.heading',
+    defaultMessage: 'Finish creating your account',
+    description: 'Heading that appears above form when user is trying to create account using social auth',
+  },
+  supportTitle: {
+    id: 'zendesk.supportTitle',
+    description: 'Title for the support button',
+    defaultMessage: 'edX Support',
+  },
+  selectTicketForm: {
+    id: 'zendesk.selectTicketForm',
+    description: 'Select ticket form',
+    defaultMessage: 'Please choose your request type:',
+  },
 });
 
 export default messages;

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

@@ -1,8 +1,8 @@
 import React from 'react';
-import { mount } from 'enzyme';
-import { act } from 'react-dom/test-utils';
 
 import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
+import { mount } from 'enzyme';
+import { act } from 'react-dom/test-utils';
 
 import FormGroup from '../FormGroup';
 import PasswordField from '../PasswordField';

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

@@ -1,17 +1,19 @@
 import React from 'react';
-import { mount } from 'enzyme';
-import configureStore from 'redux-mock-store';
 import { Provider } from 'react-redux';
-import { MemoryRouter } from 'react-router-dom';
 
 import { getConfig, mergeConfig } from '@edx/frontend-platform';
 import * as analytics from '@edx/frontend-platform/analytics';
-import { configure, injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
-
 import * as auth from '@edx/frontend-platform/auth';
-import Logistration from '../Logistration';
-import { RenderInstitutionButton } from '../InstitutionLogistration';
+import { configure, injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
+import { mount } from 'enzyme';
+import { MemoryRouter } from 'react-router-dom';
+import configureStore from 'redux-mock-store';
+
 import { COMPLETE_STATE, LOGIN_PAGE } from '../../data/constants';
+import { backupRegistrationForm } from '../../register/data/actions';
+import { clearThirdPartyAuthContextErrorMessage } from '../data/actions';
+import { RenderInstitutionButton } from '../InstitutionLogistration';
+import Logistration from '../Logistration';
 
 jest.mock('@edx/frontend-platform/analytics');
 jest.mock('@edx/frontend-platform/auth');
@@ -39,9 +41,7 @@ describe('Logistration', () => {
   );
 
   beforeEach(() => {
-    auth.getAuthenticatedUser = jest.fn(() => ({ userId: 3, username: 'edX' }));
-  });
-  it('should render registration page', () => {
+    auth.getAuthenticatedUser = jest.fn(() => ({ userId: 3, username: 'test-user' }));
     configure({
       loggingService: { logError: jest.fn() },
       config: {
@@ -50,14 +50,22 @@ describe('Logistration', () => {
       },
       messages: { 'es-419': {}, de: {}, 'en-us': {} },
     });
+  });
 
+  it('should render registration page', () => {
+    mergeConfig({
+      ALLOW_PUBLIC_ACCOUNT_CREATION: true,
+    });
     store = mockStore({
       register: {
         registrationResult: { success: false, redirectUrl: '' },
         registrationError: {},
       },
       commonComponents: {
-        thirdPartyAuthApiStatus: null,
+        thirdPartyAuthContext: {
+          providers: [],
+          secondaryProviders: [],
+        },
       },
     });
     const logistration = mount(reduxWrapper(<IntlLogistration />));
@@ -71,7 +79,10 @@ describe('Logistration', () => {
         loginResult: { success: false, redirectUrl: '' },
       },
       commonComponents: {
-        thirdPartyAuthApiStatus: null,
+        thirdPartyAuthContext: {
+          providers: [],
+          secondaryProviders: [],
+        },
       },
     });
 
@@ -81,9 +92,42 @@ describe('Logistration', () => {
     expect(logistration.find('#main-content').find('LoginPage').exists()).toBeTruthy();
   });
 
+  it('should render only login page when public account creation is disabled', () => {
+    mergeConfig({
+      ALLOW_PUBLIC_ACCOUNT_CREATION: false,
+      DISABLE_ENTERPRISE_LOGIN: 'true',
+    });
+
+    store = mockStore({
+      login: {
+        loginResult: { success: false, redirectUrl: '' },
+      },
+      commonComponents: {
+        thirdPartyAuthContext: {
+          currentProvider: null,
+          finishAuthUrl: null,
+          providers: [],
+          secondaryProviders: [secondaryProviders],
+        },
+        thirdPartyAuthApiStatus: COMPLETE_STATE,
+      },
+    });
+
+    const props = { selectedPage: LOGIN_PAGE };
+    const logistration = mount(reduxWrapper(<IntlLogistration {...props} />));
+
+    // verifying sign in heading for institution login false
+    expect(logistration.find('#main-content').find('h3').text()).toEqual('Sign in');
+
+    // verifying tabs heading for institution login true
+    logistration.find(RenderInstitutionButton).simulate('click', { institutionLogin: true });
+    expect(logistration.find('#controlled-tab').exists()).toBeTruthy();
+  });
+
   it('should display institution login option when secondary providers are present', () => {
     mergeConfig({
       DISABLE_ENTERPRISE_LOGIN: 'true',
+      ALLOW_PUBLIC_ACCOUNT_CREATION: 'true',
     });
 
     store = mockStore({
@@ -178,4 +222,50 @@ describe('Logistration', () => {
       DISABLE_ENTERPRISE_LOGIN: '',
     });
   });
+
+  it('should fire action to backup registration form on tab click', () => {
+    store = mockStore({
+      login: {
+        loginResult: { success: false, redirectUrl: '' },
+      },
+      register: {
+        registrationResult: { success: false, redirectUrl: '' },
+        registrationError: {},
+      },
+      commonComponents: {
+        thirdPartyAuthContext: {
+          providers: [],
+          secondaryProviders: [],
+        },
+      },
+    });
+
+    store.dispatch = jest.fn(store.dispatch);
+    const logistration = mount(reduxWrapper(<IntlLogistration />));
+    logistration.find('a[data-rb-event-key="/login"]').simulate('click');
+    expect(store.dispatch).toHaveBeenCalledWith(backupRegistrationForm());
+  });
+
+  it('should clear tpa context errorMessage tab click', () => {
+    store = mockStore({
+      login: {
+        loginResult: { success: false, redirectUrl: '' },
+      },
+      register: {
+        registrationResult: { success: false, redirectUrl: '' },
+        registrationError: {},
+      },
+      commonComponents: {
+        thirdPartyAuthContext: {
+          providers: [],
+          secondaryProviders: [],
+        },
+      },
+    });
+
+    store.dispatch = jest.fn(store.dispatch);
+    const logistration = mount(reduxWrapper(<IntlLogistration />));
+    logistration.find('a[data-rb-event-key="/login"]').simulate('click');
+    expect(store.dispatch).toHaveBeenCalledWith(clearThirdPartyAuthContextErrorMessage());
+  });
 });

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

@@ -1,9 +1,10 @@
 import React from 'react';
-import renderer from 'react-test-renderer';
-import { IntlProvider } from '@edx/frontend-platform/i18n';
 
-import SocialAuthProviders from '../SocialAuthProviders';
+import { IntlProvider } from '@edx/frontend-platform/i18n';
+import renderer from 'react-test-renderer';
+
 import registerIcons from '../RegisterFaIcons';
+import SocialAuthProviders from '../SocialAuthProviders';
 
 registerIcons();
 

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

@@ -1,9 +1,10 @@
 import React from 'react';
-import renderer from 'react-test-renderer';
-import { IntlProvider } from '@edx/frontend-platform/i18n';
 
-import ThirdPartyAuthAlert from '../ThirdPartyAuthAlert';
+import { IntlProvider } from '@edx/frontend-platform/i18n';
+import renderer from 'react-test-renderer';
+
 import { REGISTER_PAGE } from '../../data/constants';
+import ThirdPartyAuthAlert from '../ThirdPartyAuthAlert';
 
 describe('ThirdPartyAuthAlert', () => {
   let props = {};

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

@@ -1,12 +1,15 @@
+/* eslint-disable import/no-import-module-exports */
+/* eslint-disable react/function-component-definition */
 import React from 'react';
-import { mount } from 'enzyme';
-import { BrowserRouter as Router, MemoryRouter, Switch } from 'react-router-dom';
 
 import * as auth from '@edx/frontend-platform/auth';
+import { mount } from 'enzyme';
 
 import { UnAuthOnlyRoute } from '..';
 import { LOGIN_PAGE } from '../../data/constants';
 
+import { MemoryRouter, BrowserRouter as Router, Switch } from 'react-router-dom';
+
 jest.mock('@edx/frontend-platform/auth');
 
 const RRD = require('react-router-dom');

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

@@ -0,0 +1,17 @@
+import { IntlProvider } from '@edx/frontend-platform/i18n';
+import renderer from 'react-test-renderer';
+
+import Zendesk from '../Zendesk';
+
+jest.mock('react-zendesk', () => 'Zendesk');
+
+describe('Zendesk Help', () => {
+  it('should match login page third party auth alert message snapshot', () => {
+    const tree = renderer.create(
+      <IntlProvider locale="en">
+        <Zendesk />
+      </IntlProvider>,
+    ).toJSON();
+    expect(tree).toMatchSnapshot();
+  });
+});

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

@@ -14,8 +14,8 @@ exports[`SocialAuthProviders should match social auth provider with default icon
   >
     <svg
       aria-hidden="true"
-      className="svg-inline--fa fa-sign-in-alt fa-w-16 "
-      data-icon="sign-in-alt"
+      className="svg-inline--fa fa-right-to-bracket "
+      data-icon="right-to-bracket"
       data-prefix="fas"
       focusable="false"
       role="img"
@@ -24,7 +24,7 @@ exports[`SocialAuthProviders should match social auth provider with default icon
       xmlns="http://www.w3.org/2000/svg"
     >
       <path
-        d="M416 448h-84c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h84c17.7 0 32-14.3 32-32V160c0-17.7-14.3-32-32-32h-84c-6.6 0-12-5.4-12-12V76c0-6.6 5.4-12 12-12h84c53 0 96 43 96 96v192c0 53-43 96-96 96zm-47-201L201 79c-15-15-41-4.5-41 17v96H24c-13.3 0-24 10.7-24 24v96c0 13.3 10.7 24 24 24h136v96c0 21.5 26 32 41 17l168-168c9.3-9.4 9.3-24.6 0-34z"
+        d="M352 96h64c17.7 0 32 14.3 32 32V384c0 17.7-14.3 32-32 32H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h64c53 0 96-43 96-96V128c0-53-43-96-96-96H352c-17.7 0-32 14.3-32 32s14.3 32 32 32zm-7.5 177.4c4.8-4.5 7.5-10.8 7.5-17.4s-2.7-12.9-7.5-17.4l-144-136c-7-6.6-17.2-8.4-26-4.6s-14.5 12.5-14.5 22v72H32c-17.7 0-32 14.3-32 32v64c0 17.7 14.3 32 32 32H160v72c0 9.6 5.7 18.2 14.5 22s19 2 26-4.6l144-136z"
         fill="currentColor"
         style={Object {}}
       />
@@ -59,7 +59,7 @@ exports[`SocialAuthProviders should match social auth provider with iconClass sn
   >
     <svg
       aria-hidden="true"
-      className="svg-inline--fa fa-google fa-w-16 "
+      className="svg-inline--fa fa-google "
       data-icon="google"
       data-prefix="fab"
       focusable="false"

src/common-components/tests/__snapshots__/ThirdPartyAuthAlert.test.jsx.snap

@@ -2,7 +2,7 @@
 
 exports[`ThirdPartyAuthAlert should match login page third party auth alert message snapshot 1`] = `
 <div
-  className="fade alert-content alert-warning mt-n2 alert show"
+  className="fade alert-content alert-warning mt-n2 mb-5 alert show"
   id="tpa-alert"
   role="alert"
 >
@@ -21,26 +21,33 @@ exports[`ThirdPartyAuthAlert should match login page third party auth alert mess
 `;
 
 exports[`ThirdPartyAuthAlert should match register page third party auth alert message snapshot 1`] = `
-<div
-  className="fade alert-content alert-success mt-n2 alert show"
-  id="tpa-alert"
-  role="alert"
->
+Array [
   <div
-    className="pgn__alert-message-wrapper"
+    className="fade alert-content alert-success mt-n2 mb-5 alert show"
+    id="tpa-alert"
+    role="alert"
   >
     <div
-      className="alert-message-content"
+      className="pgn__alert-message-wrapper"
     >
       <div
-        className="alert-heading h4"
+        className="alert-message-content"
       >
-        Almost done!
+        <div
+          className="alert-heading h4"
+        >
+          Almost done!
+        </div>
+        <p>
+          You've successfully signed into Google! We just need a little more information before you start learning with Your Platform Name Here.
+        </p>
       </div>
-      <p>
-        You've successfully signed into Google! We just need a little more information before you start learning with Your Platform Name Here.
-      </p>
     </div>
-  </div>
-</div>
+  </div>,
+  <h4
+    className="mt-4 mb-4"
+  >
+    Finish creating your account
+  </h4>,
+]
 `;

src/common-components/tests/__snapshots__/Zendesk.test.jsx.snap

@@ -0,0 +1,54 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Zendesk Help should match login page third party auth alert message snapshot 1`] = `
+<Zendesk
+  cookies={true}
+  defer={true}
+  webWidget={
+    Object {
+      "answerBot": Object {
+        "avatar": Object {
+          "name": Object {
+            "*": "edX Support",
+          },
+          "url": undefined,
+        },
+        "contactOnlyAfterQuery": true,
+        "suppress": false,
+        "title": Object {
+          "*": "edX Support",
+        },
+      },
+      "chat": Object {
+        "suppress": false,
+      },
+      "contactForm": Object {
+        "attachments": true,
+        "selectTicketForm": Object {
+          "*": "Please choose your request type:",
+        },
+        "ticketForms": Array [
+          Object {
+            "fields": Array [
+              Object {
+                "id": "description",
+                "prefill": Object {
+                  "*": "",
+                },
+              },
+            ],
+            "id": 360003368814,
+            "subject": false,
+          },
+        ],
+      },
+      "contactOptions": Object {
+        "enabled": false,
+      },
+      "helpCenter": Object {
+        "originalArticleButton": true,
+      },
+    }
+  }
+/>
+`;

src/config/index.js

@@ -0,0 +1,29 @@
+const configuration = {
+  // Cookies related configs
+  SESSION_COOKIE_DOMAIN: process.env.SESSION_COOKIE_DOMAIN,
+  REGISTER_CONVERSION_COOKIE_NAME: process.env.REGISTER_CONVERSION_COOKIE_NAME || null,
+  USER_SURVEY_COOKIE_NAME: process.env.USER_SURVEY_COOKIE_NAME || null,
+  // Features
+  DISABLE_ENTERPRISE_LOGIN: process.env.DISABLE_ENTERPRISE_LOGIN || '',
+  ENABLE_COOKIE_POLICY_BANNER: process.env.ENABLE_COOKIE_POLICY_BANNER || false,
+  ENABLE_DYNAMIC_REGISTRATION_FIELDS: process.env.ENABLE_DYNAMIC_REGISTRATION_FIELDS || false,
+  ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN: process.env.ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN || false,
+  ENABLE_PERSONALIZED_RECOMMENDATIONS: process.env.ENABLE_PERSONALIZED_RECOMMENDATIONS || false,
+  MARKETING_EMAILS_OPT_IN: process.env.MARKETING_EMAILS_OPT_IN || '',
+  SHOW_CONFIGURABLE_EDX_FIELDS: process.env.SHOW_CONFIGURABLE_EDX_FIELDS || false,
+  // Links
+  ACTIVATION_EMAIL_SUPPORT_LINK: process.env.ACTIVATION_EMAIL_SUPPORT_LINK || null,
+  AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK: process.env.AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK || null,
+  LOGIN_ISSUE_SUPPORT_LINK: process.env.LOGIN_ISSUE_SUPPORT_LINK || null,
+  PASSWORD_RESET_SUPPORT_LINK: process.env.PASSWORD_RESET_SUPPORT_LINK || null,
+  PRIVACY_POLICY: process.env.PRIVACY_POLICY || null,
+  TOS_AND_HONOR_CODE: process.env.TOS_AND_HONOR_CODE || null,
+  TOS_LINK: process.env.TOS_LINK || null,
+  // Miscellaneous
+  GENERAL_RECOMMENDATIONS: process.env.GENERAL_RECOMMENDATIONS || '[]',
+  INFO_EMAIL: process.env.INFO_EMAIL || '',
+  ZENDESK_KEY: process.env.ZENDESK_KEY,
+  ZENDESK_LOGO_URL: process.env.ZENDESK_LOGO_URL,
+};
+
+export default configuration;

src/data/configureStore.js

@@ -1,9 +1,9 @@
 import { getConfig } from '@edx/frontend-platform';
-import { applyMiddleware, createStore, compose } from 'redux';
-import thunkMiddleware from 'redux-thunk';
 import { composeWithDevTools } from '@redux-devtools/extension';
+import { applyMiddleware, compose, createStore } from 'redux';
 import { createLogger } from 'redux-logger';
 import createSagaMiddleware from 'redux-saga';
+import thunkMiddleware from 'redux-thunk';
 
 import createRootReducer from './reducers';
 import rootSaga from './sagas';

src/data/constants.js

@@ -2,8 +2,9 @@
 export const LOGIN_PAGE = '/login';
 export const REGISTER_PAGE = '/register';
 export const RESET_PAGE = '/reset';
-export const WELCOME_PAGE = '/welcome';
+export const AUTHN_PROGRESSIVE_PROFILING = '/welcome';
 export const DEFAULT_REDIRECT_URL = '/dashboard';
+export const RECOMMENDATIONS = '/recommendations';
 export const PASSWORD_RESET_CONFIRM = '/password_reset_confirm/:token/';
 export const PAGE_NOT_FOUND = '/notfound';
 export const ENTERPRISE_LOGIN_URL = '/enterprise/login';
@@ -12,14 +13,16 @@ export const ENTERPRISE_LOGIN_URL = '/enterprise/login';
 export const SUPPORTED_ICON_CLASSES = ['apple', 'facebook', 'google', 'microsoft'];
 
 // Error Codes
+export const FORM_SUBMISSION_ERROR = 'form-submission-error';
 export const INTERNAL_SERVER_ERROR = 'internal-server-error';
 export const API_RATELIMIT_ERROR = 'api-ratelimit-error';
 
-// States
+// Common States
 export const DEFAULT_STATE = 'default';
 export const PENDING_STATE = 'pending';
 export const COMPLETE_STATE = 'complete';
 export const FAILURE_STATE = 'failure';
+export const FORBIDDEN_STATE = 'forbidden';
 
 // Regex
 export const VALID_EMAIL_REGEX = '(^[-!#$%&\'*+/=?^_`{}|~0-9A-Z]+(\\.[-!#$%&\'*+/=?^_`{}|~0-9A-Z]+)*'
@@ -28,8 +31,8 @@ export const VALID_EMAIL_REGEX = '(^[-!#$%&\'*+/=?^_`{}|~0-9A-Z]+(\\.[-!#$%&\'*+
                                  + '|\\[(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\]$';
 export const LETTER_REGEX = /[a-zA-Z]/;
 export const NUMBER_REGEX = /\d/;
-export const VALID_NAME_REGEX = /[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)?/gi; // eslint-disable-line no-useless-escape
+export const INVALID_NAME_REGEX = /[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)?/gi; // eslint-disable-line no-useless-escape
 
 // Query string parameters that can be passed to LMS to manage
 // things like auto-enrollment upon login and registration.
-export const AUTH_PARAMS = ['course_id', 'enrollment_action', 'course_mode', 'email_opt_in', 'purchase_workflow', 'next', 'save_for_later', 'register_for_free'];
+export const AUTH_PARAMS = ['course_id', 'enrollment_action', 'course_mode', 'email_opt_in', 'purchase_workflow', 'next', 'save_for_later', 'register_for_free', 'track', 'is_account_recovery'];

src/data/optimizely.js

@@ -0,0 +1,11 @@
+import {
+  createInstance,
+} from '@optimizely/react-sdk';
+
+const OPTIMIZELY_SDK_KEY = process.env.OPTIMIZELY_FULL_STACK_SDK_KEY;
+
+const optimizely = createInstance({
+  sdkKey: OPTIMIZELY_SDK_KEY,
+});
+
+export default optimizely;

src/data/reducers.js

@@ -1,13 +1,5 @@
 import { combineReducers } from 'redux';
 
-import {
-  reducer as loginReducer,
-  storeName as loginStoreName,
-} from '../login';
-import {
-  reducer as registerReducer,
-  storeName as registerStoreName,
-} from '../register';
 import {
   reducer as commonComponentsReducer,
   storeName as commonComponentsStoreName,
@@ -16,22 +8,29 @@ import {
   reducer as forgotPasswordReducer,
   storeName as forgotPasswordStoreName,
 } from '../forgot-password';
+import {
+  reducer as loginReducer,
+  storeName as loginStoreName,
+} from '../login';
+import {
+  reducer as authnProgressiveProfilingReducers,
+  storeName as authnProgressiveProfilingStoreName,
+} from '../progressive-profiling';
+import {
+  reducer as registerReducer,
+  storeName as registerStoreName,
+} from '../register';
 import {
   reducer as resetPasswordReducer,
   storeName as resetPasswordStoreName,
 } from '../reset-password';
 
-import {
-  reducer as welcomePageReducers,
-  storeName as welcomePageStoreName,
-} from '../welcome';
-
 const createRootReducer = () => combineReducers({
   [loginStoreName]: loginReducer,
   [registerStoreName]: registerReducer,
   [commonComponentsStoreName]: commonComponentsReducer,
   [forgotPasswordStoreName]: forgotPasswordReducer,
   [resetPasswordStoreName]: resetPasswordReducer,
-  [welcomePageStoreName]: welcomePageReducers,
+  [authnProgressiveProfilingStoreName]: authnProgressiveProfilingReducers,
 });
 export default createRootReducer;

src/data/sagas.js

@@ -1,11 +1,11 @@
 import { all } from 'redux-saga/effects';
 
-import { saga as registrationSaga } from '../register';
-import { saga as loginSaga } from '../login';
 import { saga as commonComponentsSaga } from '../common-components';
 import { saga as forgotPasswordSaga } from '../forgot-password';
+import { saga as loginSaga } from '../login';
+import { saga as authnProgressiveProfilingSaga } from '../progressive-profiling';
+import { saga as registrationSaga } from '../register';
 import { saga as resetPasswordSaga } from '../reset-password';
-import { saga as welcomePageSaga } from '../welcome';
 
 export default function* rootSaga() {
   yield all([
@@ -14,6 +14,6 @@ export default function* rootSaga() {
     commonComponentsSaga(),
     forgotPasswordSaga(),
     resetPasswordSaga(),
-    welcomePageSaga(),
+    authnProgressiveProfilingSaga(),
   ]);
 }

src/data/utils/cookies.js

@@ -1,9 +1,9 @@
-import Cookies from 'universal-cookie';
 import { getConfig } from '@edx/frontend-platform';
+import Cookies from 'universal-cookie';
 
 export function setCookie(cookieName, cookieValue, cookieExpiry) {
   const cookies = new Cookies();
-  const options = { domain: getConfig().COOKIE_DOMAIN, path: '/' };
+  const options = { domain: getConfig().SESSION_COOKIE_DOMAIN, path: '/' };
   if (cookieExpiry) {
     options.expires = cookieExpiry;
   }

src/data/utils/dataUtils.js

@@ -1,15 +1,7 @@
 // Utility functions
-
 import * as QueryString from 'query-string';
-import { AUTH_PARAMS } from '../constants';
 
-export default function processLink(link) {
-  let matches;
-  link.replace(/(.*?)<a href=["']([^"']*).*?>([^<]+)<\/a>(.*)/g, function () { // eslint-disable-line func-names
-    matches = Array.prototype.slice.call(arguments, 1, 5); // eslint-disable-line  prefer-rest-params
-  });
-  return matches;
-}
+import { AUTH_PARAMS } from '../constants';
 
 export const getTpaProvider = (tpaHintProvider, primaryProviders, secondaryProviders) => {
   let tpaProvider = null;
@@ -57,8 +49,8 @@ export const updatePathWithQueryParams = (path) => {
   return `${path}${queryParams}`;
 };
 
-export const getAllPossibleQueryParam = () => {
-  const urlParams = QueryString.parse(window.location.search);
+export const getAllPossibleQueryParams = (locationURl = null) => {
+  const urlParams = locationURl ? QueryString.parseUrl(locationURl).query : QueryString.parse(window.location.search);
   const params = {};
   Object.entries(urlParams).forEach(([key, value]) => {
     if (AUTH_PARAMS.indexOf(key) > -1) {

src/data/utils/dataUtils.test.js

@@ -1,18 +1,5 @@
 import { LOGIN_PAGE } from '../constants';
-import processLink, { updatePathWithQueryParams } from './dataUtils';
-
-describe('processLink', () => {
-  it('should use the provided processLink function to', () => {
-    const expectedHref = 'http://test.server.com/';
-    const expectedText = 'test link';
-    const link = `<a href="${expectedHref}">${expectedText}</a>`;
-
-    const matches = processLink(link);
-
-    expect(matches[1]).toEqual(expectedHref);
-    expect(matches[2]).toEqual(expectedText);
-  });
-});
+import { updatePathWithQueryParams } from './dataUtils';
 
 describe('updatePathWithQueryParams', () => {
   it('should append query params into the path', () => {

src/data/utils/index.js

@@ -1,9 +1,8 @@
 export {
-  default,
   getTpaProvider,
   getTpaHint,
   updatePathWithQueryParams,
-  getAllPossibleQueryParam,
+  getAllPossibleQueryParams,
   getActivationStatus,
   windowScrollTo,
 } from './dataUtils';

src/data/utils/useMobileResponsive.js

@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
 
 import { breakpoints } from '@edx/paragon';
 
@@ -17,7 +17,7 @@ const useMobileResponsive = (breakpoint) => {
     window.addEventListener('resize', checkForMobile);
     // return this function here to clean up the event listener
     return () => window.removeEventListener('resize', checkForMobile);
-  }, []);
+  });
   return isMobileWindow;
 };
 

src/field-renderer/FieldRenderer.jsx

@@ -1,13 +1,13 @@
 import React from 'react';
 
-import PropTypes from 'prop-types';
 import { Form, Icon } from '@edx/paragon';
 import { ExpandMore } from '@edx/paragon/icons';
+import PropTypes from 'prop-types';
 
 const FormFieldRenderer = (props) => {
   let formField = null;
   const {
-    errorMessage, fieldData, onChangeHandler, isRequired, value,
+    className, errorMessage, fieldData, onChangeHandler, isRequired, value,
   } = props;
 
   const handleFocus = (e) => {
@@ -24,8 +24,9 @@ const FormFieldRenderer = (props) => {
         return null;
       }
       formField = (
-        <Form.Group controlId={fieldData.name} isInvalid={isRequired && errorMessage}>
+        <Form.Group controlId={fieldData.name} isInvalid={!!(isRequired && errorMessage)}>
           <Form.Control
+            className={className}
             as="select"
             name={fieldData.name}
             value={value}
@@ -52,8 +53,9 @@ const FormFieldRenderer = (props) => {
     }
     case 'textarea': {
       formField = (
-        <Form.Group controlId={fieldData.name} isInvalid={isRequired && errorMessage}>
+        <Form.Group controlId={fieldData.name} isInvalid={!!(isRequired && errorMessage)}>
           <Form.Control
+            className={className}
             as="textarea"
             name={fieldData.name}
             value={value}
@@ -74,8 +76,9 @@ const FormFieldRenderer = (props) => {
     }
     case 'text': {
       formField = (
-        <Form.Group controlId={fieldData.name} isInvalid={isRequired && errorMessage}>
+        <Form.Group controlId={fieldData.name} isInvalid={!!(isRequired && errorMessage)}>
           <Form.Control
+            className={className}
             name={fieldData.name}
             value={value}
             aria-invalid={isRequired && Boolean(errorMessage)}
@@ -95,8 +98,9 @@ const FormFieldRenderer = (props) => {
     }
     case 'checkbox': {
       formField = (
-        <Form.Group isInvalid={isRequired && errorMessage}>
+        <Form.Group isInvalid={!!(isRequired && errorMessage)}>
           <Form.Checkbox
+            className={className}
             id={fieldData.name}
             checked={!!value}
             name={fieldData.name}
@@ -124,6 +128,7 @@ const FormFieldRenderer = (props) => {
   return formField;
 };
 FormFieldRenderer.defaultProps = {
+  className: '',
   value: '',
   handleBlur: null,
   handleFocus: null,
@@ -132,17 +137,22 @@ FormFieldRenderer.defaultProps = {
 };
 
 FormFieldRenderer.propTypes = {
+  className: PropTypes.string,
   fieldData: PropTypes.shape({
     type: PropTypes.string,
     label: PropTypes.string,
     name: PropTypes.string,
+    options: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.string)),
   }).isRequired,
   onChangeHandler: PropTypes.func.isRequired,
   handleBlur: PropTypes.func,
   handleFocus: PropTypes.func,
   errorMessage: PropTypes.string,
   isRequired: PropTypes.bool,
-  value: PropTypes.string,
+  value: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.bool,
+  ]),
 };
 
 export default FormFieldRenderer;

src/field-renderer/index.jsx

@@ -1 +1,2 @@
-export { default } from './FieldRenderer';
+/* eslint-disable import/prefer-default-export */
+export { default as FormFieldRenderer } from './FieldRenderer';

src/field-renderer/tests/FieldRenderer.test.jsx

@@ -1,4 +1,6 @@
 import React from 'react';
+
+import { getConfig } from '@edx/frontend-platform';
 import { mount } from 'enzyme';
 
 import FieldRenderer from '../FieldRenderer';
@@ -81,7 +83,7 @@ describe('FieldRendererTests', () => {
   it('should render checkbox field', () => {
     const fieldData = {
       type: 'checkbox',
-      label: 'I agree that edX may send me marketing messages.',
+      label: `I agree that ${getConfig().SITE_NAME} may send me marketing messages.`,
       name: 'marketing-emails-opt-in-field',
     };
 
@@ -90,7 +92,7 @@ describe('FieldRendererTests', () => {
     field.simulate('change', { target: { checked: true, type: 'checkbox' } });
 
     expect(field.prop('type')).toEqual('checkbox');
-    expect(fieldRenderer.find('label').text()).toEqual('I agree that edX may send me marketing messages.');
+    expect(fieldRenderer.find('label').text()).toEqual(fieldData.label);
     expect(value).toEqual(true);
   });
 

src/forgot-password/ForgotPasswordAlert.jsx

@@ -1,29 +1,31 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { getConfig } from '@edx/frontend-platform';
-import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { FormattedMessage, useIntl } from '@edx/frontend-platform/i18n';
 import { Alert } from '@edx/paragon';
 import { CheckCircle, Error } from '@edx/paragon/icons';
+import PropTypes from 'prop-types';
 
-import messages from './messages';
-import { INTERNAL_SERVER_ERROR } from '../data/constants';
+import {
+  COMPLETE_STATE, FORBIDDEN_STATE, FORM_SUBMISSION_ERROR, INTERNAL_SERVER_ERROR,
+} from '../data/constants';
 import { PASSWORD_RESET } from '../reset-password/data/constants';
+import messages from './messages';
 
 const ForgotPasswordAlert = (props) => {
-  const { email, emailError, intl } = props;
+  const { formatMessage } = useIntl();
+  const { email, emailError } = props;
+  let message = '';
+  let heading = formatMessage(messages['forgot.password.error.alert.title']);
   let { status } = props;
 
   if (emailError) {
-    status = 'form-submission-error';
+    status = FORM_SUBMISSION_ERROR;
   }
 
-  let message = '';
-  let heading = intl.formatMessage(messages['forgot.password.error.alert.title']);
-  const supportUrl = getConfig().PASSWORD_RESET_SUPPORT_LINK;
   switch (status) {
-    case 'complete':
-      heading = intl.formatMessage(messages['confirmation.message.title']);
+    case COMPLETE_STATE:
+      heading = formatMessage(messages['confirmation.message.title']);
       message = (
         <FormattedMessage
           id="forgot.password.confirmation.message"
@@ -34,15 +36,8 @@ const ForgotPasswordAlert = (props) => {
           values={{
             email: <span className="data-hj-suppress">{email}</span>,
             supportLink: (
-              <Alert.Link
-                className="alert-link"
-                href={supportUrl}
-                onClick={e => {
-                  e.preventDefault();
-                  window.open(supportUrl, '_blank');
-                }}
-              >
-                {intl.formatMessage(messages['confirmation.support.link'])}
+              <Alert.Link href={getConfig().PASSWORD_RESET_SUPPORT_LINK} target="_blank">
+                {formatMessage(messages['confirmation.support.link'])}
               </Alert.Link>
             ),
           }}
@@ -50,26 +45,26 @@ const ForgotPasswordAlert = (props) => {
       );
      break;
     case INTERNAL_SERVER_ERROR:
-      message = intl.formatMessage(messages['internal.server.error']);
+      message = formatMessage(messages['internal.server.error']);
       break;
-    case 'forbidden':
-      heading = intl.formatMessage(messages['forgot.password.error.message.title']);
-      message = intl.formatMessage(messages['forgot.password.request.in.progress.message']);
+    case FORBIDDEN_STATE:
+      heading = formatMessage(messages['forgot.password.error.message.title']);
+      message = formatMessage(messages['forgot.password.request.in.progress.message']);
       break;
-    case 'form-submission-error':
-      message = intl.formatMessage(messages['extend.field.errors'], { emailError });
+    case FORM_SUBMISSION_ERROR:
+      message = formatMessage(messages['extend.field.errors'], { emailError });
       break;
     case PASSWORD_RESET.INVALID_TOKEN:
-      heading = intl.formatMessage(messages['invalid.token.heading']);
-      message = intl.formatMessage(messages['invalid.token.error.message']);
+      heading = formatMessage(messages['invalid.token.heading']);
+      message = formatMessage(messages['invalid.token.error.message']);
       break;
     case PASSWORD_RESET.FORBIDDEN_REQUEST:
-      heading = intl.formatMessage(messages['token.validation.rate.limit.error.heading']);
-      message = intl.formatMessage(messages['token.validation.rate.limit.error']);
+      heading = formatMessage(messages['token.validation.rate.limit.error.heading']);
+      message = formatMessage(messages['token.validation.rate.limit.error']);
       break;
     case PASSWORD_RESET.INTERNAL_SERVER_ERROR:
-      heading = intl.formatMessage(messages['token.validation.internal.sever.error.heading']);
-      message = intl.formatMessage(messages['token.validation.internal.sever.error']);
+      heading = formatMessage(messages['token.validation.internal.sever.error.heading']);
+      message = formatMessage(messages['token.validation.internal.sever.error']);
       break;
     default:
       break;
@@ -79,7 +74,7 @@ const ForgotPasswordAlert = (props) => {
     return (
       <Alert
         id="validation-errors"
-        className="mb-5"
+        className="mb-4"
         variant={`${status === 'complete' ? 'success' : 'danger'}`}
         icon={status === 'complete' ? CheckCircle : Error}
       >
@@ -99,8 +94,7 @@ ForgotPasswordAlert.defaultProps = {
 ForgotPasswordAlert.propTypes = {
   status: PropTypes.string.isRequired,
   email: PropTypes.string,
-  intl: intlShape.isRequired,
   emailError: PropTypes.string,
 };
 
-export default injectIntl(ForgotPasswordAlert);
+export default ForgotPasswordAlert;

src/forgot-password/ForgotPasswordPage.jsx

@@ -1,152 +1,166 @@
-import React, { useState, useEffect } from 'react';
-
-import { Formik } from 'formik';
-import PropTypes from 'prop-types';
+import React, { useEffect, useState } from 'react';
 import { connect } from 'react-redux';
-import { Helmet } from 'react-helmet';
-import { Redirect } from 'react-router-dom';
 
 import { getConfig } from '@edx/frontend-platform';
 import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { useIntl } from '@edx/frontend-platform/i18n';
 import {
   Form,
-  StatefulButton,
   Hyperlink,
-  Tabs,
-  Tab,
   Icon,
+  StatefulButton,
+  Tab,
+  Tabs,
 } from '@edx/paragon';
 import { ChevronLeft } from '@edx/paragon/icons';
+import PropTypes from 'prop-types';
+import { Helmet } from 'react-helmet';
+import { Redirect } from 'react-router-dom';
 
-import { forgotPassword } from './data/actions';
-import { forgotPasswordResultSelector } from './data/selectors';
-
-import messages from './messages';
+import { BaseComponent } from '../base-component';
 import { FormGroup } from '../common-components';
 import { DEFAULT_STATE, LOGIN_PAGE, VALID_EMAIL_REGEX } from '../data/constants';
 import { updatePathWithQueryParams, windowScrollTo } from '../data/utils';
+import { forgotPassword, setForgotPasswordFormData } from './data/actions';
+import { forgotPasswordResultSelector } from './data/selectors';
 import ForgotPasswordAlert from './ForgotPasswordAlert';
-import BaseComponent from '../base-component';
+import messages from './messages';
 
 const ForgotPasswordPage = (props) => {
-  const { intl, status, submitState } = props;
-
   const platformName = getConfig().SITE_NAME;
-  const regex = new RegExp(VALID_EMAIL_REGEX, 'i');
-  const [validationError, setValidationError] = useState('');
+  const emailRegex = new RegExp(VALID_EMAIL_REGEX, 'i');
+  const {
+    status, submitState, emailValidationError,
+  } = props;
+
+  const { formatMessage } = useIntl();
+  const [email, setEmail] = useState(props.email);
+  const [bannerEmail, setBannerEmail] = useState('');
+  const [formErrors, setFormErrors] = useState('');
+  const [validationError, setValidationError] = useState(emailValidationError);
   const [key, setKey] = useState('');
-  const supportUrl = getConfig().LOGIN_ISSUE_SUPPORT_LINK;
 
   useEffect(() => {
     sendPageEvent('login_and_registration', 'reset');
     sendTrackEvent('edx.bi.password_reset_form.viewed', { category: 'user-engagement' });
   }, []);
 
-  const getValidationMessage = (email) => {
+  useEffect(() => {
+    setValidationError(emailValidationError);
+  }, [emailValidationError]);
+
+  useEffect(() => {
+    if (status === 'complete') {
+      setEmail('');
+    }
+  }, [status]);
+
+  const getValidationMessage = (value) => {
     let error = '';
 
-    if (email === '') {
-      error = intl.formatMessage(messages['forgot.password.empty.email.field.error']);
-    } else if (!regex.test(email)) {
-      error = intl.formatMessage(messages['forgot.password.page.invalid.email.message']);
+    if (value === '') {
+      error = formatMessage(messages['forgot.password.empty.email.field.error']);
+    } else if (!emailRegex.test(value)) {
+      error = formatMessage(messages['forgot.password.page.invalid.email.message']);
     }
 
-    setValidationError(error);
     return error;
   };
 
+  const handleBlur = () => {
+    props.setForgotPasswordFormData({ email, emailValidationError: getValidationMessage(email) });
+  };
+
+  const handleFocus = () => props.setForgotPasswordFormData({ emailValidationError: '' });
+
+  const handleSubmit = (e) => {
+    e.preventDefault();
+    setBannerEmail(email);
+
+    const error = getValidationMessage(email);
+    if (error) {
+      setFormErrors(error);
+      props.setForgotPasswordFormData({ email, emailValidationError: error });
+      windowScrollTo({ left: 0, top: 0, behavior: 'smooth' });
+    } else {
+      props.forgotPassword(email);
+    }
+  };
+
   const tabTitle = (
-    <div className="d-flex">
-      <Icon src={ChevronLeft} className="arrow-back-icon" />
-      <span className="ml-2">{intl.formatMessage(messages['sign.in.text'])}</span>
+    <div className="d-inline-flex flex-wrap align-items-center">
+      <Icon src={ChevronLeft} />
+      <span className="ml-2">{formatMessage(messages['sign.in.text'])}</span>
     </div>
   );
 
   return (
     <BaseComponent>
+      <Helmet>
+        <title>{formatMessage(messages['forgot.password.page.title'],
+          { siteName: getConfig().SITE_NAME })}
+        </title>
+      </Helmet>
       <div>
-        <Tabs activeKey="" id="controlled-tab-example" onSelect={(k) => setKey(k)}>
+        <Tabs activeKey="" id="controlled-tab" onSelect={(k) => setKey(k)}>
           <Tab title={tabTitle} eventKey={LOGIN_PAGE} />
         </Tabs>
         { key && (
           <Redirect to={updatePathWithQueryParams(key)} />
         )}
         <div id="main-content" className="main-content">
-          <Formik
-            initialValues={{ email: '' }}
-            validateOnChange={false}
-            validate={(values) => {
-              const validationMessage = getValidationMessage(values.email);
-
-              if (validationMessage !== '') {
-                windowScrollTo({ left: 0, top: 0, behavior: 'smooth' });
-                return { email: validationMessage };
-              }
-
-              return {};
-            }}
-            onSubmit={(values) => { props.forgotPassword(values.email); }}
-          >
-            {({
-              errors, handleSubmit, setFieldValue, values,
-            }) => (
-              <>
-                <Helmet>
-                  <title>{intl.formatMessage(messages['forgot.password.page.title'],
-                    { siteName: getConfig().SITE_NAME })}
-                  </title>
-                </Helmet>
-                <Form id="forget-password-form" name="forget-password-form" className="mw-xs">
-                  <ForgotPasswordAlert email={props.email} emailError={errors.email} status={status} />
-                  <h2 className="h4">
-                    {intl.formatMessage(messages['forgot.password.page.heading'])}
-                  </h2>
-                  <p className="mb-4">
-                    {intl.formatMessage(messages['forgot.password.page.instructions'])}
-                  </p>
-                  <FormGroup
-                    floatingLabel={intl.formatMessage(messages['forgot.password.page.email.field.label'])}
-                    name="email"
-                    errorMessage={validationError}
-                    value={values.email}
-                    handleBlur={() => getValidationMessage(values.email)}
-                    handleChange={e => setFieldValue('email', e.target.value)}
-                    handleFocus={() => setValidationError('')}
-                    helpText={[intl.formatMessage(messages['forgot.password.email.help.text'], { platformName })]}
-                  />
-                  <StatefulButton
-                    id="submit-forget-password"
-                    name="submit-forget-password"
-                    type="submit"
-                    variant="brand"
-                    className="login-button-width"
-                    state={submitState}
-                    labels={{
-                      default: intl.formatMessage(messages['forgot.password.page.submit.button']),
-                      pending: '',
-                    }}
-                    onClick={handleSubmit}
-                    onMouseDown={(e) => e.preventDefault()}
-                  />
-                  <Hyperlink
-                    id="forgot-password"
-                    name="forgot-password"
-                    className="ml-4 font-weight-500 text-body"
-                    destination={supportUrl}
-                    onClick={e => {
-                      e.preventDefault();
-                      window.open(supportUrl, '_blank');
-                    }}
-                  >{intl.formatMessage(messages['need.help.sign.in.text'])}
-                  </Hyperlink>
-                  <p className="mt-5 one-rem-font">{intl.formatMessage(messages['additional.help.text'])}
-                    <span><Hyperlink isInline destination={`mailto:${getConfig().INFO_EMAIL}`}>{getConfig().INFO_EMAIL}</Hyperlink></span>
-                  </p>
-                </Form>
-              </>
+          <Form id="forget-password-form" name="forget-password-form" className="mw-xs">
+            <ForgotPasswordAlert email={bannerEmail} emailError={formErrors} status={status} />
+            <h2 className="h4">
+              {formatMessage(messages['forgot.password.page.heading'])}
+            </h2>
+            <p className="mb-4">
+              {formatMessage(messages['forgot.password.page.instructions'])}
+            </p>
+            <FormGroup
+              floatingLabel={formatMessage(messages['forgot.password.page.email.field.label'])}
+              name="email"
+              value={email}
+              autoComplete="on"
+              errorMessage={validationError}
+              handleChange={(e) => setEmail(e.target.value)}
+              handleBlur={handleBlur}
+              handleFocus={handleFocus}
+              helpText={[formatMessage(messages['forgot.password.email.help.text'], { platformName })]}
+            />
+            <StatefulButton
+              id="submit-forget-password"
+              name="submit-forget-password"
+              type="submit"
+              variant="brand"
+              className="forgot-password-button-width"
+              state={submitState}
+              labels={{
+                default: formatMessage(messages['forgot.password.page.submit.button']),
+                pending: '',
+              }}
+              onClick={handleSubmit}
+              onMouseDown={(e) => e.preventDefault()}
+            />
+            {(getConfig().LOGIN_ISSUE_SUPPORT_LINK) && (
+              <Hyperlink
+                id="forgot-password"
+                name="forgot-password"
+                className="ml-4 font-weight-500 text-body"
+                destination={getConfig().LOGIN_ISSUE_SUPPORT_LINK}
+                target="_blank"
+                showLaunchIcon={false}
+              >
+                {formatMessage(messages['need.help.sign.in.text'])}
+              </Hyperlink>
             )}
-          </Formik>
+            <p className="mt-5.5 small text-gray-700">
+              {formatMessage(messages['additional.help.text'], { platformName })}
+              <span>
+                <Hyperlink isInline destination={`mailto:${getConfig().INFO_EMAIL}`}>{getConfig().INFO_EMAIL}</Hyperlink>
+              </span>
+            </p>
+          </Form>
         </div>
       </div>
     </BaseComponent>
@@ -154,15 +168,17 @@ const ForgotPasswordPage = (props) => {
 };
 
 ForgotPasswordPage.propTypes = {
-  intl: intlShape.isRequired,
   email: PropTypes.string,
+  emailValidationError: PropTypes.string,
   forgotPassword: PropTypes.func.isRequired,
+  setForgotPasswordFormData: PropTypes.func.isRequired,
   status: PropTypes.string,
   submitState: PropTypes.string,
 };
 
 ForgotPasswordPage.defaultProps = {
   email: '',
+  emailValidationError: '',
   status: null,
   submitState: DEFAULT_STATE,
 };
@@ -171,5 +187,6 @@ export default connect(
   forgotPasswordResultSelector,
   {
     forgotPassword,
+    setForgotPasswordFormData,
   },
-)(injectIntl(ForgotPasswordPage));
+)(ForgotPasswordPage);

src/forgot-password/data/actions.js

@@ -1,6 +1,7 @@
 import { AsyncActionType } from '../../data/utils';
 
 export const FORGOT_PASSWORD = new AsyncActionType('FORGOT', 'PASSWORD');
+export const FORGOT_PASSWORD_PERSIST_FORM_DATA = 'FORGOT_PASSWORD_PERSIST_FORM_DATA';
 
 // Forgot Password
 export const forgotPassword = email => ({
@@ -24,3 +25,8 @@ export const forgotPasswordForbidden = () => ({
 export const forgotPasswordServerError = () => ({
   type: FORGOT_PASSWORD.FAILURE,
 });
+
+export const setForgotPasswordFormData = (forgotPasswordFormData) => ({
+  type: FORGOT_PASSWORD_PERSIST_FORM_DATA,
+  payload: { forgotPasswordFormData },
+});

src/forgot-password/data/reducers.js

@@ -1,11 +1,12 @@
-import { FORGOT_PASSWORD } from './actions';
 import { INTERNAL_SERVER_ERROR, PENDING_STATE } from '../../data/constants';
 import { PASSWORD_RESET_FAILURE } from '../../reset-password/data/actions';
+import { FORGOT_PASSWORD, FORGOT_PASSWORD_PERSIST_FORM_DATA } from './actions';
 
 export const defaultState = {
   status: '',
   submitState: '',
   email: '',
+  emailValidationError: '',
 };
 
 const reducer = (state = defaultState, action = null) => {
@@ -13,28 +14,42 @@ const reducer = (state = defaultState, action = null) => {
     switch (action.type) {
       case FORGOT_PASSWORD.BEGIN:
         return {
+          email: state.email,
           status: 'pending',
           submitState: PENDING_STATE,
         };
       case FORGOT_PASSWORD.SUCCESS:
         return {
-          ...action.payload,
+          ...defaultState,
           status: 'complete',
         };
       case FORGOT_PASSWORD.FORBIDDEN:
         return {
+          email: state.email,
           status: 'forbidden',
         };
       case FORGOT_PASSWORD.FAILURE:
         return {
+          email: state.email,
           status: INTERNAL_SERVER_ERROR,
         };
       case PASSWORD_RESET_FAILURE:
         return {
           status: action.payload.errorCode,
         };
+      case FORGOT_PASSWORD_PERSIST_FORM_DATA: {
+        const { forgotPasswordFormData } = action.payload;
+        return {
+          ...state,
+          ...forgotPasswordFormData,
+        };
+      }
       default:
-        return defaultState;
+        return {
+          ...defaultState,
+          email: state.email,
+          emailValidationError: state.emailValidationError,
+        };
     }
   }
   return state;

src/forgot-password/data/sagas.js

@@ -5,11 +5,10 @@ import { call, put, takeEvery } from 'redux-saga/effects';
 import {
   FORGOT_PASSWORD,
   forgotPasswordBegin,
-  forgotPasswordSuccess,
   forgotPasswordForbidden,
   forgotPasswordServerError,
+  forgotPasswordSuccess,
 } from './actions';
-
 import { forgotPassword } from './service';
 
 // Services

src/forgot-password/data/tests/reducers.test.js

@@ -0,0 +1,34 @@
+import {
+  FORGOT_PASSWORD_PERSIST_FORM_DATA,
+} from '../actions';
+import reducer from '../reducers';
+
+describe('forgot password reducer', () => {
+  it('should set email and emailValidationError', () => {
+    const state = {
+      status: '',
+      submitState: '',
+      email: '',
+      emailValidationError: '',
+    };
+    const forgotPasswordFormData = {
+      email: 'test@gmail',
+      emailValidationError: 'Enter a valid email address',
+    };
+    const action = {
+      type: FORGOT_PASSWORD_PERSIST_FORM_DATA,
+      payload: { forgotPasswordFormData },
+    };
+
+    expect(
+      reducer(state, action),
+    ).toEqual(
+      {
+        status: '',
+        submitState: '',
+        email: 'test@gmail',
+        emailValidationError: 'Enter a valid email address',
+      },
+    );
+  });
+});

src/forgot-password/data/tests/sagas.test.js

@@ -1,16 +1,16 @@
 import { runSaga } from 'redux-saga';
 
+import initializeMockLogging from '../../../setupTest';
 import * as actions from '../actions';
 import { handleForgotPassword } from '../sagas';
 import * as api from '../service';
-import initializeMockLogging from '../../../setupTest';
 
 const { loggingService } = initializeMockLogging();
 
 describe('handleForgotPassword', () => {
   const params = {
     payload: {
-      formData: {
+      forgotPasswordFormData: {
         email: 'test@test.com',
       },
     },

src/forgot-password/index.js

@@ -1,4 +1,4 @@
-export { default } from './ForgotPasswordPage';
+export { default as ForgotPasswordPage } from './ForgotPasswordPage';
 export { default as reducer } from './data/reducers';
 export { FORGOT_PASSWORD } from './data/actions';
 export { default as saga } from './data/sagas';

src/forgot-password/messages.js

@@ -51,16 +51,6 @@ const messages = defineMessages({
     defaultMessage: 'Enter your email',
     description: 'Error message that appears when user tries to submit empty email field',
   },
-  'forgot.password.invalid.email.heading': {
-    id: 'forgot.password.invalid.email',
-    defaultMessage: 'An error occurred.',
-    description: 'heading for invalid email',
-  },
-  'forgot.password.invalid.email.message': {
-    id: 'forgot.password.invalid.email.message',
-    defaultMessage: "The email address you've provided isn't formatted correctly.",
-    description: 'message for invalid email',
-  },
   'forgot.password.email.help.text': {
     id: 'forgot.password.email.help.text',
     defaultMessage: 'The email address you used to register with {platformName}',
@@ -84,7 +74,7 @@ const messages = defineMessages({
   },
   'additional.help.text': {
     id: 'additional.help.text',
-    defaultMessage: 'For additional help, contact edX support at ',
+    defaultMessage: 'For additional help, contact {platformName} support at ',
     description: 'additional help text on forgot password page',
   },
   'sign.in.text': {
@@ -134,10 +124,5 @@ const messages = defineMessages({
     defaultMessage: 'An error has occurred. Try refreshing the page, or check your internet connection.',
     description: 'Error message that appears when server responds with 500 error code',
   },
-  'rate.limit.error': {
-    id: 'rate.limit.error',
-    defaultMessage: 'An error has occurred because of too many requests. Please try again after some time.',
-    description: 'Error message that appears when server responds with 429 error code',
-  },
 });
 export default messages;

src/forgot-password/tests/ForgotPasswordPage.test.jsx

@@ -1,21 +1,21 @@
 import React from 'react';
-
-import { mount } from 'enzyme';
-import { act } from 'react-dom/test-utils';
 import { Provider } from 'react-redux';
-import { MemoryRouter, Router } from 'react-router-dom';
-import configureStore from 'redux-mock-store';
-import { createMemoryHistory } from 'history';
 
-import * as analytics from '@edx/frontend-platform/analytics';
 import CookiePolicyBanner from '@edx/frontend-component-cookie-policy-banner';
 import { mergeConfig } from '@edx/frontend-platform';
-import { IntlProvider, injectIntl, configure } from '@edx/frontend-platform/i18n';
-
+import * as analytics from '@edx/frontend-platform/analytics';
 import * as auth from '@edx/frontend-platform/auth';
-import ForgotPasswordPage from '../ForgotPasswordPage';
+import { configure, injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
+import { mount } from 'enzyme';
+import { createMemoryHistory } from 'history';
+import { act } from 'react-dom/test-utils';
+import { MemoryRouter, Router } from 'react-router-dom';
+import configureStore from 'redux-mock-store';
+
 import { INTERNAL_SERVER_ERROR, LOGIN_PAGE } from '../../data/constants';
 import { PASSWORD_RESET } from '../../reset-password/data/constants';
+import { setForgotPasswordFormData } from '../data/actions';
+import ForgotPasswordPage from '../ForgotPasswordPage';
 
 jest.mock('@edx/frontend-platform/analytics');
 jest.mock('@edx/frontend-platform/auth');
@@ -51,7 +51,7 @@ describe('ForgotPasswordPage', () => {
 
   beforeEach(() => {
     store = mockStore(initialState);
-    auth.getAuthenticatedUser = jest.fn(() => ({ userId: 3, username: 'edX' }));
+    auth.getAuthenticatedUser = jest.fn(() => ({ userId: 3, username: 'test-user' }));
     configure({
       loggingService: { logError: jest.fn() },
       config: {
@@ -66,7 +66,15 @@ describe('ForgotPasswordPage', () => {
     };
   });
 
+  it('not should display need other help signing in button', () => {
+    const wrapper = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
+    expect(wrapper.find('#forgot-password').exists()).toBeFalsy();
+  });
+
   it('should display need other help signing in button', () => {
+    mergeConfig({
+      LOGIN_ISSUE_SUPPORT_LINK: '/support',
+    });
     const wrapper = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
     expect(wrapper.find('#forgot-password').first().text()).toEqual('Need help signing in?');
   });
@@ -125,28 +133,61 @@ describe('ForgotPasswordPage', () => {
     expect(forgotPasswordPage.find('#email-invalid-feedback').exists()).toEqual(false);
   });
 
-  it('should display error message on blur event', async () => {
-    const validationMessage = 'Enter your email';
+  it('should set error in redux store on onBlur', () => {
+    const forgotPasswordFormData = {
+      email: 'test@gmail',
+      emailValidationError: 'Enter a valid email address',
+    };
+
+    props = {
+      ...props,
+      email: 'test@gmail',
+      emailValidationError: '',
+    };
+
+    store.dispatch = jest.fn(store.dispatch);
     const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
-    const emailInput = forgotPasswordPage.find('input#email');
-
-    await act(async () => {
-      await emailInput.simulate('blur', { target: { value: '', name: 'email' } });
-    });
+    forgotPasswordPage.find('input#email').simulate('blur');
+    expect(store.dispatch).toHaveBeenCalledWith(setForgotPasswordFormData(forgotPasswordFormData));
+  });
 
+  it('should display error message if available in props', async () => {
+    const validationMessage = 'Enter your email';
+    props = {
+      ...props,
+      emailValidationError: validationMessage,
+      email: '',
+    };
+    const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
     forgotPasswordPage.update();
     expect(forgotPasswordPage.find('.pgn__form-text-invalid').text()).toEqual(validationMessage);
   });
 
-  it('should clear error message on focus event', async () => {
-    const validationMessage = 'Enter your email';
+  it('should clear error in redux store on onFocus', () => {
+    const forgotPasswordFormData = {
+      emailValidationError: '',
+    };
+
+    props = {
+      ...props,
+      email: 'test@gmail',
+      emailValidationError: 'Enter a valid email address',
+    };
+
+    store.dispatch = jest.fn(store.dispatch);
     const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
-    await act(async () => { await forgotPasswordPage.find('button.btn-brand').simulate('click'); });
-
-    forgotPasswordPage.update();
-    expect(forgotPasswordPage.find('.pgn__form-text-invalid').text()).toEqual(validationMessage);
-
     forgotPasswordPage.find('input#email').simulate('focus');
+    expect(store.dispatch).toHaveBeenCalledWith(setForgotPasswordFormData(forgotPasswordFormData));
+  });
+
+  it('should clear error message when cleared in props on focus', async () => {
+    props = {
+      ...props,
+      emailValidationError: '',
+      email: '',
+    };
+    const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
+    forgotPasswordPage.update();
     expect(forgotPasswordPage.find('#email-invalid-feedback').exists()).toEqual(false);
   });
 

src/i18n/index.jsx

@@ -1,21 +1,21 @@
 import arMessages from './messages/ar.json';
 import caMessages from './messages/ca.json';
 // no need to import en messages-- they are in the defaultMessage field
+import dedeMessages from './messages/de_DE.json';
 import es419Messages from './messages/es_419.json';
 import frMessages from './messages/fr.json';
-import zhcnMessages from './messages/zh_CN.json';
-import ititMessages from './messages/it_IT.json';
-import ptptMessages from './messages/pt_PT.json';
-import dedeMessages from './messages/de_DE.json';
-import hiMessages from './messages/hi.json';
 import heMessages from './messages/he.json';
+import hiMessages from './messages/hi.json';
 import idMessages from './messages/id.json';
+import ititMessages from './messages/it_IT.json';
 import kokrMessages from './messages/ko_kr.json';
 import plMessages from './messages/pl.json';
 import ptbrMessages from './messages/pt_br.json';
+import ptptMessages from './messages/pt_PT.json';
 import ruMessages from './messages/ru.json';
 import thMessages from './messages/th.json';
 import ukMessages from './messages/uk.json';
+import zhcnMessages from './messages/zh_CN.json';
 
 const messages = {
   ar: arMessages,

src/i18n/messages/ar.json

@@ -1,224 +1,166 @@
 {
-  "top.discount.message.15.off": "off",
-  "top.discount.message.body": "Get {discount} your first verified certificate* with code",
-  "start.learning": "Start learning",
-  "with.site.name": "with {siteName}",
-  "code.copied": "Code copied",
-  "complete.your.profile.1": "Complete",
-  "complete.your.profile.2": "your profile",
-  "welcome.to.platform": "Welcome to {siteName}, {username}!",
-  "side.discount.message.15.off": "off",
-  "certificate.message": "certificate* with code",
-  "side.discount.message.body": "Get {discountText} your first verified {lineBreak} {certificateMsg}",
-  "institution.login.page.sub.heading": "Choose your institution from the list below",
-  "forgot.password.confirmation.title": "Check your email",
-  "forgot.password.confirmation.support.link": "contact technical support",
-  "forgot.password.confirmation.info": "If you do not receive a password reset message after 1 minute, verify that you entered the correct email address, or check your spam folder.",
-  "logistration.sign.in": "Sign in",
-  "logistration.register": "Register",
-  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your internet connection.",
-  "server.ratelimit.error.message": "An error has occurred because of too many requests. Please try again after some time.",
-  "enterprisetpa.title.heading": "Would you like to sign in using your {providerName} credentials?",
-  "enterprisetpa.sso.button.title": "Sign in using {providerName}",
-  "enterprisetpa.login.button.text": "Show me other ways to sign in or register",
-  "sso.sign.in.with": "Sign in with {providerName}",
-  "sso.create.account.using": "Create account using {providerName}",
-  "show.password": "Show password",
-  "hide.password": "Hide password",
-  "one.letter": "1 Letter",
-  "one.number": "1 Number",
-  "eight.characters": "8 Characters",
-  "password.sr.only.helping.text": "Password must contain at least 8 characters, at least one letter, and at least one number",
-  "tpa.alert.heading": "Almost done!",
-  "login.third.party.auth.account.not.linked": "You have successfully signed into {currentProvider}, but your {currentProvider} account does not have a linked {platformName} account. To link your accounts, sign in now using your {platformName} password.",
-  "register.third.party.auth.account.not.linked": "You've successfully signed into {currentProvider}! We just need a little more information before you start learning with {platformName}.",
-  "error.notfound.message": "الصفحة التي تبحث عنها غير متوفرة أو هناك خطأ في نص الرابط. الرجاء التحقق من الرابط والمحاولة مجددا.",
-  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password.\n          If you do not receive a password reset message after 1 minute, verify that you entered\n          the correct email address, or check your spam folder. If you need further assistance, {supportLink}.",
-  "forgot.password.page.title": "Forgot Password | {siteName}",
-  "forgot.password.page.heading": "Reset password",
-  "forgot.password.page.instructions": "Please enter your email address below and we will send you an email with instructions on how to reset your password.",
-  "forgot.password.page.invalid.email.message": "Enter a valid email address",
-  "forgot.password.page.email.field.label": "Email",
-  "forgot.password.page.submit.button": "Submit",
-  "forgot.password.error.alert.title.": "We were unable to contact you.",
-  "forgot.password.error.message.title": "An error occurred.",
-  "forgot.password.request.in.progress.message": "Your previous request is in progress, please try again in a few moments.",
-  "forgot.password.empty.email.field.error": "Enter your email",
-  "forgot.password.invalid.email": "An error occurred.",
-  "forgot.password.invalid.email.message": "The email address you've provided isn't formatted correctly.",
-  "forgot.password.email.help.text": "The email address you used to register with {platformName}",
-  "confirmation.message.title": "Check your email",
-  "confirmation.support.link": "contact technical support",
-  "need.help.sign.in.text": "Need help signing in?",
-  "additional.help.text": "For additional help, contact edX support at ",
-  "sign.in.text": "Sign in",
-  "extend.field.errors": "{emailError} below.",
-  "invalid.token.heading": "Invalid password reset link",
-  "invalid.token.error.message": "This password reset link is invalid. It may have been used already. Enter your email below to receive a new link.",
-  "token.validation.rate.limit.error.heading": "Too many requests",
-  "token.validation.rate.limit.error": "An error has occurred because of too many requests. Please try again after some time.",
-  "token.validation.internal.sever.error.heading": "Token validation failure",
-  "token.validation.internal.sever.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
-  "internal.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
-  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time.",
-  "account.activation.error.message": "Something went wrong, please {supportLink} to resolve this issue.",
-  "login.inactive.user.error": "أنت بحاجة لتنشيط حسابك من أجل تسجيل الدخول {lineBreak}\n{lineBreak}لقد أرسلنا للتو رابط التفعيل إلى البريد الإلكتروني {email}. تحقق من مجلدات الرسائل غير المرغوب فيها أو {supportLink} إذا لم تستلم بريدًا إلكترونيًا.",
-  "login.incorrect.credentials.error.attempts.text.1": "The username, email or password you entered is incorrect. You have {remainingAttempts} more sign in\n                attempts before your account is temporarily locked.",
-  "login.incorrect.credentials.error.attempts.text.2": "If you've forgotten your password, {resetLink}",
-  "account.locked.out.message.2": "To be on the safe side, you can {resetLink} before trying again.",
-  "login.incorrect.credentials.error.with.reset.link": "The username, email, or password you entered is incorrect. Please try again or {resetLink}.",
-  "login.page.title": "Login | {siteName}",
-  "login.user.identity.label": "Username or email",
-  "login.password.label": "Password",
-  "sign.in.button": "Sign in",
-  "sign.in.btn.pending.state": "Loading",
-  "need.help.signing.in.collapsible.menu": "Need help signing in?",
-  "forgot.password.link": "Forgot my password",
-  "forgot.password": "Forgot password",
-  "other.sign.in.issues": "Other sign in issues",
-  "need.other.help.signing.in.collapsible.menu": "Need other help signing in?",
-  "institution.login.button": "Institution/campus credentials",
-  "institution.login.page.title": "Sign in with institution/campus credentials",
-  "institution.login.page.back.button": "Back to sign in",
-  "create.an.account": "Create an account",
-  "login.other.options.heading": "Or sign in with:",
-  "non.compliant.password.title": "We recently changed our password requirements",
-  "non.compliant.password.message": "Your current password does not meet the new security requirements. We just sent a password-reset message to the email address associated with this account. Thank you for helping us keep your data safe.",
-  "account.locked.out.message.1": "To protect your account, it's been temporarily locked. Try again in 30 minutes.",
-  "first.time.here": "First time here?",
-  "email.help.message": "The email address you used to register with edX.",
-  "enterprise.login.btn.text": "Company or school credentials",
-  "email.format.validation.message": "The email address you've provided isn't formatted correctly.",
-  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 3 characters.",
-  "email.validation.message": "Enter your username or email",
-  "password.validation.message": "Password criteria has not been met",
-  "register.link": "Create an account",
-  "sign.in.heading": "Sign in",
-  "account.activation.success.message.title": "Success! You have activated your account.",
-  "account.activation.success.message": "You will now receive email updates and alerts from us related to the courses you are enrolled in. Sign in to continue.",
-  "account.activation.info.message": "This account has already been activated.",
-  "account.activation.error.message.title": "Your account could not be activated",
-  "account.activation.support.link": "contact support",
-  "account.confirmation.success.message.title": "Success! You have confirmed your email.",
-  "account.confirmation.success.message": "Sign in to continue.",
-  "account.confirmation.info.message": "This email has already been confirmed.",
-  "account.confirmation.error.message.title": "Your email could not be confirmed",
-  "login.rate.limit.reached.message": "Too many failed login attempts. Try again later.",
-  "login.failure.header.title": "We couldn't sign you in.",
-  "contact.support.link": "contact {platformName} support",
-  "login.incorrect.credentials.error": "The username, email, or password you entered is incorrect. Please try again.",
-  "login.failed.attempt.error": "You have {remainingAttempts} more sign in attempts before your account is temporarily locked.",
-  "login.locked.out.error.message": "To protect your account, it’s been temporarily locked. Try again in {lockedOutPeriod} minutes.",
-  "login.form.invalid.error.message": "Please fill in the fields below.",
-  "login.incorrect.credentials.error.reset.link.text": "reset your password",
-  "login.incorrect.credentials.error.before.account.blocked.text": "click here to reset it.",
-  "password.security.nudge.title": "Password security",
-  "password.security.block.title": "Password change required",
-  "password.security.nudge.body": "Our system detected that your password is vulnerable. We recommend you change it so that your account stays secure.",
-  "password.security.block.body": "Our system detected that your password is vulnerable. Change your password so that your account stays secure.",
-  "password.security.close.button": "Close",
-  "password.security.redirect.to.reset.password.button": "Reset your password",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each\n                Member process your personal data in accordance with the {privacyPolicy}.",
-  "register.page.honor.code": "I agree to the {platformName} {tosAndHonorCode}",
-  "register.page.title": "Register | {siteName}",
-  "registration.fullname.label": "Full name",
-  "registration.email.label": "Email",
-  "registration.username.label": "Public username",
-  "registration.password.label": "Password",
-  "registration.country.label": "Country/Region",
-  "registration.opt.in.label": "I agree that {siteName} may send me marketing messages.",
-  "help.text.name": "This name will be used by any certificates that you earn.",
-  "help.text.username.1": "The name that will identify you in your courses.",
-  "help.text.username.2": "This can not be changed later.",
-  "help.text.email": "For account activation and important updates",
-  "create.account.for.free.button": "Create an account for free",
-  "create.an.account.btn.pending.state": "Loading",
-  "registration.other.options.heading": "Or register with:",
-  "register.institution.login.button": "Institution/campus credentials",
-  "register.institution.login.page.title": "Register with institution/campus credentials",
-  "empty.name.field.error": "Enter your full name",
-  "empty.email.field.error": "Enter your email",
-  "empty.username.field.error": "Username must be between 2 and 30 characters",
-  "empty.password.field.error": "Password criteria has not been met",
-  "empty.country.field.error": "Select your country or region of residence",
-  "email.invalid.format.error": "Enter a valid email address",
-  "email.ratelimit.less.chars.validation.message": "Email must have 3 characters.",
-  "username.validation.message": "Username must be between 2 and 30 characters",
-  "name.validation.message": "Enter a valid name",
-  "username.format.validation.message": "Usernames can only contain letters (A-Z, a-z), numerals (0-9), underscores (_), and hyphens (-). Usernames cannot contain spaces.",
-  "support.education.research": "Support education research by providing additional information. (Optional)",
-  "registration.request.failure.header": "We couldn't create your account.",
-  "registration.empty.form.submission.error": "Please check your responses and try again.",
-  "registration.request.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
-  "registration.rate.limit.error": "Too many failed registration attempts. Try again later.",
-  "registration.tpa.session.expired": "Registration using {provider} has timed out.",
-  "terms.of.service.and.honor.code": "Terms of Service and Honor Code",
-  "privacy.policy": "Privacy Policy",
-  "honor.code": "Honor Code",
-  "terms.of.service": "Terms of Service",
-  "registration.year.of.birth.label": "Year of birth (optional)",
-  "registration.field.gender.options.label": "Gender (optional)",
-  "registration.goals.label": "Tell us why you're interested in edX (optional)",
-  "registration.field.gender.options.f": "Female",
-  "registration.field.gender.options.m": "Male",
-  "registration.field.gender.options.o": "Other/Prefer not to say",
-  "registration.field.education.levels.label": "Highest level of education completed (optional)",
-  "registration.field.education.levels.p": "Doctorate",
-  "registration.field.education.levels.m": "Master's or professional degree",
-  "registration.field.education.levels.b": "Bachelor's degree",
-  "registration.field.education.levels.a": "Associate's degree",
-  "registration.field.education.levels.hs": "Secondary/high school",
-  "registration.field.education.levels.jhs": "Junior secondary/junior high/middle school",
-  "registration.field.education.levels.el": "Elementary/primary school",
-  "registration.field.education.levels.none": "No formal education",
-  "registration.field.education.levels.other": "Other education",
-  "registration.username.suggestion.label": "Suggested:",
-  "registration.using.tpa.form.heading": "Finish creating your account",
-  "did.you.mean.alert.text": "Did you mean",
-  "certificate.msg": "*Offer not eligible for GTx’s Analytics: Essential Tools and Methods MicroMasters Program, ColumbiaX’s Corporate Finance Professional Certificate Program, or courses or programs offered by Wharton, and NYIF.",
-  "register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
-  "sign.in": "Sign in",
-  "reset.password.page.title": "Reset Password | {siteName}",
-  "reset.password": "Reset password",
-  "reset.password.page.instructions": "Enter and confirm your new password.",
-  "new.password.label": "New password",
-  "confirm.password.label": "Confirm password",
-  "passwords.do.not.match": "Passwords do not match",
-  "confirm.your.password": "Confirm your password",
-  "forgot.password.confirmation.sign.in.link": "sign in",
-  "reset.password.request.forgot.password.text": "Forgot password",
-  "reset.password.request.invalid.token.header": "Invalid password reset link",
-  "reset.password.empty.new.password.field.error": "Please enter your new password.",
-  "reset.password.failure.heading": "We couldn't reset your password.",
-  "reset.password.form.submission.error": "Please check your responses and try again.",
-  "reset.password.request.server.error": "Failed to reset password",
-  "reset.password.token.validation.sever.error": "Token validation failure",
-  "reset.server.rate.limit.error": "Too many requests.",
-  "reset.password.success.heading": "Password reset complete.",
-  "reset.password.success": "Your password has been reset. Sign in to your account.",
-  "progressive.profiling.page.title": "Optional Fields | {siteName}",
-  "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
-  "gender.options.label": "Gender (optional)",
-  "gender.options.f": "Female",
-  "gender.options.m": "Male",
-  "gender.options.o": "Other/Prefer not to say",
-  "education.levels.label": "Highest level of education completed (optional)",
-  "education.levels.p": "Doctorate",
-  "education.levels.m": "Master's or professional degree",
-  "education.levels.b": "Bachelor's degree",
-  "education.levels.a": "Associate's degree",
-  "education.levels.hs": "Secondary/high school",
-  "education.levels.jhs": "Junior secondary/junior high/middle school",
-  "education.levels.el": "Elementary/primary school",
-  "education.levels.none": "No formal education",
-  "education.levels.other": "Other education",
-  "year.of.birth.label": "Year of birth (optional)",
-  "optional.fields.information.link": "Learn more about how we use this information.",
-  "optional.fields.submit.button": "Submit",
-  "optional.fields.skip.button": "Skip for now",
-  "continue.to.platform": "Continue to {platformName}",
-  "modal.title": "Thanks for letting us know.",
-  "modal.description": "You can complete your profile in settings at any time if you change your mind.",
-  "welcome.page.error.heading": "We couldn't update your profile",
-  "welcome.page.error.message": "An error occurred. You can complete your profile in settings at any time."
+  "start.learning": "ابدأ التعلم ",
+  "with.site.name": "مع {siteName}",
+  "complete.your.profile.1": "أكمل",
+  "complete.your.profile.2": "ملفك الشخصي",
+  "welcome.to.platform": "أهلا بك {username} في {siteName}",
+  "institution.login.page.sub.heading": "اختر مؤسستك من القائمة أدناه",
+  "logistration.sign.in": "تسجيل الدخول",
+  "logistration.register": "التسجيل",
+  "enterprisetpa.title.heading": "هل ترغب في تسجيل الدخول باستخدام بيانات {providerName} الخاصة بك؟",
+  "enterprisetpa.login.button.text": "أرِني وسائل أخرى لتسجيل الدخول أو للتسجيل",
+  "enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
+  "sso.sign.in.with": "تسجيل الدخول باستخدام {providerName}",
+  "sso.create.account.using": "إنشاء حساب باستخدام {providerName}",
+  "show.password": "إظهار كلمة المرور",
+  "hide.password": "اخفاء كلمة المرور",
+  "one.letter": "حرف واحد",
+  "one.number": "رقم واحد",
+  "eight.characters": "8 رموز",
+  "password.sr.only.helping.text": "يجب أن تحتوي كلمة المرور على الأقل 8 رموز، منها حرف واحد و رقم واحد على الأقل.",
+  "tpa.alert.heading": "انتهينا تقريبا!",
+  "login.third.party.auth.account.not.linked": "لقد نجحت في تسجيل الدخول إلى {currentProvider}، لكن حسابك على {currentProvider} غير موصول بأي حساب على {platformName}. لوصل حساباتك، سجّل الدخول الآن باستخدام كلمة مرورك على {platformName}.",
+  "register.third.party.auth.account.not.linked": "لقد سجلت دخولك بنجاح إلى {currentProvider}! نحتاج فقط قليلاً بعدُ من المعلومات قبل أن تبدأ التعلم مع {platformName}.",
+  "registration.using.tpa.form.heading": "إتمام إنشاء حسابك",
+  "zendesk.supportTitle": "edX Support",
+  "zendesk.selectTicketForm": "Please choose your request type:",
+  "error.notfound.message": "الصفحة التي تبحث عنها غير متوفرة أو هناك خطأ في العنوان. رجاءً تحقق من العنوان و حاول مجددًا.",
+  "forgot.password.confirmation.message": "لقد أرسلنا بريدًا إلكترونيًا إلى {email} به إرشادات لإعادة ضبط كلمة المرور الخاصة بك. إن لم تستلم رسالة إعادة ضبط كلمة المرور بعد دقيقة واحدة، فتحقق من إدخال عنوان البريد الإلكتروني الصحيح، أو تفقد مجلد الرسائل غير المرغوب فيها. إن احتجت مزيدًا من المساعدة، {supportLink}.",
+  "forgot.password.page.title": "نسيت كلمة المرور | {siteName}",
+  "forgot.password.page.heading": "إعادة ضبط كلمة المرور",
+  "forgot.password.page.instructions": "رجاءً أدخل عنوان بريدك الإلكتروني أدناه وسنرسل إليك بريدًا به إرشادات بخصوص كيفية إعادة ضبط كلمة مرورك.",
+  "forgot.password.page.invalid.email.message": "أدخل عنوان بريد إلكتروني صحيح",
+  "forgot.password.page.email.field.label": "البريد الإلكتروني",
+  "forgot.password.page.submit.button": "إرسال",
+  "forgot.password.error.alert.title.": "لم نتمكن من الاتصال بك.",
+  "forgot.password.error.message.title": "حدث خطأ ما.",
+  "forgot.password.request.in.progress.message": "طلبك السابق قيد التنفيذ، يرجى المحاولة مرة أخرى بعد لحظات قليلة.",
+  "forgot.password.empty.email.field.error": "أدخل بريدك الإلكتروني",
+  "forgot.password.email.help.text": "عنوان البريد الإلكتروني الذي استخدمته للتسجيل في {platformName}",
+  "confirmation.message.title": "تفقّد بريدك الإلكتروني",
+  "confirmation.support.link": "اتصل بالدعم الفني",
+  "need.help.sign.in.text": "هل تحتاج مساعدة في تسجيل الدخول؟",
+  "additional.help.text": "للمزيد من المساعدة، اتصل بدعم {platformName} على ",
+  "sign.in.text": "تسجيل الدخول",
+  "extend.field.errors": "{emailError} أدناه.",
+  "invalid.token.heading": "رابط إعادة ضبط كلمة المرور غير صالح",
+  "invalid.token.error.message": "رابط إعادة ضبط كلمة المرور هذا غير صالح. قد يكون مستعمَلا من قبل. أدخل بريدك الإلكتروني أدناه لتلقي رابط جديد.",
+  "token.validation.rate.limit.error.heading": "طلبات أكثر مما ينبغي",
+  "token.validation.rate.limit.error": "حدث خطأ بسبب كثرة الطلبات. رجاءً حاول مرة أخرى بعد مضي بعض الوقت.",
+  "token.validation.internal.sever.error.heading": "فشل في التحقق من صحة الشارة",
+  "token.validation.internal.sever.error": "حدث خطأ ما. جرب تحديث الصفحة أو تحقق من اتصالك بالإنترنت.",
+  "internal.server.error": "حدث خطأ ما. جرب تحديث الصفحة أو تحقق من اتصالك بالإنترنت.",
+  "account.activation.error.message": "شي ما لم يسر على ما يرام، يرجى {supportLink} لحل هذه المشكلة.",
+  "login.inactive.user.error": "أنت بحاجة لتفعيل حسابك من أجل تسجيل الدخول{lineBreak}\n{lineBreak}لقد أرسلنا للتو رابطًا للتفعيل إلى {email}. إن لم تتلقّ بريدًا إلكترونيا، تفقّد مجلدات الرسائل غير المرغوب فيها أو {supportLink}.",
+  "allowed.domain.login.error": "كونك مستخدمًا على {allowedDomain}، فإن عليك تسجيل الدخول باستخدام {tpaLink} الخاص بـ {allowedDomain} .",
+  "login.incorrect.credentials.error.attempts.text.1": "اسم المستخدم أو البريد الإلكتروني أو كلمة المرور التي أدخلتها غير صحيحة. لديك {remainingAttempts, plural,\n  one {محاولة  واحدة}\n  two {محاولتان}\n  few {# محاولات}\n  many {# محاولة}\n  other {# محاولة}\n} أخرى لتسجيل الدخول قبل أن يتم إقفال حسابك مؤقتًا.",
+  "login.incorrect.credentials.error.attempts.text.2": "إن نسيت كلمة مرورك، {resetLink}",
+  "account.locked.out.message.2": "لتكون في مأمن، يمكنك {resetLink} قبل تكرار المحاولة.",
+  "login.incorrect.credentials.error.with.reset.link": "اسم المستخدم أو البريد الإلكتروني أو كلمة المرور التي أدخلتها غير صحيحة. يرجى تكرار المحاولة أو {resetLink}.",
+  "login.page.title": "تسجيل الدخول | {siteName}",
+  "login.user.identity.label": "اسم المستخدم أو البريد الإلكتروني",
+  "login.password.label": "كلمة المرور",
+  "sign.in.button": "تسجيل الدخول",
+  "forgot.password": "نسيت كلمة المرور",
+  "institution.login.button": "بيانات المؤسسة / الجامعة",
+  "institution.login.page.title": "تسجيل الدخول باستخدام بيانات المؤسسة / الجامعة",
+  "login.other.options.heading": "أو قم بتسجيل الدخول باستخدام:",
+  "non.compliant.password.title": "لقد غيرنا متطلبات أمان كلمة المرور مؤخرًا",
+  "non.compliant.password.message": "كلمة مرورك الحالية لا تستسجيب لمتطلبات الأمان الجديدة. لقد أرسلنا للتو رسالة لإعادة ضبط كلمة المرور إلى عنوان البريد الإلكتروني المرتبط بهذا الحساب. شكرًا لك على مساعدتنا في الحفاظ على سلامة بياناتك.",
+  "account.locked.out.message.1": "لحماية حسابك، تم إقفاله مؤقتًا. حاول مرة أخرى بعد 30 دقيقة.",
+  "enterprise.login.btn.text": "بيانات الشركة أو المدرسة",
+  "username.or.email.format.validation.less.chars.message": "يجب أن يحتوي اسم المستخدم أو البريد الإلكتروني على 3 أحرف على الأقل.",
+  "email.validation.message": "أدخل اسم المستخدم أو البريد الإلكتروني الخاص بك",
+  "password.validation.message": "لم يتم استيفاء معايير كلمة المرور",
+  "account.activation.success.message.title": "نجح الأمر! لقد قمت بتفعيل حسابك.",
+  "account.activation.success.message": "ستصلك الآن تحديثات وتنبيهات عبر البريد الإلكتروني منا تتعلق بالمساقات التي قمت بالتسجيل فيها. قم بتسجيل الدخول للمتابعة.",
+  "account.activation.info.message": "هذا الحساب مفعَّل من قبل.",
+  "account.activation.error.message.title": "لا يمكن تفعيل حسابك",
+  "account.activation.support.link": "الاتصال بالدعم",
+  "account.confirmation.success.message.title": "نجحت العملية! لقد أكدت بريدك الإلكتروني.",
+  "account.confirmation.success.message": "سجل دخولك للمتابعة.",
+  "account.confirmation.info.message": "هذا البريد الإلكتروني مؤكد من قبل.",
+  "account.confirmation.error.message.title": "لا يمكن تأكيد بريدك الإلكتروني",
+  "tpa.account.link": "حساب {provider}",
+  "internal.server.error.message": "حدث خطأ ما. جرّب تحديث الصفحة أو تحقق من اتصالك بالانترنت.",
+  "login.rate.limit.reached.message": "كثرت محاولات تسجيل الدخول الفاشلة. رجاءً أعد المحاولة لاحقًا.",
+  "login.failure.header.title": "لم نتمكّن من تسجيل دخولك.",
+  "contact.support.link": "اتصل بدعم {platformName}",
+  "login.incorrect.credentials.error": "اسم المستخدم أو البريد الإلكتروني أو كلمة المرور التي أدخلتها غير صحيحة. حاول مرة اخرى.",
+  "login.form.invalid.error.message": "رجاءً املأ الحقول أدناه.",
+  "login.incorrect.credentials.error.reset.link.text": "إعادة ضبط كلمه المرور",
+  "login.incorrect.credentials.error.before.account.blocked.text": "انقر هنا لإعادة ضبطها.",
+  "password.security.nudge.title": "أمان كلمة المرور",
+  "password.security.block.title": "مطلوب تغيير كلمة المرور",
+  "password.security.nudge.body": "اكتشف نظامنا أن كلمة مرورك ضعيفة. ننصحك بتغييرها حتى يظل حسابك آمنًا.",
+  "password.security.block.body": "اكتشف نظامنا أن كلمة مرورك صعيفة. غيّر كلمة مرورك حتى يظل حسابك آمنًا.",
+  "password.security.close.button": "إغلاق",
+  "password.security.redirect.to.reset.password.button": "إعادة ضبط كلمة المرور",
+  "progressive.profiling.page.title": "Welcome | {siteName}",
+  "progressive.profiling.page.heading": "بعض الأسئلة الموجهة لك ستساعدنا كي نزداد ذكاءً.",
+  "optional.fields.information.link": "معرفة المزيد عن كيفية استخدامنا لهذه المعلومات.",
+  "optional.fields.submit.button": "إرسال",
+  "optional.fields.skip.button": "التخطي مؤقتا",
+  "optional.fields.next.button": "Next",
+  "continue.to.platform": "المواصلة إلى {platformName}",
+  "modal.title": "شكرا لإعلامنا.",
+  "modal.description": "إن غيرت رأيك، قيمكنك إكمال ملفك الشخصي ضمن الإعدادات في أي وقت.",
+  "welcome.page.error.heading": "لم نتمكن من تحديث ملفك الشخصي",
+  "welcome.page.error.message": "حدث خطأ ما. يمكنك إكمال ملفك الشخصي ضمن الإعدادات في أي وقت.",
+  "recommendation.page.title": "Recommendations | {siteName}",
+  "recommendation.page.heading": "We have a few recommendations to get you started.",
+  "recommendation.skip.button": "Skip for now",
+  "register.page.title": "التسجيل | {siteName}",
+  "registration.fullname.label": "الاسم الكامل",
+  "registration.email.label": "البريد الإلكتروني",
+  "registration.username.label": "اسم المستخدم العامّ",
+  "registration.password.label": "كلمة المرور",
+  "registration.country.label": "البلد / المنطقة",
+  "registration.opt.in.label": "أوافق على تلقّي رسائل تسويقية من {siteName}.",
+  "help.text.name": "سيتم استخدام هذا الاسم في أي شهادات تحصل عليها.",
+  "help.text.username.1": "الاسم الذي ستُعرَف به في مساقاتك.",
+  "help.text.username.2": "لا يمكن تغيير هذا لاحقًا.",
+  "help.text.email": "لتفعيل الحساب و التحديثات الهامة",
+  "create.account.for.free.button": "إنشاء حساب مجانا",
+  "registration.other.options.heading": "أو سجل باستخدام:",
+  "register.institution.login.button": "بيانات المؤسسة / الجامعة",
+  "register.institution.login.page.title": "التسجيل باستخدام بيانات المؤسسة / الجامعة",
+  "empty.name.field.error": "أدخل اسمك الكامل",
+  "empty.email.field.error": "أدخل بريدك الإلكتروني",
+  "empty.username.field.error": "يجب أن يتكون اسم المستخدم من 2 إلى 30 حرفًا",
+  "empty.password.field.error": "لم يتم استيفاء معايير كلمة المرور",
+  "empty.country.field.error": "حدد بلدك أو منطقة إقامتك",
+  "email.do.not.match": "عناوين البريد الإلكتروني غير متطابقة.",
+  "email.invalid.format.error": "أدخل بريدا إلكترونيا صحيحا",
+  "username.validation.message": "يجب أن يتكون اسم المستخدم من 2 إلى 30 حرفًا",
+  "name.validation.message": "أدخل اسمًا صحيحا",
+  "username.format.validation.message": "يمكن أن تحتوي أسماء المستخدمين فقط على أحرف (A-Z، a-z)، و أرقام (0-9)، و أسطر سفلية (_)، و واصلات (-). لا يمكن أن تحتوي أسماء المستخدمين على مسافات",
+  "registration.request.failure.header": "لم نتمكّن من إنشاء حسابك.",
+  "registration.empty.form.submission.error": "رجاءً تحقّق من أجوبتك و حاول مجددا.",
+  "registration.request.server.error": "حدث خطأ ما. جرب تحديث الصفحة أو تحقق من اتصالك بالإنترنت.",
+  "registration.rate.limit.error": "كثرت محاولات التسجيل الفاشلة. أعد المحاولة لاحقًا.",
+  "registration.tpa.session.expired": "نفد وقت التسجيل باستخدام {provider}.",
+  "terms.of.service.and.honor.code": "شروط الخدمة وميثاق الشرف الأكاديمي",
+  "privacy.policy": "سياسة الخصوصية",
+  "honor.code": "ميثاق الشرف الأكاديمي",
+  "terms.of.service": "شروط الخدمة",
+  "registration.username.suggestion.label": "مقترح:",
+  "did.you.mean.alert.text": "هل تقصد",
+  "register.page.terms.of.service.and.honor.code": "بإنشاءك حسابًا، فإنك توافق على {tosAndHonorCode} و تقر بأن {platformName} و كل عضو يعالج بياناتك الشخصية وفقًا لـ{privacyPolicy}.",
+  "register.page.honor.code": "I agree to the {platformName} {tosAndHonorCode}",
+  "register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
+  "sign.in": "تسجيل الدخول",
+  "reset.password.page.title": "إعادة ضبط كلمة المرور | {siteName}",
+  "reset.password": "إعادة ضبط كلمة المرور",
+  "reset.password.page.instructions": "قم بإدخال و تأكيد كلمة مرورك.",
+  "new.password.label": "كلمة المرور الجديدة",
+  "confirm.password.label": "تأكيد كلمة المرور",
+  "passwords.do.not.match": "كلمتا المرور غير متطابقتين",
+  "confirm.your.password": "تأكيد كلمة مرورك",
+  "reset.password.failure.heading": "لم نتمكن من إعادة ضبط كلمة مرورك.",
+  "reset.password.form.submission.error": "رجاءً تحقق من أجوبتك وحاول مجددًا.",
+  "reset.server.rate.limit.error": "طلبات أكثر مما ينبغي.",
+  "reset.password.success.heading": "تمت إعادة ضبط كلمة المرور.",
+  "reset.password.success": "تمت إعادة ضبط كلمة مرورك. سجل الدخول إلى حسابك.",
+  "rate.limit.error": "حدث خطأ بسبب كثرة الطلبات. رجاءً حاول مرة أخرى بعد مضي بعض الوقت."
 }