feat: hide signup page on the bases of flag (#837 )

Co-authored-by: attiyaishaque <atiya.ishaq@arbisoft.com>
feat: displaying a support link on the welcome page (#763 )
2023-04-10 17:18:22 +05:00 · 2023-03-08 10:08:59 +05:00 · 2023-03-02 16:15:55 +05:00 · 2023-03-02 16:15:38 +05:00 · 2023-03-01 12:25:31 +05:00 · 2023-02-20 13:36:20 +05:00
25 changed files with 643 additions and 292 deletions
--- a/.env
+++ b/.env
@@ -29,3 +29,4 @@ ZENDESK_KEY=''
 ZENDESK_LOGO_URL=''
 APP_ID=''
 MFE_CONFIG_API_URL=''
+ENABLE_COOKIE_POLICY_BANNER=''
--- a/src/base-component/BaseComponent.jsx
+++ b/src/base-component/BaseComponent.jsx
@@ -1,6 +1,7 @@
 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';
@@ -21,7 +22,7 @@ const BaseComponent = ({ children, showWelcomeBanner }) => {

  return (
    <>
-      <CookiePolicyBanner languageCode={getLocale()} />
+      {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}>
--- a/src/common-components/EnterpriseSSO.jsx
+++ b/src/common-components/EnterpriseSSO.jsx
@@ -15,6 +15,7 @@ import messages from './messages';
 const EnterpriseSSO = (props) => {
  const { intl } = props;
  const tpaProvider = props.provider;
+  const disablePublicAccountCreation = getConfig().ALLOW_PUBLIC_ACCOUNT_CREATION === false;

  const handleSubmit = (e, url) => {
    e.preventDefault();
@@ -61,12 +62,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
+                  ? intl.formatMessage(messages['enterprisetpa.login.button.text.public.account.creation.disabled'])
+                  : intl.formatMessage(messages['enterprisetpa.login.button.text'])}
              </Button>
            </Form>
          </div>
--- a/src/common-components/Logistration.jsx
+++ b/src/common-components/Logistration.jsx
@@ -25,6 +25,7 @@ const Logistration = (props) => {
  const tpa = getTpaHint();
  const [institutionLogin, setInstitutionLogin] = useState(false);
  const [key, setKey] = useState('');
+  const disablePublicAccountCreation = getConfig().ALLOW_PUBLIC_ACCOUNT_CREATION === false;

  useEffect(() => {
    const authService = getAuthService();
@@ -63,30 +64,56 @@ const Logistration = (props) => {
  return (
    <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">{intl.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>
+                )
+                : (
+                  <>
+                    {!tpa && (
+                      <Tabs defaultActiveKey={selectedPage} id="controlled-tab" onSelect={handleOnSelect}>
+                        <Tab title={intl.formatMessage(messages['logistration.register'])} eventKey={REGISTER_PAGE} />
+                        <Tab title={intl.formatMessage(messages['logistration.sign.in'])} eventKey={LOGIN_PAGE} />
+                      </Tabs>
+                    )}
+                  </>
+                )}
+              { key && (
+                <Redirect to={updatePathWithQueryParams(key)} />
+              )}
+              <div id="main-content" className="main-content">
+                {selectedPage === LOGIN_PAGE
+                  ? <LoginPage institutionLogin={institutionLogin} handleInstitutionLogin={handleInstitutionLogin} />
+                  : (
+                    <RegistrationPage
+                      institutionLogin={institutionLogin}
+                      handleInstitutionLogin={handleInstitutionLogin}
+                    />
+                  )}
+              </div>
+            </div>
          )}
-        { 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>
  );
--- a/src/common-components/messages.jsx
+++ b/src/common-components/messages.jsx
@@ -60,6 +60,11 @@ const messages = defineMessages({
    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',
--- a/src/common-components/tests/Logistration.test.jsx
+++ b/src/common-components/tests/Logistration.test.jsx
@@ -51,6 +51,9 @@ describe('Logistration', () => {
      messages: { 'es-419': {}, de: {}, 'en-us': {} },
    });

+    mergeConfig({
+      ALLOW_PUBLIC_ACCOUNT_CREATION: true,
+    });
    store = mockStore({
      register: {
        registrationResult: { success: false, redirectUrl: '' },
@@ -81,9 +84,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({
--- a/src/forgot-password/ForgotPasswordPage.jsx
+++ b/src/forgot-password/ForgotPasswordPage.jsx
@@ -141,16 +141,18 @@ const ForgotPasswordPage = (props) => {
              onClick={handleSubmit}
              onMouseDown={(e) => e.preventDefault()}
            />
-            <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}
-            >
-              {intl.formatMessage(messages['need.help.sign.in.text'])}
-            </Hyperlink>
+            {(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}
+              >
+                {intl.formatMessage(messages['need.help.sign.in.text'])}
+              </Hyperlink>
+            )}
            <p className="mt-5.5 small text-gray-700">
              {intl.formatMessage(messages['additional.help.text'], { platformName })}
              <span>
--- a/src/forgot-password/tests/ForgotPasswordPage.test.jsx
+++ b/src/forgot-password/tests/ForgotPasswordPage.test.jsx
@@ -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?');
  });
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -113,8 +113,20 @@
  "password.security.block.body": "اكتشف نظامنا أن كلمة مرورك صعيفة. غيّر كلمة مرورك حتى يظل حسابك آمنًا.",
  "password.security.close.button": "إغلاق",
  "password.security.redirect.to.reset.password.button": "إعادة ضبط كلمة المرور",
-  "register.page.terms.of.service.and.honor.code": "بإنشاءك حسابًا، فإنك توافق على {tosAndHonorCode} و تقر بأن {platformName} و كل عضو يعالج بياناتك الشخصية وفقًا لـ{privacyPolicy}.",
-  "register.page.honor.code": "أوافق على {tosAndHonorCode} الخاصة بـ{platformName}",
+  "progressive.profiling.page.title": "الحقول الاختيارية | {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": "البريد الإلكتروني",
--- a/src/i18n/messages/de_DE.json
+++ b/src/i18n/messages/de_DE.json
@@ -1,219 +1,163 @@
 {
-  "start.learning": "Start learning",
-  "with.site.name": "with {siteName}",
-  "complete.your.profile.1": "Complete",
-  "complete.your.profile.2": "your profile",
-  "welcome.to.platform": "Welcome to {siteName}, {username}!",
-  "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": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
-  "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.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 {platformName} 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": "In order to sign in, you need to activate your account.{lineBreak}\n            {lineBreak}We just sent an activation link to {email}. If you do not receive an email,\n            check your spam folders or {supportLink}.",
-  "allowed.domain.login.error": "As {allowedDomain} user, You must login with your {allowedDomain} {tpaLink}.",
-  "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",
-  "tpa.account.link": "{provider} account",
-  "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",
-  "email.do.not.match": "The email addresses do not match.",
-  "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",
-  "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": "Beginne zu lernen",
+  "with.site.name": "mit {siteName}",
+  "complete.your.profile.1": "Vervollständige",
+  "complete.your.profile.2": "dein Profil",
+  "welcome.to.platform": "Willkommen bei {siteName}, {username}!",
+  "institution.login.page.sub.heading": "Wählen Sie Ihre Institution aus der folgenden Liste aus",
+  "logistration.sign.in": "Anmelden",
+  "logistration.register": "Registrieren",
+  "enterprisetpa.title.heading": "Möchten Sie sich mit Ihren {providerName}-Anmeldedaten anmelden?",
+  "enterprisetpa.login.button.text": "Andere Möglichkeiten für die Anmeldung oder Registrierung",
+  "sso.sign.in.with": "Melden Sie sich mit {providerName} an",
+  "sso.create.account.using": "Erstellen Sie ein Konto mit {providerName}",
+  "show.password": "Passwort anzeigen",
+  "hide.password": "Passwort verbergen",
+  "one.letter": "1 Buchstabe",
+  "one.number": "1 Nummer",
+  "eight.characters": "8 Charaktere",
+  "password.sr.only.helping.text": "Das Passwort muss mindestens 8 Zeichen, mindestens einen Buchstaben und mindestens eine Zahl enthalten",
+  "tpa.alert.heading": "Fast fertig!",
+  "login.third.party.auth.account.not.linked": "Sie haben sich erfolgreich bei {currentProvider} angemeldet, aber Ihr {currentProvider}-Konto hat kein verknüpftes {platformName}-Konto. Um Ihre Konten zu verknüpfen, melden Sie sich jetzt mit Ihrem {platformName}-Passwort an.",
+  "register.third.party.auth.account.not.linked": "Sie haben sich erfolgreich bei {currentProvider} angemeldet! Wir brauchen nur ein paar mehr Informationen, bevor Sie anfangen, mit {platformName} zu lernen.",
+  "registration.using.tpa.form.heading": "Beenden Sie die Erstellung Ihres Kontos",
+  "error.notfound.message": "Die gesuchte Seite ist nicht verfügbar oder es liegt ein Fehler in der URL vor. Bitte überprüfen Sie die URL und versuchen Sie es erneut.",
+  "forgot.password.confirmation.message": "Wir haben eine E-Mail mit Anweisungen zum Zurücksetzen Ihres Passworts an {email} gesendet. Wenn Sie nach 1 Minute keine Nachricht zum Zurücksetzen des Passworts erhalten, überprüfen Sie, ob Sie die richtige E-Mail-Adresse eingegeben haben, oder überprüfen Sie Ihren Spam-Ordner. Wenn Sie weitere Hilfe benötigen, {supportLink}.",
+  "forgot.password.page.title": "Passwort vergessen | {siteName}",
+  "forgot.password.page.heading": "Passwort zurücksetzen",
+  "forgot.password.page.instructions": "Bitte geben Sie unten Ihre E-Mail-Adresse ein und wir senden Ihnen eine E-Mail mit Anweisungen zum Zurücksetzen Ihres Passworts.",
+  "forgot.password.page.invalid.email.message": "Geben sie eine gültige E-Mail-Adresse an",
+  "forgot.password.page.email.field.label": "E-Mail Adresse",
+  "forgot.password.page.submit.button": "Einreichen",
+  "forgot.password.error.alert.title.": "Wir konnten Sie nicht kontaktieren.",
+  "forgot.password.error.message.title": "Ein Fehler ist aufgetreten.",
+  "forgot.password.request.in.progress.message": "Ihre vorherige Anfrage ist in Bearbeitung, bitte versuchen Sie es in wenigen Augenblicken erneut.",
+  "forgot.password.empty.email.field.error": "Geben sie ihre E-Mail Adresse ein",
+  "forgot.password.email.help.text": "Die E-Mail-Adresse, mit der Sie sich bei {platformName} registriert haben",
+  "confirmation.message.title": "Prüfen Sie Ihr E-Mail-Postfach",
+  "confirmation.support.link": "wenden Sie sich an den technischen Support",
+  "need.help.sign.in.text": "Brauchen Sie Hilfe bei der Anmeldung?",
+  "additional.help.text": "Wenden Sie sich für weitere Hilfe an den {platformName}-Support unter",
+  "sign.in.text": "Anmelden",
+  "extend.field.errors": "{emailError} unten.",
+  "invalid.token.heading": "Ungültiger Link zum Zurücksetzen des Passworts",
+  "invalid.token.error.message": "Dieser Link zum Zurücksetzen des Passwortes ist ungültig. Möglicherweise wurde es bereits verwendet. Geben Sie unten Ihre E-Mail-Adresse ein, um einen neuen Link zu erhalten.",
+  "token.validation.rate.limit.error.heading": "Zu viele Anfragen",
+  "token.validation.rate.limit.error": "Aufgrund von zu vieler Anfragen ist ein Fehler aufgetreten. Bitte versuchen Sie es nach einiger Zeit erneut.",
+  "token.validation.internal.sever.error.heading": "Token-Validierungsfehler",
+  "token.validation.internal.sever.error": "Ein Fehler ist aufgetreten. Versuchen Sie, die Seite zu aktualisieren, oder überprüfen Sie Ihre Internetverbindung.",
+  "internal.server.error": "Ein Fehler ist aufgetreten. Versuchen Sie, die Seite zu aktualisieren, oder überprüfen Sie Ihre Internetverbindung.",
+  "account.activation.error.message": "Etwas ist schief gelaufen, bitte {supportLink} um dieses Problem zu lösen.",
+  "login.inactive.user.error": "Um sich anzumelden, müssen Sie Ihr Konto aktivieren.{lineBreak} {lineBreak}Wir haben gerade einen Aktivierungslink an {email} gesendet. Wenn Sie keine E-Mail erhalten, überprüfen Sie Ihre Spam-Ordner oder {supportLink}.",
+  "allowed.domain.login.error": "Als {allowedDomain}-Benutzer müssen Sie sich mit Ihrem {allowedDomain} {tpaLink} anmelden.",
+  "login.incorrect.credentials.error.attempts.text.1": "Der eingegebene Benutzername, die E-Mail oder das Passwort ist falsch. Sie haben {remainingAttempts} weitere Anmeldeversuche, bevor Ihr Konto vorübergehend gesperrt wird.",
+  "login.incorrect.credentials.error.attempts.text.2": "Wenn Sie Ihr Passwort vergessen haben, {resetLink}",
+  "account.locked.out.message.2": "Um auf der sicheren Seite zu sein, können Sie {resetLink} tun, bevor Sie es erneut versuchen.",
+  "login.incorrect.credentials.error.with.reset.link": "Der eingegebene Benutzername, die E-Mail-Adresse oder das Passwort ist falsch. Bitte versuchen Sie es erneut oder {resetLink}.",
+  "login.page.title": "Anmelden | {siteName}",
+  "login.user.identity.label": "Benutzername oder E-Mail-Adresse",
+  "login.password.label": "Passwort",
+  "sign.in.button": "Anmelden",
+  "forgot.password": "Passwort vergessen",
+  "institution.login.button": "Zeugnisse der Institution/des Campus",
+  "institution.login.page.title": "Melden Sie sich mit Institutions-/Campus-Anmeldeinformationen an",
+  "login.other.options.heading": "Oder melden Sie sich an mit:",
+  "non.compliant.password.title": "Wir haben kürzlich unsere Passwortanforderungen geändert",
+  "non.compliant.password.message": "Ihr aktuelles Passwort entspricht nicht den neuen Sicherheitsanforderungen. Wir haben gerade eine Nachricht zum Zurücksetzen des Passworts an die mit diesem Konto verknüpfte E-Mail-Adresse gesendet. Vielen Dank, dass Sie uns helfen, Ihre Daten zu schützen.",
+  "account.locked.out.message.1": "Um Ihr Konto zu schützen, wurde es vorübergehend gesperrt. Versuchen Sie es in 30 Minuten erneut.",
+  "enterprise.login.btn.text": "Arbeits- oder Schulzeugnisse",
+  "username.or.email.format.validation.less.chars.message": "Benutzername oder E-Mail müssen mindestens 3 Zeichen lang sein.",
+  "email.validation.message": "Geben Sie Ihren Benutzernamen oder Ihre E-Mail-Adresse ein",
+  "password.validation.message": "Die Passwortkriterien wurden nicht erfüllt",
+  "account.activation.success.message.title": "Super! Sie haben Ihr Konto aktiviert.",
+  "account.activation.success.message": "Sie erhalten jetzt E-Mail-Updates und Benachrichtigungen von uns in Bezug auf die Kurse, für die Sie eingeschrieben sind. Melden Sie sich an, um fortzufahren.",
+  "account.activation.info.message": "Dieses Konto wurde bereits aktiviert.",
+  "account.activation.error.message.title": "Ihr Konto konnte nicht aktiviert werden",
+  "account.activation.support.link": "kontaktieren Sie den Support",
+  "account.confirmation.success.message.title": "Super! Sie haben Ihre E-Mail bestätigt.",
+  "account.confirmation.success.message": "Melden Sie sich an, um fortzufahren.",
+  "account.confirmation.info.message": "Diese E-Mail-Adresse wurde bereits bestätigt.",
+  "account.confirmation.error.message.title": "Ihre E-Mail-Adresse konnte nicht bestätigt werden",
+  "tpa.account.link": "{provider}-Konto",
+  "internal.server.error.message": "Ein Fehler ist aufgetreten. Versuchen Sie, die Seite zu aktualisieren, oder überprüfen Sie Ihre Internetverbindung.",
+  "login.rate.limit.reached.message": "Zu viele fehlgeschlagene Anmeldeversuche. Bitte versuche es später noch einmal.",
+  "login.failure.header.title": "Wir konnten Sie leider nicht einloggen.",
+  "contact.support.link": "Wenden Sie sich an den Support der {platformName}",
+  "login.incorrect.credentials.error": "Der eingegebene Benutzername, die E-Mail-Adresse oder das Passwort ist falsch. Bitte versuche es erneut.",
+  "login.form.invalid.error.message": "Bitte füllen Sie die unten stehenden Felder aus.",
+  "login.incorrect.credentials.error.reset.link.text": "Setzen Sie Ihr Passwort zurück",
+  "login.incorrect.credentials.error.before.account.blocked.text": "Klicken Sie hier, um es zurückzusetzen.",
+  "password.security.nudge.title": "Passwortsicherheit",
+  "password.security.block.title": "Passwortänderung erforderlich",
+  "password.security.nudge.body": "Unser System hat festgestellt, dass Ihr Passwort angreifbar ist. Wir empfehlen Ihnen, es zu ändern, damit Ihr Konto sicher bleibt.",
+  "password.security.block.body": "Unser System hat festgestellt, dass Ihr Passwort angreifbar ist. Ändern Sie Ihr Passwort, damit Ihr Konto sicher bleibt.",
+  "password.security.close.button": "Schließen",
+  "password.security.redirect.to.reset.password.button": "Setzen Sie Ihr Passwort zurück",
+  "progressive.profiling.page.title": "Optionale Felder | {siteName}",
+  "progressive.profiling.page.heading": "Ein paar Fragen an Sie helfen uns, schlauer zu werden.",
+  "optional.fields.information.link": "Erfahren Sie mehr darüber, wie wir diese Informationen verwenden.",
+  "optional.fields.submit.button": "Einreichen",
+  "optional.fields.skip.button": "Überspringen",
+  "optional.fields.next.button": "Next",
+  "continue.to.platform": "Weiter zu {platformName}",
+  "modal.title": "Danke, dass Sie uns das mitteilen.",
+  "modal.description": "Sie können Ihr Profil jederzeit in den Einstellungen vervollständigen, wenn Sie Ihre Meinung ändern.",
+  "welcome.page.error.heading": "Wir konnten Ihr Profil nicht aktualisieren",
+  "welcome.page.error.message": "Ein Fehler ist aufgetreten. Sie können Ihr Profil jederzeit in den Einstellungen vervollständigen.",
+  "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": "Registrieren | {siteName}",
+  "registration.fullname.label": "Vollständiger Name",
+  "registration.email.label": "E-Mail-Adresse",
+  "registration.username.label": "Öffentlicher Benutzername",
+  "registration.password.label": "Passwort",
+  "registration.country.label": "Land/Region",
+  "registration.opt.in.label": "Ich stimme zu, dass {siteName} mir Marketingmitteilungen senden darf.",
+  "help.text.name": "Dieser Name wird von allen Zertifikaten verwendet, die Sie erwerben.",
+  "help.text.username.1": "Der Name, der Sie in Ihren Kursen identifiziert.",
+  "help.text.username.2": "Dies kann später nicht mehr geändert werden.",
+  "help.text.email": "Für die Kontoaktivierung und wichtige Updates",
+  "create.account.for.free.button": "Erstellen Sie kostenlos ein Benutzerkonto",
+  "registration.other.options.heading": "Oder registrieren Sie sich bei:",
+  "register.institution.login.button": "Zeugnisse der Institution/des Campus",
+  "register.institution.login.page.title": "Registrieren Sie sich mit Institutions-/Campus-Anmeldeinformationen",
+  "empty.name.field.error": "Geben Sie Ihren vollständigen Namen ein",
+  "empty.email.field.error": "Geben Sie Ihre E-Mail-Adresse ein",
+  "empty.username.field.error": "Der Benutzername muss zwischen 2 und 30 Zeichen lang sein",
+  "empty.password.field.error": "Kennwortkriterien wurden nicht erfüllt",
+  "empty.country.field.error": "Wählen Sie das Land oder die Region Ihres Wohnsitzes aus",
+  "email.do.not.match": "Die E-Mail-Adressen stimmen nicht überein.",
+  "email.invalid.format.error": "Geben sie eine gültige E-Mail-Adresse an",
+  "username.validation.message": "Der Benutzername muss zwischen 2 und 30 Zeichen lang sein",
+  "name.validation.message": "Geben Sie einen gültigen Namen ein",
+  "username.format.validation.message": "Benutzernamen dürfen nur Buchstaben (AZ, az), Ziffern (0-9), Unterstriche (_) und Bindestriche (-) enthalten. Benutzernamen dürfen keine Leerzeichen enthalten",
+  "registration.request.failure.header": "Wir konnten Ihr Konto leider nicht erstellen.",
+  "registration.empty.form.submission.error": "Bitte überprüfen Sie Ihre Antworten und versuchen Sie es erneut.",
+  "registration.request.server.error": "Ein Fehler ist aufgetreten. Versuchen Sie, die Seite zu aktualisieren, oder überprüfen Sie Ihre Internetverbindung.",
+  "registration.rate.limit.error": "Zu viele fehlgeschlagene Registrierungsversuche. Versuchen Sie es später noch einmal.",
+  "registration.tpa.session.expired": "Die Registrierung mit {provider} ist abgelaufen.",
+  "terms.of.service.and.honor.code": "Nutzungsbedingungen und Verhaltenskodex",
+  "privacy.policy": "Datenschutzbestimmungen",
+  "honor.code": "Verhaltenskodex",
+  "terms.of.service": "Nutzungsbedingungen",
+  "registration.username.suggestion.label": "Empfohlen:",
+  "did.you.mean.alert.text": "Meinten Sie",
+  "register.page.terms.of.service.and.honor.code": "Wenn Sie ein Konto erstellen, stimmen Sie den {tosAndHonorCode} zu und erkennen an, dass {platformName} und jedes \nMitglied Ihre personenbezogenen Daten in Übereinstimmung mit den {privacyPolicy} verarbeitet.",
+  "register.page.honor.code": "Ich stimme den {platformName} {tosAndHonorCode} zu",
+  "register.page.terms.of.service": "Ich stimme den {platformName} {termsOfService} zu",
+  "sign.in": "Anmelden",
+  "reset.password.page.title": "Passwort zurücksetzen | {siteName}",
+  "reset.password": "Passwort zurücksetzen",
+  "reset.password.page.instructions": "Neues Passwort eingeben und bestätigen",
+  "new.password.label": "Neues Passwort",
+  "confirm.password.label": "Kennwort bestätigen",
+  "passwords.do.not.match": "Passwörter stimmen nicht überein",
+  "confirm.your.password": "Bestätigen Sie Ihr Passwort",
+  "reset.password.failure.heading": "Wir konnten Ihr Passwort nicht zurücksetzen.",
+  "reset.password.form.submission.error": "Bitte überprüfen Sie Ihre Antworten und versuchen Sie es erneut.",
+  "reset.server.rate.limit.error": "Zu viele Anfragen.",
+  "reset.password.success.heading": "Zurücksetzen des Passworts abgeschlossen.",
+  "reset.password.success": "Ihr Passwort wurde zurückgesetzt. Melden Sie sich bei Ihrem Konto an.",
+  "rate.limit.error": "Aufgrund zu vieler Anfragen ist ein Fehler aufgetreten. Bitte versuchen Sie es nach einiger Zeit erneut."
 }
--- a/src/i18n/messages/es_419.json
+++ b/src/i18n/messages/es_419.json
@@ -113,8 +113,20 @@
  "password.security.block.body": "Nuestro sistema detectó que su contraseña es vulnerable. Cambie su contraseña para que su cuenta permanezca segura.",
  "password.security.close.button": "Cerrar",
  "password.security.redirect.to.reset.password.button": "Restablece tu contraseña",
-  "register.page.terms.of.service.and.honor.code": "Al crear una cuenta, aceptas el {tosAndHonorCode} y reconoces que {platformName} y cada\n                Miembro procesa tus datos personales de acuerdo con la {privacyPolicy}.",
-  "register.page.honor.code": "Acepto las {platformName} {tosAndHonorCode}",
+  "progressive.profiling.page.title": "Campos opcionales | {siteName}",
+  "progressive.profiling.page.heading": "Unas cuantas preguntas para ti nos ayudarán a mejorar.",
+  "optional.fields.information.link": "Aprende más sobre cómo usamos esta información.",
+  "optional.fields.submit.button": "Enviar",
+  "optional.fields.skip.button": "Saltar por ahora ",
+  "optional.fields.next.button": "Next",
+  "continue.to.platform": "Continuar a {platformName}",
+  "modal.title": "Gracias por informarnos.",
+  "modal.description": "Puedes completar tu perfil en los ajustes en cualquier momento si cambias de opinión.",
+  "welcome.page.error.heading": "No hemos podido actualizar tu perfil",
+  "welcome.page.error.message": "Se ha producido un error. Puedes completar tu perfil en los ajustes en cualquier momento.",
+  "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": "Register | {siteName}",
  "registration.fullname.label": "Nombre completo",
  "registration.email.label": "Correo electrónico",
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -113,8 +113,20 @@
  "password.security.block.body": "Notre système a détecté que votre mot de passe est vulnérable. Changez votre mot de passe afin que votre compte reste sécurisé.",
  "password.security.close.button": "Fermer",
  "password.security.redirect.to.reset.password.button": "Réinitialiser votre mot de passe",
-  "register.page.terms.of.service.and.honor.code": "En créant un compte, vous acceptez le {tosAndHonorCode} et vous reconnaissez que {platformName} et chaque\n                membre peut traiter vos données personnelles conformément à la {privacyPolicy}.",
-  "register.page.honor.code": "J'accepte le {tosAndHonorCode} {platformName}",
+  "progressive.profiling.page.title": "Champs optionnels | {siteName}",
+  "progressive.profiling.page.heading": "Quelques questions pour vous nous aideront à devenir plus intelligents.",
+  "optional.fields.information.link": "En savoir plus sur la façon dont nous utilisons ces informations.",
+  "optional.fields.submit.button": "Envoyez",
+  "optional.fields.skip.button": "Ignorer pour l'instant",
+  "optional.fields.next.button": "Next",
+  "continue.to.platform": "Continuer vers {platformName}",
+  "modal.title": "Merci de nous en informer.",
+  "modal.description": "Vous pouvez compléter votre profil dans les paramètres à tout moment si vous changez d'avis.",
+  "welcome.page.error.heading": "Nous n'avons pas pu mettre à jour votre profil",
+  "welcome.page.error.message": "Une erreur s'est produite. Vous pouvez compléter votre profil dans les paramètres à tout moment.",
+  "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": "S'inscrire | {siteName}",
  "registration.fullname.label": "Nom complet",
  "registration.email.label": "Email",
--- a/src/i18n/messages/hi.json
+++ b/src/i18n/messages/hi.json
@@ -113,8 +113,20 @@
  "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}",
+  "progressive.profiling.page.title": "Optional Fields | {siteName}",
+  "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
+  "optional.fields.information.link": "Learn more about how we use this information.",
+  "optional.fields.submit.button": "Submit",
+  "optional.fields.skip.button": "Skip for now",
+  "optional.fields.next.button": "Next",
+  "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.",
+  "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": "Register | {siteName}",
  "registration.fullname.label": "Full name",
  "registration.email.label": "Email",
--- a/src/i18n/messages/it_IT.json
+++ b/src/i18n/messages/it_IT.json
@@ -113,8 +113,20 @@
  "password.security.block.body": "Il nostro sistema ha rilevato che la tua password è vulnerabile. Cambia la tua password in modo che il tuo account rimanga sicuro.",
  "password.security.close.button": "Chiudi",
  "password.security.redirect.to.reset.password.button": "Ripristina la tua password",
-  "register.page.terms.of.service.and.honor.code": "Creando un account, accetti il {tosAndHonorCode} e riconosci che {platformName} e ciascun Membro trattano i tuoi dati personali in conformità con l' {privacyPolicy}.",
-  "register.page.honor.code": "Accetto il {platformName} {tosAndHonorCode}",
+  "progressive.profiling.page.title": "Campi facoltativi | {siteName}",
+  "progressive.profiling.page.heading": "Alcune domande per te ci aiuteranno a diventare più intelligenti.",
+  "optional.fields.information.link": "Ulteriori informazioni su come utilizziamo queste informazioni.",
+  "optional.fields.submit.button": "Invia",
+  "optional.fields.skip.button": "Salta per ora",
+  "optional.fields.next.button": "Next",
+  "continue.to.platform": "Continua con {platformName}",
+  "modal.title": "Grazie per averci fatto sapere.",
+  "modal.description": "Puoi completare il tuo profilo nelle impostazioni in qualsiasi momento se cambi idea.",
+  "welcome.page.error.heading": "Impossibile aggiornare il tuo profilo",
+  "welcome.page.error.message": "Si è verificato un errore. Puoi completare il tuo profilo nelle impostazioni in qualsiasi momento.",
+  "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": "Registrazione | {siteName}",
  "registration.fullname.label": "Nome e Cognome",
  "registration.email.label": "Email",
--- a/src/i18n/messages/pt_PT.json
+++ b/src/i18n/messages/pt_PT.json
@@ -113,8 +113,20 @@
  "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}",
+  "progressive.profiling.page.title": "Optional Fields | {siteName}",
+  "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
+  "optional.fields.information.link": "Learn more about how we use this information.",
+  "optional.fields.submit.button": "Submit",
+  "optional.fields.skip.button": "Skip for now",
+  "optional.fields.next.button": "Next",
+  "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.",
+  "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": "Registar | {siteName}",
  "registration.fullname.label": "Full name",
  "registration.email.label": "Email",
--- a/src/i18n/messages/ru.json
+++ b/src/i18n/messages/ru.json
@@ -113,8 +113,20 @@
  "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}",
+  "progressive.profiling.page.title": "Optional Fields | {siteName}",
+  "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
+  "optional.fields.information.link": "Learn more about how we use this information.",
+  "optional.fields.submit.button": "Submit",
+  "optional.fields.skip.button": "Skip for now",
+  "optional.fields.next.button": "Next",
+  "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.",
+  "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": "Register | {siteName}",
  "registration.fullname.label": "Full name",
  "registration.email.label": "Email",
--- a/src/i18n/messages/uk.json
+++ b/src/i18n/messages/uk.json
@@ -113,8 +113,20 @@
  "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}",
+  "progressive.profiling.page.title": "Optional Fields | {siteName}",
+  "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
+  "optional.fields.information.link": "Learn more about how we use this information.",
+  "optional.fields.submit.button": "Submit",
+  "optional.fields.skip.button": "Skip for now",
+  "optional.fields.next.button": "Next",
+  "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.",
+  "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": "Register | {siteName}",
  "registration.fullname.label": "Full name",
  "registration.email.label": "Email",
--- a/src/i18n/messages/zh_CN.json
+++ b/src/i18n/messages/zh_CN.json
@@ -113,8 +113,20 @@
  "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}",
+  "progressive.profiling.page.title": "Optional Fields | {siteName}",
+  "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
+  "optional.fields.information.link": "Learn more about how we use this information.",
+  "optional.fields.submit.button": "Submit",
+  "optional.fields.skip.button": "Skip for now",
+  "optional.fields.next.button": "Next",
+  "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.",
+  "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": "Register | {siteName}",
  "registration.fullname.label": "Full name",
  "registration.email.label": "Email",
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -44,6 +44,7 @@ initialize({
        MARKETING_EMAILS_OPT_IN: process.env.MARKETING_EMAILS_OPT_IN || '',
        ENABLE_COPPA_COMPLIANCE: process.env.ENABLE_COPPA_COMPLIANCE || '',
        ENABLE_DYNAMIC_REGISTRATION_FIELDS: process.env.ENABLE_DYNAMIC_REGISTRATION_FIELDS || false,
+        ENABLE_COOKIE_POLICY_BANNER: process.env.ENABLE_COOKIE_POLICY_BANNER || false,
      });
    },
  },
--- a/src/login/LoginFailure.jsx
+++ b/src/login/LoginFailure.jsx
@@ -29,7 +29,7 @@ const LoginFailureMessage = (props) => {
  const authService = getAuthService();
  let errorList;
  let resetLink = (
-    <Hyperlink destination="/reset" isInline>
+    <Hyperlink destination="reset" isInline>
      {intl.formatMessage(messages['login.incorrect.credentials.error.reset.link.text'])}
    </Hyperlink>
  );
@@ -94,7 +94,7 @@ const LoginFailureMessage = (props) => {
      break;
    case FAILED_LOGIN_ATTEMPT: {
      resetLink = (
-        <Hyperlink destination="/reset" isInline>
+        <Hyperlink destination="reset" isInline>
          {intl.formatMessage(messages['login.incorrect.credentials.error.before.account.blocked.text'])}
        </Hyperlink>
      );
--- a/src/login/LoginPage.jsx
+++ b/src/login/LoginPage.jsx
@@ -170,12 +170,12 @@ class LoginPage extends React.Component {

    return (
      <>
-        {((!isEnterpriseLoginDisabled && isSocialAuthActive) || (isEnterpriseLoginDisabled && isInstitutionAuthActive))
-           && (
-             <div className="mt-4 mb-3 h4">
-               {intl.formatMessage(messages['login.other.options.heading'])}
-             </div>
-           )}
+        {(isSocialAuthActive || (isEnterpriseLoginDisabled && isInstitutionAuthActive))
+          && (
+            <div className="mt-4 mb-3 h4">
+              {intl.formatMessage(messages['login.other.options.heading'])}
+            </div>
+          )}

        {(!isEnterpriseLoginDisabled && isSocialAuthActive) && (
          <Hyperlink className="btn btn-link btn-sm text-body p-0 mb-4" destination={this.getEnterPriseLoginURL()}>
--- a/src/login/tests/LoginPage.test.jsx
+++ b/src/login/tests/LoginPage.test.jsx
@@ -236,6 +236,162 @@ describe('LoginPage', () => {
    expect(loginPage.text().includes('Or sign in with:')).toBe(false);
  });

+  it('should show sign-in header providers (ENABLE ENTERPRISE LOGIN)', () => {
+    mergeConfig({
+      DISABLE_ENTERPRISE_LOGIN: '',
+    });
+
+    store = mockStore({
+      ...initialState,
+      commonComponents: {
+        ...initialState.commonComponents,
+        thirdPartyAuthContext: {
+          ...initialState.commonComponents.thirdPartyAuthContext,
+          providers: [{
+            ...ssoProvider,
+          }],
+        },
+      },
+    });
+
+    const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
+    expect(loginPage.text().includes('Or sign in with:')).toBe(true);
+    expect(loginPage.text().includes('Company or school credentials')).toBe(true);
+    expect(loginPage.text().includes('Institution/campus credentials')).toBe(false);
+  });
+
+  it('should show sign-in header with providers (DISABLE ENTERPRISE LOGIN)', () => {
+    mergeConfig({
+      DISABLE_ENTERPRISE_LOGIN: true,
+    });
+
+    store = mockStore({
+      ...initialState,
+      commonComponents: {
+        ...initialState.commonComponents,
+        thirdPartyAuthContext: {
+          ...initialState.commonComponents.thirdPartyAuthContext,
+          providers: [{
+            ...ssoProvider,
+          }],
+        },
+      },
+    });
+
+    const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
+    expect(loginPage.text().includes('Or sign in with:')).toBe(true);
+    expect(loginPage.text().includes('Company or school credentials')).toBe(false);
+    expect(loginPage.text().includes('Institution/campus credentials')).toBe(false);
+
+    mergeConfig({
+      DISABLE_ENTERPRISE_LOGIN: '',
+    });
+  });
+
+  it('should not show sign-in header without Providers and secondary Providers (ENABLE ENTERPRISE LOGIN)', () => {
+    mergeConfig({
+      DISABLE_ENTERPRISE_LOGIN: '',
+    });
+
+    store = mockStore({
+      ...initialState,
+      commonComponents: {
+        ...initialState.commonComponents,
+        thirdPartyAuthContext: {
+          ...initialState.commonComponents.thirdPartyAuthContext,
+        },
+      },
+    });
+
+    const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
+    expect(loginPage.text().includes('Or sign in with:')).toBe(false);
+    expect(loginPage.text().includes('Company or school credentials')).toBe(false);
+    expect(loginPage.text().includes('Institution/campus credentials')).toBe(false);
+  });
+
+  it('should not show sign-in header without Providers and secondary Providers (DISABLE ENTERPRISE LOGIN)', () => {
+    mergeConfig({
+      DISABLE_ENTERPRISE_LOGIN: true,
+    });
+
+    store = mockStore({
+      ...initialState,
+      commonComponents: {
+        ...initialState.commonComponents,
+        thirdPartyAuthContext: {
+          ...initialState.commonComponents.thirdPartyAuthContext,
+        },
+      },
+    });
+
+    const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
+    expect(loginPage.text().includes('Or sign in with:')).toBe(false);
+    expect(loginPage.text().includes('Company or school credentials')).toBe(false);
+    expect(loginPage.text().includes('Institution/campus credentials')).toBe(false);
+
+    mergeConfig({
+      DISABLE_ENTERPRISE_LOGIN: '',
+    });
+  });
+
+  it('should show sign-in header with secondary Providers and without Providers', () => {
+    mergeConfig({
+      DISABLE_ENTERPRISE_LOGIN: true,
+    });
+
+    store = mockStore({
+      ...initialState,
+      commonComponents: {
+        ...initialState.commonComponents,
+        thirdPartyAuthContext: {
+          ...initialState.commonComponents.thirdPartyAuthContext,
+          secondaryProviders: [{
+            ...secondaryProviders,
+          }],
+        },
+      },
+    });
+
+    const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
+    expect(loginPage.text().includes('Or sign in with:')).toBe(true);
+    expect(loginPage.text().includes('Institution/campus credentials')).toBe(true);
+
+    mergeConfig({
+      DISABLE_ENTERPRISE_LOGIN: '',
+    });
+  });
+
+  it('should show sign-in header with Providers and secondary Providers', () => {
+    mergeConfig({
+      DISABLE_ENTERPRISE_LOGIN: true,
+    });
+
+    store = mockStore({
+      ...initialState,
+      commonComponents: {
+        ...initialState.commonComponents,
+        thirdPartyAuthContext: {
+          ...initialState.commonComponents.thirdPartyAuthContext,
+          providers: [{
+            ...ssoProvider,
+          }],
+          secondaryProviders: [{
+            ...secondaryProviders,
+          }],
+        },
+      },
+    });
+
+    const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
+    expect(loginPage.text().includes('Or sign in with:')).toBe(true);
+    expect(loginPage.text().includes('Company or school credentials')).toBe(false);
+    expect(loginPage.text().includes('Institution/campus credentials')).toBe(true);
+
+    mergeConfig({
+      DISABLE_ENTERPRISE_LOGIN: '',
+    });
+  });
+
  // ******** test alert messages ********

  it('should match login error message', () => {
@@ -455,6 +611,51 @@ describe('LoginPage', () => {
    });
  });

+  it('should render other ways to sign in button', () => {
+    store = mockStore({
+      ...initialState,
+      commonComponents: {
+        ...initialState.commonComponents,
+        thirdPartyAuthContext: {
+          ...initialState.commonComponents.thirdPartyAuthContext,
+          providers: [ssoProvider],
+        },
+        thirdPartyAuthApiStatus: COMPLETE_STATE,
+      },
+    });
+
+    delete window.location;
+    window.location = { href: getConfig().BASE_URL.concat('/login'), search: `?tpa_hint=${ssoProvider.id}` };
+    ssoProvider.iconImage = null;
+
+    const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
+    expect(loginPage.find('button#other-ways-to-sign-in').text()).toEqual('Show me other ways to sign in or register');
+  });
+
+  it('should render other ways to sign in button when public account creation disabled', () => {
+    mergeConfig({
+      ALLOW_PUBLIC_ACCOUNT_CREATION: false,
+    });
+    store = mockStore({
+      ...initialState,
+      commonComponents: {
+        ...initialState.commonComponents,
+        thirdPartyAuthContext: {
+          ...initialState.commonComponents.thirdPartyAuthContext,
+          providers: [ssoProvider],
+        },
+        thirdPartyAuthApiStatus: COMPLETE_STATE,
+      },
+    });
+
+    delete window.location;
+    window.location = { href: getConfig().BASE_URL.concat('/login'), search: `?tpa_hint=${ssoProvider.id}` };
+    ssoProvider.iconImage = null;
+
+    const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
+    expect(loginPage.find('button#other-ways-to-sign-in').text()).toEqual('Show me other ways to sign in');
+  });
+
  // ******** miscellaneous tests ********

  it('should render cookie banner', () => {
--- a/src/sass/_style.scss
+++ b/src/sass/_style.scss
@@ -520,13 +520,6 @@ select.form-control {
  }
 }

-@media screen and (min-width: 960px) {
-  html {
-    margin-right: calc(100% - 100vw);
-    margin-left: 0;
-  }
-}
-
 // Smaller than Extra Small (Mobile Screens)
@media (max-width: 464px) {
  .btn-social {
--- a/src/welcome/ProgressiveProfiling.jsx
+++ b/src/welcome/ProgressiveProfiling.jsx
@@ -148,18 +148,20 @@ const ProgressiveProfiling = (props) => {
          ) : null}
          <Form>
            {formFields}
-            <span className="progressive-profiling-support">
-              <Hyperlink
-                isInline
-                variant="muted"
-                destination={getConfig().WELCOME_PAGE_SUPPORT_LINK}
-                target="_blank"
-                showLaunchIcon={false}
-                onClick={() => (sendTrackEvent('edx.bi.welcome.page.support.link.clicked'))}
-              >
-                {intl.formatMessage(messages['optional.fields.information.link'])}
-              </Hyperlink>
-            </span>
+            {(getConfig().WELCOME_PAGE_SUPPORT_LINK) && (
+              <span className="progressive-profiling-support">
+                <Hyperlink
+                  isInline
+                  variant="muted"
+                  destination={getConfig().WELCOME_PAGE_SUPPORT_LINK}
+                  target="_blank"
+                  showLaunchIcon={false}
+                  onClick={() => (sendTrackEvent('edx.bi.welcome.page.support.link.clicked'))}
+                >
+                  {intl.formatMessage(messages['optional.fields.information.link'])}
+                </Hyperlink>
+              </span>
+            )}
            <div className="d-flex mt-4 mb-3">
              <StatefulButton
                type="submit"
--- a/src/welcome/tests/ProgressiveProfiling.test.jsx
+++ b/src/welcome/tests/ProgressiveProfiling.test.jsx
@@ -94,6 +94,24 @@ describe('ProgressiveProfilingTests', () => {
    };
  });

+  it('not should display button "Learn more about how we use this information."', async () => {
+    mergeConfig({
+      WELCOME_PAGE_SUPPORT_LINK: '',
+    });
+    const progressiveProfilingPage = await getProgressiveProfilingPage();
+
+    expect(progressiveProfilingPage.find('a.pgn__hyperlink').exists()).toBeFalsy();
+  });
+
+  it('should display button "Learn more about how we use this information."', async () => {
+    mergeConfig({
+      WELCOME_PAGE_SUPPORT_LINK: 'http://localhost:1999/support',
+    });
+    const progressiveProfilingPage = await getProgressiveProfilingPage();
+
+    expect(progressiveProfilingPage.find('a.pgn__hyperlink').text()).toEqual('Learn more about how we use this information.');
+  });
+
  it('should render fields returned by backend api', async () => {
    const progressiveProfilingPage = await getProgressiveProfilingPage();
    expect(progressiveProfilingPage.find('#gender').exists()).toBeTruthy();
Author	SHA1	Message	Date
Shahbaz Shabbir	c5ef676e65	feat: hide signup page on the bases of flag (#837 ) Co-authored-by: attiyaishaque <atiya.ishaq@arbisoft.com>	2023-04-10 17:18:22 +05:00
Dmytro	ed4fbaaca5	feat: displaying a support link on the welcome page (#763 ) This update adds a display dependency support links on welcome page if variable AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK non-empty in MFE configuration.	2023-03-08 10:08:59 +05:00
Stanislav	b676a058b1	fix: Remove horizontal scroll in windows (#759 )	2023-03-02 16:15:55 +05:00
Dmytro	ce6cc34bde	fix: link to the password reset page (#753 ) When using two different deployment approaches, with one of them we get an incorrectly working link to the password reset page.	2023-03-02 16:15:38 +05:00
Ghassan Maslamani	c5deeb7f99	chore(i18n): update translations (#761 ) Co-authored-by: Jenkins <sre+jenkins@edx.org>	2023-03-01 12:25:31 +05:00
Dmytro	dabf556e2f	fix: display or sign in with (#750 )	2023-02-20 13:36:20 +05:00
Dmytro	fd4404ec28	feat: don't show support button (#746 ) Do not show the button "Need help logging in?" if there is no support page for sign-in issues.	2023-02-14 15:54:57 +05:00
Zainab Amir	8dbf20b3d2	fix: add policy banner settings to config (#708 )	2022-12-19 18:07:57 +00:00
Zainab Amir	4ae9ead191	feat: make policy banner configurable (#707 )	2022-12-19 18:07:57 +00:00